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

Moved egg icons into Graphics/Pokemon/Eggs

Browse Source
This commit is contained in:
Maruno17
2020-12-31 14:18:40 +00:00
parent 20f501c440
commit 5e885cf619
2 changed files with 10 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
Data/Scripts/011_Data/001_Game data/011_Species files.rb
View File

@@ -39,19 +39,19 @@ module GameData
return nil return nil
end end
def self.check_egg_graphic_file(path, species, form) def self.check_egg_graphic_file(path, species, form, suffix = "")
species_data = self.get_species_form(species, form) species_data = self.get_species_form(species, form)
return nil if species_data.nil? return nil if species_data.nil?
species_id = self.get(species_data.species).id_number species_id = self.get(species_data.species).id_number
if form > 0 if form > 0
ret = pbResolveBitmap(sprintf("%s%s_%d", path, species_data.species, form)) ret = pbResolveBitmap(sprintf("%s%s_%d%s", path, species_data.species, form, suffix))
return ret if ret return ret if ret
ret = pbResolveBitmap(sprintf("%s%03d_%d", path, species_id, form)) ret = pbResolveBitmap(sprintf("%s%03d_%d%s", path, species_id, form, suffix))
return ret if ret return ret if ret
end end
ret = pbResolveBitmap(sprintf("%s%s", path, species_data.species)) ret = pbResolveBitmap(sprintf("%s%s%s", path, species_data.species, suffix))
return ret if ret return ret if ret
return pbResolveBitmap(sprintf("%s%03d", path, species_id)) return pbResolveBitmap(sprintf("%s%03d%s", path, species_id, suffix))
end end
def self.front_sprite_filename(species, form = 0, gender = 0, shiny = false, shadow = false) def self.front_sprite_filename(species, form = 0, gender = 0, shiny = false, shadow = false)
@@ -116,8 +116,8 @@ module GameData
#=========================================================================== #===========================================================================
def self.egg_icon_filename(species, form) def self.egg_icon_filename(species, form)
ret = self.check_egg_graphic_file("Graphics/Pokemon/Icons", species, form) ret = self.check_egg_graphic_file("Graphics/Pokemon/Icons", species, form, "_icon")
return (ret) ? ret : pbResolveBitmap("Graphics/Pokemon/Icons/000_egg") return (ret) ? ret : pbResolveBitmap("Graphics/Pokemon/Eggs/000_icon")
end end
def self.icon_filename(species, form = 0, gender = 0, shiny = false, shadow = false, egg = false) def self.icon_filename(species, form = 0, gender = 0, shiny = false, shadow = false, egg = false)

5
Data/Scripts/022_Compiler/005_Compiler_Sprite renamer.rb
View File

@@ -68,7 +68,8 @@ module Compiler
female = "_female" if name[/f/] female = "_female" if name[/f/]
shadow = "_shadow" if name[/_shadow/] shadow = "_shadow" if name[/_shadow/]
if name[/egg/] if name[/egg/]
(default_prefix == "") ? prefix = "Eggs/" : crack = "_egg" prefix = "Eggs/"
crack = "_icon" if default_prefix == "Icons/"
crack = "_cracks" if name[/eggCracks/] crack = "_cracks" if name[/eggCracks/]
end end
end end
@@ -110,7 +111,7 @@ module Compiler
pbSetWindowText(_INTL("Converting Pokémon icons {1}/{2}...", i, files.length)) if i % 50 == 0 pbSetWindowText(_INTL("Converting Pokémon icons {1}/{2}...", i, files.length)) if i % 50 == 0
case file case file
when "iconEgg.png" when "iconEgg.png"
File.move(src_dir + file, dest_dir + "Icons/000_egg.png") File.move(src_dir + file, dest_dir + "Eggs/000_egg.png")
else else
next if !file[/^icon\d{3}[^\.]*\.[^\.]*$/] next if !file[/^icon\d{3}[^\.]*\.[^\.]*$/]
new_filename = convert_pokemon_filename(file.sub(/^icon/, ''), "Icons/") new_filename = convert_pokemon_filename(file.sub(/^icon/, ''), "Icons/")