mirror of
https://github.com/infinitefusion/infinitefusion-e18.git
synced 2025-12-06 06:01:46 +00:00
pokemon cries
This commit is contained in:
@@ -93,6 +93,8 @@ def getDexNumberForSpecies(species)
|
||||
dexNum = GameData::Species.get(species).id_number
|
||||
elsif species.is_a?(Pokemon)
|
||||
dexNum = GameData::Species.get(species.species).id_number
|
||||
elsif species.is_a?(GameData::Species)
|
||||
return species.id_number
|
||||
else
|
||||
dexNum = species
|
||||
end
|
||||
@@ -142,7 +144,10 @@ def getBodyID(species)
|
||||
return (dexNum / NB_POKEMON).round
|
||||
end
|
||||
|
||||
def getHeadID(species, bodyId)
|
||||
def getHeadID(species, bodyId = nil)
|
||||
if bodyId == nil
|
||||
bodyId = getBodyID(species)
|
||||
end
|
||||
head_dexNum = getDexNumberForSpecies(species)
|
||||
body_dexNum = getDexNumberForSpecies(bodyId)
|
||||
calculated_number = (head_dexNum - (body_dexNum * NB_POKEMON)).round
|
||||
|
||||
@@ -1317,7 +1317,7 @@ def pbDNASplicing(pokemon, scene, supersplicers = false, superSplicer = false)
|
||||
|
||||
typeWindow = drawPokemonType(newid)
|
||||
|
||||
if hasCustom§
|
||||
if hasCustom
|
||||
previewwindow.picture.pbSetColor(220, 255, 220, 200)
|
||||
else
|
||||
previewwindow.picture.pbSetColor(255, 255, 255, 200)
|
||||
@@ -1407,6 +1407,11 @@ def pbDNASplicing(pokemon, scene, supersplicers = false, superSplicer = false)
|
||||
end
|
||||
body_level = poke1.level
|
||||
head_level = poke2.level
|
||||
|
||||
pokemon.exp_gained_since_fused=0
|
||||
pokemon.exp_when_fused_head=nil
|
||||
pokemon.exp_when_fused_body=nil
|
||||
|
||||
if $Trainer.party.length >= 6
|
||||
if (keepInParty == 0)
|
||||
$PokemonStorage.pbStoreCaught(poke2)
|
||||
|
||||
Reference in New Issue
Block a user