Commit Graph
2205 Commits
Author SHA1 Message Date
Shadooow d6f07a7ef5 godmode reworked: reused existing mechanism in code = same functionality, less code changes, also when enabled GOD MODE text will now show up in left corner in red color, this was already there I just uncommented it
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@9128 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2021-07-06 19:06:23 +00:00
Shadooow 385210ba09 vehicles will no longer lose stats from critical hits
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@9127 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2021-07-06 15:59:00 +00:00
Shadooow 9f2f164bde fixed vehicles turning towards player merc who shot them
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@9126 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2021-07-06 15:54:14 +00:00
Flugente 461f16eacb Added several interactive actions that play a sound when clicking on a structure
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@9125 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2021-07-04 15:59:58 +00:00
Shadooow 16057eaae5 fixed endless clock issue persisting after using quickload
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@9122 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2021-07-01 13:41:13 +00:00
Shadooow 4725ce55f1 fixed cheat command CTRL+U not refilling vehicle fuel correctly
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@9121 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2021-06-30 07:16:09 +00:00
Flugente 6f24fb89fd Fix: dragging a structure repaired it and removed all decals
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@9120 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2021-06-28 14:52:12 +00:00
Flugente 587b7e2874 Fix: reverted revert of 9115 and fixed the issue of guns always deteriorating in NCTH
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@9119 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2021-06-28 14:39:45 +00:00
Shadooow 94f164eaa8 reverting commit 9088 as it causes regression of super high weapon deterioration
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@9115 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2021-06-28 11:18:08 +00:00
Flugente 3740d8b7c4 Anti-materiel bullets are no longer stopped when they apply damage to a structure, thus restoring piercing ability for them.
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@9114 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2021-06-27 15:32:02 +00:00
Flugente 89e2bd077a New feature: additional decals adds blood spatters and structural wear on walls
Requires GameDir >= r2595 to work

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