1dot13/source
1
0
Fork 0
mirror of https://github.com/1dot13/source.git synced 2026-08-26 14:30:26 +02:00
Code Issues Packages Projects Releases Wiki Activity
7,625 Commits 9 Branches 6 Tags
1bed0047ea5259fd08a44d5a08a3cc306b7108d5
Commit Graph
7625 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Flugente 4690b89ffc Added new laptop merc data subpage to display more stats that weren't displayed before, like dialogue approach points and whether merc is a 'good guy' 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8372 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2017-01-22 20:12:29 +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 b28ab79410 - new jam damage threshold for guns 
- gave the utility knife a lockpicking penalty

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@2358 4f8fa57e-7814-0410-bad4-adc449f26b7c
 2017-01-22 13:29:14 +00:00
Flugente 9a46c2a9fc - The number of possible IMP voices is no lnger limited 
- If no IMP voices could be read, IMP creation is not allowed

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8368 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2017-01-17 20:32:31 +00:00
Flugente ec52ab30e5 When trading, mark items that the trader won't buy. 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8367 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2017-01-15 23:48:34 +00:00
Flugente 87809f222f Gun selection at shopkeepers is pre-sorted by weapon type (by DepressivesBrot) 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8366 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2017-01-14 22:41:48 +00:00
Flugente 7163e98b6e Mercs won't attack teammates or neutrals (profile-based) if their opinion of them is > 20. For good guys, that value is -20. 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8365 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2017-01-14 22:22:30 +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 7fc215b0a9 - New feature: Voicesets are now independent fom profile slots. Voiceset is set in MercProfiles.xml with <usVoiceIndex>. IMP voices are defined in IMPVoices.xml. 
- added 5 new IMP voicesets from Wizardy8 (by ratpaz and mec05)

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@2357 4f8fa57e-7814-0410-bad4-adc449f26b7c
 2017-01-14 20:12:26 +00:00
