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