Generalised a species' types to allow any number of types

This commit is contained in:
Maruno17
2022-12-31 17:24:33 +00:00
parent 3a4b01e2dc
commit 3fe324d0da
24 changed files with 200 additions and 203 deletions

View File

@@ -28,6 +28,7 @@ module PBEffects
Encore = 23
EncoreMove = 24
Endure = 25
ExtraType = 111
FirstPledge = 26
FlashFire = 27
Flinch = 28
@@ -113,7 +114,6 @@ module PBEffects
TrappingUser = 108
Truant = 109
TwoTurnAttack = 110
Type3 = 111
Unburden = 112
Uproar = 113
WaterSport = 114

View File

@@ -30,7 +30,7 @@ class Battle::DamageState
def initialize; reset; end
def reset
@typeMod = Effectiveness::INEFFECTIVE
@typeMod = Effectiveness::INEFFECTIVE_MULTIPLIER
@unaffected = false
@protected = false
@missed = false

View File

@@ -2607,7 +2607,7 @@ Battle::AbilityEffects::OnSwitchIn.add(:ANTICIPATION,
if Settings::MECHANICS_GENERATION >= 6 && m.function == "TypeDependsOnUserIVs" # Hidden Power
moveType = pbHiddenPower(b.pokemon)[0]
end
eff = Effectiveness.calculate(moveType, types[0], types[1], types[2])
eff = Effectiveness.calculate(moveType, types)
next if Effectiveness.ineffective?(eff)
next if !Effectiveness.super_effective?(eff) &&
!["OHKO", "OHKOIce", "OHKOHitsUndergroundTarget"].include?(m.function)