7623 Commits
Author SHA1 Message Date
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 9cf666a038 New feature: Getting and using intel allows for more spy-related roleplay
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@2401 4f8fa57e-7814-0410-bad4-adc449f26b7c
2018-02-18 23:12:21 +00:00
Flugente ee73811cfe If PRINTOUTTILESET is TRUE, also print out the room number when pressing 'f'.
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8521 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2018-02-17 19:32:10 +00:00
Flugente 876b8f2502 Fix: possible crash during item transformation
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8520 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2018-02-17 19:23:03 +00:00
Flugente e7ce503e9e Cleaned up arms dealer code
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8519 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2018-01-28 20:51:07 +00:00
Flugente a9452840af Fix: gear templates: when creating a new ammo stack from non-fitting magazines, fill up the stack
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8518 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2018-01-22 21:37:51 +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
Flugente 30759b3e7f 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

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@2400 4f8fa57e-7814-0410-bad4-adc449f26b7c
2018-01-10 23:40:24 +00:00
Flugente fadb7710e6 Fix: during hiring, AIM mercs only complained about their hated ones if these were already in the country, thus ignoring other mercs in transit
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8515 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2018-01-09 23:30:50 +00:00
Flugente 70162ece95 Change: In the militia overview laptop website, do not display militia faces, instead colour their names. This way we can display more militia at once without losing information
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8514 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2018-01-04 18:57:33 +00:00
Flugente 8b41be236a If a merc harms themself, use a voice line
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8513 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2018-01-04 15:57:36 +00:00
Flugente a8e62cc406 - To make it easier to search for dialogue and understand what a line is supposed to mean, changed a few dialogue enums.
- Merged IsMercOnTeam...(...) functions into one
- Fix: during hiring, AIM mercs only complained about their hated ones if these were already in the country, thus ignoring other mercs in transit


git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8512 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2018-01-04 15:50:31 +00:00
Sevenfm f8b34b35d7 NumberOfTeamMatesAdjacent: fix vanilla bug
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8511 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2017-12-19 11:17:32 +00:00
TheBob 209f5f7c1b fixed AI freeze on creatures attacking crows
fixed some broken debug messages

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8508 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2017-11-20 23:43:16 +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 be24008f68 updated settings in Ja2_Options.INI and corresponding INI Editor XML
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@2399 4f8fa57e-7814-0410-bad4-adc449f26b7c
2017-11-08 12:31:16 +00:00
Flugente 0410017820 Fix: JA2UB compilation errors
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8506 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2017-11-01 22:51:25 +00:00
Flugente 7b1ba8f7f2 Fix: wrong sound played
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8505 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2017-11-01 16:54:08 +00:00
Flugente 605b07368f - New: Additional battlesounds can be used - simply increase the numbering after a sound (xxx_LAUGH, xxx_LAUGH2, xxx_LAUGH3...)
- Fix: CHANCE_SAY_ANNOYING_PHRASE causes non-low morale battle sounds not to be played when they should


git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8504 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2017-10-31 22:41:12 +00:00
Flugente 9c74bb75dc To make it easier to search for dialogue and understand what a line is supposed to mean, changed a few dialogue enums.
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8503 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2017-10-31 19:18:35 +00:00
inshy 0312081223 Fixed mistranslation for some lines for Russian language.
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameData@8502 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2017-10-30 14:30:01 +00:00
Flugente e4e58e81d0 Fix: stealing from or in transit
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8499 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2017-10-19 17:46:17 +00:00
Flugente fd868ada14 Fix: wrong limits used
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8498 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2017-10-18 19:59:44 +00:00
Flugente 5cf3bfd665 Fix: BP costs not read correctly
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8497 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2017-10-17 19:14:40 +00:00
Flugente babe4732d6 Changed a few BP csot modifiers (most notably lowered BP_MODIFIER_WEAPON_READY, otherwise crouched movement with gun raised drains breath way too fast)
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@2398 4f8fa57e-7814-0410-bad4-adc449f26b7c
2017-10-17 19:02:28 +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
Flugente e56e44b596 Added animations for crouched walking with weapons aimed (standing against standing/crouched targets) for all merc bodytypes (by Taro)
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@2397 4f8fa57e-7814-0410-bad4-adc449f26b7c
2017-10-15 17:08:29 +00:00
silversurfer 4f42dcbfe5 Update to folding stocks (by Cardinal):
- adjusted mostly the AK variants (standard AR- size 7, carbines - size 6, compact carbines - size 5), and some others

