correctly override abilities with negative intrinsic aim/crit modifiers

rohan

Oct 29, 2022, 2:31 AM

ZWEUVHPQYDIHQE2LEDOFTSCV2HWJO7MLKAUHKFHWATCDV4CTDBKAC

Dependencies

• [2] X4IR7ZAH baseline from krumiro's [WotC] RW Realistic Aiming Angles

Change contents

• replacement in RWRealisticAimingAnglesHL/Src/RWRealisticAimingAnglesHL/Classes/RWRealisticAimingAngles.uc at line 1
  [2.1229]→[2.1230:1291](∅→∅)
  − class RWRealisticAimingAngles

  − extends UIScreenListener
  [2.1229]

  [2.1291]
  + class RWRealisticAimingAngles

  + extends UIScreenListener
• replacement in RWRealisticAimingAnglesHL/Src/RWRealisticAimingAnglesHL/Classes/RWRealisticAimingAngles.uc at line 24
  [2.2181]→[2.2181:2335](∅→∅)
  − AbilityTemplate = X2AbilityTemplate(DataTemplate);

  − /* if (AbilityTemplate.AbilityToHitCalc.class == class'X2AbilityToHitCalc_StandardAim' ){//&&
  [2.2181]

  [2.2335]
  + AbilityTemplate = X2AbilityTemplate(DataTemplate);

  + /* if (AbilityTemplate.AbilityToHitCalc.class == class'X2AbilityToHitCalc_StandardAim' ){//&&
• replacement in RWRealisticAimingAnglesHL/Src/RWRealisticAimingAnglesHL/Classes/RWRealisticAimingAngles.uc at line 30
  [2.2671]→[2.2671:2824](∅→∅)
  − NewAbilityToHitCalc.HitModifiers = OldAbilityToHitCalc.HitModifiers; // Configured in the ability template to provide always-on modifiers.
  [2.2671]

  [2.2824]
  + NewAbilityToHitCalc.HitModifiers = OldAbilityToHitCalc.HitModifiers; // Configured in the ability template to provide always-on modifiers.
• replacement in RWRealisticAimingAnglesHL/Src/RWRealisticAimingAnglesHL/Classes/RWRealisticAimingAngles.uc at line 45
  [2.5037]→[2.5037:5192](∅→∅)
  − if (AbilityTemplate.AbilityToHitOwnerOnMissCalc.class == class'X2AbilityToHitCalc_StandardAim'){ //ABILITIES ALSO HAVING .ABILITYTOHITOWNERONMISSCALC
  [2.5037]

  [2.5192]
  + if (AbilityTemplate.AbilityToHitOwnerOnMissCalc.class == class'X2AbilityToHitCalc_StandardAim'){ //ABILITIES ALSO HAVING .ABILITYTOHITOWNERONMISSCALC
• replacement in RWRealisticAimingAnglesHL/Src/RWRealisticAimingAnglesHL/Classes/RWRealisticAimingAngles.uc at line 54
  [2.6379]→[2.6379:6590](∅→∅)
  − AbilityToHitCalc.bAllowCrit == false || //WHILE THE REMAINING ONES USED AN UNCONVENTIONAL

  − AbilityToHitCalc.bHitsAreCrits == true || //DEFINITION NOT REFERENCING DIRECTLY TO HABILITYTOHITCALC
  [2.6379]

  [2.6590]
  + AbilityToHitCalc.bAllowCrit == false || //WHILE THE REMAINING ONES USED AN UNCONVENTIONAL

  + AbilityToHitCalc.bHitsAreCrits == true || //DEFINITION NOT REFERENCING DIRECTLY TO HABILITYTOHITCALC
• replacement in RWRealisticAimingAnglesHL/Src/RWRealisticAimingAnglesHL/Classes/RWRealisticAimingAngles.uc at line 58
  [2.6941]→[2.6941:6994](∅→∅)
  − AbilityToHitCalc.bGuaranteedHit == true ||
  [2.6941]

  [2.6994]
  + AbilityToHitCalc.bGuaranteedHit == true ||
• replacement in RWRealisticAimingAnglesHL/Src/RWRealisticAimingAnglesHL/Classes/RWRealisticAimingAngles.uc at line 60
  [2.7045]→[2.7045:7160](∅→∅)
  − AbilityToHitCalc.BuiltInHitMod > 0 || //) continue;

  − AbilityToHitCalc.BuiltInCritMod > 0 ||
  [2.7045]

  [2.7160]
  + AbilityToHitCalc.BuiltInHitMod != 0 || //) continue;

  + AbilityToHitCalc.BuiltInCritMod != 0 ||
• edit in RWRealisticAimingAnglesHL/Src/RWRealisticAimingAnglesHL/Classes/RWRealisticAimingAngles.uc at line 76
  [2.8187]→[2.8187:8189](∅→∅)
  −