100 Commits
Author SHA1 Message Date
silversurfer d867051cd6 fix: when multiple mercs are repairing, it could happen that one of them didn't spend any points, causing an error message about insufficient skill
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8900 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2020-10-16 07:52:46 +00:00
silversurfer 1a31b21ea4 Fix: Re-enabled the condition check for mercs to enter tactical screen from map screen. Someone removed it, which made it possible to enter tactical with no mercs in the sector.
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8875 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2020-08-01 15:22:26 +00:00
silversurfer 7931497b9c Fix:
- when USE_XML_SQUADNAMES was TRUE, the squad box was shifted upwards over the column headers, causing clipping issues
- when READ_PROFILE_DATA_FROM_XML was TRUE, the game would still read profile data from prof.dat, if the old inventory system was used

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8868 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2020-07-17 11:22:29 +00:00
silversurfer 0e9e13e838 fix: travel time wasn't correctly calculated for survivalist and background speed bonuses
enhancement: new calculations for travel speed bonuses of survivalist and backgrounds

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8794 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2020-04-27 20:34:51 +00:00
silversurfer a181d7c061 Fix: RaiseZombies function ignored sector levels and modified wrong sector info counters
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8692 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2019-08-24 19:11:26 +00:00
silversurfer 6a1fd17026 Fix: Items that were placed by function AutoPlaceObjectToWorld() had incorrect sGridNo so they could end up in inaccessible places.
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8690 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2019-08-20 17:41:56 +00:00
silversurfer 837709a448 Fix: Mercs that entered a vehicle on the strategic map while standing on a roof would appear at roof level after arriving in another sector and exiting the vehicle in strategic after loading the map. Now all mercs entering vehicles are reset to ground level.
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8689 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2019-08-14 15:20:10 +00:00
silversurfer 557505893b Fix (by MH17):
- group assignment bug with multiple enemy groups in same sector
- sector creature counter wasn't decreased properly when zombies died

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8686 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2019-08-11 09:15:15 +00:00
silversurfer 037e877013 Fix (by Asdow): Enemy cover display performance improved.
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8685 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2019-08-11 07:49:47 +00:00
silversurfer 01b540184d Fix (by Asdow): several animation scripts had incorrect values for action (mercs got up after cowering while prone, problems with first aid and bayonet stab)
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8684 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2019-07-28 13:08:14 +00:00
silversurfer 548d85319e Fix: Civ Group popups in map editor weren't working correctly and debugger showed incorrect data for popups
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8683 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2019-07-27 12:38:39 +00:00
silversurfer a6d7c95abb Fix: missed some instance of the logic error for merc refinement that was fixed in r8679
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8682 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2019-07-05 09:17:35 +00:00
silversurfer 706c6378c2 Fix: Shift + R didn't work anymore to reload the weapons of all mercs
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8681 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2019-06-29 16:35:28 +00:00
silversurfer f8d2f0445e fix: ENEMY_GENERALS_BODYGUARDS_NUMBER wasn't applied correctly when VIP sectors were initialized
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8680 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2019-06-28 15:12:37 +00:00
silversurfer e650ea8733 Fix: mercs with average refinement and extreme care level would dislike even other average mercs
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8679 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2019-06-27 18:04:58 +00:00
silversurfer e39652f6e2 Feature enhancement: Drop All now allows to use the following settings:
0 = Drop All is off and drop chances are used
1 = Drop All is on and everything is dropped
2 = Mild Drop All which means that everything is dropped (like 1) but items that are usually not dropped (like 0) are severely damaged.

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8675 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2019-04-22 11:12:13 +00:00
silversurfer 98cab67624 Fix: Errors in UB code
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8647 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2019-01-02 13:22:24 +00:00
silversurfer 8b58f9a1bf Fixes (by Sevenfm):
- wrong level calculation for suppression resistance with friends
- incorrect buddy handling
- incorrect PoW, medic, wounded determination

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8643 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2018-12-02 14:59:08 +00:00
silversurfer 3aa412ac56 Fix: Incorrect movement cost calculation for jumping over fences with obstacles behind them
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8640 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2018-11-10 14:34:01 +00:00
silversurfer 6b601809d0 Fix: The game incorrectly deducted AP_CHANGE_TARGET for raising a weapon.
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8637 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2018-11-08 13:34:17 +00:00
silversurfer 4021450369 - fixed incorrect AP and BP calculation for jumping over fences
- fixed incorrect stance handling for jumping over fences

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8635 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2018-11-04 17:49:10 +00:00
silversurfer 384572098b - fixed incorrect rounding in several places in the code
- diagonal movement now uses the proper amount of AP and BP

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8634 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2018-11-03 16:11:21 +00:00
silversurfer 7f5d83d220 improved the "open door from the side" code to make the merc turn into the proper direction
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8633 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2018-10-31 17:00:44 +00:00
silversurfer 2196a73b1a Fix (by Sevenfm) - penalty for shooting with a height difference was wrong
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8632 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2018-10-30 18:42:51 +00:00
silversurfer d1a94ee90d Fix (by Sevenfm) - shooting upwards penalty calculation was wrong
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8631 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2018-10-30 14:55:59 +00:00
silversurfer 3723ebfa43 Fix (by Sevenfm) - noise volume was capped so less important noises could be stored in the AI noise memory
New feature - mercs can now also open doors from the side instead of the front

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8630 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2018-10-30 14:16:51 +00:00
silversurfer 54d5bb0317 fix (by Sevenfm): some functions ignored the last member of a team
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8629 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2018-10-16 11:59:54 +00:00
silversurfer d341f290f6 fixed incorrect handling of army compositions
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8617 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2018-09-23 15:46:39 +00:00
silversurfer 2aab4aff5d - added new parameters for NCTH in DifficultySettings.xml that allow the modification of CTH for militia and player mercs (requires GameDir 2445)
- re-enabled the extra elites for counter attacks

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8615 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2018-09-20 17:42:34 +00:00
silversurfer fed9ca298c - new modifiers "MISS_MAX_RADIUS_x" for grenades and mortar to set a max radius where they will land. Chance to hit something with explosives is now based more on skill than on luck.
- fixed infinite loop in function "RandomGridFromRadius" when min and max radius were 1
- fixed incorrect exit condition in function "RandomGridFromRadius" when min radius was 0
- fixed incorrect CtH calculation for mortar

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8598 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2018-08-22 17:54:24 +00:00
silversurfer 3099b78146 updated settings for JA2_Options.ini and the corresponding data in the game code
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8507 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2017-11-08 12:32:55 +00:00
silversurfer 0450b7a32c Fixes:
- missing laser range in OCTH
- missing compare functionality for laser ranges
- missing ToHitBonus display for crouched stance

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8478 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2017-09-23 11:16:37 +00:00
silversurfer 5d6de52be9 Fix: NPCs could get covert flags in old trait system which prevented them from ever losing it making them undetectable.
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8405 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2017-06-12 11:15:29 +00:00
silversurfer 0c521e2623 Fixes (by The_Bob):
- Fixed never ending interrupt bug (cats/bugs got interrupt when out of breath)
- Added condition to interrupt code for minimal breath left to get interrupts
- Tweaked timer control code

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8401 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2017-04-14 19:03:55 +00:00
silversurfer d7f91064f0 Fixes (by The_Bob):
- Fixed index out of bounds in get items assignment check
- Fixed attachment popup not allowing more than one of the same attachment
- Improved timer control sanity check code
- Added timer adjustment for variable CPU frequency
- Added shortcut: ctrl+left-click on attachment to remove and drop it in sector inventory

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8400 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2017-04-14 08:34:20 +00:00
silversurfer fef0722178 Fixes (by The_Bob):
- Fixed random freeze on win8/10
- Fixed crash on mercs entering sector
- Fixed crash when using cover display (del/end)
- Fixed attachment popup showing incompatible attachments (crash/freeze/confusion on clicking the option)
- Fixed attachment popup positioning
- Fixed LBE contents corruption/deletion
- Fixed access violation (out of array bounds) in interrupt code
- Fixed a bunch of random old stuff
- Got the project to build on VS2015
- Improved popup class handling of grayed out options
- Improved performance of get item assignment check (added by Flugente)
- Added Ctrl+Space bind for testing/fixing broken LBE contents


