tyler.durden/P3D-Legacy
1
0
Fork 0
mirror of https://github.com/P3D-Legacy/P3D-Legacy.git synced 2025-07-28 16:24:45 +02:00
Code Issues Packages Projects Releases Wiki Activity

Made Pokédex filters translatable

Browse Source
This commit is contained in:
JappaWakka 2025-05-30 11:16:16 +02:00
parent 808001ceec
commit 378e3f38dc
11 changed files with 111 additions and 61 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
P3D/Content/Data/Types/example.dat
View File

@ -1,7 +1,7 @@
# This is an example type for a GameMode. # This is an example type for a GameMode.
# The default GameMode cannot load additional types, however all other GameModes can. # The default GameMode cannot load additional types, however all other GameModes can.
# The type ID must be set and must lay above 20. # The type ID must be set and must lay above 20.
# Here's a list of all properties that can be set: "ID", "Name", "TypeImageOffset", "ItemTextureSource", "ItemTextureOffset", "EffectivenessAttack", "EffectivenessDefense" # Here's a list of all properties that can be set: "ID", "Name", "TypeImageOffset", "ItemTextureSource", "ItemTextureOffset", "EffectivenessAttack", "EffectivenessDefense", "ShowInDexFilters"
# To build your own type for your GameMode, create a new file with the .dat file extension in the Content\Data\Types folder and edit/retype the lines below (be sure to remove the # at the start of each line). # To build your own type for your GameMode, create a new file with the .dat file extension in the Content\Data\Types folder and edit/retype the lines below (be sure to remove the # at the start of each line).
# Lines that are removed will default to the values below: # Lines that are removed will default to the values below:

6
P3D/Content/Localization/Tokens_de.dat
View File

@ -546,12 +546,14 @@ pokedex_available,Verfügbar:
pokedex_select,Wähle einen Pokédex pokedex_select,Wähle einen Pokédex
pokedex_habitat_dex_name,Habitat-Dex pokedex_habitat_dex_name,Habitat-Dex
pokedex_habitat_select,Wähle ein Habitat pokedex_habitat_select,Wähle ein Habitat
pokedex_order,Sortiert: pokedex_order,Sortiert
pokedex_order_type,Type
pokedex_order_numeric,Nr. pokedex_order_numeric,Nr.
pokedex_order_alphabetically,A-Z pokedex_order_alphabetically,A-Z
pokedex_order_height,Größe pokedex_order_height,Größe
pokedex_order_weight,Gewicht pokedex_order_weight,Gewicht
pokedex_filter,Filter: pokedex_order_reverse,Reverse
pokedex_filter,Filter
pokedex_filter_none,- pokedex_filter_none,-
pokedex_filter_name,Name pokedex_filter_name,Name
pokedex_filter_type1,Typ 1 pokedex_filter_type1,Typ 1

6
P3D/Content/Localization/Tokens_en.dat
View File

@ -546,12 +546,14 @@ pokedex_available,Available:
pokedex_select,Select a Pokédex pokedex_select,Select a Pokédex
pokedex_habitat_dex_name,Habitat-Dex pokedex_habitat_dex_name,Habitat-Dex
pokedex_habitat_select,Select a Habitat pokedex_habitat_select,Select a Habitat
pokedex_order,Order: pokedex_order,Order
pokedex_order_type,Type
pokedex_order_numeric,Numeric pokedex_order_numeric,Numeric
pokedex_order_alphabetically,A-Z pokedex_order_alphabetically,A-Z
pokedex_order_height,Height pokedex_order_height,Height
pokedex_order_weight,Weight pokedex_order_weight,Weight
pokedex_filter,Filter: pokedex_order_reverse,Reverse
pokedex_filter,Filter
pokedex_filter_none,None pokedex_filter_none,None
pokedex_filter_name,Name pokedex_filter_name,Name
pokedex_filter_type1,Type 1 pokedex_filter_type1,Type 1

6
P3D/Content/Localization/Tokens_es.dat
View File

