From 9608cca26f6c88d9b863c4c5773579719b002469 Mon Sep 17 00:00:00 2001 From: infinitefusion Date: Thu, 28 Mar 2024 18:25:47 -0400 Subject: [PATCH 1/2] updates new version notification --- Data/VERSION | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Data/VERSION b/Data/VERSION index 504953848..e8f1734af 100644 --- a/Data/VERSION +++ b/Data/VERSION @@ -1 +1 @@ -6.0 \ No newline at end of file +6.1 \ No newline at end of file From 085f73f7d1c7bf915eca17f709e52f3fbf1d2370 Mon Sep 17 00:00:00 2001 From: infinitefusion Date: Thu, 28 Mar 2024 19:58:25 -0400 Subject: [PATCH 2/2] fixes dex number not updating from previous version --- Data/Scripts/014_Pokemon/001_Pokemon.rb | 21 +++++++++------------ 1 file changed, 9 insertions(+), 12 deletions(-) diff --git a/Data/Scripts/014_Pokemon/001_Pokemon.rb b/Data/Scripts/014_Pokemon/001_Pokemon.rb index eed7a488f..a0785e8ce 100644 --- a/Data/Scripts/014_Pokemon/001_Pokemon.rb +++ b/Data/Scripts/014_Pokemon/001_Pokemon.rb @@ -128,10 +128,8 @@ class Pokemon end def species_data - if !@species_data || @species != @species_data.species - @species_data = GameData::Species.get(@species) - end - return @species_data #GameData::Species.get(@species) + @species_data = GameData::Species.get(@species) + return @species_data end #============================================================================= @@ -231,17 +229,16 @@ class Pokemon end def changeFormSpecies(oldForm, newForm) - is_already_old_form = self.isFusionOf(oldForm) #A 466 - is_already_new_form = self.isFusionOf(newForm) #P - + is_already_old_form = self.isFusionOf(oldForm) #A 466 + is_already_new_form = self.isFusionOf(newForm) #P #reverse the fusion if it's a meloA and meloP fusion # There's probably a smarter way to do this but laziness lol if is_already_old_form && is_already_new_form if self.species_data.get_body_species() == oldForm - changeSpeciesSpecific(self,getFusedPokemonIdFromSymbols(newForm,oldForm)) + changeSpeciesSpecific(self, getFusedPokemonIdFromSymbols(newForm, oldForm)) else - changeSpeciesSpecific(self,getFusedPokemonIdFromSymbols(oldForm,newForm)) + changeSpeciesSpecific(self, getFusedPokemonIdFromSymbols(oldForm, newForm)) end else changeSpecies(self, oldForm, newForm) if is_already_old_form @@ -251,11 +248,11 @@ class Pokemon calc_stats end - def changeSpecies(pokemon, speciesToReplace,newSpecies) + def changeSpecies(pokemon, speciesToReplace, newSpecies) if pokemon.isFusion?() - replaceFusionSpecies(pokemon,speciesToReplace,newSpecies) + replaceFusionSpecies(pokemon, speciesToReplace, newSpecies) else - changeSpeciesSpecific(pokemon,newSpecies) + changeSpeciesSpecific(pokemon, newSpecies) end $Trainer.pokedex.set_seen(pokemon.species) $Trainer.pokedex.set_owned(pokemon.species)