From ed20fd14e87653424f703aea55aeba6900716633 Mon Sep 17 00:00:00 2001 From: JappaWakka Date: Wed, 18 Jan 2023 20:54:17 +0100 Subject: [PATCH] Fixed Frillish & Jellicent & Spiky-Eared Pichu and others --- .../Normal/{668_female.png => 668_f.png} | Bin .../Normal/{668_male.png => 668_m.png} | Bin .../Normal/{678_female.png => 678_f.png} | Bin .../Normal/{678_male.png => 678_m.png} | Bin .../Shiny/{668_female.png => 668_f.png} | Bin .../Shiny/{668_male.png => 668_m.png} | Bin .../Shiny/{678_female.png => 678_f.png} | Bin .../Shiny/{678_male.png => 678_m.png} | Bin P3D/Content/Pokemon/Sprites/592_f.png | Bin 0 -> 6246 bytes .../Pokemon/Sprites/{592.png => 592_m.png} | Bin P3D/Content/Pokemon/Sprites/593_f.png | Bin 0 -> 7662 bytes .../Pokemon/Sprites/{593.png => 593_m.png} | Bin .../Pokemon/Sprites/{668f.png => 668_f.png} | Bin .../Pokemon/Sprites/{668m.png => 668_m.png} | Bin P3D/P3D.vbproj | 73 ++++++++++-------- P3D/Pokemon/Monster/Pokemon.vb | 2 +- P3D/Pokemon/Monster/Resource/PokemonForms.vb | 8 +- 17 files changed, 47 insertions(+), 36 deletions(-) rename P3D/Content/Pokemon/Overworld/Normal/{668_female.png => 668_f.png} (100%) rename P3D/Content/Pokemon/Overworld/Normal/{668_male.png => 668_m.png} (100%) rename P3D/Content/Pokemon/Overworld/Normal/{678_female.png => 678_f.png} (100%) rename P3D/Content/Pokemon/Overworld/Normal/{678_male.png => 678_m.png} (100%) rename P3D/Content/Pokemon/Overworld/Shiny/{668_female.png => 668_f.png} (100%) rename P3D/Content/Pokemon/Overworld/Shiny/{668_male.png => 668_m.png} (100%) rename P3D/Content/Pokemon/Overworld/Shiny/{678_female.png => 678_f.png} (100%) rename P3D/Content/Pokemon/Overworld/Shiny/{678_male.png => 678_m.png} (100%) create mode 100644 P3D/Content/Pokemon/Sprites/592_f.png rename P3D/Content/Pokemon/Sprites/{592.png => 592_m.png} (100%) create mode 100644 P3D/Content/Pokemon/Sprites/593_f.png rename P3D/Content/Pokemon/Sprites/{593.png => 593_m.png} (100%) rename P3D/Content/Pokemon/Sprites/{668f.png => 668_f.png} (100%) rename P3D/Content/Pokemon/Sprites/{668m.png => 668_m.png} (100%) diff --git a/P3D/Content/Pokemon/Overworld/Normal/668_female.png b/P3D/Content/Pokemon/Overworld/Normal/668_f.png similarity index 100% rename from P3D/Content/Pokemon/Overworld/Normal/668_female.png rename to P3D/Content/Pokemon/Overworld/Normal/668_f.png diff --git a/P3D/Content/Pokemon/Overworld/Normal/668_male.png b/P3D/Content/Pokemon/Overworld/Normal/668_m.png similarity index 100% rename from P3D/Content/Pokemon/Overworld/Normal/668_male.png rename to P3D/Content/Pokemon/Overworld/Normal/668_m.png diff --git a/P3D/Content/Pokemon/Overworld/Normal/678_female.png b/P3D/Content/Pokemon/Overworld/Normal/678_f.png similarity index 100% rename from P3D/Content/Pokemon/Overworld/Normal/678_female.png rename to P3D/Content/Pokemon/Overworld/Normal/678_f.png diff --git a/P3D/Content/Pokemon/Overworld/Normal/678_male.png b/P3D/Content/Pokemon/Overworld/Normal/678_m.png similarity index 100% rename from P3D/Content/Pokemon/Overworld/Normal/678_male.png rename to P3D/Content/Pokemon/Overworld/Normal/678_m.png diff --git a/P3D/Content/Pokemon/Overworld/Shiny/668_female.png b/P3D/Content/Pokemon/Overworld/Shiny/668_f.png similarity index 100% rename from P3D/Content/Pokemon/Overworld/Shiny/668_female.png rename to P3D/Content/Pokemon/Overworld/Shiny/668_f.png diff --git a/P3D/Content/Pokemon/Overworld/Shiny/668_male.png b/P3D/Content/Pokemon/Overworld/Shiny/668_m.png similarity index 100% rename from P3D/Content/Pokemon/Overworld/Shiny/668_male.png rename to P3D/Content/Pokemon/Overworld/Shiny/668_m.png diff --git a/P3D/Content/Pokemon/Overworld/Shiny/678_female.png b/P3D/Content/Pokemon/Overworld/Shiny/678_f.png similarity index 100% rename from P3D/Content/Pokemon/Overworld/Shiny/678_female.png rename to P3D/Content/Pokemon/Overworld/Shiny/678_f.png diff --git a/P3D/Content/Pokemon/Overworld/Shiny/678_male.png b/P3D/Content/Pokemon/Overworld/Shiny/678_m.png similarity index 100% rename from P3D/Content/Pokemon/Overworld/Shiny/678_male.png rename to P3D/Content/Pokemon/Overworld/Shiny/678_m.png diff --git a/P3D/Content/Pokemon/Sprites/592_f.png b/P3D/Content/Pokemon/Sprites/592_f.png new file mode 100644 index 0000000000000000000000000000000000000000..a3cb9bdab20824111026e492aaedf1e00b7b1fe6 GIT binary patch literal 6246 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 PreserveNewest + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + PreserveNewest @@ -13812,10 +13824,10 @@ PreserveNewest - Always + PreserveNewest - Always + PreserveNewest PreserveNewest @@ -13853,13 +13865,27 @@ PreserveNewest - + + PreserveNewest + PreserveNewest PreserveNewest + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + PreserveNewest @@ -14322,6 +14348,9 @@ PreserveNewest + + PreserveNewest + PreserveNewest @@ -16092,10 +16121,16 @@ PreserveNewest - + PreserveNewest - + + PreserveNewest + + + PreserveNewest + + PreserveNewest @@ -16440,10 +16475,10 @@ PreserveNewest - + PreserveNewest - + PreserveNewest @@ -21693,12 +21728,6 @@ PreserveNewest - - PreserveNewest - - - PreserveNewest - PreserveNewest @@ -21795,12 +21824,6 @@ PreserveNewest - - PreserveNewest - - - PreserveNewest - PreserveNewest @@ -24363,12 +24386,6 @@ PreserveNewest - - PreserveNewest - - - PreserveNewest - PreserveNewest @@ -24465,12 +24482,6 @@ PreserveNewest - - PreserveNewest - - - PreserveNewest - PreserveNewest diff --git a/P3D/Pokemon/Monster/Pokemon.vb b/P3D/Pokemon/Monster/Pokemon.vb index b3e142f90..4d472974a 100644 --- a/P3D/Pokemon/Monster/Pokemon.vb +++ b/P3D/Pokemon/Monster/Pokemon.vb @@ -2513,7 +2513,7 @@ Public Class Pokemon Private Function GetTexture(ByVal index As Integer) As Texture2D Dim TextureNumberSuffix As String = "" If Me.AnimationName.Contains("_") Then - TextureNumberSuffix = AnimationName.Remove(0, GetName.Length) + TextureNumberSuffix = AnimationName.Remove(0, OriginalName.Length) End If If Textures(index) Is Nothing Then Select Case index diff --git a/P3D/Pokemon/Monster/Resource/PokemonForms.vb b/P3D/Pokemon/Monster/Resource/PokemonForms.vb index 2fa98f56e..d06a23bc7 100644 --- a/P3D/Pokemon/Monster/Resource/PokemonForms.vb +++ b/P3D/Pokemon/Monster/Resource/PokemonForms.vb @@ -2812,18 +2812,18 @@ Public Class PokemonForms Public Overrides Function GetAnimationName(ByVal P As Pokemon) As String Select Case P.Gender Case Pokemon.Genders.Male - Return P.OriginalName & "_male" + Return P.OriginalName & "_m" Case Else - Return P.OriginalName & "_female" + Return P.OriginalName & "_f" End Select End Function Public Overrides Function GetOverworldAddition(ByVal P As Pokemon) As String Select Case P.Gender Case Pokemon.Genders.Male - Return "_male" + Return "_m" Case Else - Return "_female" + Return "_f" End Select End Function End Class