mirror of
https://github.com/infinitefusion/infinitefusion-e18.git
synced 2025-12-07 21:24:59 +00:00
Changed the names of some properties in pokemon.txt and pokemon_forms.txt
This commit is contained in:
Maruno17
@@ -80,25 +80,25 @@ module GameData
|
||||
def self.schema(compiling_forms = false)
|
||||
ret = {
|
||||
"FormName" => [0, "q"],
|
||||
"Kind" => [0, "s"],
|
||||
"Category" => [0, "s"],
|
||||
"Pokedex" => [0, "q"],
|
||||
"Type1" => [0, "e", :Type],
|
||||
"Type2" => [0, "e", :Type],
|
||||
"BaseStats" => [0, "vvvvvv"],
|
||||
"EffortPoints" => [0, "uuuuuu"],
|
||||
"BaseEXP" => [0, "v"],
|
||||
"Rareness" => [0, "u"],
|
||||
"EVs" => [0, "uuuuuu"],
|
||||
"BaseExp" => [0, "v"],
|
||||
"CatchRate" => [0, "u"],
|
||||
"Happiness" => [0, "u"],
|
||||
"Moves" => [0, "*ue", nil, :Move],
|
||||
"TutorMoves" => [0, "*e", :Move],
|
||||
"EggMoves" => [0, "*e", :Move],
|
||||
"Abilities" => [0, "*e", :Ability],
|
||||
"HiddenAbility" => [0, "*e", :Ability],
|
||||
"HiddenAbilities" => [0, "*e", :Ability],
|
||||
"WildItemCommon" => [0, "e", :Item],
|
||||
"WildItemUncommon" => [0, "e", :Item],
|
||||
"WildItemRare" => [0, "e", :Item],
|
||||
"Compatibility" => [0, "*e", :EggGroup],
|
||||
"StepsToHatch" => [0, "v"],
|
||||
"EggGroups" => [0, "*e", :EggGroup],
|
||||
"HatchSteps" => [0, "v"],
|
||||
"Height" => [0, "f"],
|
||||
"Weight" => [0, "f"],
|
||||
"Color" => [0, "e", :BodyColor],
|
||||
@@ -111,7 +111,16 @@ module GameData
|
||||
"BattlerEnemyY" => [0, "i"],
|
||||
"BattlerAltitude" => [0, "i"],
|
||||
"BattlerShadowX" => [0, "i"],
|
||||
"BattlerShadowSize" => [0, "u"]
|
||||
"BattlerShadowSize" => [0, "u"],
|
||||
# All properties below here are old names for some properties above.
|
||||
# They will be removed in v21.
|
||||
"Rareness" => [0, "u"],
|
||||
"Compatibility" => [0, "*e", :EggGroup],
|
||||
"Kind" => [0, "s"],
|
||||
"BaseEXP" => [0, "v"],
|
||||
"EffortPoints" => [0, "uuuuuu"],
|
||||
"HiddenAbility" => [0, "*e", :Ability],
|
||||
"StepsToHatch" => [0, "v"],
|
||||
}
|
||||
if compiling_forms
|
||||
ret["PokedexForm"] = [0, "u"]
|
||||
@@ -124,9 +133,12 @@ module GameData
|
||||
ret["InternalName"] = [0, "n"]
|
||||
ret["Name"] = [0, "s"]
|
||||
ret["GrowthRate"] = [0, "e", :GrowthRate]
|
||||
ret["GenderRate"] = [0, "e", :GenderRatio]
|
||||
ret["GenderRatio"] = [0, "e", :GenderRatio]
|
||||
ret["Incense"] = [0, "e", :Item]
|
||||
ret["Evolutions"] = [0, "*ses", nil, :Evolution, nil]
|
||||
# All properties below here are old names for some properties above.
|
||||
# They will be removed in v21.
|
||||
ret["GenderRate"] = [0, "e", :GenderRatio]
|
||||
end
|
||||
return ret
|
||||
end
|
||||
|
||||
@@ -931,22 +931,22 @@ def pbPokemonEditor
|
||||
[_INTL("ID"), ReadOnlyProperty, _INTL("The ID of the Pokémon.")],
|
||||
[_INTL("Name"), LimitStringProperty.new(Pokemon::MAX_NAME_SIZE), _INTL("Name of the Pokémon.")],
|
||||
[_INTL("FormName"), StringProperty, _INTL("Name of this form of the Pokémon.")],
|
||||
[_INTL("Kind"), StringProperty, _INTL("Kind of Pokémon species.")],
|
||||
[_INTL("Category"), StringProperty, _INTL("Kind of Pokémon species.")],
|
||||
[_INTL("Pokédex"), StringProperty, _INTL("Description of the Pokémon as displayed in the Pokédex.")],
|
||||
[_INTL("Type1"), TypeProperty, _INTL("Pokémon's type. If same as Type2, this Pokémon has a single type.")],
|
||||
[_INTL("Type2"), TypeProperty, _INTL("Pokémon's type. If same as Type1, this Pokémon has a single type.")],
|
||||
[_INTL("BaseStats"), BaseStatsProperty, _INTL("Base stats of the Pokémon.")],
|
||||
[_INTL("EffortPoints"), EffortValuesProperty, _INTL("Effort Value points earned when this species is defeated.")],
|
||||
[_INTL("BaseEXP"), LimitProperty.new(9999), _INTL("Base experience earned when this species is defeated.")],
|
||||
[_INTL("EVs"), EffortValuesProperty, _INTL("Effort Value points earned when this species is defeated.")],
|
||||
[_INTL("BaseExp"), LimitProperty.new(9999), _INTL("Base experience earned when this species is defeated.")],
|
||||
[_INTL("GrowthRate"), GameDataProperty.new(:GrowthRate), _INTL("Pokémon's growth rate.")],
|
||||
[_INTL("GenderRate"), GameDataProperty.new(:GenderRatio), _INTL("Proportion of males to females for this species.")],
|
||||
[_INTL("Rareness"), LimitProperty.new(255), _INTL("Catch rate of this species (0-255).")],
|
||||
[_INTL("GenderRatio"), GameDataProperty.new(:GenderRatio), _INTL("Proportion of males to females for this species.")],
|
||||
[_INTL("CatchRate"), LimitProperty.new(255), _INTL("Catch rate of this species (0-255).")],
|
||||
[_INTL("Happiness"), LimitProperty.new(255), _INTL("Base happiness of this species (0-255).")],
|
||||
[_INTL("Moves"), MovePoolProperty, _INTL("Moves which the Pokémon learns while levelling up.")],
|
||||
[_INTL("TutorMoves"), EggMovesProperty, _INTL("Moves which the Pokémon can be taught by TM/HM/Move Tutor.")],
|
||||
[_INTL("EggMoves"), EggMovesProperty, _INTL("Moves which the Pokémon can learn via breeding.")],
|
||||
[_INTL("Ability1"), AbilityProperty, _INTL("One ability which the Pokémon can have.")],
|
||||
[_INTL("Ability2"), AbilityProperty, _INTL("Another ability which the Pokémon can have.")],
|
||||
[_INTL("Ability 1"), AbilityProperty, _INTL("One ability which the Pokémon can have.")],
|
||||
[_INTL("Ability 2"), AbilityProperty, _INTL("Another ability which the Pokémon can have.")],
|
||||
[_INTL("HiddenAbility 1"), AbilityProperty, _INTL("A secret ability which the Pokémon can have.")],
|
||||
[_INTL("HiddenAbility 2"), AbilityProperty, _INTL("A secret ability which the Pokémon can have.")],
|
||||
[_INTL("HiddenAbility 3"), AbilityProperty, _INTL("A secret ability which the Pokémon can have.")],
|
||||
@@ -954,9 +954,9 @@ def pbPokemonEditor
|
||||
[_INTL("WildItemCommon"), ItemProperty, _INTL("Item commonly held by wild Pokémon of this species.")],
|
||||
[_INTL("WildItemUncommon"), ItemProperty, _INTL("Item uncommonly held by wild Pokémon of this species.")],
|
||||
[_INTL("WildItemRare"), ItemProperty, _INTL("Item rarely held by wild Pokémon of this species.")],
|
||||
[_INTL("Compat1"), GameDataProperty.new(:EggGroup), _INTL("Compatibility group (egg group) for breeding purposes.")],
|
||||
[_INTL("Compat2"), GameDataProperty.new(:EggGroup), _INTL("Compatibility group (egg group) for breeding purposes.")],
|
||||
[_INTL("StepsToHatch"), LimitProperty.new(99999), _INTL("Number of steps until an egg of this species hatches.")],
|
||||
[_INTL("EggGroup 1"), GameDataProperty.new(:EggGroup), _INTL("Compatibility group (egg group) for breeding purposes.")],
|
||||
[_INTL("EggGroup 2"), GameDataProperty.new(:EggGroup), _INTL("Compatibility group (egg group) for breeding purposes.")],
|
||||
[_INTL("HatchSteps"), LimitProperty.new(99999), _INTL("Number of steps until an egg of this species hatches.")],
|
||||
[_INTL("Incense"), ItemProperty, _INTL("Item needed to be held by a parent to produce an egg of this species.")],
|
||||
[_INTL("Evolutions"), EvolutionsProperty.new, _INTL("Evolution paths of this species.")],
|
||||
[_INTL("Height"), NonzeroLimitProperty.new(999), _INTL("Height of the Pokémon in 0.1 metres (e.g. 42 = 4.2m).")],
|
||||
|
||||
@@ -546,7 +546,7 @@ module Compiler
|
||||
contents[key] = value
|
||||
# Sanitise data
|
||||
case key
|
||||
when "BaseStats", "EffortPoints"
|
||||
when "BaseStats", "EVs", "EffortPoints"
|
||||
value_hash = {}
|
||||
GameData::Stat.each_main do |s|
|
||||
value_hash[s.id] = value[s.pbs_order] if s.pbs_order >= 0
|
||||
@@ -567,7 +567,7 @@ module Compiler
|
||||
move_array.sort! { |a, b| (a[0] == b[0]) ? a[2] <=> b[2] : a[0] <=>b [0] }
|
||||
move_array.each { |arr| arr.pop }
|
||||
contents[key] = move_array
|
||||
when "TutorMoves", "EggMoves", "Abilities", "HiddenAbility", "Compatibility"
|
||||
when "TutorMoves", "EggMoves", "Abilities", "HiddenAbilities", "HiddenAbility", "EggGroups", "Compatibility"
|
||||
contents[key] = [contents[key]] if !contents[key].is_a?(Array)
|
||||
contents[key].compact!
|
||||
when "Evolutions"
|
||||
@@ -583,27 +583,27 @@ module Compiler
|
||||
:id => contents["InternalName"].to_sym,
|
||||
:name => contents["Name"],
|
||||
:form_name => contents["FormName"],
|
||||
:category => contents["Kind"],
|
||||
:category => contents["Category"] || contents["Kind"],
|
||||
:pokedex_entry => contents["Pokedex"],
|
||||
:type1 => contents["Type1"],
|
||||
:type2 => contents["Type2"],
|
||||
:base_stats => contents["BaseStats"],
|
||||
:evs => contents["EffortPoints"],
|
||||
:base_exp => contents["BaseEXP"],
|
||||
:evs => contents["EVs"] || contents["EffortPoints"],
|
||||
:base_exp => contents["BaseExp"] || contents["BaseEXP"],
|
||||
:growth_rate => contents["GrowthRate"],
|
||||
:gender_ratio => contents["GenderRate"],
|
||||
:catch_rate => contents["Rareness"],
|
||||
:gender_ratio => contents["GenderRatio"] || contents["GenderRate"],
|
||||
:catch_rate => contents["CatchRate"] || contents["Rareness"],
|
||||
:happiness => contents["Happiness"],
|
||||
:moves => contents["Moves"],
|
||||
:tutor_moves => contents["TutorMoves"],
|
||||
:egg_moves => contents["EggMoves"],
|
||||
:abilities => contents["Abilities"],
|
||||
:hidden_abilities => contents["HiddenAbility"],
|
||||
:hidden_abilities => contents["HiddenAbilities"] || contents["HiddenAbility"],
|
||||
:wild_item_common => contents["WildItemCommon"],
|
||||
:wild_item_uncommon => contents["WildItemUncommon"],
|
||||
:wild_item_rare => contents["WildItemRare"],
|
||||
:egg_groups => contents["Compatibility"],
|
||||
:hatch_steps => contents["StepsToHatch"],
|
||||
:egg_groups => contents["EggGroups"] || contents["Compatibility"],
|
||||
:hatch_steps => contents["HatchSteps"] || contents["StepsToHatch"],
|
||||
:incense => contents["Incense"],
|
||||
:evolutions => contents["Evolutions"],
|
||||
:height => contents["Height"],
|
||||
@@ -683,7 +683,7 @@ module Compiler
|
||||
# Split section_name into a species number and form number
|
||||
split_section_name = section_name.split(/[-,\s]/)
|
||||
if split_section_name.length != 2
|
||||
raise _INTL("Section name {1} is invalid ({2}). Expected syntax like [XXX,Y] (XXX=internal name, Y=form number).", sectionName, path)
|
||||
raise _INTL("Section name {1} is invalid ({2}). Expected syntax like [XXX,Y] (XXX=species ID, Y=form number).", sectionName, path)
|
||||
end
|
||||
species_symbol = csvEnumField!(split_section_name[0], :Species, nil, nil)
|
||||
form = csvPosInt!(split_section_name[1])
|
||||
@@ -713,7 +713,7 @@ module Compiler
|
||||
contents[key] = value
|
||||
# Sanitise data
|
||||
case key
|
||||
when "BaseStats", "EffortPoints"
|
||||
when "BaseStats", "EVs", "EffortPoints"
|
||||
value_hash = {}
|
||||
GameData::Stat.each_main do |s|
|
||||
value_hash[s.id] = value[s.pbs_order] if s.pbs_order >= 0
|
||||
@@ -734,7 +734,7 @@ module Compiler
|
||||
move_array.sort! { |a, b| (a[0] == b[0]) ? a[2] <=> b[2] : a[0] <=>b [0] }
|
||||
move_array.each { |arr| arr.pop }
|
||||
contents[key] = move_array
|
||||
when "TutorMoves", "EggMoves", "Abilities", "HiddenAbility", "Compatibility"
|
||||
when "TutorMoves", "EggMoves", "Abilities", "HiddenAbilities", "HiddenAbility", "EggGroups", "Compatibility"
|
||||
contents[key] = [contents[key]] if !contents[key].is_a?(Array)
|
||||
contents[key].compact!
|
||||
when "Evolutions"
|
||||
@@ -772,28 +772,28 @@ module Compiler
|
||||
:form => form,
|
||||
:name => base_data.real_name,
|
||||
:form_name => contents["FormName"],
|
||||
:category => contents["Kind"] || base_data.real_category,
|
||||
:category => contents["Category"] || contents["Kind"] || base_data.real_category,
|
||||
:pokedex_entry => contents["Pokedex"] || base_data.real_pokedex_entry,
|
||||
:pokedex_form => contents["PokedexForm"],
|
||||
:type1 => contents["Type1"] || base_data.type1,
|
||||
:type2 => contents["Type2"] || base_data.type2,
|
||||
:base_stats => contents["BaseStats"] || base_data.base_stats,
|
||||
:evs => contents["EffortPoints"] || base_data.evs,
|
||||
:base_exp => contents["BaseEXP"] || base_data.base_exp,
|
||||
:evs => contents["EVs"] || contents["EffortPoints"] || base_data.evs,
|
||||
:base_exp => contents["BaseExp"] || contents["BaseEXP"] || base_data.base_exp,
|
||||
:growth_rate => base_data.growth_rate,
|
||||
:gender_ratio => base_data.gender_ratio,
|
||||
:catch_rate => contents["Rareness"] || base_data.catch_rate,
|
||||
:catch_rate => contents["CatchRate"] || contents["Rareness"] || base_data.catch_rate,
|
||||
:happiness => contents["Happiness"] || base_data.happiness,
|
||||
:moves => moves,
|
||||
:tutor_moves => contents["TutorMoves"] || base_data.tutor_moves.clone,
|
||||
:egg_moves => contents["EggMoves"] || base_data.egg_moves.clone,
|
||||
:abilities => contents["Abilities"] || base_data.abilities.clone,
|
||||
:hidden_abilities => contents["HiddenAbility"] || base_data.hidden_abilities.clone,
|
||||
:hidden_abilities => contents["HiddenAbilities"] || contents["HiddenAbility"] || base_data.hidden_abilities.clone,
|
||||
:wild_item_common => contents["WildItemCommon"] || base_data.wild_item_common,
|
||||
:wild_item_uncommon => contents["WildItemUncommon"] || base_data.wild_item_uncommon,
|
||||
:wild_item_rare => contents["WildItemRare"] || base_data.wild_item_rare,
|
||||
:egg_groups => contents["Compatibility"] || base_data.egg_groups.clone,
|
||||
:hatch_steps => contents["StepsToHatch"] || base_data.hatch_steps,
|
||||
:egg_groups => contents["EggGroups"] || contents["Compatibility"] || base_data.egg_groups.clone,
|
||||
:hatch_steps => contents["HatchSteps"] || contents["StepsToHatch"] || base_data.hatch_steps,
|
||||
:incense => base_data.incense,
|
||||
:evolutions => evolutions,
|
||||
:height => contents["Height"] || base_data.height,
|
||||
@@ -1302,7 +1302,7 @@ module Compiler
|
||||
#=============================================================================
|
||||
# Compile Battle Tower and other Cups trainers/Pokémon
|
||||
#=============================================================================
|
||||
def compile_trainer_lists(path = "PBS/trainerlists.txt")
|
||||
def compile_trainer_lists(path = "PBS/battle_facility_lists.txt")
|
||||
btTrainersRequiredTypes = {
|
||||
"Trainers" => [0, "s"],
|
||||
"Pokemon" => [1, "s"],
|
||||
|
||||
@@ -266,17 +266,17 @@ module Compiler
|
||||
evs_array[s.pbs_order] = species.evs[s.id]
|
||||
end
|
||||
f.write(sprintf("BaseStats = %s\r\n", stats_array.join(",")))
|
||||
f.write(sprintf("GenderRate = %s\r\n", species.gender_ratio))
|
||||
f.write(sprintf("GenderRatio = %s\r\n", species.gender_ratio))
|
||||
f.write(sprintf("GrowthRate = %s\r\n", species.growth_rate))
|
||||
f.write(sprintf("BaseEXP = %d\r\n", species.base_exp))
|
||||
f.write(sprintf("EffortPoints = %s\r\n", evs_array.join(",")))
|
||||
f.write(sprintf("Rareness = %d\r\n", species.catch_rate))
|
||||
f.write(sprintf("BaseExp = %d\r\n", species.base_exp))
|
||||
f.write(sprintf("EVs = %s\r\n", evs_array.join(",")))
|
||||
f.write(sprintf("CatchRate = %d\r\n", species.catch_rate))
|
||||
f.write(sprintf("Happiness = %d\r\n", species.happiness))
|
||||
if species.abilities.length > 0
|
||||
f.write(sprintf("Abilities = %s\r\n", species.abilities.join(",")))
|
||||
end
|
||||
if species.hidden_abilities.length > 0
|
||||
f.write(sprintf("HiddenAbility = %s\r\n", species.hidden_abilities.join(",")))
|
||||
f.write(sprintf("HiddenAbilities = %s\r\n", species.hidden_abilities.join(",")))
|
||||
end
|
||||
if species.moves.length > 0
|
||||
f.write(sprintf("Moves = %s\r\n", species.moves.join(",")))
|
||||
@@ -288,15 +288,15 @@ module Compiler
|
||||
f.write(sprintf("EggMoves = %s\r\n", species.egg_moves.join(",")))
|
||||
end
|
||||
if species.egg_groups.length > 0
|
||||
f.write(sprintf("Compatibility = %s\r\n", species.egg_groups.join(",")))
|
||||
f.write(sprintf("EggGroups = %s\r\n", species.egg_groups.join(",")))
|
||||
end
|
||||
f.write(sprintf("StepsToHatch = %d\r\n", species.hatch_steps))
|
||||
f.write(sprintf("HatchSteps = %d\r\n", species.hatch_steps))
|
||||
f.write(sprintf("Height = %.1f\r\n", species.height / 10.0))
|
||||
f.write(sprintf("Weight = %.1f\r\n", species.weight / 10.0))
|
||||
f.write(sprintf("Color = %s\r\n", species.color))
|
||||
f.write(sprintf("Shape = %s\r\n", species.shape))
|
||||
f.write(sprintf("Habitat = %s\r\n", species.habitat)) if species.habitat != :None
|
||||
f.write(sprintf("Kind = %s\r\n", species.real_category))
|
||||
f.write(sprintf("Category = %s\r\n", species.real_category))
|
||||
f.write(sprintf("Pokedex = %s\r\n", species.real_pokedex_entry))
|
||||
f.write(sprintf("FormName = %s\r\n", species.real_form_name)) if species.real_form_name && !species.real_form_name.empty?
|
||||
f.write(sprintf("Generation = %d\r\n", species.generation)) if species.generation != 0
|
||||
@@ -370,15 +370,15 @@ module Compiler
|
||||
evs_array[s.pbs_order] = species.evs[s.id]
|
||||
end
|
||||
f.write(sprintf("BaseStats = %s\r\n", stats_array.join(","))) if species.base_stats != base_species.base_stats
|
||||
f.write(sprintf("BaseEXP = %d\r\n", species.base_exp)) if species.base_exp != base_species.base_exp
|
||||
f.write(sprintf("EffortPoints = %s\r\n", evs_array.join(","))) if species.evs != base_species.evs
|
||||
f.write(sprintf("Rareness = %d\r\n", species.catch_rate)) if species.catch_rate != base_species.catch_rate
|
||||
f.write(sprintf("BaseExp = %d\r\n", species.base_exp)) if species.base_exp != base_species.base_exp
|
||||
f.write(sprintf("EVs = %s\r\n", evs_array.join(","))) if species.evs != base_species.evs
|
||||
f.write(sprintf("CatchRate = %d\r\n", species.catch_rate)) if species.catch_rate != base_species.catch_rate
|
||||
f.write(sprintf("Happiness = %d\r\n", species.happiness)) if species.happiness != base_species.happiness
|
||||
if species.abilities.length > 0 && species.abilities != base_species.abilities
|
||||
f.write(sprintf("Abilities = %s\r\n", species.abilities.join(",")))
|
||||
end
|
||||
if species.hidden_abilities.length > 0 && species.hidden_abilities != base_species.hidden_abilities
|
||||
f.write(sprintf("HiddenAbility = %s\r\n", species.hidden_abilities.join(",")))
|
||||
f.write(sprintf("HiddenAbilities = %s\r\n", species.hidden_abilities.join(",")))
|
||||
end
|
||||
if species.moves.length > 0 && species.moves != base_species.moves
|
||||
f.write(sprintf("Moves = %s\r\n", species.moves.join(",")))
|
||||
@@ -390,9 +390,9 @@ module Compiler
|
||||
f.write(sprintf("EggMoves = %s\r\n", species.egg_moves.join(",")))
|
||||
end
|
||||
if species.egg_groups.length > 0 && species.egg_groups != base_species.egg_groups
|
||||
f.write(sprintf("Compatibility = %s\r\n", species.egg_groups.join(",")))
|
||||
f.write(sprintf("EggGroups = %s\r\n", species.egg_groups.join(",")))
|
||||
end
|
||||
f.write(sprintf("StepsToHatch = %d\r\n", species.hatch_steps)) if species.hatch_steps != base_species.hatch_steps
|
||||
f.write(sprintf("HatchSteps = %d\r\n", species.hatch_steps)) if species.hatch_steps != base_species.hatch_steps
|
||||
f.write(sprintf("Height = %.1f\r\n", species.height / 10.0)) if species.height != base_species.height
|
||||
f.write(sprintf("Weight = %.1f\r\n", species.weight / 10.0)) if species.weight != base_species.weight
|
||||
f.write(sprintf("Color = %s\r\n", species.color)) if species.color != base_species.color
|
||||
@@ -400,7 +400,7 @@ module Compiler
|
||||
if species.habitat != :None && species.habitat != base_species.habitat
|
||||
f.write(sprintf("Habitat = %s\r\n", species.habitat))
|
||||
end
|
||||
f.write(sprintf("Kind = %s\r\n", species.real_category)) if species.real_category != base_species.real_category
|
||||
f.write(sprintf("Category = %s\r\n", species.real_category)) if species.real_category != base_species.real_category
|
||||
f.write(sprintf("Pokedex = %s\r\n", species.real_pokedex_entry)) if species.real_pokedex_entry != base_species.real_pokedex_entry
|
||||
f.write(sprintf("Generation = %d\r\n", species.generation)) if species.generation != base_species.generation
|
||||
if species.wild_item_common != base_species.wild_item_common ||
|
||||
|
||||
Reference in New Issue
Block a user