Fixed demo party not clearing the party before adding itself, fixed Pokémon icon renamer/mover not moving shiny Pokémon icons properly, added GameData#Something#keys method

This commit is contained in:
Maruno17
2021-04-28 23:27:11 +01:00
parent 1685bbc4d4
commit 5130b097ce
3 changed files with 22 additions and 1 deletions

View File

@@ -46,6 +46,12 @@ module GameData
return (self::DATA.has_key?(other)) ? self::DATA[other] : nil return (self::DATA.has_key?(other)) ? self::DATA[other] : nil
end end
# Returns the array of keys for the data.
# @return [Array]
def keys
return self::DATA.keys
end
# Yields all data in order of their id_number. # Yields all data in order of their id_number.
def each def each
keys = self::DATA.keys.sort { |a, b| self::DATA[a].id_number <=> self::DATA[b].id_number } keys = self::DATA.keys.sort { |a, b| self::DATA[a].id_number <=> self::DATA[b].id_number }
@@ -102,6 +108,12 @@ module GameData
return (self::DATA.has_key?(other)) ? self::DATA[other] : nil return (self::DATA.has_key?(other)) ? self::DATA[other] : nil
end end
# Returns the array of keys for the data.
# @return [Array]
def keys
return self::DATA.keys
end
# Yields all data in alphabetical order. # Yields all data in alphabetical order.
def each def each
keys = self::DATA.keys.sort { |a, b| self::DATA[a].real_name <=> self::DATA[b].real_name } keys = self::DATA.keys.sort { |a, b| self::DATA[a].real_name <=> self::DATA[b].real_name }
@@ -153,6 +165,12 @@ module GameData
return (self::DATA.has_key?(other)) ? self::DATA[other] : nil return (self::DATA.has_key?(other)) ? self::DATA[other] : nil
end end
# Returns the array of keys for the data.
# @return [Array]
def keys
return self::DATA.keys
end
# Yields all data in numberical order. # Yields all data in numberical order.
def each def each
keys = self::DATA.keys.sort keys = self::DATA.keys.sort

View File

@@ -543,6 +543,7 @@ DebugMenuCommands.register("demoparty", {
for id in species for id in species
party.push(id) if GameData::Species.exists?(id) party.push(id) if GameData::Species.exists?(id)
end end
$Trainer.party.clear
# Generate Pokémon of each species at level 20 # Generate Pokémon of each species at level 20
party.each do |species| party.each do |species|
pkmn = Pokemon.new(species, 20) pkmn = Pokemon.new(species, 20)

View File

@@ -56,6 +56,8 @@ module Compiler
else else
prefix = (name[/b/]) ? "Back/" : "Front/" prefix = (name[/b/]) ? "Back/" : "Front/"
end end
elsif default_prefix == "Icons/"
prefix = "Icons shiny/" if name[/s/] && !name[/shadow/]
end end
if name[/000/] if name[/000/]
species = "000" species = "000"
@@ -69,7 +71,7 @@ module Compiler
shadow = "_shadow" if name[/_shadow/] shadow = "_shadow" if name[/_shadow/]
if name[/egg/] if name[/egg/]
prefix = "Eggs/" prefix = "Eggs/"
crack = "_icon" if default_prefix == "Icons/" crack = "_icon" if default_prefix == "Icons/" || default_prefix == "Icons shiny/"
crack = "_cracks" if name[/eggCracks/] crack = "_cracks" if name[/eggCracks/]
end end
end end