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,803 Commits 9 Branches 6 Tags
ec6867fa4bf987b14a34a857c1911eafb7cf15eb
Commit Graph
1005 Commits
Author SHA1 Message Date
rftr ec6867fa4b changed return type of CountAllMilitiaInFiveSectors() from UINT8 to UINT16 to fix an overflow during militia reinforcement 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@9400 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2022-09-08 18:09:07 +00:00
Asdow 9ac2d3c828 Fix wrong offset resulting in character inventory background not drawn in old inventory & 1024x768 resolution 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@9397 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2022-08-16 14:08:09 +00:00
Sevenfm 07700a8d7e MakeSureMedKitIsInHand: 
- for AI, just swap objects as they don't care about pockets
- only show "nowhere to place item" message for player mercs (prevents medic AI from spamming messages)

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@9394 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2022-08-06 12:44:56 +00:00
Sevenfm 058a2cd40f HandlePrison: 
- more precise calculation of prisoner to guard ratio
- improved calculation of random number of prisoners escaping (allow single prisoner/max prisoners to escape when not guarded)
- check that someone actually escaped before showing riot message
- limit ubNumTroops to 255 (like in other places) as 512 makes no sense for UINT8 value

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@9390 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2022-07-31 15:30:22 +00:00
rftr 612cc2a405 fix: clear world items when starting a new game 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@9389 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2022-06-03 04:43:48 +00:00
rftr 02a8c48873 fix ARC cashback bug: https://thepit.ja-galaxy-forum.com/index.php?t=msg&th=22776&goto=364578&#msg_364578 
also remove incorrect dependency on fAssignTraitsToEnemy for HVT strikes

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@9367 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2022-04-15 16:32:07 +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 186a722519 Fix, improv.: NO_REMOVE_RANDOM_SECTOR_ITEMS (by sun_alf). 
fix: it was using doubled number of arrived enemies (NumEnemiesInAnySector counts the same enemies twice if called prior to RemovePGroup.)
improvement:
* chance to steal a WORLDITEM is it's coolness * 10%.
* looters can steal up to "3 kg * numEnemies" of items in total, and no more.

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@9362 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2022-04-08 21:00:58 +00:00
rftr 8d952591fd fix assert/crash when a spy is hiding or gathering intel in the 2 rightmost columns. this was caused by an overflow in the fSectorsWithSoldiers array when doing the hourly assignment update 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@9359 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2022-04-05 05:38:27 +00:00
rftr 2747f9cee0 Fix: Assertion failures on militia strategic commands (by sun_alf) 
* Discarding a route can result in failure"Path exists, but no waypoints were added!	AM-0".
* Waypoints can be not deleted upon arrival to final destination.

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@9356 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2022-04-02 04:27:02 +00:00
rftr 094c2edbde Fix: incorrect path rebuilding in RebuildWayPointsForGroupPath() (by sun_alf) 
Additional correction to RebuildWayPointsForGroupPath(): we should not skip "next" sector if we are between sectors. (Original comment stated opposite which was confusing)

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@9353 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2022-03-31 05:08:49 +00:00
Sevenfm 508adc4eee Show "Select All" line in strategic movement popup box only if we have more than 1 movable squad in sector (by Asdow). 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@9351 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2022-03-29 18:58:33 +00:00
rftr 4689369f83 adjusted AI SAM site repairs: 
- SAM sites are no longer repaired instantly when AI takes control of a sector
- repairs begin 24 hours after the AI takes control, and repeat every 24 hours until the SAM is back at 100%
- repairs can be interrupted by the player regaining control of the SAM site
- time to repair a fully-destroyed SAM site depends on difficulty: novice takes 5 repair cycles, experienced takes 4, expert 3, and insane 2
- moved RepairSamSite() from ASD.h (where it was unused) into strategicmap.h
- this sets up the existing but previously unused strategic event hook EVENT_SAMSITE_REPAIRED

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@9349 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2022-03-26 21:44:43 +00:00
rftr bd5b14358d Fix: incorrect path rebuilding in RebuildWayPointsForGroupPath(), incorrect GroupAtFinalDestination() detection (by sun_alf) 
*  RebuildWayPointsForGroupPath(): incorrect manipulations with 'iOldDelta' and 'iDelta' lead to skipping a node in 'pHeadOfPath' and to assertion failure as a result:
   AssertMsg( FALSE, String( "Invalid DIAGONAL waypoint being added for groupID %d. AM-0", pGroup->ubGroupID ) );
