tyler.durden/P3D-Legacy
1
0
Fork 0
mirror of https://github.com/P3D-Legacy/P3D-Legacy.git synced 2025-07-30 17:25:22 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fix crashes and errors related to custom types

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

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

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

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

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