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

2
Data/Scripts/021_Debug/003_Debug_Pokemon.rb
View File

@@ -433,7 +433,7 @@ module PokemonDebugMixin
oldabil = (pkmn.ability) ? pkmn.ability.name : "No ability"
commands = []
for i in abils
commands.push(((i[1]<2) ? "" : "(H) ") + Data::Ability.get(i[0]).name)
commands.push(((i[1]<2) ? "" : "(H) ") + PokemonData::Ability.get(i[0]).name)
end
commands.push(_INTL("Remove override"))
msg = [_INTL("Ability {1} is natural.",oldabil),

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

26
Data/Scripts/021_Debug/005_Editor_SaveData.rb
View File

@@ -55,7 +55,7 @@ def pbSaveAbilities
f.write("\# "+_INTL("See the documentation on the wiki to learn how to edit this file."))
f.write("\r\n")
f.write("\#-------------------------------\r\n")
Data::Ability.each do |a|
PokemonData::Ability.each do |a|
f.write(sprintf("%d,%s,%s,%s\r\n",
a.id_number,
csvQuote(a.id.to_s),
@@ -711,12 +711,12 @@ def pbSavePokemonData
pokedata.write("Happiness = #{happiness}\r\n")
pokedata.write("Abilities = ")
if ability1
cability1 = Data::Ability.get(ability1).name
cability1 = PokemonData::Ability.get(ability1).name
pokedata.write("#{cability1}")
pokedata.write(",") if ability2
end
if ability2
cability2 = Data::Ability.get(ability2).name
cability2 = PokemonData::Ability.get(ability2).name
pokedata.write("#{cability2}")
end
pokedata.write("\r\n")
@@ -724,22 +724,22 @@ def pbSavePokemonData
pokedata.write("HiddenAbility = ")
needcomma = false
if hiddenability1
cabilityh = Data::Ability.get(hiddenability1).name
cabilityh = PokemonData::Ability.get(hiddenability1).name
pokedata.write("#{cabilityh}"); needcomma = true
end
if hiddenability2
pokedata.write(",") if needcomma
cabilityh = Data::Ability.get(hiddenability2).name
cabilityh = PokemonData::Ability.get(hiddenability2).name
pokedata.write("#{cabilityh}"); needcomma = true
end
if hiddenability3
pokedata.write(",") if needcomma
cabilityh = Data::Ability.get(hiddenability3).name
cabilityh = PokemonData::Ability.get(hiddenability3).name
pokedata.write("#{cabilityh}"); needcomma = true
end
if hiddenability4
pokedata.write(",") if needcomma
cabilityh = Data::Ability.get(hiddenability4).name
cabilityh = PokemonData::Ability.get(hiddenability4).name
pokedata.write("#{cabilityh}")
end
pokedata.write("\r\n")
@@ -1107,12 +1107,12 @@ def pbSavePokemonFormsData
if ability1 || ability2
pokedata.write("Abilities = ")
if ability1
cability1 = Data::Ability.get(ability1).name
cability1 = PokemonData::Ability.get(ability1).name
pokedata.write("#{cability1}")
pokedata.write(",") if ability2
end
if ability2
cability2 = Data::Ability.get(ability2).name
cability2 = PokemonData::Ability.get(ability2).name
pokedata.write("#{cability2}")
end
pokedata.write("\r\n")
@@ -1122,22 +1122,22 @@ def pbSavePokemonFormsData
pokedata.write("HiddenAbility = ")
needcomma = false
if hiddenability1
cabilityh = Data::Ability.get(hiddenability1).name
cabilityh = PokemonData::Ability.get(hiddenability1).name
pokedata.write("#{cabilityh}"); needcomma=true
end
if hiddenability2
pokedata.write(",") if needcomma
cabilityh = Data::Ability.get(hiddenability2).name
cabilityh = PokemonData::Ability.get(hiddenability2).name
pokedata.write("#{cabilityh}"); needcomma=true
end
if hiddenability3
pokedata.write(",") if needcomma
cabilityh = Data::Ability.get(hiddenability3).name
cabilityh = PokemonData::Ability.get(hiddenability3).name
pokedata.write("#{cabilityh}"); needcomma=true
end
if hiddenability4
pokedata.write(",") if needcomma
cabilityh = Data::Ability.get(hiddenability4).name
cabilityh = PokemonData::Ability.get(hiddenability4).name
pokedata.write("#{cabilityh}")
end
pokedata.write("\r\n")

2
Data/Scripts/021_Debug/007_Editor_DataTypes.rb
View File

@@ -827,7 +827,7 @@ module AbilityProperty
end
def self.format(value)
return (value && Data::Ability.exists?(value)) ? Data::Ability.get(value).name : "-"
return (value && PokemonData::Ability.exists?(value)) ? PokemonData::Ability.get(value).name : "-"
end
end

2
Data/Scripts/021_Debug/009_Editor_Utilities.rb
View File

@@ -361,7 +361,7 @@ end
# sorting between numerical and alphabetical.
def pbChooseAbilityList(default=0)
commands = []
Data::Ability.each do |a|
PokemonData::Ability.each do |a|
commands.push([a.id_number, a.name])
end
return pbChooseList(commands,default,0,-1)