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
3,295 Commits 9 Branches 6 Tags
1a31b21ea4f8544c4b2cfbda4365e0bfbc907417
Commit Graph
3295 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
silversurfer 1a31b21ea4 Fix: Re-enabled the condition check for mercs to enter tactical screen from map screen. Someone removed it, which made it possible to enter tactical with no mercs in the sector. 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8875 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2020-08-01 15:22:26 +00:00
Sevenfm 5b71be4045 CalcCoverValue: improved friendly fire check. 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8874 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2020-07-31 12:02:45 +00:00
Sevenfm 6b706f2747 Increased max possible soldiers stored for friendly fire check to 256. 
Friendly fire chance code also checks for soldiers of the same side and optionally neutral civilians.
CalcCoverValue: check friendly fire chance for each position, penalize position if friendly fire chance is high (needs AI_BETTER_COVER = TRUE)

UnderFire::Add: 
- store friendly fire CTH for new added person
- use max value when replacing friendly fire CTH for existing person

CalcBestShot:
- check CTGT and friendly fire chance for every stance
- ignore possible shot if can hit friends in this stance

CalcMoraleNew: improved code to make enemy slightly more aggressive.

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8873 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2020-07-31 10:26:07 +00:00
Flugente 8e4961f021 Fix: various compile warnings 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8872 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2020-07-24 19:27:34 +00:00
Flugente 5036772e1b - Fix: outdated text 
- Fix: animation loops until new order given

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8871 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2020-07-24 19:25:47 +00:00
Flugente 0c4997f6ec Improved feature: structures can be dragged. Which ones is defined in a new xml. 
For more info, see http://thepit.ja-galaxy-forum.com/index.php?t=msg&goto=360672&#msg_360672

Requires GameDir >= r2558

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8870 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2020-07-23 22:11:23 +00:00
Flugente c8737017ff Fix: nullpointer access 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8869 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2020-07-22 21:30:39 +00:00
silversurfer 7931497b9c Fix: 
- when USE_XML_SQUADNAMES was TRUE, the squad box was shifted upwards over the column headers, causing clipping issues
- when READ_PROFILE_DATA_FROM_XML was TRUE, the game would still read profile data from prof.dat, if the old inventory system was used

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8868 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2020-07-17 11:22:29 +00:00
Flugente ce61a0b85b Fix: if no squad name is provided in xml, fall back on hardcoded name 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8867 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2020-07-15 21:23:53 +00:00
Wanne e14444f14a Multiplayer: Disabled rooftop climbing, because its not syncing correctly between the clients 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8866 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2020-07-13 17:43:36 +00:00
Flugente 93db0bb728 - Fix: assignment not displayed consistently in personnel page 
- Fix: bizarre function

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8863 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2020-07-12 16:48:32 +00:00
Flugente 0165ba5bed Print out details of savegame loading process to easier identify bottlenecks 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8856 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2020-07-10 16:51:08 +00:00
Flugente 39d79a0bb4 Fix: dragging soldiers is frequently cancelled 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8855 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2020-07-09 20:46:41 +00:00
Wanne 1e66fe2ba7 Multiplayer: 
- Disabled fragments, because this can crash the game when stepping on a mine, ...
- Enabled rooftop climbing

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8854 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2020-07-09 09:32:49 +00:00
Wanne 9bc4b2bfb6 Translated a few German Texts 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8853 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2020-07-08 22:11:29 +00:00
Flugente 3e41299596 Accept sounds for dragging a body in other formats than .ogg 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8851 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2020-07-08 22:02:55 +00:00
Wanne aa0d52f790 Translated a few German texts 
Moved // TODO.Translate comments
Fixed missing \n in text

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8850 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2020-07-08 19:30:44 +00:00
Wanne dc23302696 Fixed compilation error when trying to compile JA2UB version 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8849 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2020-07-08 18:46:45 +00:00
Wanne 5f54d43760 Fixed compilation error (sqrt) when compiling in Visual Studio 2010 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8848 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2020-07-08 18:28:31 +00:00
Flugente 1e101b2065 Use macro where appropriate for easier maintenance 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8847 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2020-07-07 19:47:52 +00:00
Flugente 6de9deae63 Fix: mercs staffing a facility for global propaganda cause mine income to drop to 0% 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8846 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2020-07-06 22:36:56 +00:00
Flugente 04fda674e5 Fix: radio operator in a city can give movement commands to any militia in a non-city sector 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8845 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2020-07-06 21:25:45 +00:00
Flugente 3864aca117 Display item names in merchant inventory (by bfant) 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8844 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2020-07-05 12:48:12 +00:00
Flugente c8627c7234 - Fix: wrong face displayed on insurance website 
- Chg: no insurance payout on suspicious deaths (no enemy presence during merc death, or merc died from friendly fire)

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8843 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2020-07-05 12:03:44 +00:00
Flugente 7215d004fc Fix: unnecessary call for intel-based arms dealer inventory is called very often if the lua function is empty 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8842 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2020-07-04 20:07:53 +00:00
Flugente 974526cba0 Fix: when failing to apply a gasmask to another soldier, the message still states success 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8841 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2020-07-04 20:05:39 +00:00
Flugente ce06c37827 Added safety check 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8840 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2020-07-04 18:52:34 +00:00
Flugente 76302328c2 Don't check whether an explosion damaging a room pisses of civilians if there is no room to begin with 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8839 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2020-07-04 18:51:58 +00:00
Flugente 8c2c0dd71d Only display IMP gear cost if costs exceed the free amount (IMP_PROFILE_COST), mention the free amount 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8838 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2020-07-04 17:30:46 +00:00
Flugente ad59900b3d Fix: individual militia in impassable sectors cannot be dismissed via website 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8837 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2020-07-04 14:47:40 +00:00
Flugente 0544227958 Fix: militia can retreat to impassable sectors in autoresolve 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8836 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2020-07-04 14:46:19 +00:00
Flugente af04fe4b53 Fix: killing Doreen after having already convinced her to leave peacefully does not fully remove the loyalty gain for the peaceful solution, despite that being intended 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8835 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2020-07-03 23:18:15 +00:00
Flugente 000de06890 Fix: incorrect travel time calculation outside of pathing 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8834 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2020-07-03 20:40:22 +00:00
Flugente 00313a526b Minor code improvements 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8833 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2020-07-02 22:11:11 +00:00
Flugente de24b4df88 Fix: noticable lag on slow machines or while debugging when plotting a path in strategic view 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8832 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2020-07-02 21:58:45 +00:00
Flugente 9f167f16c6 Fix: if DYNAMIC_IMP_PROFILE_COST is TRUE, the IMP cost is too high(by sun_alf) 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8831 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2020-06-30 20:23:25 +00:00
Flugente 8119662904 New feature: the refilling of the queen's army resevere now requires her to train recruits, which the player can disrupt to some degree (by sun_alf) 
For more info, see http://thepit.ja-galaxy-forum.com/index.php?t=msg&th=20659&goto=360475&#msg_360475 and http://thepit.ja-galaxy-forum.com/index.php?t=msg&th=24433&goto=359872&#msg_359872

