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

Fix crashes and errors related to custom types

This commit is contained in:
JappaWakka 2023-12-12 09:57:53 +01:00
parent 09051e0cba
commit 459ce005d0
3 changed files with 50 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
P3D/Pokemon/Monster/Element.vb
View File

@ -34,7 +34,6 @@ Public Class Element
Private _type As Types = Types.Blank
'GameMode Element Properties
Private gmType As Integer = 0
Public gmName As String = "Normal"
Public gmOriginalName As String = "Normal"
Public gmTypeRectangle As Rectangle = New Rectangle(0, 0, 48, 16)
Public gmMachineTextureSource As String = "Items\ItemSheet"
@ -1012,7 +1011,12 @@ Public Class Element
Return "Blank"
End Select
Else
Return gmName
If Localization.TokenExists("type_" & gmOriginalName) = True Then
Return Localization.GetString("type_" & gmOriginalName, gmOriginalName)
Else
Return gmOriginalName
End If
End If
End Function

84
P3D/Pokemon/Monster/GameModeElementLoader.vb
View File

@ -85,45 +85,45 @@
If StringHelper.IsNumeric(data(i).GetSplit(0, ",")) = True Then
typeID = CInt(data(i).GetSplit(0, ","))
Else
Select Case data(i).GetSplit(0, ",")
Select Case data(i).GetSplit(0, ",").ToLower
Case "normal"
typeID = element.Types.Normal
typeID = Element.Types.Normal
Case "fighting"
typeID = element.Types.Fighting
typeID = Element.Types.Fighting
Case "flying"
typeID = element.Types.Flying
typeID = Element.Types.Flying
Case "poison"
typeID = element.Types.Poison
typeID = Element.Types.Poison
Case "ground"
typeID = element.Types.Ground
typeID = Element.Types.Ground
Case "rock"
typeID = element.Types.Rock
typeID = Element.Types.Rock
Case "bug"
typeID = element.Types.Bug
typeID = Element.Types.Bug
Case "ghost"
typeID = element.Types.Ghost
typeID = Element.Types.Ghost
Case "steel"
typeID = element.Types.Steel
typeID = Element.Types.Steel
Case "fire"
typeID = element.Types.Fire
typeID = Element.Types.Fire
Case "water"
typeID = element.Types.Water
typeID = Element.Types.Water
Case "grass"
typeID = element.Types.Grass
typeID = Element.Types.Grass
Case "electric"
typeID = element.Types.Electric
typeID = Element.Types.Electric
Case "psychic"
typeID = element.Types.Psychic
typeID = Element.Types.Psychic
Case "ice"
typeID = element.Types.Ice
typeID = Element.Types.Ice
Case "dragon"
typeID = element.Types.Dragon
typeID = Element.Types.Dragon
Case "dark"
typeID = element.Types.Dark
typeID = Element.Types.Dark
Case "fairy"
typeID = element.Types.Fairy
typeID = Element.Types.Fairy
Case "shadow"
typeID = element.Types.Shadow
typeID = Element.Types.Shadow
End Select
End If
element.gmEffectivenessAttack.Add(typeID, CSng(data(i).GetSplit(1, ",").InsertDecSeparator))
@ -135,45 +135,45 @@
If StringHelper.IsNumeric(data(i).GetSplit(0, ",")) = True Then
typeID = CInt(data(i).GetSplit(0, ","))
Else
Select Case data(i).GetSplit(0, ",")
Select Case data(i).GetSplit(0, ",").ToLower
Case "normal"
typeID = element.Types.Normal
typeID = Element.Types.Normal
Case "fighting"
typeID = element.Types.Fighting
typeID = Element.Types.Fighting
Case "flying"
typeID = element.Types.Flying
typeID = Element.Types.Flying
Case "poison"
typeID = element.Types.Poison
typeID = Element.Types.Poison
Case "ground"
typeID = element.Types.Ground
typeID = Element.Types.Ground
Case "rock"
typeID = element.Types.Rock
typeID = Element.Types.Rock
Case "bug"
typeID = element.Types.Bug
typeID = Element.Types.Bug
Case "ghost"
typeID = element.Types.Ghost
typeID = Element.Types.Ghost
Case "steel"
typeID = element.Types.Steel
typeID = Element.Types.Steel
Case "fire"
typeID = element.Types.Fire
typeID = Element.Types.Fire
Case "water"
typeID = element.Types.Water
typeID = Element.Types.Water
Case "grass"
typeID = element.Types.Grass
typeID = Element.Types.Grass
Case "electric"
typeID = element.Types.Electric
typeID = Element.Types.Electric
Case "psychic"
typeID = element.Types.Psychic
typeID = Element.Types.Psychic
Case "ice"
typeID = element.Types.Ice
typeID = Element.Types.Ice
Case "dragon"
typeID = element.Types.Dragon
typeID = Element.Types.Dragon
Case "dark"
typeID = element.Types.Dark
typeID = Element.Types.Dark
Case "fairy"
typeID = element.Types.Fairy
typeID = Element.Types.Fairy
Case "shadow"
typeID = element.Types.Shadow
typeID = Element.Types.Shadow
End Select
End If
element.gmEffectivenessDefense.Add(typeID, CSng(data(i).GetSplit(1, ",").InsertDecSeparator))
@ -274,11 +274,11 @@
Return New Element(Element.Types.Fairy)
Case "shadow"
Return New Element(Element.Types.Shadow)
Case "blank"
Case "blank", ""
Return New Element(Element.Types.Blank)
Case Else
For Each e As Element In LoadedElements
If e.ToString.ToLower = Name.ToLower Then
If e.gmOriginalName.ToLower = Name.ToLower Then
Return e
End If
Next

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

@ -1424,9 +1424,9 @@ Public Class Pokemon
Me.ExperienceType = ExperienceTypes.Slow
End Select
Case "type1"
Me.Type1 = New Element(Value)
Me.Type1 = BattleSystem.GameModeElementLoader.GetElementByName(Value)
Case "type2"
Me.Type2 = New Element(Value)
Me.Type2 = BattleSystem.GameModeElementLoader.GetElementByName(Value)
Case "catchrate"
Me.CatchRate = CInt(Value)
Case "basefriendship"