* GroupAtFinalDestination(): should take into account the amount of WayPoints, otherwise multiple visiting of a sector is not possible (group end up in that sector at first entrance):
   if( ( pGroup->ubSectorX == wp->x ) && ( pGroup->ubSectorY == wp->y ) )

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@9348 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2022-03-26 21:00:13 +00:00
Shadooow f130e5676c Fix for PMC/militiaroster email being sent over and over. 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@9345 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2022-03-26 06:24:10 +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
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 fb3a9d40b2 remove initialisers from rebel command structs 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@9335 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2022-03-21 05:30:53 +00:00
Shadooow 3919a648d0 Fix for PercentEliteBonus from DifficultySettings.xml not applying onto enemy armies with both admins and regular troops correctly. 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@9333 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2022-03-19 21:51:42 +00:00
rftr bc829a388e fix jeep/tank check for l_AdjustEnemyStrengthInSector (Mini Events) 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@9325 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2022-03-16 18:28:09 +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 1c8b6a0f29 fix: force inventory redraw when using the mouse wheel to navigate through your mercs in strategic view. fixes bad inventory render when using a mouse to scroll from vehicle's inventory to a merc, and vice versa (by rftr) 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@9304 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2022-02-17 02:33:23 +00:00
Sevenfm 4f0386be62 ARC: add tooltips to admin actions to show the range of their effect (by rftr). 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@9303 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2022-02-16 18:26:11 +00:00
Shadooow 9a11ddb375 Removed body inventory region in mapscreen for vehicles completely. There was no image rendered anyway, this way no popup message duplicating status will be shown and consumables won't popup the "Heh?" error either. 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@9290 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2022-02-02 15:39:35 +00:00
Shadooow 31b17d99d0 Fixed bug in ASD code causing enemy patrols to have 0 elites no matter if ASD was enabled or not. I also changed the ASD feature, for patrols only, to assign tanks and jeeps in place of elites. So if the patrol spawned without any elite it can't have tank and jeep. Robots are still placed instead of regular troops, which however means that patrol full of elites will never have any robots. 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@9287 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2022-02-02 03:41:34 +00:00
Shadooow 52a42d0354 Changed behavior of Select All button in movement box. Now it will select remaining soldiers, if only some of them are selected instead of deselecting them. It will of course still deselect all if all are selected. 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@9286 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2022-01-31 08:46:52 +00:00
Shadooow ad8edc869e Fixed bug introduced in r9275; not being able to assign mercs to facilities or train militia 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@9282 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2022-01-27 20:44: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 be14552e32 Prevented the game trying to delete an already deleted button when leaving mapscreen and fixed visual bug for popup boxes drawing in item description box in widescreen UI (by Asdow). 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@9276 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2022-01-25 22:24:53 +00:00
Sevenfm bc8fac5c3e Fix: memset bugs (by Asdow). 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@9275 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2022-01-25 11:25:03 +00:00
Shadooow 24775ee398 Fixed crash when the cheat command to teleport on mapscreen assigned previous sector into sector from which the destination cannot be entered. 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@9272 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2022-01-22 20:08:37 +00:00
Sevenfm 8c59159213 Added "select all" option for strategic movement popup box (by Asdow). 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@9269 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2022-01-20 19:48:56 +00:00
Sevenfm 5282553a8c Stop being able to change assignments of in transit mercs (by Asdow). 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@9268 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2022-01-20 17:48:39 +00:00
Sevenfm abdfd022ae Implements mouse wheel scrolling for switching mercs in strategic map when hovering mouse above teamlist, character inventory and character info panels (by Asdow). 
Simplified the r9266 inventory scrolling and made it obey inverted mouse wheel scrolling direction that is in the options screen (by Asdow).

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@9267 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2022-01-18 22:05:01 +00:00
Sevenfm f1ba48f51f Added mouse wheel scroll functionality for changing pages in strategic map inventory (by Asdow). 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@9266 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2022-01-18 19:29:50 +00:00
Shadooow 8e60b4d442 Fix&Revert of previous commit, I messed it up with my other edits in code that are not tested yet. 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@9264 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2022-01-18 08:03:12 +00:00
Shadooow bbd6b1393f Fixed Daily Expenses to no longer count salary of dead mercs or POW NPCs and RPCs. 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@9263 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2022-01-18 07:53:06 +00:00
Shadooow 5bb4de2484 Fixed bug where kicking out a merc and telling him to drop items in current sector while having that sector map inventory open would fail to move his items into sector inventory. 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@9258 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2022-01-15 14:08:41 +00:00
Shadooow 7c40f27359 Dismissing vehicle will drop items in its inventory in current sector without asking. 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@9257 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2022-01-14 22:58:32 +00:00
Shadooow 67f62736ed Changed assignment text for destroyed vehicles in merc list. 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@9256 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2022-01-14 22:27:37 +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
Shadooow 18b21ce561 Fixed bug splitting escort-requiring npc with another merc, who is under that npc in squad list, from existing squad resulting in putting the two into different groups and disallowing to plot movement. 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@9251 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2022-01-12 03:12:33 +00:00
Shadooow d2ccd4a307 Correction to not disable retreat when ALLOW_SKYRIDER_HOT_LZ is 2 or 3. 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@9246 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2022-01-12 01:31:08 +00:00
Shadooow a577db2752 Disabled retreat when hot dropping and only center of the map is allowed. 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@9244 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2022-01-11 23:54:17 +00:00
Sevenfm 6a3f5cf29e Fix for the uncertain enemies question mark location in higher resolutions (by Asdow). 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@9234 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2022-01-04 19:59:16 +00:00
Shadooow 038410db4a fix for the new cheat not updating mapscreen automatically 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@9229 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2022-01-02 16:12:23 +00:00
Shadooow e20d0cb134 new cheat/debugging command for mapscreen: CTRL+SHIFT+A will reveal all sectors and enemies 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@9228 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2022-01-02 14:13:02 +00:00
Shadooow e600134786 fixed bug allowing to move robot without soldier having control device if they were both in party where another soldier not chosen to move had the device 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@9227 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2022-01-01 20:44:21 +00:00
Shadooow 9737bd9255 fixed bug allowing to plot path with Robot or NPCs that needs to be escorted on their own 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@9225 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2022-01-01 12:36:03 +00:00