Fixed GameMode evolution items crash

This commit is contained in:
JappaWakka 2023-05-30 15:23:18 +02:00
parent 451115d7aa
commit 2d0ad05048

View File

@ -173,6 +173,13 @@ Public Class EvolutionCondition
'ElseIf c.Trigger = EvolutionTrigger.Trading Then 'ElseIf c.Trigger = EvolutionTrigger.Trading Then
'REMOVE HELD ITEM CHECK 'REMOVE HELD ITEM CHECK
End If End If
Else
If Item.GetItemByID(c.Argument).IsGameModeItem Then
If p.Item.ID.ToString <> c.Argument Then
canEvolve = False
'ElseIf c.Trigger = EvolutionTrigger.Trading Then
'REMOVE HELD ITEM CHECK
End If
Else Else
If p.Item.ID <> CInt(c.Argument) Then If p.Item.ID <> CInt(c.Argument) Then
canEvolve = False canEvolve = False
@ -180,6 +187,8 @@ Public Class EvolutionCondition
'REMOVE HELD ITEM CHECK 'REMOVE HELD ITEM CHECK
End If End If
End If End If
End If
End If End If
Case ConditionTypes.InParty Case ConditionTypes.InParty
Dim isInParty As Boolean = False Dim isInParty As Boolean = False
@ -204,7 +213,12 @@ Public Class EvolutionCondition
canEvolve = False canEvolve = False
End If End If
Case ConditionTypes.Item Case ConditionTypes.Item
If p.Item.IsGameModeItem = True Then If Item.GetItemByID(arg).IsGameModeItem = True Then
If arg <> c.Argument Then
canEvolve = False
End If
Else
If Item.GetItemByID(c.Argument).IsGameModeItem = True Then
If arg <> c.Argument Then If arg <> c.Argument Then
canEvolve = False canEvolve = False
End If End If
@ -213,6 +227,7 @@ Public Class EvolutionCondition
canEvolve = False canEvolve = False
End If End If
End If End If
End If
Case ConditionTypes.Level Case ConditionTypes.Level
If p.Level < CInt(c.Argument) Then If p.Level < CInt(c.Argument) Then
canEvolve = False canEvolve = False