Commit Graph
2121 Commits
Author SHA1 Message Date
Sevenfm a658b5121f SIDE_FACING_DIVISOR: allow this option to work for crouched target, but with lowered divisor.
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@9377 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2022-05-04 16:46:35 +00:00
Sevenfm 5a498bc0ba SIDE_FACING_DIVISOR option tweaks:
- only for standing targets
- only for human bodytypes
- only when aiming at torso/legs
- added safety checks
- disabled divisor for vertical deviation

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@9375 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2022-05-03 12:14:46 +00:00
rftr 7b57f834f6 unactivated turncoats ignore suspicious activity.
unactivated turncoats intentionally try to miss when shooting at mercs/militia.

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@9370 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2022-04-24 21:16:13 +00:00
Sevenfm 904fae7a96 CancelDrag, StartDrag: update interface panel to change drag icon status.
DrawTraitRadius uses usColour.
Allow to start dragging from any stance, soldier will crouch automatically.
Show draggable objects when drag skill menu is active.
Press [\] key to start dragging object/solder/corpse in front of merc.

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@9369 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2022-04-24 18:21:44 +00:00
Sevenfm cdc605d5ab Press [\] to break window glass with crowbar or any two-handed weapon. Weapon can be damaged in the process.
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@9368 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2022-04-21 13:00:09 +00:00
rftr 86fd310d6d fix tactical turncoat activation reducing enemy soldier count twice
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@9366 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2022-04-15 04:14:34 +00:00
rftr fcc21e32dc added new option in Skills_Settings.ini: [Covert Ops] COVERT_TURNCOATS_ACTIVATE_IN_AUTORESOLVE
if enabled, turncoats will automatically activate when entering an autoresolve battle

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@9365 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2022-04-14 06:50:44 +00:00
Sevenfm 67d5aeadb0 Additional Laptop files (by sun_alf).
Example file: https://github.com/sun-alf/BRAINMOD-o/blob/master/Data-BRAINMOD/TableData/Laptop/AdditionalFiles.xml

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@9363 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2022-04-13 10:43:49 +00:00
Sevenfm 89e0fd33ec Get rid of buggy-style odd hits when a merc is on the middle of roof, not at enemy's line-of-fire, and prone. Shortly, suppression still affects hiding roofers, but accidental hits do not (by sun_alf).
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@9361 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2022-04-07 18:18:39 +00:00
Sevenfm b2ea45b182 ESC for multiple selected mercs: first stop mercs, next press unready weapon.
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@9358 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2022-04-02 15:39:58 +00:00
Sevenfm 0782dec389 ESC: unready weapon for all selected mercs.
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@9357 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2022-04-02 15:28:41 +00:00
rftr 746d15a1ba remove magic numbers from the usLimitedToSystem bitflag
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@9355 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2022-04-02 01:11:25 +00:00
Asdow c334d4a0d4 Optimize RandomMagazine() called when deploying to tactical sector (by sun_alf)
Timings
Before:
RandomMagazine: 90044 us (total 90044 us)
RandomMagazine: 90007 us (total 180051 us)
RandomMagazine: 100009 us (total 280060 us)

After:
RandomMagazine: 0 us (total 0 us)
RandomMagazine: 0 us (total 0 us)
RandomMagazine: 0 us (total 0 us)


git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@9354 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2022-03-31 15:10:19 +00:00
Asdow 3577ffa91a Improve SurfaceCache error messages
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@9352 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2022-03-30 13:05:56 +00:00
rftr 75d98aecfd add "Disguise" menu to tactical skill menu (alt + rightclick)
add "Fill canteens" action to tactical skill menu, under "various" 

adapted from Seven's +AI

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@9350 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2022-03-29 06:02:44 +00:00
Sevenfm 9acaa41e95 Added Autobandage option to Skill Menu.
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@9344 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2022-03-25 10:50:18 +00:00
Shadooow 033ae4a191 Added two new tags into Items.xml, <FoodSystemExclusive> and <DiseaseSystemExclusive> which prevents specific items to appear without these systems enabled.
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@9343 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2022-03-24 05:40:46 +00:00
Shadooow c704e37586 WRITE_PROFILE_DATA_TO_XML = TRUE will now also outputs a MercStartingGear.xml, useful to convert data from prof.dat into new xml format automatically.
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@9342 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2022-03-23 03:20:44 +00:00
Shadooow 7baeb20175 INI option SOLDIERS_ALWAYS_WEAR_ANY_ARMOR works improperly at 100% game progress, so that a soldier lacks 1, 2 or all 3 armor items ('naked' guy). (by sun_alf)
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@9341 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2022-03-22 22:12:07 +00:00
Shadooow 3e4295c70b Corrected prototype and definition of the function ChooseArmourForSoldierCreateStruct to match and removed line breaks from withing function prototypes.
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@9340 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2022-03-22 20:43:08 +00:00
Sevenfm 39bbc63884 Fix: clear TEAM panel left/right area.
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@9339 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2022-03-22 15:23:31 +00:00
rftr 87b0c7c6b7 new feature: madlab's robot can be upgraded
requires gamedir r2642

