Skip to content
This repository was archived by the owner on Jan 23, 2024. It is now read-only.

minor improvement for pokemon type name resources #883

Closed
udnp wants to merge 2 commits into from
Closed

minor improvement for pokemon type name resources #883

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
74d2852
[C] moved pokemon type names from pokemons.xml to types.xml
udnp Feb 26, 2018
164783d
[C] changed pokemon type index according to Pokemon Official pokedex.
udnp Feb 26, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions app/src/main/java/com/kamron/pogoiv/scanlogic/PokemonNameCorrector.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ public PokeDist getPossiblePokemon(String poketext, String candytext, Optional<I
HashMap<String, String> eeveelutionCorrection = new HashMap<>();
eeveelutionCorrection.put(pokeInfoCalculator.getTypeName(2), //WATER
pokeInfoCalculator.get(133).name); //Vaporeon
eeveelutionCorrection.put(pokeInfoCalculator.getTypeName(3), //ELECTRIC
eeveelutionCorrection.put(pokeInfoCalculator.getTypeName(4), //ELECTRIC
pokeInfoCalculator.get(134).name); //Jolteon
eeveelutionCorrection.put(pokeInfoCalculator.getTypeName(1), //FIRE
pokeInfoCalculator.get(135).name); //Flareon
Expand All @@ -77,7 +77,7 @@ public PokeDist getPossiblePokemon(String poketext, String candytext, Optional<I
eeveelutionCorrection.put(pokeInfoCalculator.getTypeName(15), //DARK
pokeInfoCalculator.get(196).name); //Umbreon
// Preparing for the future....
// eeveelutionCorrection.put(pokeInfoCalculator.getTypeName(4), //GRASS
// eeveelutionCorrection.put(pokeInfoCalculator.getTypeName(3), //GRASS
// pokeInfoCalculator.get(469).name); //Leafeon
// eeveelutionCorrection.put(pokeInfoCalculator.getTypeName(5), //ICE
// pokeInfoCalculator.get(470).name); //Glaceon
Expand Down
4 changes: 2 additions & 2 deletions app/src/main/res/values-es/pokemons.xml → app/src/main/res/values-es/types.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@
<!-- 0 normal --> <item>NORMAL</item>
<!-- 1 fire --> <item>FUEGO</item>
<!-- 2 water --> <item>AGUA</item>
<!-- 3 electric --> <item>ELÉCTRICO</item>
<!-- 4 grass --> <item>PLANTA</item>
<!-- 3 grass --> <item>PLANTA</item>
<!-- 4 electric --> <item>ELÉCTRICO</item>
<!-- 5 ice --> <item>HIELO</item>
<!-- 6 fighting --> <item>LUCHA</item>
<!-- 7 poison --> <item>VENENO</item>
Expand Down
4 changes: 2 additions & 2 deletions app/src/main/res/values-it/pokemons.xml → app/src/main/res/values-it/types.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@
<!-- 0 normal --> <item>NORMALE</item>
<!-- 1 fire --> <item>FUOCO</item>
<!-- 2 water --> <item>ACQUA</item>
<!-- 3 electric --> <item>ELETTRO</item>
<!-- 4 grass --> <item>ERBA</item>
<!-- 3 grass --> <item>ERBA</item>
<!-- 4 electric --> <item>ELETTRO</item>
<!-- 5 ice --> <item>GHIACCIO</item>
<!-- 6 fighting --> <item>LOTTA</item>
<!-- 7 poison --> <item>VELENO</item>
Expand Down
20 changes: 0 additions & 20 deletions app/src/main/res/values/pokemons.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -394,24 +394,4 @@
<item>Deoxys_Speed</item>
<item>Deoxys</item>
</string-array>
<string-array name="typeName">
<!-- 0 normal --> <item>NORMAL</item>
<!-- 1 fire --> <item>FIRE</item>
<!-- 2 water --> <item>WATER</item>
<!-- 3 electric --> <item>ELECTRIC</item>
<!-- 4 grass --> <item>GRASS</item>
<!-- 5 ice --> <item>ICE</item>
<!-- 6 fighting --> <item>FIGHTING</item>
<!-- 7 poison --> <item>POISON</item>
<!-- 8 ground --> <item>GROUND</item>
<!-- 9 flying --> <item>FLYING</item>
<!-- 10 psychic --> <item>PSYCHIC</item>
<!-- 11 bug --> <item>BUG</item>
<!-- 12 rock --> <item>ROCK</item>
<!-- 13 ghost --> <item>GHOST</item>
<!-- 14 dragon --> <item>DRAGON</item>
<!-- 15 dark --> <item>DARK</item>
<!-- 16 steel --> <item>STEEL</item>
<!-- 17 fairy --> <item>FAIRY</item>
</string-array>
</resources>
23 changes: 23 additions & 0 deletions app/src/main/res/values/types.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<string-array name="typeName">
<!-- 0 normal --> <item>NORMAL</item>
<!-- 1 fire --> <item>FIRE</item>
<!-- 2 water --> <item>WATER</item>
<!-- 3 grass --> <item>GRASS</item>
<!-- 4 electric --> <item>ELECTRIC</item>
<!-- 5 ice --> <item>ICE</item>
<!-- 6 fighting --> <item>FIGHTING</item>
<!-- 7 poison --> <item>POISON</item>
<!-- 8 ground --> <item>GROUND</item>
<!-- 9 flying --> <item>FLYING</item>
<!-- 10 psychic --> <item>PSYCHIC</item>
<!-- 11 bug --> <item>BUG</item>
<!-- 12 rock --> <item>ROCK</item>
<!-- 13 ghost --> <item>GHOST</item>
<!-- 14 dragon --> <item>DRAGON</item>
<!-- 15 dark --> <item>DARK</item>
<!-- 16 steel --> <item>STEEL</item>
<!-- 17 fairy --> <item>FAIRY</item>
</string-array>
</resources>