@ -548,12 +548,14 @@ pokedex_available,Available:
pokedex_select,Select a Pokédex pokedex_select,Select a Pokédex
pokedex_habitat_dex_name,Habitat-Dex pokedex_habitat_dex_name,Habitat-Dex
pokedex_habitat_select,Select a Habitat pokedex_habitat_select,Select a Habitat
pokedex_order,Order: pokedex_order,Order
pokedex_order_type,Type
pokedex_order_numeric,Numeric pokedex_order_numeric,Numeric
pokedex_order_alphabetically,A-Z pokedex_order_alphabetically,A-Z
pokedex_order_height,Height pokedex_order_height,Height
pokedex_order_weight,Weight pokedex_order_weight,Weight
pokedex_filter,Filter: pokedex_order_reverse,Reverse
pokedex_filter,Filter
pokedex_filter_none,None pokedex_filter_none,None
pokedex_filter_name,Name pokedex_filter_name,Name
pokedex_filter_type1,Type 1 pokedex_filter_type1,Type 1

4
P3D/Content/Localization/Tokens_fr.dat
View File

@ -545,11 +545,13 @@ pokedex_select,Choisis un Pokédex
pokedex_habitat_dex_name,Habitat-Dex pokedex_habitat_dex_name,Habitat-Dex
pokedex_habitat_select,Choisis un Habitat pokedex_habitat_select,Choisis un Habitat
pokedex_order,Ordre pokedex_order,Ordre
pokedex_order_type,Type
pokedex_order_numeric,Numérique pokedex_order_numeric,Numérique
pokedex_order_alphabetically,A-Z pokedex_order_alphabetically,A-Z
pokedex_order_height,Taille pokedex_order_height,Taille
pokedex_order_weight,Poids pokedex_order_weight,Poids
pokedex_filter,Filtre: pokedex_order_reverse,Reverse
pokedex_filter,Filtre
pokedex_filter_none,Aucun pokedex_filter_none,Aucun
pokedex_filter_name,Nom pokedex_filter_name,Nom
pokedex_filter_type1,Type 1 pokedex_filter_type1,Type 1

6
P3D/Content/Localization/Tokens_nl.dat
View File

@ -533,12 +533,14 @@ pokedex_available,Available:
pokedex_select,Kies een Pokédex pokedex_select,Kies een Pokédex
pokedex_habitat_dex_name,Habitat-Dex pokedex_habitat_dex_name,Habitat-Dex
pokedex_habitat_select,Kies een Habitat pokedex_habitat_select,Kies een Habitat
pokedex_order,Volgorde: pokedex_order,Volgorde
pokedex_order_type,Type
pokedex_order_numeric,Numeriek pokedex_order_numeric,Numeriek
pokedex_order_alphabetically,A-Z pokedex_order_alphabetically,A-Z
pokedex_order_height,Lengte pokedex_order_height,Lengte
pokedex_order_weight,Gewicht pokedex_order_weight,Gewicht
pokedex_filter,Filter: pokedex_order_reverse,Omgekeerd
pokedex_filter,Filter
pokedex_filter_none,Geen pokedex_filter_none,Geen
pokedex_filter_name,Naam pokedex_filter_name,Naam
pokedex_filter_type1,Type 1 pokedex_filter_type1,Type 1

6
P3D/Content/Localization/Tokens_pl.dat
View File

@ -546,12 +546,14 @@ pokedex_available,Dostępne:
pokedex_select,Wybierz Pokédex pokedex_select,Wybierz Pokédex
pokedex_habitat_dex_name,Dex Siedlisk pokedex_habitat_dex_name,Dex Siedlisk
pokedex_habitat_select,Wybierz siedlisko pokedex_habitat_select,Wybierz siedlisko
pokedex_order,Kolejność: pokedex_order,Kolejność
pokedex_order_type,Type
pokedex_order_numeric,Numeryczna pokedex_order_numeric,Numeryczna
pokedex_order_alphabetically,A-Z pokedex_order_alphabetically,A-Z
pokedex_order_height,Wzrost pokedex_order_height,Wzrost
pokedex_order_weight,Waga pokedex_order_weight,Waga
pokedex_filter,Filtr: pokedex_order_reverse,Reverse
pokedex_filter,Filtr
pokedex_filter_none,Brak pokedex_filter_none,Brak
pokedex_filter_name,Nazwa pokedex_filter_name,Nazwa
pokedex_filter_type1,Typ 1 pokedex_filter_type1,Typ 1

6
P3D/Content/Localization/Tokens_ptbr.dat
View File