https://thepit.ja-galaxy-forum.com/index.php?t=msg&goto=364403

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@9338 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2022-03-21 17:34:49 +00:00
rftr 374b125ffc fix initial gearkit costs for AIM members (thanks Toni)
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@9330 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2022-03-18 06:40:36 +00:00
Shadooow 682cbda213 Fixed graphic glitches, usually black screen or shadow boxes over the screen, appearing when inside the key ring popup box.
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@9326 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2022-03-16 22:38:32 +00:00
Shadooow 9122d7a7a6 CAN_FAN_THE_HAMMER = FALSE now disables the burst mode on pistols
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@9319 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2022-03-13 19:43:25 +00:00
Shadooow 1b63f1da01 Fixed bug, where scope mode icons were lost after exiting EDB.
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@9318 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2022-03-10 19:29:06 +00:00
Shadooow 06599477a0 changed ctrl + shift + T to be gated behind cheat activation, and it is now labelled "Auto save # cheat"
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@9314 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2022-03-01 23:14:09 +00:00
Sevenfm 1e94aea625 Don't apply mortar/GL default penalty for enemy/militia is they cannot have trait skills, improved code to support old skill system.
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@9313 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2022-03-01 18:20:46 +00:00
Shadooow c23d62de02 Makes it so that if ASSIGN_SKILL_TRAITS_TO_ENEMY or MILIATIA is disables then enemies or militia will not get penalties/bonuses from new traits which then should fix the issue where enemies do not use mortars at all when this option is disabled.
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@9312 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2022-03-01 17:49:24 +00:00
Shadooow a184f76753 Fix for grenades being put into inventory instead back into hand if the soldier is stopped from throwing it in middle of animation by game (interrupt/spotting another enemy).
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@9311 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2022-02-28 22:23:33 +00:00
Sevenfm 81f493aa5a Quick keys Alt + 0..9 and Alt + [~] now work consistently in normal and cheat mode.
Moved Alt + 1..5 cheat hotkeys to Ctrl + Alt + 1..5

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@9309 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2022-02-20 13:42:59 +00:00
Shadooow a8fec72f2e ALT+g cheat changed from "semi-random" merc to merc of your choosing.
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@9308 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2022-02-19 14:13:00 +00:00
Shadooow a4aa443b32 Stat Progress Bar removed from options and made permanently active.
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@9307 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2022-02-19 13:25:39 +00:00
Shadooow f2d5adca88 Fixed APs to start running being charged twice.
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@9306 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2022-02-19 13:07:20 +00:00
Sevenfm aaa88a11f3 Fix: shooting through roof.
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@9302 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2022-02-16 15:22:21 +00:00
Sevenfm aa5e2dc4c3 PlaceObject: don't show incompatible face item message when doing autoplacement.
SwapGoggles: swap face item to helmet if possible.

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@9301 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2022-02-15 12:03:54 +00:00
Sevenfm 878447af9f Improved code for flashlight/stock transformation hotkeys.
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@9300 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2022-02-13 16:55:39 +00:00
Sevenfm f51c1b1e8d CalcEffVolume: removed bCheckTerrain as it's not used in the code.
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@9299 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2022-02-13 10:23:53 +00:00
Sevenfm 8d655ceb96 Shift+T: allow transformation into item with the same item size (for example, shovel mode transformation).
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@9298 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2022-02-13 07:22:12 +00:00
Sevenfm 04d14f436f New hotkey Shift+P - transform stock.
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@9297 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2022-02-13 06:56:23 +00:00
Sevenfm 3a9d6d65e4 Shift+T: only allow item transformation if item is corpse or resulting item is of the same item class, also check it's not transformation into same item.
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@9296 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2022-02-11 11:22:33 +00:00
Sevenfm b8b48e7d2e Only play certain sounds when soldier is visible or if there is player team member near:
- cow sounds
- crow sounds
- animation based sounds
- lock n' load sound for gun
- enter deep water sound

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@9295 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2022-02-10 08:24:07 +00:00
Sevenfm 1015614473 Play different sound when object drops into water, depending on object weight and type.
Play S_WATER_IMPACT1 when bullet hits water.

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@9294 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2022-02-08 10:17:38 +00:00
Shadooow 5e8fa16cb9 Added missing parenthesis to the code evaluating sightrange NCTH that could lead to issues.
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@9291 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2022-02-06 09:24:04 +00:00
Shadooow 1503b32e30 Fixes random merc portraits sometimes appearing in a region where would merc inventory normally be when opening inventory of a vehicle.
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@9289 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2022-02-02 15:20:12 +00:00
Shadooow 9a89bb6793 Set the newly initialized vehicle driver to be NOBODY. This fixes jeep and possibly tank as well in autoresolve to play sounds of player merc.
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@9288 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2022-02-02 13:11:34 +00:00
Shadooow 6ca75431ae Disallowed to pick up items from openable structures like crates if they are currently closed. This additionally fixes bug where Bobby Ray's delivery wouldn't show up if the player had sector of the delivery currently loaded and there were any unpicked items from previous delivery in the delivery crate.
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@9285 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2022-01-31 03:39:50 +00:00
Sevenfm 531849f7aa Disabled muzzle flash when trying to fire jammed gun.
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@9281 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2022-01-27 10:04:21 +00:00
Sevenfm 49989da8b1 Dropping items from hand when being hit:
- civilians with profile should not drop items from hand as it may break quests
- fixed possible incorrect type conversion which could result in dropping too often if weapon in hand marked as undroppable

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@9280 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2022-01-27 01:24:11 +00:00
Shadooow c29e070ccf Fixes the missing muzzle flash lighting when firing in the dark. The flag was actually never set when using NCTH, and UseGunNCTH() that was supposed to set it gets called after the animation control checks whether a muzzleflash is true or not, so I had to add the setting the flag just before that check (by Asdow).
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@9279 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2022-01-26 16:12:06 +00:00