Skip to content

Commit

Permalink
Merge pull request #14 from lramati/master
Browse files Browse the repository at this point in the history 
Bump to v5.5.6
  • Loading branch information
@lramati
lramati authored Aug 29, 2021
2 parents 7d342a7 + 0048ea0 commit 654b9f6
Show file tree
Hide file tree
Showing 13 changed files with 2,770 additions and 114 deletions.
4 changes: 2 additions & 2 deletions app/build.gradle
View file
Original file line number Diff line number Diff line change
Expand Up @@ -82,8 +82,8 @@ android {
defaultConfig {
minSdkVersion 19 /*Dont change this unless you know why*/
targetSdkVersion 29 /*Dont change this unless you know why*/
versionCode 71
versionName "5.5.4"
versionCode 73
versionName "5.5.6"
testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
vectorDrawables.useSupportLibrary = true
}
Expand Down
34 changes: 11 additions & 23 deletions app/src/main/java/com/kamron/pogoiv/scanlogic/PokeInfoCalculator.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,13 +27,13 @@ public class PokeInfoCalculator {
private List<Pokemon> formVariantPokemons;
private String[] pokeNamesWithForm = {};

public static final int MELTAN_INDEX_OFFSET = 7;
public static final int MELMETAL_INDEX_OFFSET = 6;
public static final int OBSTAGOON_INDEX_OFFSET = 5;
public static final int PERRSERKER_INDEX_OFFSET = 4;
public static final int SIRFETCHD_INDEX_OFFSET = 3;
public static final int MRRIME_INDEX_OFFSET = 2;
public static final int RUNERIGUS_INDEX_OFFSET = 1;
//public static final int MELTAN_INDEX_OFFSET = 7;
//public static final int MELMETAL_INDEX_OFFSET = 6;
//public static final int OBSTAGOON_INDEX_OFFSET = 5;
//public static final int PERRSERKER_INDEX_OFFSET = 4;
//public static final int SIRFETCHD_INDEX_OFFSET = 3;
//public static final int MRRIME_INDEX_OFFSET = 2;
//public static final int RUNERIGUS_INDEX_OFFSET = 1;

/**
* Pokemons who's name appears as a type of candy.
Expand Down Expand Up @@ -185,21 +185,6 @@ private void populatePokemon(@NonNull GoIVSettings settings, @NonNull Resources
int pokeListSize = names.length;
ArrayList<Pokemon> formVariantPokemons = new ArrayList<>();

// quick hardcoded patch for supporting discontinuous pokedex number pokemons followings
// #808 Meltan
// #809 Melmetal
// #862 Obstagoon
// #863 Perrserker
// #865 Sirfetch'd
// #866 Mr. Rime
// #867 Runerigus
// currently GoIV logic expects that pokedex numbers are continuous and less than pokeListSize.
// so this patch shifts these to dummy indexes, with pokeListSize offset.
candyNamesArray[pokeListSize - MELTAN_INDEX_OFFSET] = pokeListSize - MELTAN_INDEX_OFFSET;
candyNamesArray[pokeListSize - MELMETAL_INDEX_OFFSET] = pokeListSize - MELTAN_INDEX_OFFSET;
devolution[pokeListSize - MELMETAL_INDEX_OFFSET] = pokeListSize - MELTAN_INDEX_OFFSET;
// END patch for supporting discontinuous pokedex number pokemons

for (int i = 0; i < pokeListSize; i++) {
PokemonBase p = new PokemonBase(names[i], displayNames[i], i, devolution[i],
candyNamesArray[i], evolutionCandyCost[i]);
Expand All @@ -211,7 +196,10 @@ private void populatePokemon(@NonNull GoIVSettings settings, @NonNull Resources
PokemonBase devo = pokedex.get(devolution[i]);
devo.evolutions.add(pokedex.get(i));
} else {
candyPokemons.add(pokedex.get(candyNamesArray[i]));
int candyNameIndex = candyNamesArray[i];
if (candyNameIndex != -1) {
candyPokemons.add(pokedex.get(candyNameIndex));
}
}

PokemonBase base = pokedex.get(i);
Expand Down
4 changes: 2 additions & 2 deletions app/src/main/java/com/kamron/pogoiv/scanlogic/PokemonBase.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,7 @@ public Pokemon getForm(@NonNull Pokemon otherForm) {

final int pokeListSize = PokeInfoCalculator.getInstance().getPokedex().size();

if (number == 51) { // #52 Meowth
/* if (number == 51) { // #52 Meowth
// check #863 Perrserker with its index number in pokemons.xml
if (otherForm.number == pokeListSize - PokeInfoCalculator.PERRSERKER_INDEX_OFFSET) {
// return Galarian forms
Expand Down Expand Up @@ -176,7 +176,7 @@ public Pokemon getForm(@NonNull Pokemon otherForm) {
} else {
return getForm(otherForm.formName);
}
}
} */

if ((otherForm.base.forms.size() == 1 && forms.size() > 1)
|| (forms.size() == 1 && otherForm.base.forms.size() > 1 && otherForm.base.forms.get(0) == otherForm)) {
Expand Down
177 changes: 177 additions & 0 deletions app/src/main/res/values-de/pokemons.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -679,6 +679,9 @@
<item>Coiffwaff</item>
<item>Psiau</item>
<item>Psiaugon</item>
<item>Placeholder</item>
<item>Placeholder</item>
<item>Placeholder</item>
<item>Parfi</item>
<item>Parfinesse</item>
<item>Flauschling</item>
Expand Down Expand Up @@ -715,12 +718,186 @@
<item>UHaFnir</item>
<item>Xerneas</item>
<item>Yveltal</item>
<item>Placeholder</item>
<item>Diancie</item>
<item>Hoopa</item>
<item>Volcanion</item>
<item>Placeholder</item>
<item>Placeholder</item>
<item>Placeholder</item>
<item>Placeholder</item>
<item>Placeholder</item>
<item>Placeholder</item>
<item>Placeholder</item>
<item>Placeholder</item>
<item>Placeholder</item>
<item>Placeholder</item>
<item>Placeholder</item>
<item>Placeholder</item>
<item>Placeholder</item>
<item>Placeholder</item>
<item>Placeholder</item>
<item>Placeholder</item>
<item>Placeholder</item>
<item>Placeholder</item>
<item>Placeholder</item>
<item>Placeholder</item>
<item>Placeholder</item>
<item>Placeholder</item>
<item>Placeholder</item>
<item>Placeholder</item>
<item>Placeholder</item>
<item>Placeholder</item>
<item>Placeholder</item>
<item>Placeholder</item>
<item>Placeholder</item>
<item>Placeholder</item>
<item>Placeholder</item>
<item>Placeholder</item>
<item>Placeholder</item>
<item>Placeholder</item>
<item>Placeholder</item>
<item>Placeholder</item>
<item>Placeholder</item>
<item>Placeholder</item>
<item>Placeholder</item>
<item>Placeholder</item>
<item>Placeholder</item>
<item>Placeholder</item>
<item>Placeholder</item>
<item>Placeholder</item>
<item>Placeholder</item>
<item>Placeholder</item>
<item>Placeholder</item>
<item>Placeholder</item>
<item>Placeholder</item>
<item>Placeholder</item>
<item>Placeholder</item>
<item>Placeholder</item>
<item>Placeholder</item>
<item>Placeholder</item>
<item>Placeholder</item>
<item>Placeholder</item>
<item>Placeholder</item>
<item>Placeholder</item>
<item>Placeholder</item>
<item>Placeholder</item>
<item>Placeholder</item>
<item>Placeholder</item>
<item>Placeholder</item>
<item>Placeholder</item>
<item>Placeholder</item>
<item>Placeholder</item>
<item>Placeholder</item>
<item>Placeholder</item>
<item>Placeholder</item>
<item>Placeholder</item>
<item>Placeholder</item>
<item>Placeholder</item>
<item>Placeholder</item>
<item>Placeholder</item>
<item>Placeholder</item>
<item>Placeholder</item>
<item>Placeholder</item>
<item>Placeholder</item>
<item>Placeholder</item>
<item>Placeholder</item>
<item>Placeholder</item>
<item>Placeholder</item>
<item>Placeholder</item>
<item>Placeholder</item>
<item>Placeholder</item>
<item>Placeholder</item>
<item>Meltan</item>
<item>Melmetal</item>
<item>Chimpep</item>
<item>Chimstix</item>
<item>Gortrom</item>
<item>Hopplo</item>
<item>Kickerlo</item>
<item>Liberlo</item>
<item>Memmeon</item>
<item>Phlegleon</item>
<item>Intelleon</item>
<item>Raffel</item>
<item>Schlaraffel</item>
<item>Meikro</item>
<item>Kranoviz</item>
<item>Krarmor</item>
<item>Sensect</item>
<item>Keradar</item>
<item>Maritellit</item>
<item>Kleptifux</item>
<item>Gaunux</item>
<item>Cottini</item>
<item>Cottomi</item>
<item>Wolly</item>
<item>Zwollock</item>
<item>Kamehaps</item>
<item>Kamalm</item>
<item>Voldi</item>
<item>Bellektro</item>
<item>Klonkett</item>
<item>Wagong</item>
<item>Montecarbo</item>
<item>Knapfel</item>
<item>Drapfel</item>
<item>Schlapfel</item>
<item>Salanga</item>
<item>Sanaconda</item>
<item>Urgl</item>
<item>Pikuda</item>
<item>Barrakiefa</item>
<item>Toxel</item>
<item>Riffex</item>
<item>Thermopod</item>
<item>Infernopod</item>
<item>Klopptopus</item>
<item>Kaocto</item>
<item>Fatalitee</item>
<item>Mortipot</item>
<item>Brimova</item>
<item>Brimano</item>
<item>Silembrim</item>
<item>Bähmon</item>
<item>Pelzebub</item>
<item>Olangaar</item>
<item>Barrikadax</item>
<item>Mauzinger</item>
<item>Gorgasonn</item>
<item>Lauchzelot</item>
<item>Pantifrost</item>
<item>Oghnatoll</item>
<item>Hokumil</item>
<item>Pokusan</item>
<item>Legios</item>
<item>Britzigel</item>
<item>Snomnom</item>
<item>Mottineva</item>
<item>Humanolith</item>
<item>Kubuin</item>
<item>Servol</item>
<item>Morpeko</item>
<item>Kupfanti</item>
<item>Patinaraja</item>
<item>Lectragon</item>
<item>Lecryodon</item>
<item>Pescragon</item>
<item>Pescryodon</item>
<item>Duraludon</item>
<item>Grolldra</item>
<item>Phandra</item>
<item>Katapuldra</item>
<item>Zacian</item>
<item>Zamazenta</item>
<item>Endynalos</item>
<item>Dakuma</item>
<item>Wulaosu</item>
<item>Zarude</item>
<item>Regieleki</item>
<item>Regidrago</item>
<item>Polaross</item>
<item>Phantoross</item>
<item>Coronospa</item>
</string-array>
</resources>
Loading

0 comments on commit 654b9f6

Please sign in to comment.