mirror of
https://github.com/infinitefusion/infinitefusion-e18.git
synced 2025-12-07 21:24:59 +00:00
Removed deprecated code, renamed "base_damage"/"baseDamage"/"baseDmg" to "power"
This commit is contained in:
@@ -314,15 +314,15 @@ class Pokemon
|
||||
return species_data.types.clone
|
||||
end
|
||||
|
||||
# @deprecated This method is slated to be removed in v21.
|
||||
# @deprecated This method is slated to be removed in v22.
|
||||
def type1
|
||||
Deprecation.warn_method("type1", "v21", "pkmn.types")
|
||||
Deprecation.warn_method("type1", "v22", "pkmn.types")
|
||||
return types[0]
|
||||
end
|
||||
|
||||
# @deprecated This method is slated to be removed in v21.
|
||||
# @deprecated This method is slated to be removed in v22.
|
||||
def type2
|
||||
Deprecation.warn_method("type2", "v21", "pkmn.types")
|
||||
Deprecation.warn_method("type2", "v22", "pkmn.types")
|
||||
return types[1] || types[0]
|
||||
end
|
||||
|
||||
|
||||
@@ -48,7 +48,7 @@ class Pokemon
|
||||
alias totalpp total_pp
|
||||
|
||||
def function_code; return GameData::Move.get(@id).function_code; end
|
||||
def base_damage; return GameData::Move.get(@id).base_damage; end
|
||||
def power; return GameData::Move.get(@id).power; end
|
||||
def type; return GameData::Move.get(@id).type; end
|
||||
def category; return GameData::Move.get(@id).category; end
|
||||
def accuracy; return GameData::Move.get(@id).accuracy; end
|
||||
@@ -60,6 +60,12 @@ class Pokemon
|
||||
def description; return GameData::Move.get(@id).description; end
|
||||
def hidden_move?; return GameData::Move.get(@id).hidden_move?; end
|
||||
|
||||
# @deprecated This method is slated to be removed in v22.
|
||||
def base_damage
|
||||
Deprecation.warn_method("base_damage", "v22", "power")
|
||||
return @power
|
||||
end
|
||||
|
||||
def display_type(pkmn); return GameData::Move.get(@id).display_type(pkmn, self); end
|
||||
def display_category(pkmn); return GameData::Move.get(@id).display_category(pkmn, self); end
|
||||
def display_damage(pkmn); return GameData::Move.get(@id).display_damage(pkmn, self); end
|
||||
|
||||
Reference in New Issue
Block a user