Symbolised enums in module TrainersMetadata

This commit is contained in:
Maruno17
2020-09-07 22:52:59 +01:00
parent e987c10472
commit f82ed7f5dc
2 changed files with 36 additions and 36 deletions

View File

@@ -81,14 +81,14 @@ module PokemonMetadata
"WildCaptureME" => [MetadataWildCaptureME, "s"], "WildCaptureME" => [MetadataWildCaptureME, "s"],
"SurfBGM" => [MetadataSurfBGM, "s"], "SurfBGM" => [MetadataSurfBGM, "s"],
"BicycleBGM" => [MetadataBicycleBGM, "s"], "BicycleBGM" => [MetadataBicycleBGM, "s"],
"PlayerA" => [MetadataPlayerA, "esssssss",:PBTrainers], "PlayerA" => [MetadataPlayerA, "esssssss", :PBTrainers],
"PlayerB" => [MetadataPlayerB, "esssssss",:PBTrainers], "PlayerB" => [MetadataPlayerB, "esssssss", :PBTrainers],
"PlayerC" => [MetadataPlayerC, "esssssss",:PBTrainers], "PlayerC" => [MetadataPlayerC, "esssssss", :PBTrainers],
"PlayerD" => [MetadataPlayerD, "esssssss",:PBTrainers], "PlayerD" => [MetadataPlayerD, "esssssss", :PBTrainers],
"PlayerE" => [MetadataPlayerE, "esssssss",:PBTrainers], "PlayerE" => [MetadataPlayerE, "esssssss", :PBTrainers],
"PlayerF" => [MetadataPlayerF, "esssssss",:PBTrainers], "PlayerF" => [MetadataPlayerF, "esssssss", :PBTrainers],
"PlayerG" => [MetadataPlayerG, "esssssss",:PBTrainers], "PlayerG" => [MetadataPlayerG, "esssssss", :PBTrainers],
"PlayerH" => [MetadataPlayerH, "esssssss",:PBTrainers] "PlayerH" => [MetadataPlayerH, "esssssss", :PBTrainers]
} }
NonGlobalTypes = { NonGlobalTypes = {
"Outdoor" => [MetadataOutdoor, "b"], "Outdoor" => [MetadataOutdoor, "b"],
@@ -96,7 +96,7 @@ module PokemonMetadata
"Bicycle" => [MetadataBicycle, "b"], "Bicycle" => [MetadataBicycle, "b"],
"BicycleAlways" => [MetadataBicycleAlways, "b"], "BicycleAlways" => [MetadataBicycleAlways, "b"],
"HealingSpot" => [MetadataHealingSpot, "uuu"], "HealingSpot" => [MetadataHealingSpot, "uuu"],
"Weather" => [MetadataWeather, "eu",:PBFieldWeather], "Weather" => [MetadataWeather, "eu", :PBFieldWeather],
"MapPosition" => [MetadataMapPosition, "uuu"], "MapPosition" => [MetadataMapPosition, "uuu"],
"DiveMap" => [MetadataDiveMap, "u"], "DiveMap" => [MetadataDiveMap, "u"],
"DarkMap" => [MetadataDarkMap, "b"], "DarkMap" => [MetadataDarkMap, "b"],
@@ -110,7 +110,7 @@ module PokemonMetadata
"TrainerVictoryME" => [MetadataMapTrainerVictoryME, "s"], "TrainerVictoryME" => [MetadataMapTrainerVictoryME, "s"],
"WildCaptureME" => [MetadataMapWildCaptureME, "s"], "WildCaptureME" => [MetadataMapWildCaptureME, "s"],
"MapSize" => [MetadataMapSize, "us"], "MapSize" => [MetadataMapSize, "us"],
"Environment" => [MetadataEnvironment, "e",:PBEnvironment] "Environment" => [MetadataEnvironment, "e", :PBEnvironment]
} }
end end
@@ -156,41 +156,41 @@ MetricBattlerShadowSize = 6
module PokemonSpeciesData module PokemonSpeciesData
def self.requiredValues(compilingForms=false) def self.requiredValues(compilingForms=false)
ret = { ret = {
"Type1" => [SpeciesType1, "e",:PBTypes], "Type1" => [SpeciesType1, "e", :PBTypes],
"BaseStats" => [SpeciesBaseStats, "vvvvvv"], "BaseStats" => [SpeciesBaseStats, "vvvvvv"],
"BaseEXP" => [SpeciesBaseExp, "v"], "BaseEXP" => [SpeciesBaseExp, "v"],
"EffortPoints" => [SpeciesEffortPoints, "uuuuuu"], "EffortPoints" => [SpeciesEffortPoints, "uuuuuu"],
"Rareness" => [SpeciesRareness, "u"], "Rareness" => [SpeciesRareness, "u"],
"Happiness" => [SpeciesHappiness, "u"], "Happiness" => [SpeciesHappiness, "u"],
"Compatibility" => [SpeciesCompatibility, "eE",:PBEggGroups,:PBEggGroups], "Compatibility" => [SpeciesCompatibility, "eE", :PBEggGroups, :PBEggGroups],
"StepsToHatch" => [SpeciesStepsToHatch, "v"], "StepsToHatch" => [SpeciesStepsToHatch, "v"],
"Height" => [SpeciesHeight, "f"], "Height" => [SpeciesHeight, "f"],
"Weight" => [SpeciesWeight, "f"], "Weight" => [SpeciesWeight, "f"],
"Color" => [SpeciesColor, "e",:PBColors], "Color" => [SpeciesColor, "e", :PBColors],
"Shape" => [SpeciesShape, "u"], "Shape" => [SpeciesShape, "u"],
"Moves" => [0, "*ue",nil,:PBMoves], "Moves" => [0, "*ue", nil, :PBMoves],
"Kind" => [0, "s"], "Kind" => [0, "s"],
"Pokedex" => [0, "q"] "Pokedex" => [0, "q"]
} }
if !compilingForms if !compilingForms
ret["GenderRate"] = [SpeciesGenderRate, "e",:PBGenderRates] ret["GenderRate"] = [SpeciesGenderRate, "e", :PBGenderRates]
ret["GrowthRate"] = [SpeciesGrowthRate, "e",:PBGrowthRates] ret["GrowthRate"] = [SpeciesGrowthRate, "e", :PBGrowthRates]
ret["Name"] = [0, "s"] ret["Name"] = [0, "s"]
ret["InternalName"] = [0, "n"] ret["InternalName"] = [0, "n"]
end end
return ret return ret
end end
def self.optionalValues(compilingForms=false) def self.optionalValues(compilingForms = false)
ret = { ret = {
"Type2" => [SpeciesType2, "e",:PBTypes], "Type2" => [SpeciesType2, "e", :PBTypes],
"Abilities" => [SpeciesAbilities, "eE",:PBAbilities,:PBAbilities], "Abilities" => [SpeciesAbilities, "eE", :PBAbilities, :PBAbilities],
"HiddenAbility" => [SpeciesHiddenAbility, "eEEE",:PBAbilities,:PBAbilities, "HiddenAbility" => [SpeciesHiddenAbility, "eEEE", :PBAbilities, :PBAbilities,
:PBAbilities,:PBAbilities], :PBAbilities, :PBAbilities],
"Habitat" => [SpeciesHabitat, "e",:PBHabitats], "Habitat" => [SpeciesHabitat, "e", :PBHabitats],
"WildItemCommon" => [SpeciesWildItemCommon, "e",:PBItems], "WildItemCommon" => [SpeciesWildItemCommon, "e", :PBItems],
"WildItemUncommon" => [SpeciesWildItemUncommon, "e",:PBItems], "WildItemUncommon" => [SpeciesWildItemUncommon, "e", :PBItems],
"WildItemRare" => [SpeciesWildItemRare, "e",:PBItems], "WildItemRare" => [SpeciesWildItemRare, "e", :PBItems],
"BattlerPlayerX" => [MetricBattlerPlayerX, "i"], "BattlerPlayerX" => [MetricBattlerPlayerX, "i"],
"BattlerPlayerY" => [MetricBattlerPlayerY, "i"], "BattlerPlayerY" => [MetricBattlerPlayerY, "i"],
"BattlerEnemyX" => [MetricBattlerEnemyX, "i"], "BattlerEnemyX" => [MetricBattlerEnemyX, "i"],
@@ -198,18 +198,18 @@ module PokemonSpeciesData
"BattlerAltitude" => [MetricBattlerAltitude, "i"], "BattlerAltitude" => [MetricBattlerAltitude, "i"],
"BattlerShadowX" => [MetricBattlerShadowX, "i"], "BattlerShadowX" => [MetricBattlerShadowX, "i"],
"BattlerShadowSize" => [MetricBattlerShadowSize, "u"], "BattlerShadowSize" => [MetricBattlerShadowSize, "u"],
"EggMoves" => [0, "*e",:PBMoves], "EggMoves" => [0, "*e", :PBMoves],
"FormName" => [0, "q"], "FormName" => [0, "q"],
"Evolutions" => [0, "*ses",nil,:PBEvolution,nil] "Evolutions" => [0, "*ses", nil, :PBEvolution, nil]
} }
if compilingForms if compilingForms
ret["PokedexForm"] = [SpeciesPokedexForm, "u"] ret["PokedexForm"] = [SpeciesPokedexForm, "u"]
ret["MegaStone"] = [SpeciesMegaStone, "e",:PBItems] ret["MegaStone"] = [SpeciesMegaStone, "e", :PBItems]
ret["MegaMove"] = [SpeciesMegaMove, "e",:PBMoves] ret["MegaMove"] = [SpeciesMegaMove, "e", :PBMoves]
ret["UnmegaForm"] = [SpeciesUnmegaForm, "u"] ret["UnmegaForm"] = [SpeciesUnmegaForm, "u"]
ret["MegaMessage"] = [SpeciesMegaMessage, "u"] ret["MegaMessage"] = [SpeciesMegaMessage, "u"]
else else
ret["Incense"] = [SpeciesIncense, "e",:PBItems] ret["Incense"] = [SpeciesIncense, "e", :PBItems]
ret["RegionalNumbers"] = [0, "*u"] ret["RegionalNumbers"] = [0, "*u"]
end end
return ret return ret

