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

Fixed the species editor crashing when trying to edit abilities

Browse Source
This commit is contained in:
Maruno17
2020-11-01 20:34:27 +00:00
parent 213347b938
commit 531a1c09e3
3 changed files with 18 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Data/Scripts/011_Data/014_Item_Data.rb
View File

@@ -92,7 +92,9 @@ class Data
end end
def self.each def self.each
DATA.keys.sort.each do |key| keys = DATA.keys
keys.sort! { |a, b| a.to_s <=> b.to_s }
keys.each do |key|
yield DATA[key] if key.is_a?(Symbol) yield DATA[key] if key.is_a?(Symbol)
end end
end end

4
Data/Scripts/011_Data/015_Ability_Data.rb
View File

@@ -73,7 +73,9 @@ class Data
end end
def self.each def self.each
DATA.keys.sort.each do |key| keys = DATA.keys
keys.sort! { |a, b| a.to_s <=> b.to_s }
keys.each do |key|
yield DATA[key] if key.is_a?(Symbol) yield DATA[key] if key.is_a?(Symbol)
end end
end end

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

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