Release 6.9.0

This commit is contained in:
chardub
2026-11-02 11:34:46 -05:00
parent 060726298d
commit ae6e2ebc64
5697 changed files with 131795 additions and 17423 deletions
@@ -314,14 +314,14 @@ end
def get_body_number_from_symbol(id)
dexNum = getDexNumberForSpecies(id)
return dexNum if !isFusion(dexNum)
id.to_s.match(/\d+/)[0]
return id.to_s.match(/\d+/)[0].to_i
dexNum -= get_head_number_from_symbol(id)
return dexNum / Settings::NB_POKEMON
end
def get_head_number_from_symbol(id)
dexNum = getDexNumberForSpecies(id)
return dexNum if !isFusion(dexNum)
return id.to_s.match(/(?<=H)\d+/)[0].to_i
return dexNum % Settings::NB_POKEMON
end
def get_fusion_symbol(head_id, body_id)
@@ -440,7 +440,7 @@ end
def getSpeciesRealName(species_symbol)
return nil if !species_symbol
species = GameData::Species.get(species_symbol)
return species.real_name
return species.name
end
def playerHasFusedPokemonInTeam()
@@ -522,6 +522,14 @@ def get_triple_fusion_components(species_id)
return [480,483,486]
when Settings::ZAPMOLCUNO_NB + 30
return [481,484,487]
when Settings::ZAPMOLCUNO_NB + 31 #Telemauv
return [000]
when Settings::ZAPMOLCUNO_NB + 32 #Solrock/minior/lunatone
return [498,544,545]
when Settings::ZAPMOLCUNO_NB + 33 #Solrock/minior_core/lunatone
return [499,544,545]
when Settings::ZAPMOLCUNO_NB + 34 #stunfisk/bruxish/luvdisc
return [420,469,501]
else
return [000]
end