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,413 Commits 9 Branches 6 Tags
d41c0f2f93bbc3cf6f61228f6804973ddd50ecbc
Commit Graph
3413 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Sevenfm 09270c04f0 Fix Deidranna endless clock in cutscene. 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8970 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2021-04-24 13:31:56 +00:00
Sevenfm fc91cb545a Fixes bug when you sometimes got vision inside building when climbing from the roof (by Shadooow). 
Extended explanation: This happens from two reasons, first - there seems to be vision update for all soldiers every 5 seconds. Second, when climbing down the roof, the height level is set to 0 at the very beginning of the climb when merc is still on the roof - which makes him for a split second inside the building in fact. If the automatic vision update is triggered in this split of second, you will see into building.

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8969 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2021-04-24 12:52:39 +00:00
Sevenfm 23ce4caf26 Fix: CTRL+U cheat command not replenishing energy properly (by Shadooow). 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8968 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2021-04-24 12:42:53 +00:00
Sevenfm 3b3476c379 EVENT_SoldierBeginBladeAttack: initialize attack data before other calculations, set bTargetLevel to soldier's level as melee attacks don't work between levels (by Shadooow). 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8967 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2021-04-23 07:02:35 +00:00
Sevenfm b8aac91b9e Fixes (by Shadooow): 
- fixed AP cost shown at the cursor when pressing ALT during RUN mode since game doesn't allow to "reverse run" and forces walking
- shows walking cursor instead of running if ALT is held

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8966 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2021-04-23 06:42:09 +00:00
Sevenfm df3d71f07c Fix: erase path after switching active merc with mouse wheel (by Shadooow). 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8965 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2021-04-22 06:37:17 +00:00
Sevenfm 73070b004b Fix: path not being erased and recalculated when changing selected soldier via SPACE button (by Shadooow). 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8964 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2021-04-22 06:14:00 +00:00
Sevenfm 886c1bac71 Fix: display of merc AP in case he started with value over 99 new APs are lower than that (by Shadooow). 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8963 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2021-04-22 05:02:25 +00:00
Sevenfm 5626257492 Improved r8961: 
- removed unneeded checks in BtnClimbCallback
- improved code in UpdateSMPanel, check if crouched stance is valid when enabling jump button

Warnings fixes.

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8962 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2021-04-19 06:18:24 +00:00
Sevenfm f02de44a32 Fixes by Shadooow: 
- fixed queen alternative gridno feature spawning her behind walls in basement instead of in front of the throne in palace
- fixed queen alternative gridno feature triggering even when palace was cleared
- added missing sanity checks when Climbing/Jumping via UI button

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8961 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2021-04-19 05:37:36 +00:00
Sevenfm 38c2af0b8b FIX: mechanical units are not a valid blood donors (by Shadooow). 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8960 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2021-04-18 18:08:15 +00:00
Sevenfm 8928ad0d65 Russian text fixes (by impulseUK). 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8958 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2021-04-09 11:39:26 +00:00
Sevenfm addff41022 Build 21.04.04 
Fixed savegame compatibility (by rftr).

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8957 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2021-04-04 17:40:11 +00:00
Sevenfm b6f15b2347 Add robots to enemy groups (by rftr). 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8956 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2021-04-03 03:32:40 +00:00
Sevenfm 4c7db819ef Fixed default OutDir for 2019 project. 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8955 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2021-03-17 13:24:37 +00:00
Sevenfm 4cab0e2bdf Experimental tweak: stop muzzle flash at the end of the attack, to allow visibility check and interrupt to work correctly. 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8954 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2021-03-14 18:33:06 +00:00
Sevenfm 8822bfcb8f TileEngine include cleanup (by Asdow). 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8953 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2021-03-11 20:41:44 +00:00
Sevenfm c8cb9a0d6c SetAttachmentSlotsFlag: improved code to check array bounds. 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8952 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2021-03-11 06:51:12 +00:00
Sevenfm d1de51605c TransformObject: disabled interrupt after sight check. 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8951 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2021-03-09 22:26:02 +00:00
Sevenfm d028282b39 Focus skill: no watched location interrupt bonus if focus is active. 
Improved data initialization.
Smart tree top hiding: increased max distance to hide tree in vertical direction.

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8950 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2021-03-05 07:01:51 +00:00
Sevenfm b157b47a34 GridNoSpotterCTHBonus: fixed bTeam type. 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8949 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2021-03-04 21:00:28 +00:00
Sevenfm f99f802e25 Removed AP_SUPPRESSION_SHOCK_DIVISOR option. 
HandleSuppressionFire: improved code to calculate suppression shock, take into account 100AP / 25AP system.

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8948 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2021-02-28 16:21:16 +00:00
Sevenfm 1abb292f8e New militia order: Move to (works in realtime only, switches militia soldier to DTATIONARY/DEFENSIVE). 
Cancel current AI order when giving militia order.
Check if desired stance is possible here when ordering militia to crouch/prone.
Green AI: reworked climb code (only climb up, only at the start of the turn, disable for STATIONARY).

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8947 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2021-02-26 12:14:11 +00:00