- removed <ToHitBonus>-1</ToHitBonus> from weapons that used to have modifiers representing permanent folding stocks, since stock items now carry the penalty

- removed the folding stock from xm-8 compact carbine and added fixed recoil penalties - apparently the one in the game is the stockless butt-cap version

- fixed some mistakes I made previously with assigning default attachments

- Unrelated to the stocks, I changed the PercentHandling modifier for the combat knife and the KCB knife from -10 to 10. Unless I'm mistaken, this should mean that when used as bayonets they now properly add a handling penalty instead a bonus

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@2396 4f8fa57e-7814-0410-bad4-adc449f26b7c
2017-10-15 08:41:44 +00:00
Flugente 298fc4dd58 Improved bayonet animations (by Taro)
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@2395 4f8fa57e-7814-0410-bad4-adc449f26b7c
2017-10-07 17:36:43 +00:00
silversurfer 2577a22ebb Enhancement (by Cardinal):
- folding/retractable stocks can now be folded/unfolded with item transformations
- weapons with built-in folding/retractable stocks come with transformable stocks too (unfolded by default). These stocks cannot be removed.

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@2394 4f8fa57e-7814-0410-bad4-adc449f26b7c
2017-10-07 10:58:55 +00:00
Flugente d701f26919 Added bayonet animations (standing against prone targets) for all merc bodytypes (by Taro)
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8494 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2017-10-06 17:52:26 +00:00
Flugente fabd27c376 Fix: various individual militia issues
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8493 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2017-10-05 19:57:26 +00:00
Flugente d321bf8abe Fix: difficulty introduction texts were cutoff
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8492 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2017-10-04 19:22:52 +00:00
Flugente f82dad3712 Removed non-default output entries
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8491 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2017-10-02 13:05:50 +00:00
Flugente 380d858d2c Added VS2017 solution and project files (by DepressivesBrot)
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8490 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2017-10-02 13:00:46 +00:00
Flugente 3f057567dc - Added bayonet animations (standing against standing/crouched targets) for all merc bodytypes (by Taro)
- Initiating a bayonet attack immediately after running adds a melee damage bonus (+20%)

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8489 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2017-10-02 10:38:12 +00:00
Flugente c3592c23f3 Slightly speed up overhead map display
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8488 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2017-10-01 12:30:39 +00:00
Flugente 2d2e789ce0 Fix: display riot shields only if soldier is seen (relevant on non-player controlled soldiers)
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8487 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2017-10-01 12:02:38 +00:00
Flugente a57d9455f3 Dynamic dialogue boxes cause less issues when scrolling
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8486 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2017-10-01 11:08:38 +00:00
Flugente 8de2a8601e New: if REDUCED_INSTANT_DEATH is TRUE, damage from guns/knives that would normally instantly kill non-comatose player-controlled mercs is lowered so that they instead fall into a coma (and can be saved by other mercs) (by sevenfm)
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8485 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2017-09-29 19:48:32 +00:00
Flugente 5e2dac40e0 New: if REDUCED_INSTANT_DEATH is TRUE, damage from guns/knives that would normally instantly kill non-comatose player-controlled mercs is lowered so that they instead fall into a coma (and can be saved by other mercs) (by sevenfm)
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@2391 4f8fa57e-7814-0410-bad4-adc449f26b7c
2017-09-29 19:47:42 +00:00
Flugente 2c84cbe48d Change: AI does not attack mercs that are already dying, thus focusing on more dangerous opponents while giving the player a chance to rescue dying mercs (by sevenfm)
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8483 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2017-09-28 21:27:59 +00:00
Flugente dfc55c286d Fix: boxing exception to covert behaviour only works between 2 boxers
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8482 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2017-09-28 19:40:49 +00:00
Flugente dc4846a464 Fix: as being covert breaks boxing fights, boxers are not covert
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8481 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2017-09-27 21:18:35 +00:00
Flugente bc85245a53 Fix: Squadleader level bonus for other mercs was applied in strategic.
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8479 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2017-09-24 15:49:41 +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 6ef15f3952 Updated scripts
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@2388 4f8fa57e-7814-0410-bad4-adc449f26b7c
2017-09-21 18:47:53 +00:00
Flugente c20604f16a Fix: various individual militia issues
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8477 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2017-09-21 18:38:22 +00:00
Flugente e57c769720 Updated inis
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@2387 4f8fa57e-7814-0410-bad4-adc449f26b7c
2017-09-20 19:04:37 +00:00
Flugente f30482d939 Soldiers move slower when dragging someone
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8476 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2017-09-18 17:36:39 +00:00