bugfix: Undetected mines can now be approached when using a disarm weapon #1883
+16
−0
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
LGTM |
Caball009
approved these changes
Dec 21, 2025
Caball009
left a comment
Caball009
left a comment
There was a problem hiding this comment.
Tested and works. Looks good to me.
xezon
reviewed
Dec 30, 2025
| return STATE_FAILURE; | ||
| } | ||
| } | ||
| if( victim->testStatus( OBJECT_STATUS_STEALTHED ) && !victim->testStatus( OBJECT_STATUS_DETECTED ) && !victim->testStatus( OBJECT_STATUS_DISGUISED ) ) |
There was a problem hiding this comment.
The same condition also exists in AIAttackPursueTargetState::updateInternal. Does that need similar treatment?
| return STATE_FAILURE; // If obj is stealthed, can no longer approach. | ||
| #else | ||
| const Bool isTargetingMine = weapon && weapon->getDamageType() == DAMAGE_DISARM && | ||
| (victim->isKindOf(KINDOF_MINE) || victim->isKindOf(KINDOF_BOOBY_TRAP) || victim->isKindOf(KINDOF_DEMOTRAP)); |
There was a problem hiding this comment.
If the damage type is DAMAGE_DISARM, do we even need to test for the target kindof? We assume that all object kinds can be approached if they can be disarmed, no?
xezon
reviewed
Dec 30, 2025
| (victim->isKindOf(KINDOF_MINE) || victim->isKindOf(KINDOF_BOOBY_TRAP) || victim->isKindOf(KINDOF_DEMOTRAP)); | ||
|
|
||
| if (!isTargetingMine) | ||
| return STATE_FAILURE; // If obj is stealthed, can no longer approach - unless we're targeting a mine! |
There was a problem hiding this comment.
I suggest move the EA comment up like so:
// If obj is stealthed, can no longer approach
// TheSuperHackers @bugfix Except when disarming stealthed mine-like objects
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
4 participants
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Fixes #1874
This change allows undetected mines to be approached when using a disarm weapon.
In the retail game, a worker or dozer refuses to perform a mine disarming command if there are undetected mines at the targeted location. This is because there is no logic in the
AIAttackApproachTargetState(entered when a weapon is out of range) to accommodate the special-case mine disarming behaviour, and the state returns a fail if the target is stealthed and undetected irrespective of the initial command's success.Before
The worker does not proceed to disarm mines
MINE_FAIL.mp4
After
The worker proceeds to disarm mines
MINE_SUCCESS.mp4