7623 Commits
Author SHA1 Message Date
Flugente a0c2b0a39a SAM site repair is now an assignment. For this, old code has been repurposed.
For more info, see http://thepit.ja-galaxy-forum.com/index.php?t=msg&th=22916&goto=347318&#msg_347318

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8314 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2016-10-14 17:20:23 +00:00
Flugente ab4afcd2a6 Fix: bad flag in Nada
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@2344 4f8fa57e-7814-0410-bad4-adc449f26b7c
2016-10-13 18:24:48 +00:00
Flugente e38e37d99c When buying soda from a machine, check inventory for cash first
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8313 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2016-10-13 18:22:47 +00:00
Flugente 5b6611bc61 Code change: When loading gun/looking for a default maazine for a gun while no mag with fitting magsize exists, instead take a magazine of same calibre and ammotype that has magsize bigger (but close to) the originally requested magsize.
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8312 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2016-10-07 19:20:53 +00:00
Wanne bdc6aaf460 Updated Chinese text file (by TBS)
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8311 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2016-10-06 18:00:03 +00:00
Flugente 258e9c24a0 New feature: SAM site cover can now overlap, and SAM sites can be hacked to lower their radius. For more info, see http://thepit.ja-galaxy-forum.com/index.php?t=msg&th=23211&goto=347188&#msg_347188
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8309 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2016-10-05 22:22:50 +00:00
Flugente 72d567a06e New feature: SAM site cover can now overlap, and SAM sited can be hacked to lower their radius. For more info, see http://thepit.ja-galaxy-forum.com/index.php?t=msg&th=23211&goto=347188&#msg_347188
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@2343 4f8fa57e-7814-0410-bad4-adc449f26b7c
2016-10-05 21:55:45 +00:00
Flugente 8523a1dead Fix: enemy jeeps are not always counted as enemies
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8308 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2016-10-04 19:57:27 +00:00
Wanne c83847a407 Fix: Item's short name in tactical interface, Chinese characters smearing bug
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8307 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2016-09-28 08:31:22 +00:00
Wanne 1e84d4e6b3 Updated Chinese GameDir files (by TBS)
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameData@8305 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2016-09-28 08:26:13 +00:00
Wanne 721e9effe9 Updated Chinese Text translations (by TBS)
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8304 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2016-09-28 08:24:27 +00:00
silversurfer a44c316e78 fix (by Darkling): removed all <resistance_poison> lines from Backgrounds.xml. This tag is not used anymore in the code.
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@2342 4f8fa57e-7814-0410-bad4-adc449f26b7c
2016-09-22 07:54:10 +00:00
Sevenfm e7fe040722 CalcChanceToHitGun, CalcNewChanceToHitGun: set fCantSeeTarget = true when shooting at empty invisible tile
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8301 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2016-09-14 07:07:40 +00:00
Sevenfm 17ce3e4473 Replaced Assert(pTempSoldier) in StartInterrupt with NOBODY and NULL checks.
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8300 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2016-09-13 20:14:11 +00:00
Wanne 8c3902e1b6 Fixed compilation error that was popping up when compiling a non English version
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8299 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2016-09-13 09:18:33 +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
Wanne 1e51250475 Multiplayer: Completely disabled interrupts in a COOP game, because it is still buggy. So the ALT + E workaround on the server (to give turn back to client on stuck interrupt) should not be needed anymore
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8296 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2016-09-12 18:03:19 +00:00
silversurfer cfc541f870 new modifier SCROLL_SPEED_FACTOR in Ja2_Options.INI that allows to modify scroll speed
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@2341 4f8fa57e-7814-0410-bad4-adc449f26b7c
2016-09-11 11:46:10 +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
Flugente ded46fea5a Changed Miguel from non-smoker to smoker for UB lore (by Boojum)
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@2340 4f8fa57e-7814-0410-bad4-adc449f26b7c
2016-09-01 18:00:04 +00:00
Wanne a011ae4a61 - German Subtitles for additional merc "Spooky" (by firebat)
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameData@8293 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2016-08-29 19:23:19 +00:00
Wanne 392135753c Update - 2016-08-29: Deadly Games German Translated Mercs for 1.13 - FINAL VERSION (by firebat)
- updates for certain mercs
- added known problems and solutions to the ReadMe file
- moved "Snitch" folder from "Data" to the correct location "Data\Speech\Snitch"


