DocRock3r/infinitefusion-e18
1
0
Fork 0
mirror of https://github.com/infinitefusion/infinitefusion-e18.git synced 2025-12-06 06:01:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

Battlers now make use of Ability objects to be consistent with Pokemon objects

Browse Source
This commit is contained in:
Maruno17
2020-11-04 21:27:56 +00:00
parent 9dc6da0742
commit ff70791104
26 changed files with 189 additions and 183 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
Data/Scripts/021_Debug/004_Editor_Screens.rb
View File

@@ -838,10 +838,10 @@ def pbPokemonEditor
formname = messages.get(MessageTypes::FormNames,selection)
abilities = speciesData[SpeciesData::ABILITIES]
if abilities.is_a?(Array)
ability1 = (abilities[0]) ? Data::Ability.get(abilities[0]).id_number : 0
ability2 = (abilities[1]) ? Data::Ability.get(abilities[1]).id_number : 0
ability1 = (abilities[0]) ? PokemonData::Ability.get(abilities[0]).id_number : 0
ability2 = (abilities[1]) ? PokemonData::Ability.get(abilities[1]).id_number : 0
else
ability1 = (abilities) ? Data::Ability.get(abilities).id_number : 0
ability1 = (abilities) ? PokemonData::Ability.get(abilities).id_number : 0
ability2 = 0
end
color = speciesData[SpeciesData::COLOR]
@@ -870,12 +870,12 @@ def pbPokemonEditor
baseexp = speciesData[SpeciesData::BASE_EXP]
hiddenAbils = speciesData[SpeciesData::HIDDEN_ABILITY]
if hiddenAbils.is_a?(Array)
hiddenability1 = (hiddenAbils[0]) ? Data::Ability.get(hiddenAbils[0]).id_number : 0
hiddenability2 = (hiddenAbils[1]) ? Data::Ability.get(hiddenAbils[1]).id_number : 0
hiddenability3 = (hiddenAbils[2]) ? Data::Ability.get(hiddenAbils[2]).id_number : 0
hiddenability4 = (hiddenAbils[3]) ? Data::Ability.get(hiddenAbils[3]).id_number : 0
hiddenability1 = (hiddenAbils[0]) ? PokemonData::Ability.get(hiddenAbils[0]).id_number : 0
hiddenability2 = (hiddenAbils[1]) ? PokemonData::Ability.get(hiddenAbils[1]).id_number : 0
hiddenability3 = (hiddenAbils[2]) ? PokemonData::Ability.get(hiddenAbils[2]).id_number : 0
hiddenability4 = (hiddenAbils[3]) ? PokemonData::Ability.get(hiddenAbils[3]).id_number : 0
else
hiddenability1 = (hiddenAbils) ? Data::Ability.get(hiddenAbils).id_number : 0
hiddenability1 = (hiddenAbils) ? PokemonData::Ability.get(hiddenAbils).id_number : 0
hiddenability2 = 0
hiddenability3 = 0
hiddenability4 = 0