@ -545,12 +545,14 @@ pokedex_available,Disponível:
pokedex_select,Escolha a Pokédex pokedex_select,Escolha a Pokédex
pokedex_habitat_dex_name,Habitat-Dex pokedex_habitat_dex_name,Habitat-Dex
pokedex_habitat_select,Escolha o Habitat pokedex_habitat_select,Escolha o Habitat
pokedex_order,Órdem: pokedex_order,Órdem
pokedex_order_type,Type
pokedex_order_numeric,Numérica pokedex_order_numeric,Numérica
pokedex_order_alphabetically,A-Z pokedex_order_alphabetically,A-Z
pokedex_order_height,Tamanho pokedex_order_height,Tamanho
pokedex_order_weight,Peso pokedex_order_weight,Peso
pokedex_filter,Filtro: pokedex_order_reverse,Reverse
pokedex_filter,Filtro
pokedex_filter_none,Nenhum pokedex_filter_none,Nenhum
pokedex_filter_name,Nome pokedex_filter_name,Nome
pokedex_filter_type1,Tipo 1 pokedex_filter_type1,Tipo 1

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

@ -4,6 +4,7 @@
Public Class Element Public Class Element
Public IsGameModeElement As Boolean = False Public IsGameModeElement As Boolean = False
Public ShowInDexFilters As Boolean = True
''' <summary> ''' <summary>
''' The Type an Element can be. ''' The Type an Element can be.

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

@ -9,7 +9,7 @@
Const PATH As String = "Data\Types\" Const PATH As String = "Data\Types\"
'List of loaded moves. 'List of loaded moves.
Shared LoadedElements As New List(Of Element) Public Shared LoadedElements As New List(Of Element)
''' <summary> ''' <summary>
''' Load the attack list for the loaded GameMode. ''' Load the attack list for the loaded GameMode.
@ -78,6 +78,8 @@
element.gmMachineTextureSource = value element.gmMachineTextureSource = value
Case "itemtextureoffset" Case "itemtextureoffset"
element.gmMachineTextureRectangle = New Rectangle(CInt(value.GetSplit(0, ",")), CInt(value.GetSplit(1, ",")), 24, 24) element.gmMachineTextureRectangle = New Rectangle(CInt(value.GetSplit(0, ",")), CInt(value.GetSplit(1, ",")), 24, 24)
Case "showindexfilters"
element.ShowInDexFilters = CBool(value)
Case "effectivenessattack" Case "effectivenessattack"
Dim data() As String = value.Split(";") Dim data() As String = value.Split(";")
For i = 0 To data.Count - 1 For i = 0 To data.Count - 1
@ -189,9 +191,6 @@
If nonCommentLines > 0 Then If nonCommentLines > 0 Then
If setID = True Then If setID = True Then
If element.Type >= 20 Then If element.Type >= 20 Then
If Localization.TokenExists("element_name_" & element.gmOriginalName.ToString) = True Then
element.gmOriginalName = Localization.GetString("move_name_" & element.gmOriginalName.ToString)
End If
For i = 0 To 18 For i = 0 To 18
If element.gmEffectivenessAttack.ContainsKey(i) = False Then If element.gmEffectivenessAttack.ContainsKey(i) = False Then
element.gmEffectivenessAttack.Add(i, 1.0F) element.gmEffectivenessAttack.Add(i, 1.0F)

122
P3D/Screens/Pokedex/PokedexScreen.vb
View File

