1dot13/source
1
0
Fork 0
mirror of https://github.com/1dot13/source.git synced 2026-07-29 13:52:17 +02:00
Code Issues Packages Projects Releases Wiki Activity
3,625 Commits 9 Branches 6 Tags
abb1aeeea2bd8ef647c23a0e4987b3915aebddf2
Commit Graph
954 Commits
Author SHA1 Message Date
Sevenfm 1ee875be61 New ingame options screen (by rftr). 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@9212 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2021-11-17 07:50:20 +00:00
Sevenfm f9cfb5e831 Auto Resolve code: added type change missing from previous commit, fixed some compiler warnings. 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@9210 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2021-11-01 16:19:17 +00:00
Sevenfm 01a566494e Fix possible signed/unsigned type inconsistency problems in auto resolve code, fix max limit for tries in auto bandage code. 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@9209 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2021-11-01 16:09:59 +00:00
Shadooow bd5fc83ef8 fixed gap between the involved table and uninvolved table 
fixed uninvolved header not appearing at all when all mercs were involved

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@9205 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2021-10-30 19:23:03 +00:00
Shadooow 14e963e338 re-enabled the scrolling functionality via mouse wheel on the message scroll bar which got lost due to previous change to message region boundaries 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@9203 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2021-10-28 14:34:44 +00:00
Shadooow c9b9652940 reworked the camouflage and weight map regions to be created only on demand 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@9202 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2021-10-28 13:26:02 +00:00
Shadooow 30b3528956 improved the boundaries of the message area in map screen 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@9201 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2021-10-28 12:56:56 +00:00
Shadooow 6d8e11931a fixed negative value passed into PreRandom that could cause game to crash 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@9198 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2021-10-27 00:21:47 +00:00
Sevenfm a8bace71fc Rebel command balancing (by rftr): 
- most admin actions' effectiveness now scale with town loyalty
- added the ability to spend supplies to raise town loyalty
- fixed arc website dropdown issues
- minor code cleaning in Rebel Command.cpp

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@9192 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2021-10-22 09:31:38 +00:00
Sevenfm 8d8f912e1a Fix: ASD deploys tanks if there are any in reserve, instead of prioritizing jeeps (by rftr). 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@9190 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2021-10-19 07:22:32 +00:00
Sevenfm ff172cc92f fix: follow-up minievents properly wait for the specified time (by rftr) 
fix: money income from rebel command displays properly in finances (by rftr)

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@9188 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2021-10-18 06:15:40 +00:00
Shadooow a3bcfef40a maximum heath of merc on mapscreen will now show in red color if the merc suffered a health loss from critical hit 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@9187 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2021-10-17 23:16:52 +00:00
Shadooow 7f57376f93 pressing ESC while map movement popup box opened will now cancel the box instead of leaving map into tactical mode 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@9186 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2021-10-17 22:37:20 +00:00
Shadooow 9f18ebb382 fix: mercs in a helicopter can initiate movement by clicking in their destination column, like regular on-foot/in-car movement (by rfrt) 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@9185 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2021-10-17 21:58:13 +00:00
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