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,505 Commits 9 Branches 6 Tags
76429a09b636e5bdfe56a20457ff0fec9fd005ff
Commit Graph
3505 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Shadooow 76429a09b6 interrogation cutscene will no longer be started if player fired all POW soldiers that were scheduled to appear there 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@9089 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2021-06-20 14:24:15 +00:00
Flugente a7d7f4b93b Fix: crash due to overflow as a result of very low reliability values 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@9088 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2021-06-19 10:27:13 +00:00
Flugente 7a866c5f29 If a container is destroyed by gunfire or vehicle collision, don't destroy the contents, reveal them instead. 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@9087 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2021-06-18 18:43:24 +00:00
Flugente a288b2e60c Fix: load map modifications before loading items, as altered structures can change items visibility 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@9086 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2021-06-18 18:40:31 +00:00
Flugente 9bdb2adfac Fix: movement costs are not recompiled if a structure is destroyed by gunfire or vehicular collision 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@9085 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2021-06-15 21:56:37 +00:00
Flugente fc6973d022 Only destroy the content of a container when it is destroyed, not when it is damaged 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@9084 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2021-06-14 21:15:31 +00:00
Flugente 433a41f03b Fix: use of uninitialized variables 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@9083 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2021-06-14 21:05:59 +00:00
Sevenfm 00b2f5965b ASD fix (by rftr): moved ASD initialisation to just before the strategic AI init, which is where starting enemy groups are created (and ASD flags are checked to see if any troops can be upgraded to jeeps/tanks/robots). 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@9082 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2021-06-14 04:44:09 +00:00
Sevenfm 08ba4f9323 CancelAIAction: improved condition to allow cover check. 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@9081 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2021-06-13 17:46:21 +00:00
Flugente ff3076203f Fix: antimateriel bullet damage to structures often isn't properly applied 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@9080 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2021-06-13 17:23:55 +00:00
Flugente 680a8cb43a Fix: improved display of ballistic shields over/under a merc. In particular they are no longer drawn over buildings. 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@9079 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2021-06-13 13:14:34 +00:00
Shadooow eb1ee4a71a further lowered the damage of Joe punching mercs in interrogation cutscene to prevent him knocking the merc unconcious which resulted to endless clock issue 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@9078 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2021-06-13 03:20:07 +00:00
Sevenfm 2459f90412 Disabled clearing next AI action in CancelAIAction as it may interfere with scripted actions code. 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@9077 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2021-06-12 17:33:16 +00:00
Shadooow f71a462445 fix for likes and hates of IMPs characters (not sure it actually is handled for IMP characters, but the previous fix make it to be Barry instead of nobody) 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@9076 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2021-06-12 12:48:56 +00:00
Shadooow 0c1a74b3d1 fix for newly created IMP characters eye blinking very fast 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@9075 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2021-06-12 12:39:55 +00:00
Shadooow 6c1f5ed7ee corrected typo in previous commit 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@9074 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2021-06-12 10:06:32 +00:00
Shadooow a854f73ba9 added missing code from commit 9059 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@9073 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2021-06-12 09:43:43 +00:00
Shadooow d46cbda2b6 new fix for endless clock issue in POW cutscene, was actually caused by Elliot trying to do the kick animation which doesn't exists for civilian body type 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@9072 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2021-06-12 09:39:20 +00:00
Shadooow aa1df7d5a3 prevented the game to capture more than 3 mercs for rescuing - this also fixes a memory leak as the code accessed array with out of bounds value 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@9071 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2021-06-12 02:48:06 +00:00
Shadooow 5b24d136f2 fix for endless clock issue in POW cutscene 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@9070 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2021-06-12 00:10:42 +00:00
Shadooow 90d5230c6e fixes for combining items with CTRL + LMB 
- fixed regression causing this to substract APs in mapscreen even with no enemies in sector causing this to fail after several merges
- a "Not enough APs!" error will now show when doing this in turn based mode without enough APs
- fixed merc APs on portrait not being updated when doing this in mapscreen during fight
- fixed merged items not updating their graphic when doing this in mapscreen with stack of items in hand

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@9069 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2021-06-09 20:10:39 +00:00
Shadooow 807bd518b3 fixes for running over water 
- merc will continue running after he walks out of last water tile
- fixed both pathing prediction AP cost calculation and an actual AP cost deduction when running into water and out of water

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@9068 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2021-06-09 03:25:43 +00:00
Shadooow 4b8a00f6e2 experimental fix for charging AP for turning at the end of the movement 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@9067 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2021-06-07 16:29:36 +00:00
Shadooow 9473f3bd24 fixed regression caused by previous fix that probably prevented IMP chars to recruit npcs and start quests, also fixes same problem of IMP chars above 10th which already had this problem before (values were 0 in MercProfiles.xml, now the values in xml are ignored so it doesn't matter) 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@9066 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2021-06-06 17:20:12 +00:00
Shadooow 2cc6d778ad fixed pressing ENTER and ESC during IMP enter key input when there is a messagebox notifying user he inputted wrong key which resulted in re-appearance of the messagebox or leaving laptop mode 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@9065 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2021-06-06 15:44:01 +00:00
Shadooow 3ada868111 partial revert of 9063 - less code, same functionality 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@9064 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2021-06-05 06:28:44 +00:00
Shadooow 4a2a1c67d2 better way of handling IMP slot replacements, game will no longer replace dead merc that was not deleted from team - so his name and stats will stay intact in personnel page 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@9063 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2021-06-05 06:08:55 +00:00
Shadooow 4046368bd3 fixed more issues when replacing dead/pow IMP char like statistics and attributes progress not being erased, reverted old code 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@9062 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2021-06-05 05:53:24 +00:00
Shadooow c5df4830ea allowed to replace POW IMP char that was removed from team 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@9061 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2021-06-04 23:08:50 +00:00
Shadooow 54fb8e2862 fix for duplicated items in inventory when replacing dead IMP 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@9060 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2021-06-04 23:07:44 +00:00
Shadooow fe9dd67edc Fixed bug that resets melee attack aim location if the attack was stopped in interrupt. 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@9059 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2021-06-01 15:21:56 +00:00
Shadooow 9ea0968001 fixed bug when manually placing item from soldier/vehicle inventory to not currently loaded sector inventory bugged the items and made them inaccesible after the sector got loaded 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@9058 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2021-05-29 04:16:46 +00:00
Shadooow 0c39762f88 added new optional tag into SectorLoadscreens.xml <szImageFormatAlt> that allows modder to specify format of alternative loadscreen as we already have loadscreens that have only STI and loadscreens that have only PNG variant but currently we can specify just one format for both normal and alternative loadscreen 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@9057 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2021-05-28 05:36:39 +00:00
Shadooow e0e45b83cd Significant overhaul on handling doors regarding to noise: 
- significantly increased base noise volume of opening or closing doors
- adjusted the noise volume based on type of the door (metal louder etc.)
- can with string adds +4 points to the noise volume and disallows to use stealth to prevent any noise
- removed the code for movement noise from door handling and replaced it with simpler stealth check
- noise will now come from GridNo of doors, not soldier opening them
- disabled terrain check when the noise comes from doors
- fixed doors always playing sound of closing even when there was no noise (stealth mode)
- whether game plays sounds of opening/closing doors will now be based on whether any of player mercs heard it or not
- game will now show doors being opened/closed if any of our mercs heard it
- disabled the message for player about soldiers hearing noise from doors being opened/closed (no point imo when player can hear it)
- added locator ping when someone opens doors with can with string attached on them

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@9056 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2021-05-27 23:32:50 +00:00
Shadooow 95f4db9758 fixed can with string executing take blood action when used from spot directly next to doors 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@9055 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2021-05-26 22:51:57 +00:00
Shadooow aaaf13bda2 deleted now redundant old code for marbles which is no longer executedby game due to said change 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@9054 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2021-05-26 21:29:15 +00:00
Shadooow 72582501e9 fix for undeground sectors showing LS_DAYGENERIC.sti instead of assigned custom loadscreen that is only in PNG format 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@9053 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2021-05-26 21:22:45 +00:00
Shadooow 375008656d new feature: allowed to re-hire RPCs in case they are fired from team 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@9052 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2021-05-26 04:32:06 +00:00
Shadooow f53ab81cfb allowed the OK button only message box to be escaped with ESC key 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@9051 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2021-05-26 01:34:44 +00:00
Shadooow 8c4c15adcf if all mercs were killed or captured and default arrival sector is Omerta, force helidrop arrival animation 
note: this has a small flaw that when there are more mercs arriving, they arrive with two helicopters and not just one - I am unable to fix this perhaps someone else can look into it, additionally it might be worth it to force quest quotes and even give letter, if the rebel hideout was not visited yet

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@9050 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2021-05-25 19:09:24 +00:00
Shadooow fc35e19915 allowed the meanwhile popup box to be handled with keyboard - ESC or n to skip ENTER or o for prompt 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@9049 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2021-05-25 18:20:13 +00:00
Shadooow d29b1f6467 fix: disabled inventory in meanwhile scenes 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@9048 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2021-05-25 18:08:46 +00:00
Shadooow 1a1d1fe54d fix: subsequent helicopter animation drops in Omerta will now work correctly (if saved before arrival, restarted game and then loaded, this resulted in helicopter now showing up and merc spawned into wall which bugged the game completely) 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@9047 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2021-05-25 08:11:50 +00:00
Shadooow d757ef71b6 fixed some of the merc stats like kills and progress of stats/level increase not being resetted when starting a new game after some previous gameplay was loaded initially 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@9046 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2021-05-25 03:45:19 +00:00
Shadooow e3e0226071 fixed incorrect squad name when selecting merc with option USE_XML_SQUADNAMES = TRUE 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@9045 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2021-05-24 17:07:53 +00:00
Shadooow 326b44787b improved inventory costs feature to show red straffing on pockets that soldier has not enough APs to move currently held item into 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@9044 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2021-05-24 05:28:51 +00:00
Shadooow 5f62e90189 replaced iLastHandPosMapScreen global from mapscreen inventory code with iLastHandPos from tactical - I need it for upcoming feature and it should not cause any problems since you cannot have item in mouse pointer and change game mode 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@9043 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2021-05-24 05:26:14 +00:00
Shadooow 0cddd33264 fixed issue when the helicopter didn't show in sector after loading a game, if the previous "opened" gameplay had helicopter elsewhere 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@9042 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2021-05-24 01:57:49 +00:00
Shadooow 0fbf72cc74 fix: if merc dies off screen and is not between sectors, create his corpse and items at the last position he was, when the sector was loaded instead of random GridNo 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@9041 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2021-05-24 01:14:34 +00:00
Shadooow c890640e1d fix: vehicle assignment will no longer show destroyed vehicles 
fix: helicopter will no longer be available when Skyrider dies (will not work in saved games where he is already dead though)

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@9040 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2021-05-23 21:32:16 +00:00