git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8399 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2017-04-12 08:09:12 +00:00
silversurfer 5d02ca8894 fix: UB build error from change in 8396
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8398 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2017-04-02 16:07:23 +00:00
silversurfer 3a4821286a fix: game info display showed incorrect levels for BR
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8397 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2017-04-02 07:38:09 +00:00
silversurfer dbec9c6ca0 - Added external parameter CounterAttackGroupSize to DifficultySettings.xml for counter attack strength. This replaces the old hard coded value. Requires GameDir >= 2363!
- Changed counter attack elite soldier distribution to replace regulars just like the rest of the code handles elites.

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8396 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2017-03-14 17:21:40 +00:00
silversurfer 4f8498e5ef slightly modified the damage formula from r8370
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8371 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2017-01-22 14:09:26 +00:00
silversurfer a6b2568e24 - new jam damage thresholds for guns - when a gun jams it can only take damage if its status is below the threshold
- modified damage calculation for jam damage
- modified cleaning point calculation for mercs
- natural dirt level of sectors now halved if the shooter is inside a building

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8370 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2017-01-22 13:33:44 +00:00
silversurfer 5a602f0b9c Fix: incorrect underground check for cave vision bonus and scouting
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8340 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2016-11-16 16:41:16 +00:00
silversurfer 372adc37b8 repair and dirt system change:
Dirt is now part of gun status. The original dirt system has been removed. For details see:
http://thepit.ja-galaxy-forum.com/index.php?t=msg&th=20198&goto=347370&#msg_347370