git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameData@8292 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2016-08-29 19:21:54 +00:00
Wanne 835e948735 Fixed compilation errors in VS 2005: std::sqrt() -> sqrt()
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8291 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2016-08-22 19:24:14 +00:00
Wanne 1826c57efd Added missing items to the *.Items.xml files
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameData@8290 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2016-08-22 18:26:52 +00:00
silversurfer 0ac39925d5 Fix: Syringes didn't fit into syringe pockets. Changed pocket definition to fit new size of syringes that was modified in GameDir 2242.
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@2339 4f8fa57e-7814-0410-bad4-adc449f26b7c
2016-08-21 22:24:56 +00:00
Flugente cbf284ce4d Fix: tileset index 0 always present in construct/deconstruct arrays
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8289 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2016-08-14 18:55:09 +00:00
Flugente a332b1943c Fix: one could remove Nails' jacekt via [Ctrl] + [W] in strategic inventory
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8288 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2016-08-12 22:34:30 +00:00
Flugente c32bf09bbb New feature: bear traps are mechanical traps that function like bombs, cause no explosion, can be reused, deal significant damage to legs and pin down the target.
GameDir >= r2338 is recommended.

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

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8287 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2016-08-12 20:48:34 +00:00
Flugente e5ec768af2 New feature: bear traps are mechanical traps that function like bombs, cause no explosion, can be reused, deal significant damage to legs and pin down the target.
For more info, see http://thepit.ja-galaxy-forum.com/index.php?t=msg&goto=346624&#msg_346624

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@2338 4f8fa57e-7814-0410-bad4-adc449f26b7c
2016-08-12 20:47:13 +00:00
Flugente d000e8c1a3 Fix: invalid access to inventory
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8286 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2016-08-12 17:51:21 +00:00
Flugente b36f24334c Fix: VS2010 compilation issue
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8285 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2016-08-11 20:15:52 +00:00
Flugente b712008493 Added pictures for Strela-2 and Strela-2 Missile (by Wil473)
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@2337 4f8fa57e-7814-0410-bad4-adc449f26b7c
2016-08-11 19:46:46 +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
Flugente f71e00ed78 Fix: VS2010 compilation issue
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8283 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2016-08-10 22:30:07 +00:00
Flugente a0ef5edbba Fix: VS2010 compilation issue, see also http://thepit.ja-galaxy-forum.com/index.php?t=msg&th=23144&goto=346505&#msg_346505
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8282 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2016-08-10 18:14:58 +00:00
Flugente 8803d85392 - added Katana to possible IMP item choices
- added description to AmmoTypes.xml

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@2336 4f8fa57e-7814-0410-bad4-adc449f26b7c
2016-08-09 21:54:26 +00:00
silversurfer d3df075665 - removed parameter USE_NEW_CTH_CALCULATION from Ja2_Options.INI as it is not used anymore since r8281
- added missing rain chance to some sectors and fixed typo for sand storm chance

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@2335 4f8fa57e-7814-0410-bad4-adc449f26b7c
2016-08-06 10:47: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 a58f8a6622 Snake number formula has been slightly tweaked.
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8280 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2016-08-03 17:45:37 +00:00
Flugente 33df523b57 Helpful option: if PRINTOUTTILESET is TRUE (default FALSE), pressing [f] over a structure will also print out what tileset the structure's subtileset belongs too, its name, and the specific tile index. This is rather helpful if you set up fortifiction or interactive action xmls, or if you just want to know a sector's tileset.
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@2334 4f8fa57e-7814-0410-bad4-adc449f26b7c
2016-08-03 17:37:26 +00:00
Flugente 9eb2008147 Helpful option: if PRINTOUTTILESET is TRUE (default FALSE), pressing [f] over a structure will also print out what tileset the structure's subtileset belongs too, its name, and the specific tile index. This is rather helpful if you set up fortifiction or interactive action xmls, or if you just want to know a sector's tileset.
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8279 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2016-08-03 17:36:37 +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
Flugente 0969339db9 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

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@2333 4f8fa57e-7814-0410-bad4-adc449f26b7c
2016-08-02 18:51:14 +00:00
Flugente 41dcb598dd - New background property: <snake_defense> alters snake defense chance
- New sector property: <numsnakes> sets maximum number of snakes per snake attack

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8277 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2016-07-26 22:39:28 +00:00
Flugente 8858d75309 - New background property: <snake_defense> alters snake defense chance
- New sector property: <numsnakes> sets maximum number of snakes per snake attack

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@2332 4f8fa57e-7814-0410-bad4-adc449f26b7c
2016-07-26 22:35:58 +00:00
Flugente 83020d3702 New LUA functions: via GetModderLUAFact and SetModderLUAFact, a modder can set up to 1000 INT32 values exclusively in LUA scripts. This can be used to store mod-specific data in save games without additional code required
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@2331 4f8fa57e-7814-0410-bad4-adc449f26b7c
2016-07-26 20:45:47 +00:00
Flugente 7b6f3d8441 New LUA functions: via GetModderLUAFact and SetModderLUAFact, a modder can set up to 1000 INT32 values exclusively in LUA scripts. This can be used to store mod-specific data in save games without additional code required
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8276 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2016-07-26 20: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
Flugente 6acbd72c89 Slightly altered militia resource display
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8274 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2016-07-16 22:13:53 +00:00