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
4,086 Commits 9 Branches 6 Tags
f5f3bb94deab5fa2ed318c75e5a35814484840bd
Commit Graph
4086 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Shadooow b1233990d8 fix: vehicles will also not count into number of mercenenaries died under player command 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@9039 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2021-05-23 20:55:10 +00:00
Shadooow 281a005fef Fix: merc dying in different sector than we are in currently will now properly spawn items into sector inventory and game will show the red colored message about him dying. 
todo: if merc dies off screen, his body/corpse disappears

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@9038 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2021-05-23 19:03:23 +00:00
Shadooow 5a2202f5b4 new feature: after throwing knives, put any throwing knife class item from second hand into main hand 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@9037 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2021-05-22 15:07:28 +00:00
Shadooow 9a942fcb89 improved the way how marbles works, now it will work already when reaching the gridno where marbles are, not just when trying to exit it 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@9036 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2021-05-21 18:46:29 +00:00
Shadooow 5d81b61f8e fix for "white face" when saying some quote which happened when the soldier was bleeding in different sector than we are in right now 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@9035 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2021-05-21 14:01:40 +00:00
Shadooow 0b6dfdb24d spread fire fixes in realtime mode 
- fixes spread fire not working properly and shooting elsewhere than assigned
- fixes throwing items not working and instead firing from weapon
- added the fix shooting to random direction that was previously added into Turn Based Input

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@9034 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2021-05-21 11:55:00 +00:00
Shadooow 43dfa982a5 Bright future is here, introduced turning AP costs into pathing AP prediction. Full changelog: 
- fixed camera action AP cost shown and made soldier to turn towards target
- fixed handcuffs, jar and can actions AP cost shown calculating pathing cost twice and not calculating stance change at all
- fixed refueling and repairing pathing leading to inside vehicle
- fixed endless clock issue when trying to refuel from spot next to vehicle
- fixed endless clock issue when trying to repair vehicle/SAM site during combat
- fixed refuel, repair and jar actions not costing any AP in turn based mode
- fixed multiple actions not calculating and substracting AP cost for turning
- fixed using toolkit asking whether player wants to attack ally
- fixed issue where the required AP cost for melee attack was not recalculated when changing movement mode
- allowed to start repairs on robot manually from tactical mode
still a problem:
- repairing during combat still does nothing as soldiers cannot go into assignment while there are enemies on map
- we need new function to return action gridno for actions on vehicles, FindAdjacentGridEx is not working very well
- soldiers doesn't turn during interactive actions

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@9033 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2021-05-20 11:42:57 +00:00
Shadooow a5d13a6ebe fix for AP cost sometimes not recalculating when changing modes via right click 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@9032 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2021-05-18 21:04:25 +00:00
Sevenfm aa088af952 Allowed the 1.13 custom message boxes (corpse handling, CTRL+. one etc.) to be escaped/skipped via ESC key (by Shadooow). 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@9031 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2021-05-16 18:48:05 +00:00
Sevenfm a2e0080227 Re-allowed diagonal melee attacks, this time it will work correctly and game actually use this in pathing too, which was not the case before (by Shadooow). 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@9030 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2021-05-16 18:46:37 +00:00
Sevenfm 42481737ab Improved bloodcats targetting against prone targets. Same as previous change for soldiers, now even bloodcats will be able to attack the second tile that is prone target lying at (by Shadooow). 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@9029 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2021-05-16 18:37:11 +00:00
Sevenfm 638f6d2786 New cheat command ALT+6 to turn selected soldier into bloodcat (by Shadooow). 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@9028 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2021-05-16 18:36:00 +00:00
Sevenfm 39b8911803 Fix: attaching guns to tripwire. 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@9027 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2021-05-15 06:26:37 +00:00
Sevenfm cf55e6ddf3 Fix: removes the usMapPos code from actions that can be used by AI + improves function FindAdjacentGridEx to handle monsters and find adjacent tile for any of the tile they occupy (by Shadooow). 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@9026 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2021-05-15 05:18:12 +00:00
Sevenfm b923471914 Minor code improvements. 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@9025 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2021-05-15 04:47:17 +00:00
Sevenfm 09ea9f3fb7 Fix for knife and punch attacks attack from GridNo (by Shadooow). 
This fixes punching and stabbing target through door and improves attacking at prone target which was previously calculating shortest route only to the "main" GridNo of the prone target despite he occupies two in this position. It also removes the possibility of attacking from diagonal tile - it was never intended to happen and was calculating APs incorrectly.

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@9024 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2021-05-14 19:50:22 +00:00
Sevenfm 5fb5520380 Missing code for melee aim cost patch (by Shadooow). 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@9023 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2021-05-13 14:05:06 +00:00
Sevenfm 205f4516d9 Missing part of previous fix (by Shadooow). 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@9022 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2021-05-13 05:19:22 +00:00
Sevenfm 77980dd2cc Fixes mouse wheel not working with knife cursor (by Shadooow). 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@9021 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2021-05-13 04:52:01 +00:00