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
Sevenfm 57003e1802 Fixes issues with AP costs for aimed melee attack that allowed to make such attack even without required action points. Note for coders - #defines using conditionals needs to be in parenthesis, otherwise they won't work properly when used in conditionals - which was the case here on many places. (SANDRO catched only few of them. His fixes are reverted since the fix is now in #define itself) (by Shadooow) 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@9020 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2021-05-13 04:43:06 +00:00
Sevenfm 91e6e37c51 Improvement for r9018: code uses enums and includes two more cursor states for both knife and punch cursor which were still not showing circles (by Shadooow). 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@9019 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2021-05-13 04:39:54 +00:00
Sevenfm 23601a2e30 Restoration of aiming circles for melee attacks under NCTH (by Shadooow). 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@9018 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2021-05-12 17:43:08 +00:00
Sevenfm 5607d57385 If refilling canteen makes merc to automatically drink, drinking should make merc to automatically refill canteen - which gives player a way how to refill empty canteen while in battle (by Shadooow). 
https://discord.com/channels/348449397308391426/821085354009952307/841090805435072522

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@9017 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2021-05-11 04:56:58 +00:00
Sevenfm 3146cd9b9d Fix for for using items on enemies on roofs from inside room below. This includes multiple actions like first aid kit, blade or punch that shown path into room below enemy on roof and even allowed to stab from there (with zero chance to hit) or punch from there (clocks running for minute) (by Shadooow). 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@9016 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2021-05-11 04:50:27 +00:00
Sevenfm fc3869bcd6 Fixed function PickPocket to work with MOLLE type of LBEs (by Shadooow). 
Changed code that handles putting medical kit from merc inventory into his main hand to respect pockets restrictions to avoid putting gun into medkit only pocket etc.. Writes an error in case that medical kit cannot be put into hands due to no suitable place for currently held items (by Shadooow).

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@9015 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2021-05-11 04:40:54 +00:00
Sevenfm cf7588cacd Only show "sniper" message when shooter uses sniper rifle. 
Disabled "sniper" message for vehicles.

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@9014 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2021-05-09 03:54:41 +00:00
Sevenfm 6d3dc29163 Fix for "bullets too high" sanity check in tilesets with non-zero floor height causing bullets to disappear when firing at roof from too steep degree. + fixed extra parameters inserted into debug messages (compiler warning) (by Shadooow). 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@9013 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2021-05-09 03:24:02 +00:00
Sevenfm 5c0e6f2439 Fix: incorrect initialization (by serg). 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@9012 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2021-05-08 15:45:23 +00:00
Sevenfm 037a70b253 Fix for drugged icon not displaying on merc portrait immediately when taking drug from map screen (by Shadooow). 
Fix for playing full burst firing sound with less bullets than the usual for the gun burst fire in chamber (by Shadooow).

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@9011 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2021-05-07 18:12:32 +00:00
Sevenfm 92c2fc53f1 Allowed inventory management in map screen with inventory costs feature enabled. Actions points will be deducted as expected (by Shadooow). 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@9010 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2021-05-07 17:49:49 +00:00
Sevenfm e97b84b01a Allowed moving items between mercs in map screen during combat for mercs that are not in the sector where battle is occurring (by Shadooow). 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@9009 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2021-05-07 17:45:35 +00:00
Sevenfm 22c3f36a92 SHIFT+k shortcut on map screen to use same code as in tactical. Made ALT and CTRL +SHIFT+k shortcuts work on map screen (by Shadooow). 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@9008 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2021-05-07 17:42:43 +00:00
Sevenfm 3eba067b6a Fix for switch weapon shortcuts taking more AP than doing it manually when inventory costs are enabled (by Shadooow). 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@9007 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2021-05-07 17:40:03 +00:00
Sevenfm 422c72b957 Fixes NPCs going back to cower animation after collapsing which also caused them not to die properly (by Shadooow). 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@9006 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2021-05-06 18:38:31 +00:00
Sevenfm a38b3b414f Fixes by Shadooow: 
- robot has no (dynamic) opinions anymore. For now I allowed other mercs to have opinion about robot, but that is also a bit odd
- fixed Not Enough Action Points error triggering needlessly, when doing stuff like reloading ammo, using consumables or changing attachments in map screen during battle with mercs that are not in the sector where battle is occuring
- fix for RPCs sometimes repeating last spoken line after victory in the sector

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@9005 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2021-05-06 04:55:08 +00:00
Sevenfm 3579d96999 Fixes some old traits not having any popup text or showing "No bonuses" during IMP character creation (by Shadooow). 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@9004 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2021-05-05 15:54:31 +00:00
Sevenfm e4f12a68aa Reverted optimization code which prevented 40mm grenades to load if <attachment> tag is not set in mod (by Shadooow). 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@9003 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2021-05-05 08:08:37 +00:00
Sevenfm b7cc3bbcf8 Fix for Dynamic Opinions feature not respecting ini setting and not allowing it to be disabled easily (by Shadooow). 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@9002 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2021-05-05 03:40:57 +00:00
Sevenfm c2ccc871fc Fix for assertion failure when right clicking on merc assignment (by Shadooow). 
Bug description: http://thepit.ja-galaxy-forum.com/index.php?t=msg&th=22776&goto=362743&#msg_362743

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@9001 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2021-05-04 14:19:47 +00:00
Sevenfm 49c2340fa2 Feature: displaying action points in upper right corner of the merc portrait on map screen if the merc is in sector under attack and turn based mode (by Shadooow). 
Demo video: https://youtu.be/a0BihsKq4bM

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@9000 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2021-05-04 09:59:32 +00:00
Sevenfm 239005365f More highlighting changes (by Shadooow): 
- unified the highlight behavior with currently held item in cursor to only ever highlight compatible items for that item (was the case in tactical, not in map screen)
- enabled the body silhouette in map screen to be lit up when hovering/holding consumable item just as it happens in tactical mode
- few small fixes correcting code I sent previously

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8999 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2021-05-04 09:56:58 +00:00
Sevenfm a9a6193a81 Another efficiency improvement for attachments validity check function - will not check all items in inventory to be a valid gun/ammo for tested item if the tested item is attachment/hidden addon (by Shadooow). 
Significant improvement for the inventory panel item highlighting code on map screen. There is also a fix for wrong items highlighted when changing currently selected merc (by Shadooow).
Old code was constantly running update for highlights several times a second. Now it only happens when the mouse position first finds or loses an item in inventory.

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8998 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2021-05-03 04:57:07 +00:00
Sevenfm d41c0f2f93 Efficiency improvements for code dealing with attachments validity to fix any potential lag issues (by Shadooow). 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8997 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2021-05-02 05:23:52 +00:00
Sevenfm 1db29862c8 Fix for incorrect highlighting attachments + lots of efficiency improvements (by Shadooow). 
Code formatting.

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8996 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2021-05-02 05:19:43 +00:00
Sevenfm 6174df6584 Fix: No longer get individual militia email when individual militia is disabled (by noooooo). 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8995 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2021-05-01 16:59:59 +00:00
Sevenfm 3784f56ce1 Fix: small GUI issue where the body silhouette in merc inventory turned dark after moving applicable item onto it and then out of it (by Shadooow). 
Fix: GUI issue where the body silhouette wasn't lit up with some of the new consumable items such as energy drinks, etc. Also, empty canteen will no longer lit up the body silhouette anymore (by Shadooow).

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8994 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2021-05-01 16:13:40 +00:00
Sevenfm 891a17d859 Fix for not enough action points error message not appearing when using consumable without enough AP in turn based mode. (The message got overriden with another one -> "Huh?") (by Shadooow) 
Additionally fixed empty canteens to consume AP just to do nothing. Empty canteen now throws the Huh? error.

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8993 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2021-04-30 20:54:27 +00:00
Sevenfm 5400775c82 Fix for randomly shooting in wrong direction because the game activates spreading code by mistake (by Shadooow). 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8992 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2021-04-30 19:16:52 +00:00
Sevenfm f611cec057 Fix for leaving merc never reaching final sector until current battle is finished (by Shadooow). 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8991 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2021-04-30 14:16:42 +00:00
Sevenfm 8722a5d8cc Fix incorrect CTH message for [F] key when not using gun. 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8990 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2021-04-29 15:07:27 +00:00
Sevenfm 935edd128f Fix for for autobandaging sometimes hang indefinitely (by Shadooow). 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8989 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2021-04-29 10:54:50 +00:00
Sevenfm 59fba04ff5 More turncoat-related fixes and tweaks (by rftr): 
- added "recruit turncoat" to the talk menu
- recruiting turncoats now costs AP (AP_TALK in APBPConstants)
- fixed groups not decrementing soldiers when activating turncoats
- fixed a hang when activating a sector with 100% turncoats in realtime

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8988 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2021-04-29 06:28:40 +00:00
Sevenfm 61e6f4e98a Fix for filling canteens during combat (by Shadooow). 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8987 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2021-04-29 06:09:23 +00:00
Sevenfm f9ada03e5a Fix: enemy counter not updated correctly when turncoat feature is used. 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8986 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2021-04-28 07:10:12 +00:00
Wanne 6535c81157 Updated Chinese Texts (by kmoi & zwwooooo) 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8985 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2021-04-27 18:21:16 +00:00
Sevenfm 40c5e115ed Fix: variable initialization (by rftr). 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8984 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2021-04-27 05:16:55 +00:00
Sevenfm b12b5dd03a Fix: items stacking with those that player cannot take from sector inventory when using CTRL+LMB from merc inventory (by Shadooow). 
Fixed some warnings.

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8983 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2021-04-27 05:12:21 +00:00
Sevenfm 02d2c92f66 ASD deployment fix (by rftr): 
- fix: robots, jeeps, and tanks now appear in garrison reinforcement and patrol groups (if the ASD and these units are enabled)
- fix: ASD continues to purchase jeeps if tanks are disabled
- removed some magic numbers in Strategic AI.cpp

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8982 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2021-04-27 04:00:07 +00:00
Sevenfm cb074f4549 Fix for various crashing and merc placement issues when getting ambushed (by Shadooow). 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8981 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2021-04-26 17:59:51 +00:00
Sevenfm 78d73cc221 Removed unused options: ARMY_USES_TANKS_IN_ATTACKS, ARMY_USES_TANKS_IN_PATROLS, ARMY_USES_JEEPS_IN_ATTACKS, ARMY_USES_JEEPS_IN_PATROLS, ARMY_USES_ROBOTS_IN_ATTACKS, ARMY_USES_ROBOTS_IN_PATROLS (by rftr). 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8980 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2021-04-26 05:41:23 +00:00
Sevenfm a28f18cd15 Fix for black windows (Orta) not blocking vision properly, code formatting (by Shadooow). 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8979 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2021-04-26 04:59:29 +00:00
Sevenfm 9d4829ef5a Fix: incorrect cursor when using wire cutters (by Shadooow). 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8978 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2021-04-25 13:58:32 +00:00
Sevenfm 72c20b724f Exploit fix: don't allow "handcuff" cursor to reveal position of invisible enemy. 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8977 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2021-04-25 13:43:08 +00:00
Sevenfm e23e473333 Exploit fix: don't allow "apply item to others" cursor to reveal position of invisible enemy. 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8976 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2021-04-25 12:26:58 +00:00
Sevenfm c3e961731a Fix: allow interrupts after door opening (by Shadooow). 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8975 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2021-04-25 07:31:52 +00:00
Sevenfm f9ec5b1b04 Partially fixed vanilla exploit (detect invisible enemy by using plotted path), still doesn't work if merc is prone. 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8974 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2021-04-25 06:32:03 +00:00
Sevenfm 99556e09a5 Fixes female and big male body types being transparent when climbing up roof (by Shadooow). 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8973 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2021-04-25 05:35:28 +00:00
Sevenfm a92379ec96 Vision update fixes (by Shadooow): 
Small fix in TurnSoldier code. 
I am not sure if this caused anything or not, but unless I missed something, the deleted code will never trigger. So I moved the check for jump up/down animations above if they are even used.

Fix for vision not being updated in many situations.
This fixes the vision issue captured at above images. The reason it happened was that the code uses hacky approach to change direction when making certain actions like stabbing, punching, giving first aid etc. to make it smoother which then causes code later in the events to not update vision. I only playtested punching, stabbing and knife throwing, but it is obvious that the same issue happens with other activities I altered. I also made the code more efficient - changing direction will only happen when needed.

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8972 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2021-04-25 04:05:45 +00:00
Sevenfm d86a1f15a2 No sector ambients in cutscenes. 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8971 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2021-04-24 13:41:09 +00:00