mirror of
https://github.com/infinitefusion/infinitefusion-e18.git
synced 2025-12-06 06:01:46 +00:00
dna reverser, hotel crashes fix, unfusing & exp tracking, wondertrade
This commit is contained in:
@@ -14,6 +14,11 @@ class Pokemon
|
||||
attr_accessor :time_form_set
|
||||
# @return [Integer] the current experience points
|
||||
attr_reader :exp
|
||||
|
||||
attr_accessor :exp_when_fused_head
|
||||
attr_accessor :exp_when_fused_body
|
||||
attr_accessor :exp_gained_since_fused
|
||||
|
||||
# @return [Integer] the number of steps until this Pokémon hatches, 0 if this Pokémon is not an egg
|
||||
attr_accessor :steps_to_hatch
|
||||
# @return [Integer] the current HP
|
||||
@@ -134,6 +139,10 @@ class Pokemon
|
||||
@species == GameData::Species.get(check_species).species)
|
||||
end
|
||||
|
||||
def isFusion?
|
||||
return species_data.id_number > NB_POKEMON
|
||||
end
|
||||
|
||||
def form
|
||||
return @forced_form if !@forced_form.nil?
|
||||
return @form if $game_temp.in_battle
|
||||
@@ -1054,6 +1063,7 @@ class Pokemon
|
||||
return ret
|
||||
end
|
||||
|
||||
|
||||
# Creates a new Pokémon object.
|
||||
# @param species [Symbol, String, Integer] Pokémon species
|
||||
# @param level [Integer] Pokémon level
|
||||
|
||||
Reference in New Issue
Block a user