DocRock3r/infinitefusion-e18
1
0
Fork 0
mirror of https://github.com/infinitefusion/infinitefusion-e18.git synced 2025-12-06 06:01:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixes meloetta form change

Browse Source
This commit is contained in:
chardub
2025-02-21 20:38:23 -05:00
parent a52af5a021
commit c6f69edf9c
4 changed files with 10 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
Data/Scripts/011_Battle/001_Battler/007_Battler_UseMove.rb
View File

@@ -624,27 +624,8 @@ class PokeBattle_Battler
#For meloetta form change
def changeFormSpecies(oldForm, newForm,animation = "UltraBurst2")
@pokemon.changeFormSpecies(oldForm,newForm)
playChangeFormAnimation(animation)
# is_already_old_form = @pokemon.isFusionOf(oldForm) #A 466
# is_already_new_form = @pokemon.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 @pokemon.species_data.get_body_species() == oldForm
# changeSpeciesSpecific(@pokemon,getFusedPokemonIdFromSymbols(newForm,oldForm))
# else
# changeSpeciesSpecific(@pokemon,getFusedPokemonIdFromSymbols(oldForm,newForm))
# end
# playChangeFormAnimation(animation)
# else
# changeSpecies(@pokemon, oldForm, newForm, animation) if is_already_old_form
# changeSpecies(@pokemon, newForm, oldForm, animation) if is_already_new_form
# end
end

4
Data/Scripts/011_Battle/002_Move/005_Move_Effects_000-07F.rb
View File

@@ -49,7 +49,9 @@ class PokeBattle_Move_003 < PokeBattle_SleepMove
#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_meloetta_A && is_meloetta_P
if user.pokemon.species_data.get_body_species() == :MELOETTA_A
body_id = user.pokemon.species_data.get_body_species()
body_species = GameData::Species.get(body_id)
if body_species == :MELOETTA_A
changeSpeciesSpecific(user.pokemon,:B467H466)
else
changeSpeciesSpecific(user.pokemon,:B466H467)

4
Data/Scripts/012_Overworld/004_Overworld_FieldMoves.rb
View File

@@ -677,7 +677,9 @@ def changeMeloettaForm(pokemon)
return
end
if is_meloetta_A && is_meloetta_P
if pokemon.species_data.get_body_species() == :MELOETTA_A
body_id = pokemon.species_data.get_body_species()
body_species = GameData::Species.get(body_id)
if body_species == :MELOETTA_A
changeSpeciesSpecific(pokemon, :B467H466)
else
changeSpeciesSpecific(pokemon, :B466H467)

5
Data/Scripts/014_Pokemon/001_Pokemon.rb
View File

@@ -341,7 +341,10 @@ class Pokemon
#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
body_id = self.species_data.get_body_species()
body_species = GameData::Species.get(body_id)
if body_species == oldForm
changeSpeciesSpecific(self, getFusedPokemonIdFromSymbols(newForm, oldForm))
else
changeSpeciesSpecific(self, getFusedPokemonIdFromSymbols(oldForm, newForm))