Commit Graph
392 Commits
Author SHA1 Message Date
Flugente 90de5ed424 Additional dialogue can be used for consuming specific items
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8531 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2018-02-28 20:29:30 +00:00
Flugente f4171a3889 If a merc's background has <druguse> set, they occasionally consume beneficial drugs in combat for free.
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8530 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2018-02-28 20:01:07 +00:00
Flugente abb8152d24 Fix: missing files
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8529 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2018-02-27 00:49:42 +00:00
Flugente 3bbdd4a23a New ability: a disguised spy can distract unalerted enemies, making it easier to sneak by.
For more info, see http://thepit.ja-galaxy-forum.com/index.php?t=msg&th=20228&goto=352562&#msg_352562

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8528 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2018-02-25 19:07:31 +00:00
Flugente c7d68dbd55 If DISABLE_EVOLUTION is TRUE, learning evolution is not used.
For more info, see http://thepit.ja-galaxy-forum.com/index.php?t=msg&th=20659&goto=352514&#msg_352514

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8525 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2018-02-22 19:01:43 +00:00
Flugente e55b480996 New feature: Getting and using intel allows for more spy-related roleplay.
For more info, see http://thepit.ja-galaxy-forum.com/index.php?t=msg&th=23643&goto=352475&#msg_352475

Requires GameDir >= r2401.

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8522 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2018-02-18 23:17:34 +00:00
Flugente dd3129ac11 New feature: additional dialogue allows modders to play additional dialogue on man occasions, including reactions to other people speaking
For more info, see http://thepit.ja-galaxy-forum.com/index.php?t=tree&goto=351982&#msg_351982 and for a demonstration http://thepit.ja-galaxy-forum.com/index.php?t=tree&goto=351981&#msg_351981

Requires GameDir >= r2400

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8516 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2018-01-10 23:41:52 +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
Flugente 5bdd23ac13 New animations: added animations for crouched walking with weapons aimed for all merc bodytypes (made by Taro)
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8496 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2017-10-15 17:10:49 +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
Flugente 6031257dcd New feature: mercs can drag people and corpses
Requires GameDir >= r2386.

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

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8474 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2017-09-17 22:16:30 +00:00
Flugente f7423782db New Feature: gear templates allow us to save and load a merc's equipment, thereby speeding up the equipment process.
For more info, see http://thepit.ja-galaxy-forum.com/index.php?t=msg&th=23462&goto=350497&#msg_350497

Requires GameDir >= r2384

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8440 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2017-08-06 21:06:49 +00:00
Flugente 11729a132e New feature: riot shields protect against damage from some directions.
For more info, see http://thepit.ja-galaxy-forum.com/index.php?t=msg&th=23452&start=0&

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8434 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2017-07-29 21:18:13 +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
Flugente a6b641d701 Fix: crash when loading a savegame repeatedly due to initialisation flag not being reset
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8384 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2017-01-30 20:06:45 +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
Flugente efd9ab4723 New feature: Voicesets are now independent fom profile slots. Voiceset is set in MercProfiles.xml with <usVoiceIndex>. IMP voices are defined in IMPVoices.xml.
This feature is savegame compatible.

Requires GameDir >= r2357

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8364 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2017-01-14 20:20:11 +00:00
Flugente d08b4d13b9 New feature: Minigames are interactive actions that happen in a dedicated screen. For more info, see http://thepit.ja-galaxy-forum.com/index.php?t=msg&goto=347722&#msg_347722
GameDir >= r2350 is required.

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8346 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2016-12-11 12:43:41 +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
Flugente 99f5be0ed7 New feature: interactive actions allow various actions (hacking/reading/drinking/...) from user-defined xml acttions. The exact results can be set in a lua function.
For more info, see http://thepit.ja-galaxy-forum.com/index.php?t=msg&th=23144&goto=346447&#msg_346447

This is fully savegame compatible.

GameDir >= r2333 is required.

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8278 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2016-08-02 19:03:28 +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
Flugente 7a34e9a154 New feature: militia resources requires the player to convert items to resources to be able to train and promote militia
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8271 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2016-07-15 19:33:44 +00:00
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
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
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
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 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
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
Flugente 33ab9c5e82 There are now separate functions for armed vehicles.
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8126 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2016-03-26 21:52:49 +00:00
Flugente 9e97538d89 New feature: enemy combat jeeps fill the role between infantry and tanks. For more info, see http://thepit.ja-galaxy-forum.com/index.php?t=msg&goto=344628&#msg_344628
This is savegame compatible. GameDir >= r2305 required.

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8114 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2016-03-20 18:45:51 +00:00