Commit Graph
3321 Commits
Author SHA1 Message Date
Flugente 503523a9fa New feature: localized weather adds more weather types, different weather can happen in different sectors at the same time.
For more info, see http://thepit.ja-galaxy-forum.com/index.php?t=msg&th=23094&#msg_345949

Requires GameDir >= r2325

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8253 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2016-06-18 20:57:03 +00:00
Flugente facadda6e8 Fix: potential random memory access
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8252 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2016-06-17 18:28:50 +00:00
silversurfer 6e1676c94f Fix (by Sevenfm): height difference penalty calculation for cowering targets in OCTH was using wrong target
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8249 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2016-06-06 14:45:23 +00:00
silversurfer 5307881cb7 Fixes (by Sevenfm):
- incorrect sized array for secondary item stat regions
- incorrect check for secondary item stat display removed

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8248 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2016-06-05 13:23:26 +00:00
silversurfer 90ff5d5626 Fix: AimLevels bonus was displayed for OCTH although it doesn't apply there
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8247 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2016-06-04 09:56:46 +00:00
Flugente 2c85d6dc03 Fix: determining a militia path in strategic map could cause the sector militia size to be cut to MAX_STRATEGIC_ENEMY_GROUP_SIZE
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8243 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2016-05-28 15:07:44 +00:00
silversurfer 7b288c5c83 Fix (by Sevenfm):
- Armor search routine could crash if EffectiveArmour returns 0

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8241 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2016-05-27 11:08:22 +00:00
silversurfer 7f6d44183a Fix (by Sevenfm): breath points for walking with a weapon raised were calculated incorrectly
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8240 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2016-05-27 07:55:44 +00:00
silversurfer 671b4527ac Fixes (by Sevenfm):
- Armor search routine had incorrect calculations
- Tiles adjacent to buildings could be assigned to a building

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8239 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2016-05-27 07:52:32 +00:00
Flugente d8c79675e7 Fix: armour comparison compares helmet with vest/legs and is unsafe
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8238 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2016-05-26 19:05:58 +00:00
Flugente c20232a740 Fix: when starting a new campaign, NULL the StrategicMap flagmask
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8237 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2016-05-26 12:27:49 +00:00
Flugente 88d60c8df1 Fix: corpses on a roof cannot be interacted with
Note that once a rooftop corpse has been decapitated, it cannot be accessed again, due to as of yet unclear structure handling.

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8236 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2016-05-26 11:17:04 +00:00
Flugente 2defb8259b Fix: after firing an underbarrel GL, it was possible to reload via leftclick for a short time, leading to reload of main gun with a grenade
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8235 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2016-05-25 19:39:10 +00:00
Flugente 4e498b1a5d Fix: ASD update function not periodicaly called. This bug only exists in campaigns started before r8015.
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8233 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2016-05-24 19:19:48 +00:00
Wanne c676a48cd5 Fix: Added explicit BOOLEAN check for pSoldier->bVisible (by sevenfm)
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8230 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2016-05-23 05:24:45 +00:00
Flugente db00927287 - Fix: same militia profile is used several times in autoresolve
- Fix: sometimes no battle repoer is written for autoresolve
- Fix: no militia profile found in autoresolve due to bad sector

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8229 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2016-05-22 23:04:05 +00:00
Flugente 74bebdd454 - colour TestTable scrollbar
- militia website sector filter uses longer names
- prisoner surrender dialogue explains how many prisoners were captured, and allows selecting prison via dropdown selection
- explain soldier relation boundaries on Melody website

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8228 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2016-05-20 22:39:29 +00:00
Flugente c0d25c3cb7 Fix: mobile militia (ALLOW_MOBILE_MILITIA = TRUE) could get 'lost' if moving
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8227 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2016-05-20 19:07:04 +00:00
silversurfer 196a1eb84d AI and tactics improvements (by Sevenfm):
New options:
 AI_YELLOW_FLANKING - yellow flanking is disabled by default
 IMPROVED_TACTICAL_UI - use name color to show soldier's status (disguised, drunk)

Removed obsolete options:
 SHOW_COVER_INDICATOR
 SHOW_ENEMY_RANK_ICON
 SHOW_ENEMY_AWARENESS

Fixes and improvements:
 - collapsed enemies should not taunt
 - if soldier is unconscious, he can't see anything or anybody
 - ClosestReachableDisturbance - performance improvement
 - allow InternalGoAsFarAsPossibleTowards to jump over fences

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8226 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2016-05-20 18:25:33 +00:00
Flugente e86b24821c sped up reload function
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8225 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2016-05-19 21:58:07 +00:00
Flugente 310fa7d57c Fix: incorrect check (by sevenfm)
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8224 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2016-05-18 19:13:38 +00:00
Flugente 5a84b7b748 Fix: on various actions in the strategic screen (open inventory, dynamic dialogue) the message list is turned on and off
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8223 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2016-05-18 18:13:45 +00:00
Flugente 1565a9f67c 'Improve Gear'-function now also merges magazines and fills up ammo stacks
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8221 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2016-05-17 21:37:42 +00:00
Flugente b9575fcbee If Skyrider can't fly due to being out of fuel, warn the player
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8220 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2016-05-16 20:54:01 +00:00
Flugente 41a9c7104d Fix: crash in release exe due to bad initialisation
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8218 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2016-05-16 16:25:32 +00:00
Flugente 5df191a263 New disability: Hemophiliac causes mercs to bleed a lot faster, even for tiny wounds
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8217 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2016-05-16 15:17:11 +00:00
Flugente 645b42bc8b Fix: UB compilation error
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8216 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2016-05-16 12:37:24 +00:00
Flugente 381acc74a4 If we manually disguise a merc, immediately test the disguise
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8215 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2016-05-16 10:31:47 +00:00
Flugente 6460e9d325 Fix: unable to save after loading an older savegame
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8213 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2016-05-15 22:53:19 +00:00
Flugente 7bb401b1fb New feature: We can now create non-profile-based merchants via lua.scripts.
Requires GameDir >= r2320.