git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8325 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2016-10-19 15:58:02 +00:00
silversurfer 5f4a7e2331 - turned off compiler warning in VS2010
- fixed compiler error in VS2010

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8317 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2016-10-15 18:18:10 +00:00
silversurfer f1f0ba7aed Fix: Tag <BadSector> was overlooked in the r8295 change causing the game to crash on startup. This is now handled differently and properly.
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8297 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2016-09-12 18:39:52 +00:00
silversurfer 9395fcc8a2 Enhancement:
- SCROLL_SPEED_FACTOR in Ja2_Options.ini allows to modify scroll speed
- while reading MovementCosts.xml the game checks now for valid traversal type and asserts instead simply assigning type GROUNDBARRIER

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8295 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2016-09-11 11:42:48 +00:00
silversurfer cedb77bffb Fixes (by Sevenfm):
- put back AIM_VISIBILITY calculation in function "CalcNewChanceToHitGun"
- fixed possible NULL pointer condition

Added an indicator to the NCTH cursor to show aiming penalty for moving target.

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8294 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2016-09-03 11:56:00 +00:00
silversurfer 2c5e85f828 Fix: VS2010 debug builds crashed while reading InteractiveActions.xml
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8284 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2016-08-11 13:48:38 +00:00
silversurfer 73e3e1172c Fix: gGameCTHConstants.BASE_CROUCHING_STANCE was missing from handling calculations in NCTH
- removed gGameExternalOptions.fUseNewCTHCalculation as it is not needed anymore
- cleaned up function CalcNewChanceToHitGun

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8281 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2016-08-06 10:44:42 +00:00
silversurfer ab554b937c Fix:
- price and militia resource points display in sector inventory was incorrect and didn't take Shift key into account
- display of militia resource below the map didn't work if MILITIA_VOLUNTEER_POOL was FALSE

Enhancements:
- militia resource points display below map now better organized
- militia resource points display below map now available when in sector inventory and pressing ALT key
- conversion of items to militia resource points now available with ALT + RMB, ALT + Shift + RMB and ALT + Shift + Y + RMB just like quick sell feature works


git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8275 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2016-07-17 13:44:58 +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
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
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
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
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
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
silversurfer fcad428a12 Fix: When MIN_DELAY_ENEMY_REINFORCEMENTS was set in Ja2_Options.ini incoming enemy troops were not placed on the map because their reinforcement timer was not met yet. Also the game was paused so the timer could never run at all.
The game is now unpaused whenever we enter the tactical screen. Also if there are no enemies on the map yet the minimum reinforcement delay is ignored.

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8131 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2016-03-29 14:08:26 +00:00
silversurfer 3fb99cfb87 Moved INITIAL_MERC_ARRIVAL_LOCATION from Ja2_Options.ini to Mod_Settings.ini. If Mod_Settings.ini has a value defined it will overwrite the value from Ja2_Options.ini. Otherwise it will leave it alone.
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8105 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2016-03-12 09:30:18 +00:00
silversurfer d23f9313bd Fix (by Sevenfm): AI attitude was mixed with orders in function NewDest
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8091 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2016-03-05 14:43:40 +00:00
silversurfer 9388e38956 New parameter in DifficultySettings.xml:
LootStatusModifier defines how much his dropped equipment can get damaged when an opponent dies. This externalizes the hardcoded values that depended on difficulty level.

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8056 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2016-02-13 15:20:45 +00:00
silversurfer f20b638214 Fix: the game had inconsistent handling of maximum XP level. At some points it was 9, at others it was 10. Now it is 10 throughout the code.
New parameters in DifficultySettings.xml:
- LevelModifierLowLimit
- LevelModifierHighLimit
- AllowUnrestrictedXPLevels


