1dot13/source
1
0
Fork 0
mirror of https://github.com/1dot13/source.git synced 2026-08-26 14:30:26 +02:00
Code Issues Packages Projects Releases Wiki Activity
7,628 Commits 9 Branches 6 Tags
de4e0d3dc76c18bb1f40bc9b584e97a9f5f8d5b8
Commit Graph
7628 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
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 ccbe4eace0 FIX: made Knife pocket restricted to only normal and throwing knives (by Shadooow). 
FIX: changed size category for all kinds of 5.56x45mm C-Mag ammo belts (100 bullets) from 24 to 25 (by Shadooow).
This fixes the fact that these ammo belts could be put into large ammo pocket. It also balances the amount of these belts in all pockets they are supposed to be put into - previously you could have 6 of them in Double Belt pocket while you could have only 2 of the 200bullet 5.56x45mm belts in the same pocket - now its 4. -1 compared to previous value in Ammo Belt pocket and Vehicle too.

FEATURE: allowed heavy throwing knives to get bloody (by Shadooow).

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@2587 4f8fa57e-7814-0410-bad4-adc449f26b7c
 2021-04-18 04:12:27 +00:00
Sevenfm 5d8ec28de2 FIX: cleaned duplicated attributes (by impulseUK). 
FIX: cleaned duplicated attributes (by impulseUK).

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@2586 4f8fa57e-7814-0410-bad4-adc449f26b7c
 2021-04-18 04:09:41 +00:00
Sevenfm aa1a54d8c9 Added missing icons to prevent crash in EDB (by impulseUK). 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameData@8959 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2021-04-12 17:46: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 41afd4fabe Add robots to enemy groups (by rftr). 
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@2585 4f8fa57e-7814-0410-bad4-adc449f26b7c
 2021-04-03 03:34:09 +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 7d25e30219 Removed AP_SUPPRESSION_SHOCK_DIVISOR option. 
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@2584 4f8fa57e-7814-0410-bad4-adc449f26b7c
 2021-02-28 16:23:19 +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
Sevenfm fe10587437 Show flash light when throwing flares. 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8946 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2021-02-21 16:25:36 +00:00
Sevenfm 37aa936f5b New option DEFEAT_MODE: 
- 0: default, any lost battle is considered defeat
- 1: if enemy team was alerted
- 2: if at least one of retreating mercs is not covert
- 3: if at least one merc was killed in battle
- 4: if all mercs were killed in battle

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@2583 4f8fa57e-7814-0410-bad4-adc449f26b7c
 2021-02-21 13:18:31 +00:00
Sevenfm 0e0d329b95 New option DEFEAT_MODE: 
- 0: default, any lost battle is considered defeat
- 1: if enemy team was alerted
- 2: if at least one of retreating mercs is not covert
- 3: if at least one merc was killed in battle
- 4: if all mercs were killed in battle

MORALE_RAN_AWAY:
- apply penalty when retreating from sector only if enemy team was alerted
- improved check for mercs in sector
- no MORALE_HEARD_BATTLE_LOST penalty
- no reputation loss when retreating from battle

CheckForEndOfBattle:
- only apply morale and loyalty penalty if player was defeated
- only play death music if player is defeated
- log defeat only when player was defeated
- clear aware status for enemy team, clear enemy kill counter

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8945 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2021-02-21 13:18:04 +00:00
Sevenfm 02d19f3240 Update tree visibility after changing stance. 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8944 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2021-02-20 17:38:38 +00:00
Sevenfm 0f6f84fb35 Updated LOBOT files (by Asdow). 
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@2582 4f8fa57e-7814-0410-bad4-adc449f26b7c
 2021-02-18 09:38:26 +00:00
Sevenfm 6bb9759e75 LOBOT filters update (by Asdow). 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8943 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2021-02-18 09:19:37 +00:00
Sevenfm 311b3d40af Added missing TOPTION_SMART_TREE_TOPS option. 
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@2581 4f8fa57e-7814-0410-bad4-adc449f26b7c
 2021-02-18 05:49:18 +00:00
