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,595 Commits 9 Branches 6 Tags
b11957691c2f66e4e28b2b480ffef92de9484d21
Commit Graph
940 Commits
Author SHA1 Message Date
Sevenfm 7a7f554908 Fix/change: the hospital now checks for mercs with damaged stats in addition to damaged health. in addition, the hospital now charges money to heal damaged stats (by rftr). 
Minor fixes for quest debug log.

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@9180 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2021-10-15 04:49:17 +00:00
Sevenfm 0a717c2697 Removed option AI_DECISION_INFO. 
Added quest debug logging to Logs\QuestInfo.txt

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@9177 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2021-10-14 08:35:32 +00:00
Sevenfm d3d06bced6 Mercs with the <druguse> tag in their background don't automatically consume drugs/alcohol if they are asleep (by rftr). 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@9174 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2021-10-05 07:29:05 +00:00
Sevenfm 9ebd4a5137 Bugfix: dissolve all militia groups involved in a battle when it is completed. this fixes bad/immobile militia groups created by safehouses (ARC feature) (by rftr). 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@9170 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2021-10-04 06:59:37 +00:00
Shadooow 999fc8ac96 improved the graphic of the prebattle table 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@9166 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2021-09-17 08:50:52 +00:00
Shadooow 79bd483fe4 allowed mouse wheel to work in map screen message log area 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@9165 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2021-09-10 20:53:57 +00:00
Sevenfm 418cf24039 misc fixes (by rftr): 
- cleaned up warnings in Rebel Command.cpp
- ARC: Draft directive is hidden if volunteer pool option is disabled
- fixed dropdown menu behaviour at the RIS website

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@9163 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2021-09-03 05:15:54 +00:00
Sevenfm b7adaf802a Small arc update (by rftr): 
- 2 new directives
- 3 new admin actions
- arc website dropdown fix
- one admin action per region can now be changed

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@9161 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2021-09-01 16:48:13 +00:00
Sevenfm 1828cf252b Fix vs2013 compilation errors (by rftr). 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@9155 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2021-08-25 14:17:08 +00:00
Flugente eca080f0f9 New feature (by rftr): Arulco Rebel Command (ARC) 
Improve you cities and overall campaign by choosing out of several upgrades

Requires GameDir >= r2613

For more info, see https://thepit.ja-galaxy-forum.com/index.php?t=msg&th=24884&start=0&

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@9153 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2021-08-22 19:00:09 +00:00
Flugente 58379b84cd Minor code improvements 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@9147 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2021-07-24 19:16:12 +00:00
Flugente ed82841e3c Fix: when using two guns, both are reloaded on the reload cursor prompt, even if one of them still has ammo. This has been changed so that now only empty guns get reloaded 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@9146 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2021-07-24 19:15:18 +00:00
Flugente 320328a441 Fixes for Mini events (by rftr) 
AdjustStat fixes:
- fix negative values not being recoverable
- gains and losses made through this now properly appear in the laptop personnel tab (physical stats only)

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@9143 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2021-07-14 18:48:51 +00:00
Flugente 44858020d5 Minor improvement for mini events (by rftr): town names are provided by the game for lua 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@9142 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2021-07-13 20:28:51 +00:00
Flugente 6cad680b02 We can now use interactive actions to alter decals on walls, so it is possible to simulate taking off an object from the scenery and add it as an item. 
For more info, see http://thepit.ja-galaxy-forum.com/index.php?t=msg&goto=363513&#msg_363513

Requires GameDir >= r2601

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@9141 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2021-07-13 19:50:49 +00:00
Flugente 960bb2d4ba New feature (by rftr): Mini events are a feature where the player can receive short text blurbs, and pick one of two outcomes. 
Based on game implementations like Gloomhaven (road/city events) or Battletech (travel events).

For more info, see https://thepit.ja-galaxy-forum.com/index.php?t=msg&th=24865&goto=363481&#msg_363481

Requires GameDir >= r2599

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@9137 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2021-07-09 19:38:55 +00:00
Flugente 8d112e5191 Added lua function for finding/creating/destroying items in a soldier's inventory 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@9132 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2021-07-08 19:23:26 +00:00
Flugente 3f4da5fad5 Interactive actions now allows displaying images. 
For more info, see http://thepit.ja-galaxy-forum.com/index.php?t=msg&th=23144&goto=363478&#msg_363478