Flugente e2c05ce1c6 minor code cleanup 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8363 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2017-01-13 20:19:44 +00:00
Flugente 6b3e8819e0 added new character trait "Coward" (charrcter trait #13) and added it to Biff and Lance 
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@2356 4f8fa57e-7814-0410-bad4-adc449f26b7c
 2017-01-12 23:25:08 +00:00
Flugente 3419fd1c5d dded new character trait "Coward" (charrcter trait #13) 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8362 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2017-01-12 23:24:41 +00:00
Flugente 556ce68586 Fix: jeeps were not properly counted 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8361 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2017-01-12 00:51:46 +00:00
Flugente 1b39535b15 Fix: during retreat, mercs got a morale penalty for being a pacifist, instead of getting it unless they are pacifist 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8360 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2017-01-11 23:26:30 +00:00
Flugente 9359ee8003 added new disability "Self-Harming" (disability #12) 
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@2355 4f8fa57e-7814-0410-bad4-adc449f26b7c
 2017-01-11 22:38:55 +00:00
Flugente 4d48876c1f added new disability "Self-Harming" 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8359 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2017-01-11 22:32:33 +00:00
Flugente 322d307980 Fix: background value drink_energyregen not only increased breath gain, but also loss, which was not intended 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8358 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2017-01-10 21:21:07 +00:00
Flugente 7231934fa4 Added more ammo to many merc gearkits (dropping into a warzone with < 10 bullets is idiotic) 
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@2354 4f8fa57e-7814-0410-bad4-adc449f26b7c
 2017-01-06 14:41:54 +00:00
Flugente bb6872787d - Fix: if merc cannot complain about his equipment due to being asleep or on duty, retry an hour later 
- Fix: in AIM bios, show max life, not life at start of game
- Fix: typo resulted in AIM mercs not refusing job because of hated mercs present when they should do so
- Dialogue clarification: QUOTE_PRE_NOT_SMART is now used for complaints about food, QUOTE_POST_NOT_SMART to refuse smoking

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8354 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2017-01-06 01:17:45 +00:00
Flugente 4ab21a08c2 Fix: crash in pong due to bad iterator usage 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8353 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2017-01-04 22:58:38 +00:00
Flugente 88abc6263f New minigame: Pong 
Requires GameDir >= r2353

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8352 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2017-01-04 19:32:24 +00:00
Flugente 8c231e6f55 New minigame: Pong 
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@2353 4f8fa57e-7814-0410-bad4-adc449f26b7c
 2017-01-04 19:30:46 +00:00
Flugente c5026b1275 added new disability "Fear of heights" (disability #11) and added it to Vicki, Sparky and Hector 
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@2352 4f8fa57e-7814-0410-bad4-adc449f26b7c
 2016-12-31 12:07:28 +00:00
Flugente 3ab70dde90 - added new disability "Fear of heights" 
- Fix: wrong backgrounds were filtered out when checking for personality/disability/traits

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8351 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2016-12-31 12:00:45 +00:00
Flugente 58eb840439 Cleaned up IMP creation code 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8350 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2016-12-30 17:43:30 +00:00
Flugente 0249d50474 - Fix: Vicki's 'Gunslinger' gear kit had no LBE for some items 
- added Laptop item to Gumpy and Speck gear kits due to their hacking ability

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@2351 4f8fa57e-7814-0410-bad4-adc449f26b7c
 2016-12-30 00:10:57 +00:00
Flugente d6b7dd4d52 Fix: when buying gear kits from AIM/MERC, prices are incorrect for item stacks 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8349 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2016-12-30 00:09:15 +00:00
Flugente 200899593e Fix: New IMP gear selection method: If identical items are selected in several slots, only those of one slot are given to the IMP 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8348 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2016-12-15 21:05:23 +00:00
Flugente 929e0adf66 added comments 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8347 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2016-12-13 20:05:36 +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
Flugente d5429f5372 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 
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@2350 4f8fa57e-7814-0410-bad4-adc449f26b7c
 2016-12-11 12:37:27 +00:00
Wanne ea9d5f74a5 Fixed a few translations for Chinese version (by TBS) 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8344 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2016-11-29 20:45:03 +00:00
Flugente ae2656b975 Fix: negative price backgrounds don't work as intended 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8343 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2016-11-22 21:20:14 +00:00
silversurfer bdb1067636 Fix (by Gambigobilla): background 83 had two stealth tags 
- added flag 2147483648 to all specialized grenade and bomb pouches

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@2349 4f8fa57e-7814-0410-bad4-adc449f26b7c
 2016-11-17 19:52:13 +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
Wanne 6c737fefd3 Fixed compilation errors in VS 2005: std::sqrt() -> sqrt() 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8339 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2016-11-02 13:24:17 +00:00
Flugente 745ba7d660 Items in a slot granted by LBE with the flag LBE_EXPLOSIONPROOF (<ItemFlag> 2147483648) are protected from explosion damage (and cannot cause a chain reaction). 
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@2348 4f8fa57e-7814-0410-bad4-adc449f26b7c
 2016-10-24 20:16:43 +00:00
Flugente 3c836ba191 Items in a slot granted by LBE with the flag LBE_EXPLOSIONPROOF (<ItemFlag> 2147483648) are protected from explosion damage (and cannot cause a chain reaction). 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8335 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2016-10-24 20:15:35 +00:00
Flugente 85f3ef511b - slightly tweaked disease effects 
- increased disease cure quantity at pharmacy
- lowered militia resource gain modifiers

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@2347 4f8fa57e-7814-0410-bad4-adc449f26b7c
 2016-10-24 18:59:42 +00:00
Flugente fcfab521fb unified code for enemy/militia gear selection 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8334 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2016-10-24 18:46:39 +00:00
Flugente d6d4841d85 When loading a savegame with version < WORKERS, set up town worker population to initial rate 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8333 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2016-10-24 18:44:13 +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 9ba6da08de - new option "DELAYED_GRENADE_EXPLOSION" in Ja2_Options.INI (by Sevenfm) that makes grenades explode in the next turn instead of instantly 
- new value "AP_GRENADE_MODE" in APBPConstants.ini (by Sevenfm)

preparation for new dirt/repair system:
- new option "CLEANING_RATE_DIVISOR" in Ja2_Options.INI 
- removed options "DIRT_SYSTEM", "FULL_REPAIR_CLEANS_GUN" and "SECTOR_DIRT_DIVIDER" as they are not used anymore

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@2346 4f8fa57e-7814-0410-bad4-adc449f26b7c
 2016-10-18 21:00:06 +00:00
Sevenfm e9a1f4b352 New feature: delayed grenade explosions: 
- use transformation menu to change explosion mode
- only Normal/Stun/Flashbang type grenades can be delayed
- AI soldiers will avoid staying close to armed grenades\explosives
- use option DELAYED_GRENADE_EXPLOSION to make all hand\GL grenades work as delayed
- new value AP_GRENADE_MODE = 4 in APBPConstants.ini
- new item flag DELAYED_GRENADE_EXPLOSION

Other changes:
- fixed call to sqrt in DrawExplosionWarning() that prevented compiling in VS2010
- correctly update interface after transformations
- PATHAI: AI soldiers will skip gassed tiles if not in gas already
- InGas check: AI soldiers will avoid mustard gas even when wearing gas mask
- Yellow AI: added check to avoid gas/water/bomb using FindNearestUngassedLand
- gas/flare grenades will always explode instantly even when in bad state
- LegalNPCDestination: locations near armed bombs are not legal
- FindBestNearbyCover: avoid locations near armed bombs

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8324 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2016-10-18 12:39:06 +00:00
Wanne b607601b46 Updated Chinese GameDir files (by zwwooooo & TBS) 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameData@8322 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2016-10-17 16:40:13 +00:00
Wanne 926b9d9e5c Updated Chinese translation and adjustments in WinFont (by zwwooooo and TBS) 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8320 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2016-10-17 16:38:36 +00:00
Flugente 350e7cd849 If TIME_BOMB_WARNING is true, display a warning animation around any armed time bomb. 
GameDir >= r2345 is recommended.

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

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8319 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2016-10-16 14:32:37 +00:00
Flugente 88b69e1bcb If TIME_BOMB_WARNING is true, display a warning animation around any armed time bomb. 
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@2345 4f8fa57e-7814-0410-bad4-adc449f26b7c
 2016-10-16 14:30:40 +00:00
Flugente c086b98b4c Fix: tanks and jeeps can only be assigned to enemy patrols if ASD is active 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8318 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2016-10-16 00:07:23 +00:00