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
1083 Commits
Author SHA1 Message Date
rftrdev 337bb023e3 Don't show "Mission prep in progress" if there are none 2022-10-22 23:17:19 -07:00
rftrdev 89285b4961 Remove debug mission randomisation 
General cleanup
 2022-10-22 22:14:22 -07:00
rftrdev 5000f965e1 Add "Soldier Bounties" mission 2022-10-22 17:54:06 -07:00
rftrdev cb3613eb1b Merge branch 'arc-missions' of https://github.com/rftrdev/1dot13-source into arc-missions 2022-10-19 17:06:15 -07:00
rftrdevandGitHub f3ca6cb80b Merge branch '1dot13:master' into arc-missions 2022-10-19 17:06:04 -07:00
rftrdev 4b8b549df5 Ensure a nonzero value is used for Mini Event stat changes 
Fixes an assert found by Vacuusimago on Discord
 2022-10-19 16:49:12 -07:00
rftrdev 1448ee0cbb Prevent toggling on admin actions when the player has too few supplies 
Fix toggle check in daily update
 2022-10-19 11:26:01 -07:00
rftrdev c9421215e0 Toggle admin actions off if the player can't pay upkeep 2022-10-18 22:34:18 -07:00
rftrdev fcd7ed5ef6 Move text to _EnglishText 2022-10-18 22:08:09 -07:00
rftrdev 7e55488b40 Clean up some todos 2022-10-18 17:27:05 -07:00
rftrdev 3807b7fed4 Add proper checks and bonuses for active missions 2022-10-17 23:28:21 -07:00
rftrdev 1e189c54ac Add mission cost settings 2022-10-17 22:40:47 -07:00
rftrdev 572933e359 Display missions, both active and under preparation 2022-10-17 19:37:12 -07:00
rftrdev 3724de9299 Properly reset merc assignment when mission prep completes, regardless of success or failure 
Fix use of merc profile id in first mission event param
 2022-10-17 14:38:51 -07:00
rftrdev 61858e472a Move some text around 2022-10-17 13:56:45 -07:00
rftrdev d9697e900b Add merc contract check to StartMission 
Fail mission prep if the agent is no longer in the player's employ
 2022-10-17 00:39:32 -07:00
rftrdev 983aa24b1b Add settings variable for mission refresh time 
Fix nullptr derefence when starting a mission with a generic agent

Limit missions to one per batch

Add popup box and screenmsg when a mission activates, fails to activates, and expires
 2022-10-17 00:33:38 -07:00
rftrdev 2b88fac870 Award exp to mercs who prep a mission, regardless of whether they succeed or not 2022-10-16 20:43:21 -07:00
rftrdev e9c4b09de5 Manually align mission prep completion to top of the hour (xx:00) 2022-10-15 00:05:52 -07:00
rftrdev b0b26d8ef2 Fix being able to assign Radio Scan in specific cases 2022-10-14 23:43:43 -07:00
rftrdev 2e17b4ff14 Show "No mission available" after starting a mission 
Consume supplies after mission starts
 2022-10-14 17:31:07 -07:00
rftrdev c8465baee2 Add POW/MiniEvent/RebelCommand assignment check for StartMission 2022-10-14 01:02:46 -07:00
rftrdev 0485aa230e A bit of cleanup 2022-10-14 00:59:42 -07:00
rftrdev dea5da5fc6 Implement "Train Militia Anywhere" 
Subtract supplies when starting mission

Fix second stage mission strategic event
 2022-10-14 00:26:38 -07:00
rftrdev feaf9827c9 Set up ASSIGNMENT_REBELCOMMAND 
Hook up Start Mission button
 2022-10-13 11:31:48 -07:00
rftrdev 8858559a10 Add checks before enabling Start Mission button 
Minor UI adjustments
 2022-10-12 00:58:30 -07:00
rftrdev 7b0830c060 Initial commit - SVN checkpoint to git branch 2022-10-11 00:17:12 -07:00
Asdow 5197ef21e5 r9402: Fixed nullptr dereference & assertion error 
https://github.com/1dot13/source/issues/3#issue-1400794531
https://github.com/1dot13/source/issues/2#issue-1400794162
 2022-10-10 07:45:20 +03:00
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