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
2205 Commits
Author SHA1 Message Date
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
Sevenfm 0fdaba84f6 World items patch (by Asdow). 
Adds timing logs to savegame function, similar to how we already had in loading a save file. 
Uses a global struct for unloaded sectors' inventory instead of using map item temp files every time unloaded inventory is accessed.
From timing loading and saving functions with a save that has dozens of sectors with hundreds of items each, saving is a little bit slower than before, because map item temp files have to be written to disk just before the save, when that wasn't the case before (from ~0.3 s -> ~0.5s). It is offset by a decrease in loading a game (from ~1.1s -> 0.745s), once an older save is saved at least once. Any unloaded sector inventory access during gameplay is considerably faster and for example the autoresolve lag when militia is using sector equipment is completely gone for me.
Preserves save game compatibility

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@9277 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2022-01-26 01:02:30 +00:00
Sevenfm e887f85a44 ProcessNoise: fixed incorrect noise terrain check. 
Reverted r9259.

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@9274 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2022-01-25 04:15:39 +00:00
Shadooow 9668618b68 Demand surrender feature will now work on each team separately, ie. demanding surrender from regular enemy will not count hostile civilians or bandits and neither it will capture them. 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@9271 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2022-01-22 16:46:13 +00:00
Sevenfm c972655886 ESC key: 
- close active skill sub-menu
- stop moving merc
- stop moving group of mercs
- stop dragging
- unready weapon

Changed hotkeys:
- [A]: activate skills menu.
- [Alt]+[A]: start autobandage
- [Q]: change scope mode
- [Ctrl]+[Q]: change grenade launcher angle

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@9260 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2022-01-16 13:59:59 +00:00
Sevenfm 94b7d5611d Improved door noise sound playing: only play sound if merc opening/closing door is visible on screen or if player team hears noise from door. 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@9259 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2022-01-16 13:33:11 +00:00
Shadooow a9fa54e69a Fixed not being able to remove vehicle from merc list. 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@9255 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2022-01-14 22:12:18 +00:00
Sevenfm 76472eed0a Separated cover view area update from RemoveCoverObjectsFromViewArea() into its own function to make it more explicit when and where we do it (by Asdow). 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@9253 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2022-01-12 16:09:10 +00:00
Shadooow 3f0ccb0a56 Implemented the missing option of hot drop merc via helicopter into center of the map only, ie. ALLOW_SKYRIDER_HOT_LZ = 1 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@9243 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2022-01-11 23:52:50 +00:00
Shadooow b320052d6b Revert of 9241 and a new more coherent solution which works for hot drops as well. 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@9242 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2022-01-11 20:49:37 +00:00
Shadooow 48f61bd7bf Fixed regression when newly arriving merc in Omerta was facing north instead of east if player pressed ESC key during helidrop animation. 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@9241 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2022-01-11 19:59:49 +00:00
Sevenfm 082d9838a5 When taking/dropping corpse as object, use object's ubWireNetworkFlag and sRepairThreshold variables to store palette and camo status of corpse, instead of hardcoded flags. 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@9240 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2022-01-11 17:52:06 +00:00
Shadooow a57cc79c83 enabled new attachments to be shown even without EDB for all items except LBE gear 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@9239 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2022-01-11 01:11:50 +00:00
Shadooow 61f1dd4acb fixed MAX_BACKPACK_WEIGHT_TO_CLIMB not being checked in all places which caused: 
- mouse cursor showing blocked path incorrectly and jumping over fence via mouse failing
- endless clock issue at the end of the boxing match if player merc had backpack

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@9238 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2022-01-10 22:44:52 +00:00
Sevenfm be80da650c Various improvements by rftr: 
- added more toggles to the features screen: drop all, suppression, drassen/city counterattacks, dynamic opinions and dialogue, and weather
- fixed weather rendering check for individual weather types
- added mousewheel support to options screen and features screen to navigate through pages
- added keyboard inputs to options screen and features screen: TAB toggles between features and options, and A/D/leftarrow/rightarrow navigates through pages

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@9230 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2022-01-03 22:49:43 +00:00
Shadooow 1749d3adfb Surrender GUI when talking to boxing opponent replaced with MessageBox allowing to forfeit the match. 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@9226 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2022-01-01 13:33:34 +00:00
Sevenfm 27c0d1f8fe With ALTERNATE_MOUSE_COMMANDS = TRUE, mouse wheel allows to change active interface level. 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@9224 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2021-12-31 20:46:44 +00:00