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

Fixed gender forms

This commit is contained in:
JappaWakka 2023-07-07 11:35:34 +02:00
parent e1be26284f
commit cb37645746
2 changed files with 68 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

87
P3D/Pokemon/Monster/Resource/PokemonForms.vb
View File

@ -154,8 +154,10 @@ Public Class PokemonForms
Public Shared Function GetInitialAdditionalData(ByVal P As Pokemon) As String Public Shared Function GetInitialAdditionalData(ByVal P As Pokemon) As String
If _pokemonList.Count > 0 Then If _pokemonList.Count > 0 Then
For Each listP In _pokemonList For Each listP In _pokemonList
If listP.IsNumber(P.Number) = True AndAlso listP.ValueMatch(P.AdditionalData) Then If listP.IsNumber(P.Number) = True Then
Return listP.GetInitialAdditionalData(P) If listP.GetSeasonFormMatch(True) = "match" OrElse listP.GetGenderFormMatch(P, True) = "match" OrElse (listP.GetSeasonFormMatch(True) = "" AndAlso listP.GetGenderFormMatch(P, True) = "" AndAlso listP.ValueMatch(P.AdditionalData)) Then
Return listP.GetInitialAdditionalData(P)
End If
End If End If
Next Next
End If End If
@ -165,8 +167,20 @@ Public Class PokemonForms
Public Shared Function GetFormDataInParty(ByVal P As Pokemon) As String Public Shared Function GetFormDataInParty(ByVal P As Pokemon) As String
If _pokemonList.Count > 0 Then If _pokemonList.Count > 0 Then
For Each listP In _pokemonList For Each listP In _pokemonList
If listP.IsNumber(P.Number) = True AndAlso listP.ValueMatch(P.AdditionalData) Then If listP.IsNumber(P.Number) = True Then
Return listP.GetFormDataInParty(P) If listP.GetSeasonFormMatch() = "match" OrElse listP.GetGenderFormMatch(P) = "match" OrElse (listP.GetSeasonFormMatch() = "" AndAlso listP.GetGenderFormMatch(P) = "" AndAlso listP.ValueMatch(P.AdditionalData)) Then
Return listP.GetFormDataInParty(P)
End If
End If
Next
End If
Return ""
End Function
Public Shared Function GetGenderFormMatch(ByVal P As Pokemon) As String
If _pokemonList.Count > 0 Then
For Each listP In _pokemonList
If listP.IsNumber(P.Number) = True AndAlso listP.GetGenderFormMatch(P) = "match" Then
Return listP.GetGenderFormMatch(P)
End If End If
Next Next
End If End If
@ -182,17 +196,6 @@ Public Class PokemonForms
End If End If
Return "" Return ""
End Function End Function
Public Shared Function GetSeasonFormMatch(ByVal P As Pokemon) As String
If _pokemonList.Count > 0 Then
For Each listP In _pokemonList
If listP.IsNumber(P.Number) = True AndAlso listP.GetSeasonFormMatch() <> "nomatch" Then
Return listP.GetSeasonFormMatch()
End If
Next
End If
Return ""
End Function
''' <summary> ''' <summary>
''' Returns the Animation Name of the Pokémon, the path to its Sprite/Model files. ''' Returns the Animation Name of the Pokémon, the path to its Sprite/Model files.
@ -203,7 +206,7 @@ Public Class PokemonForms
If listP.IsNumber(P.Number) = True Then If listP.IsNumber(P.Number) = True Then
Dim TypeAddition As String = GetTypeAdditionFromItem(P) Dim TypeAddition As String = GetTypeAdditionFromItem(P)
If GetTypeAdditionFromItem(P) <> "" OrElse listP.GetSeasonFormMatch() = "match" OrElse (listP.GetSeasonFormMatch() = "" AndAlso listP.TypeChange = Element.Types.Blank AndAlso listP.ValueMatch(P.AdditionalData) = True) Then If GetTypeAdditionFromItem(P) <> "" OrElse listP.GetSeasonFormMatch() = "match" OrElse listP.GetGenderFormMatch(P) = "match" OrElse (listP.GetSeasonFormMatch() = "" AndAlso listP.GetGenderFormMatch(P) = "" AndAlso listP.TypeChange = Element.Types.Blank AndAlso listP.ValueMatch(P.AdditionalData) = True) Then
Return listP.GetAnimationName(P).ToLower Return listP.GetAnimationName(P).ToLower
End If End If
End If End If
@ -220,7 +223,7 @@ Public Class PokemonForms
If _pokemonList.Count > 0 Then If _pokemonList.Count > 0 Then
For Each listP In _pokemonList For Each listP In _pokemonList
If listP.IsNumber(P.Number) = True Then If listP.IsNumber(P.Number) = True Then
If listP.GetSeasonFormMatch() = "match" OrElse (listP.GetSeasonFormMatch() = "" AndAlso listP.ValueMatch(P.AdditionalData)) Then If listP.GetSeasonFormMatch() = "match" OrElse listP.GetGenderFormMatch(P) = "match" OrElse (listP.GetSeasonFormMatch() = "" AndAlso listP.GetGenderFormMatch(P) = "" AndAlso listP.ValueMatch(P.AdditionalData)) Then
Return listP.GetCrySuffix(P) Return listP.GetCrySuffix(P)
End If End If
End If End If
@ -236,7 +239,7 @@ Public Class PokemonForms
If _pokemonList.Count > 0 Then If _pokemonList.Count > 0 Then
For Each listP In _pokemonList For Each listP In _pokemonList
If listP.IsNumber(P.Number) = True Then If listP.IsNumber(P.Number) = True Then
If listP.GetSeasonFormMatch() = "match" OrElse (listP.GetSeasonFormMatch() = "" AndAlso listP.ValueMatch(P.AdditionalData)) Then If listP.GetSeasonFormMatch() = "match" OrElse listP.GetGenderFormMatch(P) = "match" OrElse (listP.GetSeasonFormMatch() = "" AndAlso listP.GetGenderFormMatch(P) = "" AndAlso listP.ValueMatch(P.AdditionalData)) Then
Return listP.GetFormName(P) Return listP.GetFormName(P)
End If End If
End If End If
@ -248,7 +251,7 @@ Public Class PokemonForms
If _pokemonList.Count > 0 Then If _pokemonList.Count > 0 Then
For Each listP In _pokemonList For Each listP In _pokemonList
If listP.IsNumber(P.Number) = True Then If listP.IsNumber(P.Number) = True Then
If GetTypeAdditionFromItem(P) <> "" OrElse listP.GetSeasonFormMatch() = "match" OrElse (listP.GetSeasonFormMatch() = "" AndAlso listP.TypeChange = Element.Types.Blank AndAlso listP.ValueMatch(P.AdditionalData) = True) Then If GetTypeAdditionFromItem(P) <> "" OrElse listP.GetSeasonFormMatch() = "match" OrElse listP.GetGenderFormMatch(P) = "match" OrElse (listP.GetSeasonFormMatch() = "" AndAlso listP.GetGenderFormMatch(P) = "" AndAlso listP.TypeChange = Element.Types.Blank AndAlso listP.ValueMatch(P.AdditionalData) = True) Then
Return listP.GetFrontBackSpriteFileSuffix(P) Return listP.GetFrontBackSpriteFileSuffix(P)
End If End If
End If End If
@ -264,7 +267,7 @@ Public Class PokemonForms
If _pokemonList.Count > 0 Then If _pokemonList.Count > 0 Then
For Each listP In _pokemonList For Each listP In _pokemonList
If listP.IsNumber(P.Number) = True Then If listP.IsNumber(P.Number) = True Then
If GetTypeAdditionFromItem(P) <> "" OrElse listP.GetSeasonFormMatch() = "match" OrElse (listP.GetSeasonFormMatch() = "" AndAlso listP.TypeChange = Element.Types.Blank AndAlso listP.ValueMatch(P.AdditionalData) = True) Then If GetTypeAdditionFromItem(P) <> "" OrElse listP.GetSeasonFormMatch() = "match" OrElse listP.GetGenderFormMatch(P) = "match" OrElse (listP.GetSeasonFormMatch() = "" AndAlso listP.GetGenderFormMatch(P) = "" AndAlso listP.TypeChange = Element.Types.Blank AndAlso listP.ValueMatch(P.AdditionalData) = True) Then
Return listP.GetSheetName(P) Return listP.GetSheetName(P)
End If End If
End If End If
@ -299,7 +302,7 @@ Public Class PokemonForms
If _pokemonList.Count > 0 Then If _pokemonList.Count > 0 Then
For Each listP In _pokemonList For Each listP In _pokemonList
If listP.IsNumber(P.Number) = True Then If listP.IsNumber(P.Number) = True Then
If GetTypeAdditionFromItem(P) <> "" OrElse listP.GetSeasonFormMatch() = "match" OrElse (listP.GetSeasonFormMatch() = "" AndAlso listP.TypeChange = Element.Types.Blank AndAlso listP.ValueMatch(P.AdditionalData) = True) Then If GetTypeAdditionFromItem(P) <> "" OrElse listP.GetSeasonFormMatch() = "match" OrElse listP.GetGenderFormMatch(P) = "match" OrElse (listP.GetSeasonFormMatch() = "" AndAlso listP.GetGenderFormMatch(P) = "" AndAlso listP.TypeChange = Element.Types.Blank AndAlso listP.ValueMatch(P.AdditionalData) = True) Then
Return listP.GetMenuImagePosition(P) Return listP.GetMenuImagePosition(P)
End If End If
End If End If
@ -362,7 +365,7 @@ Public Class PokemonForms
For Each listP In _pokemonList For Each listP In _pokemonList
If listP.IsNumber(P.Number) = True Then If listP.IsNumber(P.Number) = True Then
If GetTypeAdditionFromItem(P) <> "" OrElse listP.GetSeasonFormMatch() = "match" OrElse (listP.GetSeasonFormMatch() = "" AndAlso listP.TypeChange = Element.Types.Blank AndAlso listP.ValueMatch(P.AdditionalData) = True) Then If GetTypeAdditionFromItem(P) <> "" OrElse listP.GetSeasonFormMatch() = "match" OrElse listP.GetGenderFormMatch(P) = "match" OrElse (listP.GetSeasonFormMatch() = "" AndAlso listP.GetGenderFormMatch(P) = "" AndAlso listP.TypeChange = Element.Types.Blank AndAlso listP.ValueMatch(P.AdditionalData) = True) Then
Return listP.GetOverworldAddition(P) Return listP.GetOverworldAddition(P)
End If End If
End If End If
@ -456,8 +459,12 @@ Public Class PokemonForms
Return CStr(trigger(Core.Random.Next(randomMin, randomMax))) Return CStr(trigger(Core.Random.Next(randomMin, randomMax)))
End If End If
ElseIf trigger(0).ToLower = "gender" Then ElseIf trigger(0).ToLower = "gender" Then
If P.Gender = CType(CInt(trigger(1)), Pokemon.Genders) Then If GetGenderFormMatch(P, True) = "match" Then
Return AdditionalValue If TypeChange <> Element.Types.Blank Then
Return TypeChange.ToString
Else
Return AdditionalValue
End If
End If End If
ElseIf trigger(0).ToLower = "season" Then ElseIf trigger(0).ToLower = "season" Then
If GetSeasonFormMatch(true) = "match" Then If GetSeasonFormMatch(true) = "match" Then
@ -488,7 +495,7 @@ Public Class PokemonForms
If InPartyFormTriggers(i).Contains(";") Then If InPartyFormTriggers(i).Contains(";") Then
Dim trigger() As String = InPartyFormTriggers(i).Split(";") Dim trigger() As String = InPartyFormTriggers(i).Split(";")
If trigger(0).ToLower = "gender" Then If trigger(0).ToLower = "gender" Then
If P.Gender = CType(CInt(trigger(1)), Pokemon.Genders) Then If GetGenderFormMatch(P) = "match" Then
If TypeChange <> Element.Types.Blank Then If TypeChange <> Element.Types.Blank Then
Return TypeChange.ToString Return TypeChange.ToString
Else Else
@ -597,6 +604,36 @@ Public Class PokemonForms
End If End If
Return "" Return ""
End Function End Function
Public Function GetGenderFormMatch(ByVal P As Pokemon, Optional ByVal initial As Boolean = False) As String
If initial = False Then
If InPartyFormTriggers.Count > 0 Then
For i = 0 To InPartyFormTriggers.Count - 1
Dim trigger() As String = InPartyFormTriggers(i).Split(";")
If trigger(0).ToLower = "gender" Then
If P.Gender = CType(CInt(trigger(1)), Pokemon.Genders) Then
Return "match"
Else
Return "nomatch"
End If
End If
Next
End If
Else
If WildFormTriggers.Count > 0 Then
For i = 0 To WildFormTriggers.Count - 1
Dim trigger() As String = WildFormTriggers(i).Split(";")
If trigger(0).ToLower = "gender" Then
If P.Gender = CType(CInt(trigger(1)), Pokemon.Genders) Then
Return "match"
Else
Return "nomatch"
End If
End If
Next
End If
End If
Return ""
End Function
Public Overridable Function GetAnimationName(ByVal P As Pokemon) As String Public Overridable Function GetAnimationName(ByVal P As Pokemon) As String
Return CStr(P.Number & OverworldSpriteFileSuffix) Return CStr(P.Number & OverworldSpriteFileSuffix)
End Function End Function

6
P3D/Screens/Pokemon/PartyScreen.vb
View File

@ -161,6 +161,9 @@ Public Class PartyScreen
p.LoadDefinitions(p.Number, FormData) p.LoadDefinitions(p.Number, FormData)
p.ClearTextures() p.ClearTextures()
End If End If
If PokemonForms.GetGenderFormMatch(p) = "match" Then
p.ClearTextures()
End If
Me.PokemonList.Add(Pokemon.GetPokemonByData(p.GetSaveData())) Me.PokemonList.Add(Pokemon.GetPokemonByData(p.GetSaveData()))
Next Next
End If End If
@ -173,6 +176,9 @@ Public Class PartyScreen
p.ClearTextures() p.ClearTextures()
End If End If
End If End If
If PokemonForms.GetGenderFormMatch(p) = "match" Then
p.ClearTextures()
End If
Next Next
Me.PokemonList = Core.Player.Pokemons Me.PokemonList = Core.Player.Pokemons
End If End If