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,527 Commits 9 Branches 6 Tags
2e7071d1c7720ca67dcddfa2d310b0577637df78
Commit Graph
3527 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Shadooow 2e7071d1c7 highlighting fix: hovering over item will now highlight valid attachment that doesn't have attachment tag 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@9111 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2021-06-27 02:52:51 +00:00
Shadooow 5e4d587baf fixed: KAC masterkey and other items without attachment flag to work 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@9110 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2021-06-27 02:36:46 +00:00
Shadooow 143711f1ac fix: no more moving around with vehicle that has no fuel 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@9109 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2021-06-27 02:22:30 +00:00
Shadooow 6fec4e8511 fix: flares will no longer explode when delayed but make light 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@9108 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2021-06-26 06:30:53 +00:00
Shadooow db6727b2d7 crash fix: changed maximum number of enemies in raid to be dependant on maximum enemies of that type defined beforehand 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@9107 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2021-06-26 00:59:14 +00:00
Shadooow 0dc07614a4 more god mod tweaks: 
- prevented morale drop from getting damaged
- fixed sometimes taking damage in autoresolve

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@9106 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2021-06-25 21:21:28 +00:00
Shadooow 99cb5f4e31 fixed corpses on the roof not being added correctly 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@9105 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2021-06-25 15:46:46 +00:00
Shadooow f47c7e8f3f fixed snake attacks not initiating damage/death animations and not decreasing number of enemies in sector properly 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@9104 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2021-06-24 20:30:51 +00:00
Shadooow 0a91067d24 formatting and efficiency changes to previous commit 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@9103 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2021-06-24 18:36:22 +00:00
Shadooow 3acb96f8e6 fixed memory leak inside corpse placement code causing various issues when entering a town sector 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@9102 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2021-06-24 18:07:46 +00:00
Shadooow dce924540f fixed POW code throwing errors when trying to compile UB build 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@9101 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2021-06-23 23:04:49 +00:00
Shadooow 749854b24f fixed new tag in SectorLoadscreens not being loaded 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@9100 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2021-06-23 20:06:00 +00:00
Shadooow 50d9737528 god mode cheat: no special death animations against player either 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@9099 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2021-06-22 11:56:12 +00:00
Shadooow da940db97c god mode cheat code tweaks + preventing ability damage 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@9098 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2021-06-22 00:20:12 +00:00
Shadooow bdbe1ffe65 new cheat command CTRL+SHIFT+g = god mode (invulnerability) requested by Parkan, works in both tactical and strategic 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@9097 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2021-06-21 21:15:17 +00:00
Shadooow fd528e418c new feature: CHEAT_MODE, new option in Ja2_Options.ini to automatically enable cheat mode in every loaded game or new replay 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@9096 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2021-06-21 16:50:14 +00:00
Shadooow f779c0cb37 Major rework of getting captured quests and mechanics. 
- new feature: added Tixa as another prison where capture mercs can be held (Alma is still primary choice though)
- fix: all mercs in the map will be taken POW when surrendered, however only 3 will appear in Alma/Tixa/N7, rest will be POW forever without chance of getting free
- fix: whenever player liberates any of the POW sectors (Alma, Tixa, N7) the respective quest/cutscene with POW will be disabled in that sector until enemy recapture the sector
- robot will be destroyed when surrendered as it makes no sense to inprison mechanical units
- externalized the GridNos for freeing POW mercs into Mod_Settings.ini

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@9095 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2021-06-21 13:53:56 +00:00
Shadooow 0101ed3c58 minor code fix under debug defined (seems that someone replaced all instances of bLevel with pathing.bLevel, but the structure path_s doesn't have this) 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@9094 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2021-06-21 10:53:30 +00:00
Shadooow 9f0033dac8 disabled changing assignment on POW mercs to prevent to break them free improperly 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@9093 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2021-06-21 01:56:37 +00:00
Shadooow 70eda57141 no battle records for POW mercs 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@9092 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2021-06-21 01:19:32 +00:00
Shadooow 922d3e37c7 - fixed newly added merc to current squad not showing up in the panel interface 
- fixed dead mercs not showing up in the panel interface properly from loaded savegame

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@9091 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2021-06-21 00:56:42 +00:00
Shadooow cf36b8c5d8 fixed breaking prisoners free via doors (check was executed before door status actually changed which is why it failed) 
also rewritten hardcoded coords to those from Mod_Settings.ini

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@9090 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2021-06-20 23:10:28 +00:00
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