mirror of
https://github.com/infinitefusion/infinitefusion-e18.git
synced 2025-12-07 21:24:59 +00:00
self fusions boosted exp
This commit is contained in:
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
@@ -89,6 +89,8 @@ class PokeBattle_Battle
|
|||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
def pbGainExpOne(idxParty,defeatedBattler,numPartic,expShare,expAll,showMessages=true)
|
def pbGainExpOne(idxParty,defeatedBattler,numPartic,expShare,expAll,showMessages=true)
|
||||||
pkmn = pbParty(0)[idxParty] # The Pokémon gaining EVs from defeatedBattler
|
pkmn = pbParty(0)[idxParty] # The Pokémon gaining EVs from defeatedBattler
|
||||||
growth_rate = pkmn.growth_rate
|
growth_rate = pkmn.growth_rate
|
||||||
@@ -136,7 +138,8 @@ class PokeBattle_Battle
|
|||||||
end
|
end
|
||||||
# Foreign Pokémon gain more Exp
|
# Foreign Pokémon gain more Exp
|
||||||
isOutsider = (pkmn.owner.id != pbPlayer.id ||
|
isOutsider = (pkmn.owner.id != pbPlayer.id ||
|
||||||
(pkmn.owner.language != 0 && pkmn.owner.language != pbPlayer.language))
|
(pkmn.owner.language != 0 && pkmn.owner.language != pbPlayer.language)) ||
|
||||||
|
pkmn.isSelfFusion? #also self fusions
|
||||||
if isOutsider
|
if isOutsider
|
||||||
if pkmn.owner.language != 0 && pkmn.owner.language != pbPlayer.language
|
if pkmn.owner.language != 0 && pkmn.owner.language != pbPlayer.language
|
||||||
exp = (exp*1.7).floor
|
exp = (exp*1.7).floor
|
||||||
|
|||||||
@@ -171,6 +171,10 @@ class Pokemon
|
|||||||
return species_data.id_number
|
return species_data.id_number
|
||||||
end
|
end
|
||||||
|
|
||||||
|
def isSelfFusion?
|
||||||
|
return isFusion? && getHeadID(species) == getBodyID(species)
|
||||||
|
end
|
||||||
|
|
||||||
def isFusion?
|
def isFusion?
|
||||||
return species_data.id_number > NB_POKEMON && !self.isTripleFusion?
|
return species_data.id_number > NB_POKEMON && !self.isTripleFusion?
|
||||||
end
|
end
|
||||||
|
|||||||
@@ -5,9 +5,9 @@ module GameData
|
|||||||
species = GameData::Species.get(species).id_number # Just to be sure it's a number
|
species = GameData::Species.get(species).id_number # Just to be sure it's a number
|
||||||
return self.egg_sprite_bitmap(species, pkmn.form) if pkmn.egg?
|
return self.egg_sprite_bitmap(species, pkmn.form) if pkmn.egg?
|
||||||
if back
|
if back
|
||||||
ret = self.back_sprite_bitmap(species,pkmn.shiny?)
|
ret = self.back_sprite_bitmap(species,nil,nil,pkmn.shiny?)
|
||||||
else
|
else
|
||||||
ret = self.front_sprite_bitmap(species,pkmn.shiny?)
|
ret = self.front_sprite_bitmap(species,nil,nil,pkmn.shiny?)
|
||||||
end
|
end
|
||||||
return ret
|
return ret
|
||||||
end
|
end
|
||||||
@@ -21,7 +21,7 @@ module GameData
|
|||||||
return ret
|
return ret
|
||||||
end
|
end
|
||||||
|
|
||||||
def self.front_sprite_bitmap(dex_number, isShiny = false, b = 0, c = 0, d = 0)
|
def self.front_sprite_bitmap(dex_number, a=0, b = 0, isShiny = false, d = 0)
|
||||||
#la méthode est utilisé ailleurs avec d'autres arguments (gender, form, etc.) mais on les veut pas
|
#la méthode est utilisé ailleurs avec d'autres arguments (gender, form, etc.) mais on les veut pas
|
||||||
if dex_number.is_a?(Symbol)
|
if dex_number.is_a?(Symbol)
|
||||||
dex_number = GameData::Species.get(dex_number).id_number
|
dex_number = GameData::Species.get(dex_number).id_number
|
||||||
@@ -34,7 +34,7 @@ module GameData
|
|||||||
return sprite
|
return sprite
|
||||||
end
|
end
|
||||||
|
|
||||||
def self.back_sprite_bitmap(dex_number, isShiny = false, form = 0, gender = 0, c = false, shadow = false)
|
def self.back_sprite_bitmap(dex_number, b=0, form = 0, isShiny=false, c = false, shadow = false)
|
||||||
filename = self.sprite_filename(dex_number)
|
filename = self.sprite_filename(dex_number)
|
||||||
sprite = (filename) ? AnimatedBitmap.new(filename) : nil
|
sprite = (filename) ? AnimatedBitmap.new(filename) : nil
|
||||||
if isShiny
|
if isShiny
|
||||||
|
|||||||
@@ -1322,7 +1322,6 @@ def pbFuse(pokemon, poke2, supersplicers = false)
|
|||||||
if hasCustom
|
if hasCustom
|
||||||
previewwindow.picture.pbSetColor(150, 255, 150, 200)
|
previewwindow.picture.pbSetColor(150, 255, 150, 200)
|
||||||
else
|
else
|
||||||
previewwindow.picture.shiftColors(pbGet(1))
|
|
||||||
previewwindow.picture.pbSetColor(255, 255, 255, 200)
|
previewwindow.picture.pbSetColor(255, 255, 255, 200)
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|||||||
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Reference in New Issue
Block a user