git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8052 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2016-02-06 23:31:57 +00:00
silversurfer 50c764ee04 Fix: - additional defenses around Meduna and additional elites where used incorrectly from DifficultySettings.xml
- corrected some typos for parameters from DifficultySettings.xml

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8013 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2016-01-09 16:27:56 +00:00
silversurfer dcf8b3abaf AI improvements (by Sevenfm):
Bugfixes:
- Fix: Watched Locations system (never worked in 1.13)
- Fix: LineOfSight test with NO_DISTANCE_LIMIT (stopped on trees previously)

AI/tactical improvements:
- EstimateThrowDamage additionally calculates damage from fragments (important for AI to use frag grenades with low main damage and many fragments)
- EstimateThrowDamage correctly adds IndoorModifier
- Additional checks for RED suppression (check that the soldier will not shoot his friends, check that he has extra clip to reload weapon, check that target is not cowering, don't suppress when flanking)
- ClosestReachableDisturbance will use general noise only if cannot find any enemy
- Allow RED seeking in prone stance if we haven't seen enemy for several turns

Flanking improvements:
- allow YELLOW flanking for CLOSEPATROL at night
- better YELLOW/RED flanking start/stop conditions
- better RED AI behavior when finished flanking (try to reach flanking spot)
- allow RED flanking for CLOSEPATROL soldiers when at night, overcrowded or no other flanking soldiers yet

Optional AI improvements:
AI_EXTRA_SUPPRESSION
- AI will use suppression fire more often in RED state (set minimum AI CTH to 1)

AI_NEW_MORALE
- Better dynamic morale calculation depending on tactical situation.
- Additional min/max limits for AI morale
- Disabled HOPELESS morale for soldiers without guns (they can pick up weapon or attack with hands sometimes)

AI_BETTER_COVER
- Additional checks for line of sight, fresh corpses and overcrowded locations

AI_EXTRA_FLANKING
- Allow flanking for BRAVEAID/BRAVESOLO

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8006 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2015-12-19 14:22:47 +00:00
silversurfer 2c889635ac Fix: New drug system didn't work and led to crashes of the debug build at start. Data will now be assigned to NewDrug directly instead of going through a placeholder which breaks the vectors.
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8005 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2015-12-14 10:15:09 +00:00
silversurfer 1e54f492ff AI flanking improvement by Sevenfm:
Improved AI RED/YELLOW flanking:
 - better direction calculation (use direction arrays)
 - increased search range 4->8
 - removed incorrectly calculated AP limit (use CalcActionPoints instead)
 - additional direction for flank spot searching
 - prefer desired direction
 - penalize tiles with no cover from noise location
 - penalize tiles too far from noise location
 - don't go into deep water for flanking
 - skip water tiles (can flank over water tiles only if can cross them in one turn)
 - min/max flanking range depends on time of day and base sight range
 - skip buildings when searching for flank spot if not in building already, because soldiers often run into buildings and stop flanking
 - use RUNNING movement mode for flanking instead of default SWATTING
 - only CUNNINGSOLO and CUNNINGAID soldiers flank
 - don't start flanking when no friends between soldier and noise gridno (in 3 directions)
 - stop flanking when no friends between soldier and noise gridno (in 3 directions)
 - stop flanking and reset flank counter in BLACK state
 - avoid map edges when flanking
 - disable flanking for soldiers with limited roaming range (STATIONARY/ONGUARD/CLOSEPATROL/SNIPER)

 In general, AI flanking is much more effective now (it never fully worked previously, especially in turnbased).

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8003 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2015-11-17 19:19:22 +00:00
silversurfer 0ff8256c40 Fix: When talking to a shopkeeper the game could crash with an assertion in Shopkeeper Interface.cpp line 990 because the temp vector wasn't initialized properly.
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8000 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2015-11-03 12:34:31 +00:00
silversurfer 873929c410 Fix (by sevenfm): Queen position was not read correctly from Mod_Settings.ini
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7976 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2015-08-17 17:09:51 +00:00
silversurfer abe7117231 Fix (by navaroe): The game could try to place more soldiers on the map than the map had slots which would cause the game to crash.
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7955 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2015-08-02 13:59:07 +00:00
silversurfer 1d8136aa06 Fix: New IMP gear selection method didn't include the Sidearm category so mercs could be left without a gun if their trait selection didn't include one.
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7908 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2015-07-09 16:19:47 +00:00
silversurfer 5c107cee7e Fix: FACT_HILLBILLIES_KILLED could be set TRUE even if the hicks were still alive breaking vendor Keith's quest. An additional check prevents this.
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7879 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2015-05-27 17:12:04 +00:00
silversurfer effc2d0d58 Fix: MAX_CTH_PENALTY_FOR_MOVING_TARGET wasn't read correctly from Ja2_Options.ini and also not used in the code. Now it's used like intended for OCTH.
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7878 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2015-05-26 11:15:11 +00:00
silversurfer e370e21f5f New door handling from r7872 will now only happen in turn based combat.
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7874 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2015-05-22 07:28:19 +00:00
silversurfer f24d417ac1 Enhanced the change from 7871 as the game doesn't distinguish between doors and containers. They are all "doors" in code terms. Now any "door" that doesn't have a key item assigned is considered a container.
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7872 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2015-05-21 18:59:13 +00:00
silversurfer dfc60c4394 Using shaped charges, keys or lockpicks on a locked door now only unlocks the door. It doesn't automatically open the door anymore. This solves the problem that a merc manages to pick a lock and after automatically opening the door he is a sitting duck because he has no AP left.
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7871 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2015-05-21 18:26:12 +00:00
silversurfer ca68c2b620 Fix: EDB displayed wrong number of aim levels if OCTH system was used.
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7864 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2015-05-14 19:51:52 +00:00
silversurfer 51dcf322aa EDB now displays the spread pattern of shotguns on the description tab.
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7859 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2015-05-13 20:10:08 +00:00
silversurfer 8ca4f49d61 Fix: OBJECT_KNOWN_TO_BE_TRAPPED was never set on player owned bombs so even the person who armed the bomb didn't know what he did. From now on every trap that we create gets this flag set.
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7811 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2015-04-11 15:49:11 +00:00
silversurfer 46a485b739 Fix (by Sevenfm): Opponent's action points had too much weight when calculating threat.
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7810 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2015-04-07 15:56:10 +00:00
silversurfer 4ef5b58107 Enhancement for scope mode fix in r7792: It is now allowed to use any scope mode except scopes while dual wielding guns.
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7804 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2015-04-01 09:56:47 +00:00
silversurfer 37f1ac452a Fix: Any tile that once had a player mine on it forever kept that flag. The map temp file will now be updated with a remove flag tag so that when a map is loaded the player mine flag will be removed.
If your savegame is already bugged you will need to step on each tile that had a mine to remove the player mine flag once.

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7796 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2015-03-22 13:27:44 +00:00
silversurfer 8ef0c1e353 Fix: It's not allowed to use scope modes other than iron sight and alternative weapon holding anymore when dual wielding guns.
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7792 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2015-03-20 21:26:28 +00:00
silversurfer a1f1b83952 Enhancement: It is now possible to view detailed camo information on the map screen (mouse-over popup at the camo value).
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7791 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2015-03-19 13:09:49 +00:00
silversurfer 6e55c159de Changed camo display - now only the highest value is displayed in the camo box instead of a sum of all different types of camo. This also fixes the problem that a laser could drown our camo value because of different types of penalties.
Also camo can no longer take a negative value.

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7789 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2015-03-18 16:29:57 +00:00
silversurfer 4b5fc5bc3c Fix:
- large MOLLE pockets didn't display their volume in EDB
- attaching a filled MOLLE pocket didn't show its contents. Now the contents will be removed and put in the soldiers inventory or on the ground if there is no space.

Enhancement:
Detaching filled MOLLE pockets is possible again. The contents will be moved to soldier inventory (if pocket was on the soldier before) or to the ground (in case of sector inventory manipulation).

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7788 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2015-03-17 18:15:58 +00:00
silversurfer 2afa02c913 Requires GameDir >= 2227 because of new icons!
EDB now displays available volume and pocket volume for MOLLE items.

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7784 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2015-03-16 09:56:29 +00:00
silversurfer 76689ab99d Enhancement: It is now possible to display attachments and contents of LBE at the same time when game option "Show LBE Content" is active.
http://thepit.ja-galaxy-forum.com/index.php?t=msg&th=20659&goto=340063&#msg_340063

Fixes for MOLLE display and handling:
- MOLLE didn't display attached pockets and their contents when the item was in sector inventory
- MOLLE pockets could be detached although there were still items inside the pocket. This led to items in invalid pockets (MOLLE on soldier) or items vanishing completely (MOLLE in sector inventory). Now it is not possible anymore to detach filled MOLLE pockets. You will have to empty them first.
- MOLLE in a stack displayed the wrong contents as long as their index was not 0.

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7783 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2015-03-15 12:50:30 +00:00
silversurfer 181f6eba63 Fix (by Sevenfm):
- calculation error in sight adjustment for stealth at light level
- calculation error in sight adjustment for movement at light level

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7780 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2015-03-11 19:38:47 +00:00
silversurfer f3553cf888 Fix: Mercs that have the <druguse> tag in their background spawned a bottle of alcohol anywhere in there inventory at full hour when function HourlyLarryUpdate() was run. The bottle would spawn in invalid slots as well for example the backpack slot. Now the game will only spawn a 25% condition bottle which is consumed right away which solves the inventory problem. This is more or less a hackfix.
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7766 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2015-03-04 10:54:28 +00:00
silversurfer 8ae8c147f9 Fix (by Sevenfm): NCTH aperture was offset by 1 to the bottom right
EDB enhancement: rechamber display now includes effects from traits

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7765 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2015-03-02 17:15:29 +00:00
silversurfer 215550e8fc Fix: Machinegunner trait did only count once for LMG attack AP reduction
More updates to EDB:
- fixed gun range calculation
- trait modified values now shown for attack AP and reload AP

Cleaned up attack AP trait modifiers and moved them to a new function.

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7764 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2015-03-01 16:25:58 +00:00
silversurfer 4b70b1e400 Fix: mouse position was not restored after a message box was closed
Modified the Ranger trait to make it more useful after loosing all survival bonuses:
- aim click bonus for shotguns is now again 1 (hunter) or 2 (ranger)
- new aim click bonus for rifles that is half the shotgun bonus. With the default value of "1" this means 0 for hunter and 1 for ranger. This does NOT stack with the sniper bonus! It's one or the other depending on which is higher.
- new speed bonus to reloading single shells into shotguns
- new range bonus for shotguns of 10% (hunter) or 20% (ranger)

EDB now displays the trait modified values for:
- Gun Range
- Draw Cost


git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7761 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2015-02-28 17:08:37 +00:00
silversurfer 34803db3cd fix: - alternative heli fuel system read the wrong parameters from Helicopter_Settings.INI
- when alternative heli fuel system was turned off the heli wouldn't refuel at all despite being at a refuel site

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7754 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2015-02-26 17:14:52 +00:00
silversurfer b2d35f6333 Message boxes can now have the mouse over a default button.
First places this is used are the tactical sector menu (CTRL + .) where "Refill Canteens" is the default and the trap disarm menu where "Disarm" is the default.

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7753 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2015-02-23 19:33:15 +00:00
silversurfer caf482614a Pre-placed bombs (action items with an explosive) can now be blown up by explosives. This allows clearing mine fields with grenades for example.
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7745 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2015-02-21 16:33:44 +00:00
silversurfer 1d1616707d fix: Mercs were always complaining that they can't hit a target with buckshot. Problem was that only one pellet was considered for the fake shot. Now all are calculated and the best result is returned.
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7741 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2015-02-16 19:23:09 +00:00
silversurfer 38cb0f8ffc fix: on map screen number of enemy troops in a sector was displayed incorrectly if there was one player unit besides the sector and another unit was diagonal to it and ALLOW_DETECTION_IN_DIAGONAL_SECTORS was FALSE.
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7740 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2015-02-15 13:36:58 +00:00