diff --git a/2.5DHero/2.5DHero/Content/Pokemon/Data/705.dat b/2.5DHero/2.5DHero/Content/Pokemon/Data/705.dat index 442f84a7c..f812e82c5 100644 --- a/2.5DHero/2.5DHero/Content/Pokemon/Data/705.dat +++ b/2.5DHero/2.5DHero/Content/Pokemon/Data/705.dat @@ -48,4 +48,5 @@ Move|32,34 Move|38,330 Move|47,406 TradeValue|60 -EvolutionCondition|706,Level,50,Level \ No newline at end of file +EvolutionCondition|706,level,50,level +EvolutionCondition|706,weather,rain,level \ No newline at end of file diff --git a/2.5DHero/2.5DHero/Pokemon/Monster/EvolutionCondition.vb b/2.5DHero/2.5DHero/Pokemon/Monster/EvolutionCondition.vb index 34723554a..067036f23 100644 --- a/2.5DHero/2.5DHero/Pokemon/Monster/EvolutionCondition.vb +++ b/2.5DHero/2.5DHero/Pokemon/Monster/EvolutionCondition.vb @@ -15,6 +15,7 @@ Public Class EvolutionCondition DayTime InParty InPartyType + Weather End Enum Public Structure Condition @@ -63,6 +64,8 @@ Public Class EvolutionCondition c.ConditionType = ConditionTypes.InParty Case "inpartytype" c.ConditionType = ConditionTypes.InPartyType + Case "weather" + c.ConditionType = ConditionTypes.Weather End Select Select Case trigger.ToLower() @@ -208,6 +211,10 @@ Public Class EvolutionCondition End If End If End If + Case ConditionTypes.Weather + If World.GetCurrentRegionWeather().ToString.ToLower <> c.Argument.ToLower Then + canEvolve = False + End If End Select Next End If