View File

@@ -20,17 +20,17 @@ TPLOSETEXT = 15
module TrainersMetadata module TrainersMetadata
InfoTypes = { InfoTypes = {
"Items" => [0, "eEEEEEEE", PBItems, PBItems, PBItems, PBItems, "Items" => [0, "eEEEEEEE", :PBItems, :PBItems, :PBItems, :PBItems,
PBItems, PBItems, PBItems, PBItems], :PBItems, :PBItems, :PBItems, :PBItems],
"Pokemon" => [TPSPECIES, "ev", PBSpecies,nil], # Species, level "Pokemon" => [TPSPECIES, "ev", :PBSpecies,nil], # Species, level
"Item" => [TPITEM, "e", PBItems], "Item" => [TPITEM, "e", :PBItems],
"Moves" => [TPMOVES, "eEEE", PBMoves, PBMoves, PBMoves, PBMoves], "Moves" => [TPMOVES, "eEEE", :PBMoves, :PBMoves, :PBMoves, :PBMoves],
"Ability" => [TPABILITY, "u"], "Ability" => [TPABILITY, "u"],
"Gender" => [TPGENDER, "e", { "M" => 0, "m" => 0, "Male" => 0, "male" => 0, "0" => 0, "Gender" => [TPGENDER, "e", { "M" => 0, "m" => 0, "Male" => 0, "male" => 0, "0" => 0,
"F" => 1, "f" => 1, "Female" => 1, "female" => 1, "1" => 1 }], "F" => 1, "f" => 1, "Female" => 1, "female" => 1, "1" => 1 }],
"Form" => [TPFORM, "u"], "Form" => [TPFORM, "u"],
"Shiny" => [TPSHINY, "b"], "Shiny" => [TPSHINY, "b"],
"Nature" => [TPNATURE, "e", PBNatures], "Nature" => [TPNATURE, "e", :PBNatures],
"IV" => [TPIV, "uUUUUU"], "IV" => [TPIV, "uUUUUU"],
"Happiness" => [TPHAPPINESS, "u"], "Happiness" => [TPHAPPINESS, "u"],
"Name" => [TPNAME, "s"], "Name" => [TPNAME, "s"],