Fixed cloud nine interaction with Hail/Sandstorm

This commit is contained in:
CaptainSegis 2017-01-19 17:54:26 -05:00
parent 4019f7777b
commit 21e7514070
1 changed files with 2 additions and 2 deletions

View File

@ -4627,7 +4627,7 @@
'Sandstorm
If .FieldEffects.Weather = BattleWeather.WeatherTypes.Sandstorm Then
If .OwnPokemon.Type1.Type <> Element.Types.Ground And .OwnPokemon.Type2.Type <> Element.Types.Ground And .OwnPokemon.Type1.Type <> Element.Types.Steel And .OwnPokemon.Type2.Type <> Element.Types.Steel And .OwnPokemon.Type1.Type <> Element.Types.Rock And .OwnPokemon.Type2.Type <> Element.Types.Rock Then
Dim sandAbilities() As String = {"sand veil", "sand rush", "sand force", "overcoat", "magic guard"}
Dim sandAbilities() As String = {"sand veil", "sand rush", "sand force", "overcoat", "magic guard", "cloud nine"}
If sandAbilities.Contains(.OwnPokemon.Ability.Name.ToLower()) = False Then
If .OwnPokemon.HP > 0 Then
Dim sandHP As Integer = CInt(.OwnPokemon.MaxHP / 16)
@ -4640,7 +4640,7 @@
'Hailstorm
If .FieldEffects.Weather = BattleWeather.WeatherTypes.Hailstorm Then
If .OwnPokemon.Type1.Type <> Element.Types.Ice And .OwnPokemon.Type2.Type <> Element.Types.Ice Then
Dim hailAbilities() As String = {"ice body", "snow cloak", "overcoat", "magic guard"}
Dim hailAbilities() As String = {"ice body", "snow cloak", "overcoat", "magic guard", "cloud nine"}
If hailAbilities.Contains(.OwnPokemon.Ability.Name.ToLower()) = False Then
If .OwnPokemon.HP > 0 Then
Dim hailHP As Integer = CInt(.OwnPokemon.MaxHP / 16)