Sevenfm f3d35c9401 Strip clothes: drop item to soldier's level if no place in inventory. 
HandleTalkInit: 
- use SoldierToSoldierLineOfSightTest to check sight to person
- increased talking range for militia to TACTICAL_RANGE
When checking if radio set equipped for using with militia command feature, don't check for AP_RADIO as the game will deduct AP_TALK when giving order.

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8942 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2021-02-17 20:31:44 +00:00
Sevenfm 417fa661c6 Smart tree top hiding: more optimization. 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8941 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2021-02-17 15:36:02 +00:00
Sevenfm 27d681905d Smart tree top hiding: code optimization. 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8940 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2021-02-17 15:24:00 +00:00
Sevenfm 4471b8ef97 Improved code to check if militia options are available. 
Start radio animation when giving orders to militia.
FindClosestClimbPointAvailableToAI: don't check roaming range when searching climb spot for AI.

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8939 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2021-02-17 15:01:57 +00:00
Sevenfm c72300d51f Fix crash when using LOBOT with certain sti size and offset (by Asdow). 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8938 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2021-02-17 14:02:30 +00:00
Sevenfm 75f5f35ea0 Added 0.1s delay to hide tree top when moving cursor to prevent flickering when moving mouse over trees. 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8937 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2021-02-17 06:22:39 +00:00
Sevenfm 7c1e9e3200 New ingame option: Smart tree tops. 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8936 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2021-02-16 17:22:44 +00:00
Sevenfm 0ccecc472c Fix: UI attack handling prioritised interactive structures over target soldiers even if target soldier was explicitly provided causing deadlocks e.g. when trying to punch enemy overlapped by a door (by anv). 
ReInitMergedItem: show item id, attachment id when doing assert.

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8935 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2021-02-13 05:48:17 +00:00
Sevenfm 169e909b56 Minor code improvements. 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8934 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2021-02-12 07:23:54 +00:00
Sevenfm f0693d4aad Black AI: 
- fixed bug when AI soldier was ordered to move to his current spot when trying to get closer
- check if soldier can find cover before disabling the attack

Added more AI log info.

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8933 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2021-02-12 07:15:03 +00:00
Sevenfm 39776dc569 Fix: guiBaseJA2Clock overflow (by MH17) 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8932 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2021-02-12 05:31:14 +00:00
Sevenfm 18dcced82a Use TACTICAL_RANGE instead of DAY_VISION_RANGE for AI calculations. 
Implemented Black cover advance code for AI: try to get closer to enemy using cover if soldier has low CTH or enemy too far for shooting or soldier has high morale or no cover at spot.

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8931 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2021-02-11 19:11:54 +00:00
Sevenfm 02cba3e1e5 When changing stance from UI, first stop cowering. 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8930 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2021-02-10 20:20:09 +00:00
Sevenfm a0a6396eaa Stop cowering when merc starts to move. 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8929 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2021-02-10 19:17:44 +00:00
Sevenfm d66a05b0f4 NO_STANDING_ANIM_ADJUSTMENT_IN_COMBAT: apply only for player mercs, to avoid possible problems with AI. 
CalcChanceHTH: only use reduced chance for boxers.
AIDoctorFriend, AIDoctorSelf: first change soldier to stationary.
AIDoctorFriend: change target to stationary.

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8928 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2021-02-08 18:27:27 +00:00
Sevenfm 6ad8b22368 CalcChanceHTH: restored higher base chance for melee attacks. 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8927 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2021-02-07 21:07:17 +00:00
Sevenfm c63f2e5a7e New option BOBBY_RAY_TOOLTIPS_SHOW_LBE_DETAILS. 
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@2580 4f8fa57e-7814-0410-bad4-adc449f26b7c
 2021-02-01 08:26:39 +00:00
Sevenfm 0abc2bf31f Features by rftr (http://thepit.ja-galaxy-forum.com/index.php?t=msg&th=12557&goto=362288&#msg_362288) 
New option BOBBY_RAY_TOOLTIPS_SHOW_LBE_DETAILS.
Stop Speck from spamming your email when multiple new mercs are available on the same day.

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8926 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2021-02-01 08:25:59 +00:00
Sevenfm f8768a557d Minor code improvement for r8924. 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8925 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2021-01-31 14:37:38 +00:00
Sevenfm bc3b398b63 Use MAXITEMS + 1 max limit when checking transformations. 
UpdateAttachmentTooltips: 
- separate items, launchables and attachments checks as they have different max limits
- improved searching of existing item in vector

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8924 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2021-01-31 13:48:21 +00:00