Fixed weather turn increasing items redundancy

This commit is contained in:
CaptainSegis 2016-10-30 17:16:19 -05:00
parent 45d770ed97
commit 3ca677e9d5
1 changed files with 24 additions and 22 deletions

View File

@ -3657,28 +3657,30 @@
Exit Sub
End If
If Not p.Item Is Nothing Then
If BattleScreen.FieldEffects.CanUseItem(own) = True And BattleScreen.FieldEffects.CanUseOwnItem(own, BattleScreen) = True Then
Select Case p.Item.Name.ToLower()
Case "damp rock"
If newWeather = BattleWeather.WeatherTypes.Rain Then
weatherRounds += 3
End If
Case "heat rock"
If newWeather = BattleWeather.WeatherTypes.Sunny Then
weatherRounds += 3
End If
Case "icy rock"
If newWeather = BattleWeather.WeatherTypes.Hailstorm Then
weatherRounds += 3
End If
Case "smooth rock"
If newWeather = BattleWeather.WeatherTypes.Sandstorm Then
weatherRounds += 3
End If
End Select
End If
End If
'Redundant with BattleCalculation.FieldEffectTurns
'If Not p.Item Is Nothing Then
' If BattleScreen.FieldEffects.CanUseItem(own) = True And BattleScreen.FieldEffects.CanUseOwnItem(own, BattleScreen) = True Then
' Select Case p.Item.Name.ToLower()
' Case "damp rock"
' If newWeather = BattleWeather.WeatherTypes.Rain Then
' weatherRounds += 3
' End If
' Case "heat rock"
' If newWeather = BattleWeather.WeatherTypes.Sunny Then
' weatherRounds += 3
' End If
' Case "icy rock"
' If newWeather = BattleWeather.WeatherTypes.Hailstorm Then
' weatherRounds += 3
' End If
' Case "smooth rock"
' If newWeather = BattleWeather.WeatherTypes.Sandstorm Then
' weatherRounds += 3
' End If
' End Select
' End If
'End If
BattleScreen.FieldEffects.Weather = newWeather
BattleScreen.FieldEffects.WeatherRounds = weatherRounds