mirror of
https://github.com/infinitefusion/infinitefusion-e18.git
synced 2025-12-06 06:01:46 +00:00
various fixes
This commit is contained in:
@@ -6,7 +6,7 @@
|
||||
module Settings
|
||||
# The version of your game. It has to adhere to the MAJOR.MINOR.PATCH format.
|
||||
GAME_VERSION = '5.0.0'
|
||||
GAME_VERSION_NUMBER = "5.0 - beta"
|
||||
GAME_VERSION_NUMBER = "5.0.9 - beta"
|
||||
|
||||
#
|
||||
FUSION_ICON_SPRITE_OFFSET = 10
|
||||
|
||||
@@ -139,6 +139,10 @@ class Pokemon
|
||||
@species == GameData::Species.get(check_species).species)
|
||||
end
|
||||
|
||||
def dexNum
|
||||
return species_data.id_number
|
||||
end
|
||||
|
||||
def isFusion?
|
||||
return species_data.id_number > NB_POKEMON
|
||||
end
|
||||
@@ -1061,9 +1065,9 @@ class Pokemon
|
||||
end
|
||||
hpDiff = @totalhp - @hp
|
||||
#@totalhp = stats[:HP]
|
||||
@totalhp= self.ability == :WONDERGUARD ? 1 : stats[:HP]
|
||||
@totalhp = self.ability == :WONDERGUARD ? 1 : stats[:HP]
|
||||
calculated_hp = @totalhp - hpDiff
|
||||
@hp = calculated_hp > 0 ? calculated_hp: 0
|
||||
@hp = calculated_hp > 0 ? calculated_hp : 0
|
||||
@attack = stats[:ATTACK]
|
||||
@defense = stats[:DEFENSE]
|
||||
@spatk = stats[:SPECIAL_ATTACK]
|
||||
|
||||
@@ -100,6 +100,11 @@ def getDexNumberForSpecies(species)
|
||||
return dexNum
|
||||
end
|
||||
|
||||
#shortcut for using in game events because of script characters limit
|
||||
def dexNum(species)
|
||||
return getDexNumberForSpecies(species)
|
||||
end
|
||||
|
||||
def getRandomCustomFusion(returnRandomPokemonIfNoneFound=true,customPokeList=[],maxPoke=-1,recursionLimit=3)
|
||||
if customPokeList.length==0
|
||||
customPokeList = getCustomSpeciesList()
|
||||
|
||||
Reference in New Issue
Block a user