1dot13/source
1
0
Fork 0
mirror of https://github.com/1dot13/source.git synced 2026-07-22 13:40:22 +02:00
Code Issues Packages Projects Releases Wiki Activity
2,990 Commits 9 Branches 6 Tags
82a2b6c2db8a5b1d91da5cb3bf16da05459378b4
Commit Graph
2990 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Flugente 82a2b6c2db Added new assignments for training existing militia and doctoring them. 
For more info, see http://thepit.ja-galaxy-forum.com/index.php?t=msg&th=23044&goto=352617&#msg_352617

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8537 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2018-03-04 21:20:38 +00:00
Flugente a95c4fd614 Fix: UB compilation 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8536 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2018-03-04 17:11:56 +00:00
Flugente f45c0a3544 Fix: UB compilation 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8535 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2018-03-04 17:08:00 +00:00
Flugente 62f8b7d3e8 Cleaned up assignment menu code (WIP) 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8534 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2018-03-03 16:04:47 +00:00
Flugente cf2f219067 Cleaned up assignment menu code (WIP) 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8533 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2018-03-03 15:42:16 +00:00
Flugente 5501e390de Fix: math functions on VS2010 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8532 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2018-03-02 22:47:54 +00:00
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 c8e9a3fb8e Fix: if we steal from an enemy, they turn to us if they notice us 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8527 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2018-02-25 16:21:45 +00:00
Flugente 7a537c3a2e Fix: soldier automatically taunts us whenever we steal, making stealth impossible 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8526 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2018-02-24 20:45:27 +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 9773e1d293 Fix: on low resolutions, the message log blocks parts of the inventory,so deactivate the log in that case 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8524 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2018-02-21 20:45:57 +00:00
Flugente 92e759555d - New enemy role: display whether an enemy carries a key 
For more, see http://thepit.ja-galaxy-forum.com/index.php?t=msg&th=21774&goto=352502&#msg_352502
- If ENHANCED_CLOSE_COMBAT_SYSTEM is on, stealing multiple items from an enemy is possible if he is not on alert

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8523 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2018-02-21 18:49:35 +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 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 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
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
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 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 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 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