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,823 Commits 9 Branches 6 Tags
3724de92991cb800cb7be0cfaf2be40fa9563f98
Commit Graph
3823 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
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
rftrdevandGitHub 392b70b1c5 Merge branch '1dot13:master' into arc-missions 2022-10-17 00:44:35 -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
AsdowandGitHub 62f3fc8453 Merge pull request #8 from FunkyFr3sh/master 
Detect cnc-ddraw and disable windowed mode
 2022-10-15 21:04:25 +03: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
FunkyFr3shandGitHub 5441cd3326 Detect cnc-ddraw and disable windowed mode 2022-10-14 13:24:47 +02: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
AsdowandGitHub 9cc567644f Merge pull request #4 from 1dot13/bugfix 
r9402: Fixed nullptr dereference & assertion error
 2022-10-10 07:48:13 +03: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 41e0cedb7a fix: mercs in pow/minievent state feed themselves properly 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@9401 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2022-09-26 22:21:31 +00: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
Sevenfm b7067b860c Chinese translation update (by zwwooooo). 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@9398 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2022-08-23 11:14:33 +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
Asdow 317f741811 Added assertion with error message to prevent silent crashes/nullptr dereference if loading big item graphics fails. 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@9396 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2022-08-16 13:37:08 +00:00
rftr b843d82f54 add nullptr check to features and options screen buttonlists 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@9395 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2022-08-06 17:07:06 +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
Asdow f733bda830 Fixed nullptr dereference in void CommonEnterCombatModeCode( ) & added two nullptr safety checks 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@9393 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2022-08-02 22:29:00 +00:00
Asdow 9f0a3e03bb Fixed glowing rectangle staying on the screen if one selects an item, clicks Finish button instead of closing inventory pool with checkmark/right click and then goes back to gear selection screen through Attributes screen 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@9392 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2022-08-02 07:42:38 +00:00
Asdow 1f095b7d31 Implemented new IMP gear selection interface to replace the dropdown menus. Requires GameDir rev 2652. 
Enrico's letter is forced to the first hired merc in old inventory, similar to new inventory in case a free item pocket is not found.

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@9391 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2022-08-01 21:15:34 +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 15bb2a8537 check in missed file 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@9388 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2022-05-29 19:25:17 +00:00
rftr 4b40212ebd added new options to limit merc salary increases on level up: 
MERC_LEVEL_UP_MAXIMUM_SALARY_INCREASE_DAILY
MERC_LEVEL_UP_MAXIMUM_SALARY_INCREASE_WEEKLY
MERC_LEVEL_UP_MAXIMUM_SALARY_INCREASE_BIWEEKLY

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@9387 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2022-05-28 21:09:02 +00:00
Sevenfm 9441173fba Chinese translation update (by zwwooooo). 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@9386 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2022-05-20 11:01:37 +00:00
Sevenfm a0a71894d1 Path code optimization: moved inventory searching functions out of path loop. 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@9385 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2022-05-12 16:15:58 +00:00
Sevenfm 2874a0cb92 Damage lock with bullets: 
- lockBustingPower works as percentage bonus to damage based on bullet impact
- only damage lock if opening possible
- allow damaging lock if ubSmashDifficulty <= lockBustingPower + bullet impact

AttemptToBlowUpLock: make noise when using shaped charge.

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@9384 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2022-05-11 15:23:23 +00:00
Sevenfm dc8fffb471 Fix: use system time instead of game time for breaking AI deadlock as game time is affected by fast timer mode, as a result breaking AI decision before it can execute normally. 
Allow to break AI deadlock manually by pressing ESC key after 10 seconds, auto break AI after DEAD_LOCK_DELAY seconds.

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@9383 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2022-05-10 18:45:19 +00:00
Sevenfm 3fa2758399 AttemptToBlowUpLock: 
- fix incorrect damage value taken from removed item
- catch overflow in bLockDamage
- don't increase shaped charge damage without demolitions skill, use vanilla multiplier when old traits are used
- only damage lock if opening possible, check actual damage in case of reaching max INT8
- improved code

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@9382 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2022-05-10 14:50:33 +00:00
Sevenfm 0f4aea2574 Experimental fix: use WALKING movement mode when sidestepping with weapon raised in turnbased mode. 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@9381 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2022-05-07 18:37:27 +00:00
Sevenfm 7f28015ac5 LIMIT_SIMULTANEOUS_SOUND option: changed delay to 50ms. 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@9380 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2022-05-06 19:15:10 +00:00
Sevenfm d0c5b366fb AICalcChanceToHitGun: take into account target facing for standing/crouched human targets (when not using SIDE_FACING_DIVISOR option). 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@9379 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2022-05-05 12:50:30 +00:00
Sevenfm b75669c181 New option LIMIT_SIMULTANEOUS_SOUND prevents sound system from multiple playing same sound at the same time. 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@9378 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2022-05-05 07:54:00 +00:00
Sevenfm a658b5121f SIDE_FACING_DIVISOR: allow this option to work for crouched target, but with lowered divisor. 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@9377 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2022-05-04 16:46:35 +00:00
rftr 2cdc346934 fix divide-by-zero crash in some cases when crepitus queen is doing a tentacle attack 
bug found by BigBritishGuy on discord

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@9376 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2022-05-03 22:24:44 +00:00
Sevenfm 5a498bc0ba SIDE_FACING_DIVISOR option tweaks: 
- only for standing targets
- only for human bodytypes
- only when aiming at torso/legs
- added safety checks
- disabled divisor for vertical deviation

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@9375 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2022-05-03 12:14:46 +00:00
Sevenfm 01de9164b6 Chinese translation update (by zwwooooo). 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@9373 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2022-05-03 06:51:56 +00:00
Sevenfm 3d1f8b1951 New ingame option "Show enemy movement" - show location of recently known enemy (seen/heard last turn). 
Improved tooltip for formation movement: SHIFT + click to move in formation.

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@9372 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2022-05-01 08:24:46 +00:00
rftr 6d0c4ab4ce if using the features screen to play with intel, also enable extra civilians and extra merchants so the black market is available 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@9371 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2022-04-29 07:45:40 +00:00
rftr 7b57f834f6 unactivated turncoats ignore suspicious activity. 
unactivated turncoats intentionally try to miss when shooting at mercs/militia.

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@9370 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2022-04-24 21:16:13 +00:00
Sevenfm 904fae7a96 CancelDrag, StartDrag: update interface panel to change drag icon status. 
DrawTraitRadius uses usColour.
Allow to start dragging from any stance, soldier will crouch automatically.
Show draggable objects when drag skill menu is active.
Press [\] key to start dragging object/solder/corpse in front of merc.

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@9369 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2022-04-24 18:21:44 +00:00