@ -329,7 +329,7 @@ Public Class PokedexScreen
Public Enum OrderType Public Enum OrderType
Numeric Numeric
Weigth Weight
Height Height
Alphabetically Alphabetically
End Enum End Enum
@ -401,7 +401,7 @@ Public Class PokedexScreen
Select Case Me.Order Select Case Me.Order
Case OrderType.Alphabetically Case OrderType.Alphabetically
neededEntryType = 1 neededEntryType = 1
Case OrderType.Height, OrderType.Weigth Case OrderType.Height, OrderType.Weight
neededEntryType = 2 neededEntryType = 2
End Select End Select
@ -479,12 +479,12 @@ Public Class PokedexScreen
Exit For Exit For
End If End If
Case FilterType.Type1 Case FilterType.Type1
If p.Type1.Type <> New Element(F.FilterValue).Type Then If p.Type1.Type <> BattleSystem.GameModeElementLoader.GetElementByName(F.FilterValue).Type Then
valid = False valid = False
Exit For Exit For
End If End If
Case FilterType.Type2 Case FilterType.Type2
If p.Type2.Type <> New Element(F.FilterValue).Type Then If p.Type2.Type <> BattleSystem.GameModeElementLoader.GetElementByName(F.FilterValue).Type Then
valid = False valid = False
Exit For Exit For
End If End If
@ -525,7 +525,7 @@ Public Class PokedexScreen
Else Else
Me.PokemonList = (From p As Pokemon In Me.PokemonList Order By p.GetName(True) Ascending).ToList() Me.PokemonList = (From p As Pokemon In Me.PokemonList Order By p.GetName(True) Ascending).ToList()
End If End If
Case OrderType.Weigth Case OrderType.Weight
If Me.ReverseOrder = True Then If Me.ReverseOrder = True Then
Me.PokemonList = (From p As Pokemon In Me.PokemonList Order By p.PokedexEntry.Weight Descending).ToList() Me.PokemonList = (From p As Pokemon In Me.PokemonList Order By p.PokedexEntry.Weight Descending).ToList()
Else Else
@ -658,7 +658,7 @@ Public Class PokedexScreen
orderText = Localization.GetString("pokedex_order_alphabetically", "A-Z") orderText = Localization.GetString("pokedex_order_alphabetically", "A-Z")
Case OrderType.Height Case OrderType.Height
orderText = Localization.GetString("pokedex_order_height", "Height") orderText = Localization.GetString("pokedex_order_height", "Height")
Case OrderType.Weigth Case OrderType.Weight
orderText = Localization.GetString("pokedex_order_weight", "Weight") orderText = Localization.GetString("pokedex_order_weight", "Weight")
End Select End Select
Dim filterText As String = Localization.GetString("pokedex_filter_none", "None") Dim filterText As String = Localization.GetString("pokedex_filter_none", "None")
@ -678,8 +678,8 @@ Public Class PokedexScreen
End Select End Select
Next Next
End If End If
Dim OrderFilterTitleWidth As Integer = CInt(FontManager.MainFont.MeasureString(Localization.GetString("pokedex_order", "Order:") & Environment.NewLine & Localization.GetString("pokedex_filter", "Filter:")).X) Dim OrderFilterTitleWidth As Integer = CInt(FontManager.MainFont.MeasureString(Localization.GetString("pokedex_order", "Order") & ":" & Environment.NewLine & Localization.GetString("pokedex_filter", "Filter") & ":").X)
Core.SpriteBatch.DrawString(FontManager.MainFont, Localization.GetString("pokedex_order", "Order:") & Environment.NewLine & Localization.GetString("pokedex_filter", "Filter:") & Environment.NewLine & Localization.GetString("pokedex_search_hint", "Press [<system.button(special)>] or Select to search."), New Vector2(685, 45), Color.White) Core.SpriteBatch.DrawString(FontManager.MainFont, Localization.GetString("pokedex_order", "Order") & ":" & Environment.NewLine & Localization.GetString("pokedex_filter", "Filter") & ":" & Environment.NewLine & Localization.GetString("pokedex_search_hint", "Press [<system.button(special)>] or Select to search."), New Vector2(685, 45), Color.White)
Core.SpriteBatch.DrawString(FontManager.MainFont, orderText & Environment.NewLine & filterText, New Vector2(685 + OrderFilterTitleWidth + CInt(FontManager.MainFont.MeasureString(" ").X), 45), Color.Black) Core.SpriteBatch.DrawString(FontManager.MainFont, orderText & Environment.NewLine & filterText, New Vector2(685 + OrderFilterTitleWidth + CInt(FontManager.MainFont.MeasureString(" ").X), 45), Color.Black)
If menu.Visible = True Then If menu.Visible = True Then
@ -894,7 +894,7 @@ Public Class PokedexScreen
End If End If
If KeyBoardHandler.KeyPressed(KeyBindings.SpecialKey) = True Or ControllerHandler.ButtonPressed(Buttons.Back) = True Then If KeyBoardHandler.KeyPressed(KeyBindings.SpecialKey) = True Or ControllerHandler.ButtonPressed(Buttons.Back) = True Then
Me.menu = New SelectMenu({"Order", "Filter", "Reset", "Back"}.ToList(), SelectIndexMain, AddressOf SelectMenu1, 3, "selectmain") Me.menu = New SelectMenu({Localization.GetString("pokedex_order", "Order"), Localization.GetString("pokedex_filter", "Filter"), Localization.GetString("global_reset", "Reset"), Localization.GetString("global_back", "Back")}.ToList(), SelectIndexMain, AddressOf SelectMenu1, 3, "selectmain")
End If End If
If Controls.Dismiss(True, True, True) = True Then If Controls.Dismiss(True, True, True) = True Then
@ -946,12 +946,16 @@ Public Class PokedexScreen
#Region "Menus" #Region "Menus"
Private Sub SelectMenu1(ByVal s As SelectMenu) Private Sub SelectMenu1(ByVal s As SelectMenu)
Dim ReverseString As String = Localization.GetString("global_yes", "Yes")
If Me.ReverseOrder = False Then
ReverseString = Localization.GetString("global_no", "No")
End If
Select Case s.SelectedItem.ToLower() Select Case s.SelectedItem.ToLower()
Case "order" Case Localization.GetString("pokedex_order", "Order").ToLower
Me.menu = New SelectMenu({"Type", "Reverse: " & Me.ReverseOrder.ToString(), "Back"}.ToList(), OrderIndexMain, AddressOf SelectMenuOrder, 2, "ordermain") Me.menu = New SelectMenu({Localization.GetString("pokedex_order_type", "Type"), Localization.GetString("pokedex_order_reverse", "Reverse") & ": " & ReverseString, Localization.GetString("global_back", "Back")}.ToList(), OrderIndexMain, AddressOf SelectMenuOrder, 2, "ordermain")
Case "filter" Case Localization.GetString("pokedex_filter", "Filter").ToLower
Me.menu = New SelectMenu({"Name", "Type1", "Type2", "Clear", "Back"}.ToList(), FilterIndexMain, AddressOf SelectMenuFilter, 4, "filtermain") Me.menu = New SelectMenu({Localization.GetString("pokedex_filter_name", "Name"), Localization.GetString("pokedex_filter_type1", "Type 1"), Localization.GetString("pokedex_filter_type2", "Type 2"), Localization.GetString("global_clear", "Clear"), Localization.GetString("global_back", "Back")}.ToList(), FilterIndexMain, AddressOf SelectMenuFilter, 4, "filtermain")
Case "reset" Case Localization.GetString("global_reset", "Reset").ToLower
Me.Filters.Clear() Me.Filters.Clear()
Me.ReverseOrder = False Me.ReverseOrder = False
Me.Order = OrderType.Numeric Me.Order = OrderType.Numeric
@ -961,22 +965,34 @@ Public Class PokedexScreen
Private Sub SelectMenuFilter(ByVal s As SelectMenu) Private Sub SelectMenuFilter(ByVal s As SelectMenu)
Select Case s.SelectedItem.ToLower() Select Case s.SelectedItem.ToLower()
Case "name" Case Localization.GetString("pokedex_filter_name", "Name").ToLower
Me.menu = New SelectMenu({"A", "B", "C", "D", "E", "F", "G", "H", "I", "J", "K", "L", "M", "N", "O", "P", "Q", "R", "S", "T", "U", "V", "W", "X", "Y", "Z", "Back"}.ToList(), FilterIndexName, AddressOf SelectMenuNameFilter, -1, "filtername") Me.menu = New SelectMenu({"A", "B", "C", "D", "E", "F", "G", "H", "I", "J", "K", "L", "M", "N", "O", "P", "Q", "R", "S", "T", "U", "V", "W", "X", "Y", "Z", Localization.GetString("global_back", "Back")}.ToList(), FilterIndexName, AddressOf SelectMenuNameFilter, -1, "filtername")
Case "type1" Case Localization.GetString("pokedex_filter_type1", "Type 1").ToLower
Me.menu = New SelectMenu({"Normal", "Fire", "Fighting", "Water", "Flying", "Grass", "Poison", "Electric", "Ground", "Psychic", "Rock", "Ice", "Bug", "Dragon", "Ghost", "Dark", "Steel", "Fairy", "Blank", "Back"}.ToList(), FilterIndexType1, AddressOf SelectMenuType1Filter, -1, "filtertype1") Dim typeList As New List(Of String)
Case "type2" typeList.AddRange({"Normal", "Fire", "Fighting", "Water", "Flying", "Grass", "Poison", "Electric", "Ground", "Psychic", "Rock", "Ice", "Bug", "Dragon", "Ghost", "Dark", "Steel", "Fairy"})
Me.menu = New SelectMenu({"Normal", "Fire", "Fighting", "Water", "Flying", "Grass", "Poison", "Electric", "Ground", "Psychic", "Rock", "Ice", "Bug", "Dragon", "Ghost", "Dark", "Steel", "Fairy", "Blank", "Back"}.ToList(), FilterIndexType2, AddressOf SelectMenuType2Filter, -1, "filtertype2") For Each e As Element In BattleSystem.GameModeElementLoader.LoadedElements
Case "clear" typeList.Add(e.gmOriginalName)
Next
typeList.AddRange({"Blank", Localization.GetString("global_back", "Back")})
Me.menu = New SelectMenu(typeList, FilterIndexType1, AddressOf SelectMenuType1Filter, -1, "filtertype1")
Case Localization.GetString("pokedex_filter_type2", "Type 2").ToLower
Dim typeList As New List(Of String)
typeList.AddRange({"Normal", "Fire", "Fighting", "Water", "Flying", "Grass", "Poison", "Electric", "Ground", "Psychic", "Rock", "Ice", "Bug", "Dragon", "Ghost", "Dark", "Steel", "Fairy"})
For Each e As Element In BattleSystem.GameModeElementLoader.LoadedElements
typeList.Add(e.gmOriginalName)
Next
typeList.AddRange({"Blank", Localization.GetString("global_back", "Back")})
Me.menu = New SelectMenu(typeList, FilterIndexType2, AddressOf SelectMenuType2Filter, -1, "filtertype2")
Case Localization.GetString("global_clear", "Clear").ToLower
Me.Filters.Clear() Me.Filters.Clear()
Me.SetList() Me.SetList()
Case "back" Case Localization.GetString("global_back", "Back").ToLower
Me.menu = New SelectMenu({"Order", "Filter", "Reset", "Back"}.ToList(), SelectIndexMain, AddressOf SelectMenu1, 3, "selectmain") Me.menu = New SelectMenu({Localization.GetString("pokedex_order", "Order"), Localization.GetString("pokedex_filter", "Filter"), Localization.GetString("global_reset", "Reset"), Localization.GetString("global_back", "Back")}.ToList(), SelectIndexMain, AddressOf SelectMenu1, 3, "selectmain")
End Select End Select
End Sub End Sub
Private Sub SelectMenuType1Filter(ByVal s As SelectMenu) Private Sub SelectMenuType1Filter(ByVal s As SelectMenu)
If s.SelectedItem <> "Back" Then If s.SelectedItem <> Localization.GetString("global_back", "Back") Then
For i = 0 To Filters.Count - 1 For i = 0 To Filters.Count - 1
If Filters(i).FilterType = FilterType.Type1 Then If Filters(i).FilterType = FilterType.Type1 Then
Filters.RemoveAt(i) Filters.RemoveAt(i)
@ -987,12 +1003,12 @@ Public Class PokedexScreen
Filters.Add(New Filter With {.FilterType = FilterType.Type1, .FilterValue = s.SelectedItem}) Filters.Add(New Filter With {.FilterType = FilterType.Type1, .FilterValue = s.SelectedItem})
SetList() SetList()
Else Else
Me.menu = New SelectMenu({"Name", "Type1", "Type2", "Clear", "Back"}.ToList(), FilterIndexMain, AddressOf SelectMenuFilter, 4, "filtermain") Me.menu = New SelectMenu({Localization.GetString("pokedex_filter_name", "Name"), Localization.GetString("pokedex_filter_type1", "Type 1"), Localization.GetString("pokedex_filter_type2", "Type 2"), Localization.GetString("global_clear", "Clear"), Localization.GetString("global_back", "Back")}.ToList(), FilterIndexMain, AddressOf SelectMenuFilter, 4, "filtermain")
End If End If
End Sub End Sub
Private Sub SelectMenuType2Filter(ByVal s As SelectMenu) Private Sub SelectMenuType2Filter(ByVal s As SelectMenu)
If s.SelectedItem <> "Back" Then If s.SelectedItem <> Localization.GetString("global_back", "Back") Then
For i = 0 To Filters.Count - 1 For i = 0 To Filters.Count - 1
If Filters(i).FilterType = FilterType.Type2 Then If Filters(i).FilterType = FilterType.Type2 Then
Filters.RemoveAt(i) Filters.RemoveAt(i)
@ -1003,12 +1019,12 @@ Public Class PokedexScreen
Filters.Add(New Filter With {.FilterType = FilterType.Type2, .FilterValue = s.SelectedItem}) Filters.Add(New Filter With {.FilterType = FilterType.Type2, .FilterValue = s.SelectedItem})
SetList() SetList()
Else Else
Me.menu = New SelectMenu({"Name", "Type1", "Type2", "Clear", "Back"}.ToList(), FilterIndexMain, AddressOf SelectMenuFilter, 4, "filtermain") Me.menu = New SelectMenu({Localization.GetString("pokedex_filter_name", "Name"), Localization.GetString("pokedex_filter_type1", "Type 1"), Localization.GetString("pokedex_filter_type2", "Type 2"), Localization.GetString("global_clear", "Clear"), Localization.GetString("global_back", "Back")}.ToList(), FilterIndexMain, AddressOf SelectMenuFilter, 4, "filtermain")
End If End If
End Sub End Sub
Private Sub SelectMenuNameFilter(ByVal s As SelectMenu) Private Sub SelectMenuNameFilter(ByVal s As SelectMenu)
If s.SelectedItem <> "Back" Then If s.SelectedItem <> Localization.GetString("global_back", "Back") Then
For i = 0 To Filters.Count - 1 For i = 0 To Filters.Count - 1
If Filters(i).FilterType = FilterType.Name Then If Filters(i).FilterType = FilterType.Name Then
Filters.RemoveAt(i) Filters.RemoveAt(i)
@ -1019,39 +1035,48 @@ Public Class PokedexScreen
Filters.Add(New Filter With {.FilterType = FilterType.Name, .FilterValue = s.SelectedItem}) Filters.Add(New Filter With {.FilterType = FilterType.Name, .FilterValue = s.SelectedItem})
SetList() SetList()
Else Else
Me.menu = New SelectMenu({"Name", "Type1", "Type2", "Clear", "Back"}.ToList(), FilterIndexMain, AddressOf SelectMenuFilter, 4, "filtermain") Me.menu = New SelectMenu({Localization.GetString("pokedex_filter_name", "Name"), Localization.GetString("pokedex_filter_type1", "Type 1"), Localization.GetString("pokedex_filter_type2", "Type 2"), Localization.GetString("global_clear", "Clear"), Localization.GetString("global_back", "Back")}.ToList(), FilterIndexMain, AddressOf SelectMenuFilter, 4, "filtermain")
End If End If
End Sub End Sub
Private Sub SelectMenuOrder(ByVal s As SelectMenu) Private Sub SelectMenuOrder(ByVal s As SelectMenu)
Dim ReverseString As String = Localization.GetString("global_yes", "Yes")
If Me.ReverseOrder = False Then
ReverseString = Localization.GetString("global_no", "No")
End If
Select Case s.SelectedItem.ToLower() Select Case s.SelectedItem.ToLower()
Case "type" Case Localization.GetString("pokedex_order_type", "Type").ToLower
Me.menu = New SelectMenu({"Numeric", "A-Z", "Weight", "Height", "Back"}.ToList(), OrderIndexType, AddressOf SelectMenuOrderType, 4, "ordertype") Me.menu = New SelectMenu({Localization.GetString("pokedex_order_numeric", "Numeric"), Localization.GetString("pokedex_order_alphabetically", "A-Z"), Localization.GetString("pokedex_order_weight", "Weight"), Localization.GetString("pokedex_order_height", "Height"), Localization.GetString("global_back", "Back")}.ToList(), OrderIndexType, AddressOf SelectMenuOrderType, 4, "ordertype")
Case "reverse: " & Me.ReverseOrder.ToString().ToLower() Case Localization.GetString("pokedex_order_reverse", "Reverse").ToLower & ": " & ReverseString.ToLower()
Me.ReverseOrder = Not Me.ReverseOrder Me.ReverseOrder = Not Me.ReverseOrder
Me.menu = New SelectMenu({"Type", "Reverse: " & Me.ReverseOrder.ToString(), "Back"}.ToList(), OrderIndexMain, AddressOf SelectMenuOrder, 2, "ordermain") Me.menu = New SelectMenu({Localization.GetString("pokedex_order_type", "Type"), Localization.GetString("pokedex_order_reverse", "Reverse") & ": " & ReverseString.ToLower(), Localization.GetString("global_back", "Back")}.ToList(), OrderIndexMain, AddressOf SelectMenuOrder, 2, "ordermain")
Me.SetList() Me.SetList()
Case "back" Case Localization.GetString("global_back", "Back").ToLower
Me.menu = New SelectMenu({"Order", "Filter", "Reset", "Back"}.ToList(), SelectIndexMain, AddressOf SelectMenu1, 3, "selectmain") Me.menu = New SelectMenu({Localization.GetString("pokedex_order", "Order"), Localization.GetString("pokedex_filter", "Filter"), Localization.GetString("global_reset", "Reset"), "Back"}.ToList(), SelectIndexMain, AddressOf SelectMenu1, 3, "selectmain")
End Select End Select
End Sub End Sub
Private Sub SelectMenuOrderType(ByVal s As SelectMenu) Private Sub SelectMenuOrderType(ByVal s As SelectMenu)
Dim ReverseString As String = Localization.GetString("global_yes", "Yes")
If Me.ReverseOrder = False Then
ReverseString = Localization.GetString("global_no", "No")
End If
Select Case s.SelectedItem.ToLower() Select Case s.SelectedItem.ToLower()
Case "numeric" Case Localization.GetString("pokedex_order_numeric", "Numeric").ToLower
Me.Order = OrderType.Numeric Me.Order = OrderType.Numeric
Me.SetList() Me.SetList()
Case "a-z" Case Localization.GetString("pokedex_order_alphabetically", "A-Z").ToLower
Me.Order = OrderType.Alphabetically Me.Order = OrderType.Alphabetically
Me.SetList() Me.SetList()
Case "weight" Case Localization.GetString("pokedex_order_weight", "Weight").ToLower
Me.Order = OrderType.Weigth Me.Order = OrderType.Weight
Me.SetList() Me.SetList()
Case "height" Case Localization.GetString("pokedex_order_height", "Height").ToLower
Me.Order = OrderType.Height Me.Order = OrderType.Height
Me.SetList() Me.SetList()
Case "back" Case Localization.GetString("global_back", "Back")
Me.menu = New SelectMenu({"Type", "Reverse: " & Me.ReverseOrder.ToString(), "Back"}.ToList(), OrderIndexMain, AddressOf SelectMenuOrder, 2, "ordermain") Me.menu = New SelectMenu({Localization.GetString("pokedex_order_type", "Type"), Localization.GetString("pokedex_order_reverse", "Reverse") & ": " & ReverseString, Localization.GetString("global_back", "Back")}.ToList(), OrderIndexMain, AddressOf SelectMenuOrder, 2, "ordermain")
End Select End Select
End Sub End Sub
@ -1154,7 +1179,18 @@ Public Class PokedexScreen
If Visible = True Then If Visible = True Then
For i = Scroll To Me.Scroll + 8 For i = Scroll To Me.Scroll + 8
If i <= Me.Items.Count - 1 Then If i <= Me.Items.Count - 1 Then
Dim Text As String = Items(i) Dim Entry As String = Items(i)
Dim Text As String = Entry
Select Case Entry
Case "Normal", "Fire", "Fighting", "Water", "Flying", "Grass", "Poison", "Electric", "Ground", "Psychic", "Rock", "Ice", "Bug", "Dragon", "Ghost", "Dark", "Steel", "Fairy", "Blank"
Text = Localization.GetString("global_pokemon_type_" & Entry.ToLower, Entry)
End Select
For Each e As Element In BattleSystem.GameModeElementLoader.LoadedElements
If Entry.ToLower = e.gmOriginalName.ToLower Then
Text = Localization.GetString("global_pokemon_type_" & e.gmOriginalName.ToLower, Entry)
End If
Next
Dim startPos As New Vector2(Core.windowSize.Width - 270, 66 * ((i + 1) - Scroll)) Dim startPos As New Vector2(Core.windowSize.Width - 270, 66 * ((i + 1) - Scroll))