Skip to content

Fixed Eagle Eyes rolls for Advanced Scouting #8751

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
heckindoc wants to merge 3 commits into from
+2 −2
Closed

Fixed Eagle Eyes rolls for Advanced Scouting #8751

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
5467af1
Eagles Eyes was missing a negative, causing it to make scouting rolls…
heckindoc Feb 18, 2026
4ba0121
Eagles Eyes was missing a negative, causing it to make scouting rolls…
heckindoc Feb 18, 2026
d4d212e
Merge remote-tracking branch 'origin/main'
heckindoc Feb 18, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions MekHQ/src/mekhq/campaign/stratCon/StratConRulesManager.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1721,7 +1721,7 @@ private static TargetRollModifier getUnitSpeedModifier(int unitSpeed) {
*/
private static TargetRollModifier getScoutComplementarySPAModifier(Person scout) {
PersonnelOptions options = scout.getOptions();
int complementaryModifier = options.booleanOption(OptionsConstants.MISC_EAGLE_EYES) ? 1 : 0;
int complementaryModifier = options.booleanOption(OptionsConstants.MISC_EAGLE_EYES) ? -1 : 0;

return new TargetRollModifier(complementaryModifier, "Complementary SPA Modifier");
}
Expand Down Expand Up @@ -1811,7 +1811,7 @@ private static List<ScoutRecord> buildScoutMap(Force force, Hangar hangar, boole
PersonnelOptions options = crewMember.getOptions();
int complementaryModifier = !hasSensorEquipment && // Doesn't stack with Sensor Equipment
options.booleanOption(OptionsConstants.MISC_EAGLE_EYES) ?
1 : 0;
-1 : 0;

int scoutSkillLevel = (scoutSkill == null) ? -1 : scoutSkill.getTotalSkillLevel(skillModifierData);
Comment on lines 1813 to 1816
Copy link
Member

@psikomonkie psikomonkie Feb 18, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

For this specific usage, is lower better or worse & should eagle eyes be a bonus or penalty?

The other usage is a TN, lower is better, all good.

This usage looks like lower is worse - this value will be added to scoutSkillLevel, which defaults to -1 if the skill isn't found.

I believe the eagle eyes value here should still be positive if it's meant to be a bonus.

Copy link
Contributor Author

@heckindoc heckindoc Feb 18, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Eagle Eyes functions in the same fashion as a beagle probe in the setting of Advanced Scouting, decreasing the TN by 1.

In testing on 50.11, Eagle Eyes increased the TN by 1 and when made negative and retested in the 50.12 environment Eagle Eyes then had the intended effect of reducing the TN by 1.

Copy link
Member

@psikomonkie psikomonkie Feb 18, 2026 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Changing "1" to "-1" for the TN is correct, I agree.

I don't think this specific usage is for a TN though.

EDIT: This is for determining the best scout. It calculates their effective skill level, a positive value, and returns whoever has the highest value. This change will cause persons with Eagle Eye to be considered worse than they are.

Copy link
Contributor Author

@heckindoc heckindoc Feb 18, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'll try to take another look at it tonight and test it further and/or see if I can find a different solution. Thank you!

scoutSkillLevel += complementaryModifier;
Expand Down