GameDir >= r2597 recommended.

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@9131 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2021-07-07 20:05:42 +00:00
Shadooow d6f07a7ef5 godmode reworked: reused existing mechanism in code = same functionality, less code changes, also when enabled GOD MODE text will now show up in left corner in red color, this was already there I just uncommented it 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@9128 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2021-07-06 19:06:23 +00:00
Shadooow 4ca4ea279a why the hell do we have bVehicleID and iVehicleId where the former is some old leftover with wrong value? 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@9112 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2021-06-27 05:15:52 +00:00
Shadooow 143711f1ac fix: no more moving around with vehicle that has no fuel 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@9109 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2021-06-27 02:22:30 +00:00
Shadooow 0dc07614a4 more god mod tweaks: 
- prevented morale drop from getting damaged
- fixed sometimes taking damage in autoresolve

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@9106 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2021-06-25 21:21:28 +00:00
Shadooow dce924540f fixed POW code throwing errors when trying to compile UB build 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@9101 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2021-06-23 23:04:49 +00:00
Shadooow da940db97c god mode cheat code tweaks + preventing ability damage 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@9098 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2021-06-22 00:20:12 +00:00
Shadooow bdbe1ffe65 new cheat command CTRL+SHIFT+g = god mode (invulnerability) requested by Parkan, works in both tactical and strategic 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@9097 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2021-06-21 21:15:17 +00:00
Shadooow fd528e418c new feature: CHEAT_MODE, new option in Ja2_Options.ini to automatically enable cheat mode in every loaded game or new replay 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@9096 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2021-06-21 16:50:14 +00:00
Shadooow f779c0cb37 Major rework of getting captured quests and mechanics. 
- new feature: added Tixa as another prison where capture mercs can be held (Alma is still primary choice though)
- fix: all mercs in the map will be taken POW when surrendered, however only 3 will appear in Alma/Tixa/N7, rest will be POW forever without chance of getting free
- fix: whenever player liberates any of the POW sectors (Alma, Tixa, N7) the respective quest/cutscene with POW will be disabled in that sector until enemy recapture the sector
- robot will be destroyed when surrendered as it makes no sense to inprison mechanical units
- externalized the GridNos for freeing POW mercs into Mod_Settings.ini

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@9095 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2021-06-21 13:53:56 +00:00
Shadooow 9f0033dac8 disabled changing assignment on POW mercs to prevent to break them free improperly 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@9093 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2021-06-21 01:56:37 +00:00
Shadooow 76429a09b6 interrogation cutscene will no longer be started if player fired all POW soldiers that were scheduled to appear there 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@9089 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2021-06-20 14:24:15 +00:00
Sevenfm 00b2f5965b ASD fix (by rftr): moved ASD initialisation to just before the strategic AI init, which is where starting enemy groups are created (and ASD flags are checked to see if any troops can be upgraded to jeeps/tanks/robots). 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@9082 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2021-06-14 04:44:09 +00:00
Shadooow aa1df7d5a3 prevented the game to capture more than 3 mercs for rescuing - this also fixes a memory leak as the code accessed array with out of bounds value 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@9071 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2021-06-12 02:48:06 +00:00
Shadooow 90d5230c6e fixes for combining items with CTRL + LMB 
- fixed regression causing this to substract APs in mapscreen even with no enemies in sector causing this to fail after several merges
- a "Not enough APs!" error will now show when doing this in turn based mode without enough APs
- fixed merc APs on portrait not being updated when doing this in mapscreen during fight
- fixed merged items not updating their graphic when doing this in mapscreen with stack of items in hand

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@9069 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2021-06-09 20:10:39 +00:00
Shadooow 3ada868111 partial revert of 9063 - less code, same functionality 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@9064 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2021-06-05 06:28:44 +00:00
Shadooow 4a2a1c67d2 better way of handling IMP slot replacements, game will no longer replace dead merc that was not deleted from team - so his name and stats will stay intact in personnel page 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@9063 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2021-06-05 06:08:55 +00:00
Shadooow 9ea0968001 fixed bug when manually placing item from soldier/vehicle inventory to not currently loaded sector inventory bugged the items and made them inaccesible after the sector got loaded 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@9058 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2021-05-29 04:16:46 +00:00
Shadooow 375008656d new feature: allowed to re-hire RPCs in case they are fired from team 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@9052 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2021-05-26 04:32:06 +00:00
Shadooow 5f62e90189 replaced iLastHandPosMapScreen global from mapscreen inventory code with iLastHandPos from tactical - I need it for upcoming feature and it should not cause any problems since you cannot have item in mouse pointer and change game mode 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@9043 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2021-05-24 05:26:14 +00:00
Shadooow 0fbf72cc74 fix: if merc dies off screen and is not between sectors, create his corpse and items at the last position he was, when the sector was loaded instead of random GridNo 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@9041 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2021-05-24 01:14:34 +00:00
Shadooow b1233990d8 fix: vehicles will also not count into number of mercenenaries died under player command 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@9039 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2021-05-23 20:55:10 +00:00
Shadooow 281a005fef Fix: merc dying in different sector than we are in currently will now properly spawn items into sector inventory and game will show the red colored message about him dying. 
todo: if merc dies off screen, his body/corpse disappears

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@9038 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2021-05-23 19:03:23 +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 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 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 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 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 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