Requires GameDir >= r2555

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8830 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2020-06-29 20:12:53 +00:00
Flugente 308631ee25 - There can now be effectively unlimited battle sounds for NPCs. 
- Activated some NPC voices that never played.

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

GameDir >= r2554 is recommended.

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8829 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2020-06-26 20:44:59 +00:00
Flugente 098dc8e280 Disease update: 
- <InfectionChance_WOUND_FIRE> can cause infections when taking fire damage
- <InfectionChance_WOUND_GAS> can cause infections when taking non-fire gas damage
- <fSpecialFlagLimitedUseArms> causes the infected to be unable to use one arm
- <fSpecialFlagLimitedUseLegs> causes the infected to be unable to run, and walk and travel slowly
- JA2_options.ini option DISEASE_SEVERE_LIMITATIONS controls whether <fSpecialFlagContractDisability>, <fSpecialFlagLimitedUseArms> and <fSpecialFlagLimitedUseLegs> are used

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

- Gas damage split up in fire and non-fire damage.
- Flamethrower projectile damaged is affected by fire resistance.

Requires GameDir >= r2553.

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8828 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2020-06-25 22:42:44 +00:00
Flugente 4e86046d0c Store 32 instead of 31 disabilities 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8827 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2020-06-20 16:14:46 +00:00
Flugente d33bc9123c Mercs can now have multiple disabilities at the same time. 
The new fSpecialFlagContractDisability tag for diseases adds a disability every time we are infected with the disease, it is used for PTSD.

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8826 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2020-06-20 15:47:43 +00:00
Flugente 7899cc1f1e Fix: disabling cover display left coloured remnants outside the screen (by Asdow) 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8825 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2020-06-18 18:49:37 +00:00
Flugente dd9f2c28e8 Minor code cleanup 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8824 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2020-06-17 22:27:20 +00:00
Flugente f1bd0f8e8e Fix: crash if player offer area exceeds 255 fields (possible on high resolutions) 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8823 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2020-06-17 22:24:52 +00:00
Flugente 01d8bbf408 Fix: illegal array access if resolution exceeds monitor resolution 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8822 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2020-06-17 22:22:26 +00:00
Flugente 3b3abc2bc6 We can play external dialogue lines for NPC merchants via the lua function HandleNPCMerchantQuote(...) 
For more info, see http://thepit.ja-galaxy-forum.com/index.php?t=msg&th=20611&goto=360388&#msg_360388

Requires GameDir >= r2550.

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8821 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2020-06-17 20:21:39 +00:00
Flugente f0c6511ca4 Added general modifier to grenade throw AP cost 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8820 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2020-06-15 23:12:48 +00:00
Flugente 97fa0c8e90 Added interface functions fo lua 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8819 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2020-06-11 18:33:20 +00:00
Flugente a48bd9a8a0 Fix: previous fix excluded non-RPCs from dialogue replacement 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8818 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2020-06-02 18:37:18 +00:00
Flugente d5d4db6066 Fix: do not call lua dialogue replacement function for RPCs 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8817 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2020-06-02 17:27:20 +00:00