For more info, see http://thepit.ja-galaxy-forum.com/index.php?t=msg&th=23061&goto=345526&#msg_345526

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8212 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2016-05-15 17:11:29 +00:00
Flugente d594ba0e67 If a merc intentionally removes the diguise property via the [Ctrl] + [.] menu, the disguise property will not be reapplied until new clothes are applied, even if COVERT_STRIPIFUNCOVERED is set to FALSE in Skills_Settings.ini. This allows dressing up mercs in other colours without them being subject to covert mechanics.
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8211 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2016-05-13 17:25:02 +00:00
Flugente 284910e2d5 Changes to covert operations feature (by sevenfm): If the new skill setting COVERT_STRIPIFUNCOVERED is FALSE,
- we can only disguise successfully if we haven't been seen recently (last 3 turns)
- disabled automatic clothes stripping when uncovered
- redisguise automatically if spy haven't been seen by enemy recently and wears correct clothes

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8210 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2016-05-12 22:27:54 +00:00
silversurfer e43d1b3fb3 Fix: The Brass Knuckles tag didn't count as bare hand attacks anymore since revision 6465. I changed that back because Martial Arts trait includes brass knuckle items. Single attack AP display of such items in EDB was fixed as well.
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8207 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2016-05-08 15:19:39 +00:00
Flugente 1a56d4a473 Fix: jumping over a merc allowed moving through walls
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8206 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2016-05-07 19:54:56 +00:00
Flugente 999fcea058 Added more operation names
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8205 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2016-05-06 18:42:22 +00:00
Flugente dc78077b0f Fix: unneccessary individual militia created during savegame loading due to bad sector
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8203 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2016-05-06 15:09:17 +00:00
Flugente 9f52c940a8 New feature: individual militia creates small militia profiles that track a militia's history and allow it to be recreated, thereby maintaining the illusion of persistent militia.
Requires GameDir >= r2316.

For more info, see http://thepit.ja-galaxy-forum.com/index.php?t=tree&th=23044&goto=345324&#msg_345324

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8202 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2016-05-06 14:51:24 +00:00
silversurfer 67927ed723 Fix: After restarting the game and loading a savegame the reinforcement option was always TRUE because it didn't take DifficultySettings.xml into account.
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8191 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2016-05-04 11:23:03 +00:00
Wanne c969dce2b3 Bugfix: Button Image (WM_AUTOFIRE) was not unloaded (by Subotai)
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8187 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2016-05-03 19:28:54 +00:00
Flugente 6adf9ad901 - Fix: coloured glitches in dropdown area
- Improved mouse drag in dropdown scrollbar

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8183 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2016-05-02 20:11:42 +00:00
Flugente dba2386bc3 Changed variables to UINT16, in case a dropdown has a lot of entries
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8179 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2016-05-01 19:04:50 +00:00
Flugente bd59b2fcba - Fix: UB cannot be compiled
- Fixed a few compiler warnings

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8176 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2016-04-24 19:59:25 +00:00
Flugente 38814f5ee3 Fix: counter is not increased, potentially resulting in endless loop
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8169 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2016-04-23 14:42:58 +00:00
Flugente f0b9bb4304 Fix: if an enemy jeep is destroyed, sector jeep count is not properly updated
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8168 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2016-04-23 14:36:38 +00:00
Flugente 1b8a368108 Fix: UB cannot be compiled
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8167 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2016-04-22 20:03:32 +00:00
Flugente 92314bfbfb Fix: if a jeep is fought in autoresolve, it's entry remains in the vehicle list
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8166 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2016-04-22 19:46:41 +00:00
silversurfer 14ccc1193b Fix: The invisible troops fix from r8131 caused defending troops to be handled as reinforcements and appear at the map border instead of the pre-defined positions across the map. This was caused by unpausing the game before the troops had been placed. This revision fixes that and hopefully doesn't break anything else.
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8162 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2016-04-18 21:21:53 +00:00
Flugente 26db62bd19 Fix: when merc starting gear is distributed into inventory, it is possible that too many items are spawned if an item stack is ahared over several slots
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8154 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2016-04-12 21:36:07 +00:00
Flugente d913cf5ad8 Fix: crash in autoresolve
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8149 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2016-04-10 15:39:41 +00:00
Flugente 7124df2354 - Fix: Get Item assignement: if no valid gridno is found, let the game find one upon loading the sector instead of risking a wrong gridno assignment
- Fix: When dropping an item in strategic inventory, height values are not set 
- Fix: When looking for a valid gridno to drop items t via strategic inventory, WORLD_ITEM_REACHABLE is not reliable, as updated map topology trumps this. Instead rely upon finding a valid gridno once the sector is entered.
- Fix: when searching for a new item dropoff gridno, search for new height too
- Fix: if items are spawned mid-air, the player cannot retrieve them

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8136 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2016-04-09 16:11:43 +00:00