Fixed changing a Pokémon's species to a single gendered/non-gendered one not updating its gender, enabled a bred Mr. Mime/Meowth to inherit Galarian forms

This commit is contained in:
Maruno17
2021-08-19 18:29:53 +01:00
parent f768df4696
commit 9c5c3c77ed
2 changed files with 8 additions and 6 deletions

View File

@@ -199,12 +199,13 @@ def pbDayCareGenerateEgg
end end
# Inheriting regional form # Inheriting regional form
if [:RATTATA, :SANDSHREW, :VULPIX, :DIGLETT, :MEOWTH, :GEODUDE, :GRIMER, if [:RATTATA, :SANDSHREW, :VULPIX, :DIGLETT, :MEOWTH, :GEODUDE, :GRIMER,
:PONYTA, :SLOWPOKE, :FARFETCHD, :ARTICUNO, :ZAPDOS, :MOLTRES, :CORSOLA, :PONYTA, :SLOWPOKE, :FARFETCHD, :MRMINE, :ARTICUNO, :ZAPDOS, :MOLTRES,
:ZIGZAGOON, :DARUMAKA, :YAMASK, :STUNFISK].include?(babyspecies) :CORSOLA, :ZIGZAGOON, :DARUMAKA, :YAMASK, :STUNFISK].include?(babyspecies)
if mother.form==1 if mother.form > 0
egg.form = 1 if mother.hasItem?(:EVERSTONE) egg.form = mother.form if mother.hasItem?(:EVERSTONE)
elsif father.species_data.get_baby_species(true, mother.item_id, father.item_id) == babyspecies elsif father.form > 0 &&
egg.form = 1 if father.form==1 && father.hasItem?(:EVERSTONE) father.species_data.get_baby_species(true, mother.item_id, father.item_id) == babyspecies
egg.form = father.form if father.hasItem?(:EVERSTONE)
end end
end end
# Inheriting Moves # Inheriting Moves

View File

@@ -122,6 +122,7 @@ class Pokemon
@species = new_species_data.species @species = new_species_data.species
@form = new_species_data.form if new_species_data.form != 0 @form = new_species_data.form if new_species_data.form != 0
@forced_form = nil @forced_form = nil
@gender = nil if singleGendered?
@level = nil # In case growth rate is different for the new species @level = nil # In case growth rate is different for the new species
@ability = nil @ability = nil
calc_stats calc_stats