tyler.durden
/
P3D-Legacy
mirror of https://github.com/P3D-Legacy/P3D-Legacy.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Finally fixed protean not resetting types

This commit is contained in:
JappaWakka 2023-02-02 14:58:33 +01:00
parent f30ed7af8f
commit fabab5e32e
2 changed files with 10 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
P3D/Battle/BattleSystemV2/Battle.vb
View File

@ -2008,12 +2008,12 @@
If p.Ability.Name.ToLower() = "protean" Then If p.Ability.Name.ToLower() = "protean" Then
If p.Type1.Type <> moveUsed.Type.Type Then If p.Type1.Type <> moveUsed.Type.Type Then
If p.OriginalType1 Is Nothing Then If p.OriginalType1 Is Nothing Then
p.OriginalType1 = p.Type1 p.OriginalType1 = New Element(p.Type1.Type)
End If End If
p.Type1.Type = moveUsed.Type.Type p.Type1.Type = moveUsed.Type.Type
If p.Type2.Type <> Element.Types.Blank Then If p.Type2.Type <> Element.Types.Blank Then
If p.OriginalType2 Is Nothing Then If p.OriginalType2 Is Nothing Then
p.OriginalType2 = p.Type2 p.OriginalType2 = New Element(p.Type2.Type)
End If End If
p.Type2.Type = Element.Types.Blank p.Type2.Type = Element.Types.Blank
End If End If

16
P3D/Pokemon/Monster/Pokemon.vb
View File

@ -1002,14 +1002,14 @@ Public Class Pokemon
Me._originalItem = Nothing Me._originalItem = Nothing
End If End If
If Not _originalType1 Is Nothing Then If OriginalType1 IsNot Nothing Then
Me.Type1.Type = _originalType1.Type Me.Type1.Type = OriginalType1.Type
_originalType1 = Nothing OriginalType1 = Nothing
End If End If
If Not _originalType2 Is Nothing Then If OriginalType2 IsNot Nothing Then
Me.Type2.Type = _originalType2.Type Me.Type2.Type = OriginalType2.Type
_originalType2 = Nothing OriginalType2 = Nothing
End If End If
If _originalStats(0) > -1 Then If _originalStats(0) > -1 Then
@ -1084,9 +1084,7 @@ Public Class Pokemon
Return Me._originalType1 Return Me._originalType1
End Get End Get
Set(value As Element) Set(value As Element)
If Me._originalType1 Is Nothing Then
Me._originalType1 = value Me._originalType1 = value
End If
End Set End Set
End Property End Property
@ -1098,9 +1096,7 @@ Public Class Pokemon
Return Me._originalType2 Return Me._originalType2
End Get End Get
Set(value As Element) Set(value As Element)
If Me._originalType2 Is Nothing Then
Me._originalType2 = value Me._originalType2 = value
End If
End Set End Set
End Property End Property