Skip to content
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.

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

Prevent built-in hit and crit modifiers from applying against non-units #1167

Merged
merged 1 commit into from
May 21, 2023

Conversation

Iridar
Copy link
Contributor

@Iridar Iridar commented Apr 22, 2023

Fixes #346

Per RM's suggestion, just moved the two AddModifier(BuiltIn...Mod) functions lower in the code, where we know we're dealing with a unit target.

Tested and working. Logs of using Rapid Fire on a non-unit target, pre change:


[0461.36] XCom_HitRolls: =GetHitChance=
[0461.36] XCom_HitRolls: Modifying eHit_Success -15 (Rapid Fire), New hit chance: -15
[0461.36] XCom_HitRolls: Modifying eHit_Crit +0 (Rapid Fire), New hit chance: -15
[0461.36] XCom_HitRolls: Modifying eHit_Success +100 (Aim), New hit chance: 85
[0461.36] XCom_HitRolls: ==FinalizeHitChance==

[0461.36] XCom_HitRolls: Starting values...
[0461.36] XCom_HitRolls: eHit_Success: 85
[0461.36] XCom_HitRolls: eHit_Crit: 0
[0461.36] XCom_HitRolls: eHit_Graze: 0
[0461.36] XCom_HitRolls: eHit_Miss: 0
[0461.36] XCom_HitRolls: eHit_LightningReflexes: 0
[0461.36] XCom_HitRolls: eHit_Untouchable: 0
[0461.36] XCom_HitRolls: eHit_CounterAttack: 0
[0461.36] XCom_HitRolls: eHit_Parry: 0
[0461.36] XCom_HitRolls: eHit_Deflect: 0
[0461.36] XCom_HitRolls: eHit_Reflect: 0
[0461.36] XCom_HitRolls: Calculated values...
[0461.36] XCom_HitRolls: eHit_Success: 85
[0461.36] XCom_HitRolls: eHit_Crit: 0
[0461.37] XCom_HitRolls: eHit_Graze: 0
[0461.37] XCom_HitRolls: eHit_Miss: 15
[0461.37] XCom_HitRolls: eHit_LightningReflexes: 0
[0461.37] XCom_HitRolls: eHit_Untouchable: 0
[0461.37] XCom_HitRolls: eHit_CounterAttack: 0
[0461.37] XCom_HitRolls: eHit_Parry: 0
[0461.37] XCom_HitRolls: eHit_Deflect: 0
[0461.37] XCom_HitRolls: eHit_Reflect: 0
[0461.37] XCom_HitRolls: Final hit chance (success + crit + graze) = 85
[0461.37] XCom_HitRolls: =InternalRollForAbilityHit=
[0461.37] XCom_HitRolls: Final hit chance: 85
[0461.37] XCom_HitRolls: Random roll: 38
[0461.37] XCom_HitRolls: Checking table eHit_Success (85)...
[0461.37] XCom_HitRolls: MATCH!
[0461.37] XCom_HitRolls: ***HIT eHit_Success
[0461.37] XCom_HitRolls: ===CalculateDamageAmount===
[0461.37] XCom_HitRolls: Attacker ID: 2078 With Item ID: 2084 Target ID: 2627
[0461.37] XCom_HitRolls: bIgnoreBaseDamage:'False' DamageTag:'None'
[0461.37] XCom_HitRolls: Weapon damage: 5 Potential spread: 1
[0461.37] XCom_HitRolls: Damage with spread: 6
[0461.37] XCom_HitRolls: Total Damage: 6

Logs after change:


[0403.66] XCom_HitRolls: =GetHitChance=
[0403.66] XCom_HitRolls: Modifying eHit_Success +100 (Aim), New hit chance: 100
[0403.66] XCom_HitRolls: ==FinalizeHitChance==

[0403.66] XCom_HitRolls: Starting values...
[0403.66] XCom_HitRolls: eHit_Success: 100
[0403.66] XCom_HitRolls: eHit_Crit: 0
[0403.66] XCom_HitRolls: eHit_Graze: 0
[0403.66] XCom_HitRolls: eHit_Miss: 0
[0403.66] XCom_HitRolls: eHit_LightningReflexes: 0
[0403.66] XCom_HitRolls: eHit_Untouchable: 0
[0403.66] XCom_HitRolls: eHit_CounterAttack: 0
[0403.66] XCom_HitRolls: eHit_Parry: 0
[0403.66] XCom_HitRolls: eHit_Deflect: 0
[0403.66] XCom_HitRolls: eHit_Reflect: 0
[0403.66] XCom_HitRolls: Calculated values...
[0403.66] XCom_HitRolls: eHit_Success: 100
[0403.66] XCom_HitRolls: eHit_Crit: 0
[0403.66] XCom_HitRolls: eHit_Graze: 0
[0403.66] XCom_HitRolls: eHit_Miss: 0
[0403.66] XCom_HitRolls: eHit_LightningReflexes: 0
[0403.66] XCom_HitRolls: eHit_Untouchable: 0
[0403.66] XCom_HitRolls: eHit_CounterAttack: 0
[0403.66] XCom_HitRolls: eHit_Parry: 0
[0403.66] XCom_HitRolls: eHit_Deflect: 0
[0403.66] XCom_HitRolls: eHit_Reflect: 0
[0403.66] XCom_HitRolls: Final hit chance (success + crit + graze) = 100
[0403.66] XCom_HitRolls: =InternalRollForAbilityHit=
[0403.66] XCom_HitRolls: Final hit chance: 100
[0403.66] XCom_HitRolls: Random roll: 44
[0403.66] XCom_HitRolls: Checking table eHit_Success (100)...
[0403.66] XCom_HitRolls: MATCH!
[0403.66] XCom_HitRolls: ***HIT eHit_Success
[0403.68] XCom_HitRolls: ===CalculateDamageAmount===
[0403.68] XCom_HitRolls: Attacker ID: 2079 With Item ID: 2085 Target ID: 2829
[0403.68] XCom_HitRolls: bIgnoreBaseDamage:'False' DamageTag:'None'
[0403.68] XCom_HitRolls: Weapon damage: 5 Potential spread: 1
[0403.68] XCom_HitRolls: Damage with spread: 5
[0403.68] XCom_HitRolls: Total Damage: 5

…odifiers from applying against non-units.
@Iridar Iridar added bug-basegame ready-to-review A pull request is ready to be reviewed labels Apr 22, 2023
@Iridar Iridar added this to the 1.25.0 milestone Apr 22, 2023
@Iridar Iridar self-assigned this Apr 22, 2023
@Iridar Iridar merged commit a4e6eb2 into X2CommunityCore:master May 21, 2023
4 checks passed
@Iridar Iridar deleted the 346-built-in-modifiers branch May 21, 2023 08:49
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
bug-basegame ready-to-review A pull request is ready to be reviewed
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Make attacks against for non-units be properly guaranteed
2 participants