diff --git a/Tupfile.lua b/Tupfile.lua index 0759de94..e5639594 100644 --- a/Tupfile.lua +++ b/Tupfile.lua @@ -14,17 +14,26 @@ function padsprite(input, output, w, h) ) end -for dir in iter{"asymmetrical", "custom", "misc", "pokemon"} do - for file in iglob{"src/canonical/minisprites/gen6/" .. dir .. "/*"} do - padsprite(file, - "build/gen6-minisprites-padded/" .. dir .. "/" .. tup.file(file), - 40, 30) +for canon in iter{"canonical", "noncanonical"} do + for dir in iter{"asymmetrical", "custom", "misc", "pokemon"} do + -- TODO fix this, tup hates git's quirk of not creating directories when + -- there aren't any files + if canon == "noncanonical" and dir ~= "pokemon" then + goto continue + end + + for file in iglob{"src/" .. canon .. "/minisprites/gen6/" .. dir .. "/*"} do + padsprite(file, + "build/gen6-minisprites-padded/" .. canon .. "/" .. dir .. "/" .. tup.file(file), + 40, 30) + end + ::continue:: end end -- Forum sprites -for file in iglob{"build/gen6-minisprites-padded/pokemon/*"} do +for file in iglob{"build/gen6-minisprites-padded/canonical/pokemon/*", "build/gen6-minisprites-padded/noncanonical/pokemon/*"} do local base = toSmogonAlias(decodeBase(file)) symlink(file, "build/smogon/forumsprites/" .. base .. ".png") @@ -33,8 +42,8 @@ end -- PS spritesheet tup.rule( - "build/gen6-minisprites-padded/pokemon/*", - "node tools/sprites/ps.js build/gen6-minisprites-padded/pokemon/ --output-image build/ps/pokemonicons-sheet.png --output-metadata build/ps/pokemonicons.json", + {"build/gen6-minisprites-padded/canonical/pokemon/*", "build/gen6-minisprites-padded/noncanonical/pokemon/*"}, + "node tools/sprites/ps.js build/gen6-minisprites-padded/canonical/pokemon/ build/gen6-minisprites-padded/noncanonical/pokemon/ --output-image build/ps/pokemonicons-sheet.png --output-metadata build/ps/pokemonicons.json", {"build/ps/pokemonicons-sheet.png", "build/ps/pokemonicons.json"} ) diff --git a/src/canonical/minisprites/gen5/pokemon/Arghonaut.png b/src/noncanonical/minisprites/gen5/pokemon/Arghonaut.png similarity index 100% rename from src/canonical/minisprites/gen5/pokemon/Arghonaut.png rename to src/noncanonical/minisprites/gen5/pokemon/Arghonaut.png diff --git a/src/canonical/minisprites/gen5/pokemon/Colossoil.png b/src/noncanonical/minisprites/gen5/pokemon/Colossoil.png similarity index 100% rename from src/canonical/minisprites/gen5/pokemon/Colossoil.png rename to src/noncanonical/minisprites/gen5/pokemon/Colossoil.png diff --git a/src/canonical/minisprites/gen5/pokemon/Cyclohm.png b/src/noncanonical/minisprites/gen5/pokemon/Cyclohm.png similarity index 100% rename from src/canonical/minisprites/gen5/pokemon/Cyclohm.png rename to src/noncanonical/minisprites/gen5/pokemon/Cyclohm.png diff --git a/src/canonical/minisprites/gen5/pokemon/Fidgit.png b/src/noncanonical/minisprites/gen5/pokemon/Fidgit.png similarity index 100% rename from src/canonical/minisprites/gen5/pokemon/Fidgit.png rename to src/noncanonical/minisprites/gen5/pokemon/Fidgit.png diff --git a/src/canonical/minisprites/gen5/pokemon/Kitsunoh.png b/src/noncanonical/minisprites/gen5/pokemon/Kitsunoh.png similarity index 100% rename from src/canonical/minisprites/gen5/pokemon/Kitsunoh.png rename to src/noncanonical/minisprites/gen5/pokemon/Kitsunoh.png diff --git a/src/canonical/minisprites/gen5/pokemon/Krilowatt.png b/src/noncanonical/minisprites/gen5/pokemon/Krilowatt.png similarity index 100% rename from src/canonical/minisprites/gen5/pokemon/Krilowatt.png rename to src/noncanonical/minisprites/gen5/pokemon/Krilowatt.png diff --git a/src/canonical/minisprites/gen5/pokemon/Necturna.png b/src/noncanonical/minisprites/gen5/pokemon/Necturna.png similarity index 100% rename from src/canonical/minisprites/gen5/pokemon/Necturna.png rename to src/noncanonical/minisprites/gen5/pokemon/Necturna.png diff --git a/src/canonical/minisprites/gen5/pokemon/Pyroak.png b/src/noncanonical/minisprites/gen5/pokemon/Pyroak.png similarity index 100% rename from src/canonical/minisprites/gen5/pokemon/Pyroak.png rename to src/noncanonical/minisprites/gen5/pokemon/Pyroak.png diff --git a/src/canonical/minisprites/gen5/pokemon/Revenankh.png b/src/noncanonical/minisprites/gen5/pokemon/Revenankh.png similarity index 100% rename from src/canonical/minisprites/gen5/pokemon/Revenankh.png rename to src/noncanonical/minisprites/gen5/pokemon/Revenankh.png diff --git a/src/canonical/minisprites/gen5/pokemon/Stratagem.png b/src/noncanonical/minisprites/gen5/pokemon/Stratagem.png similarity index 100% rename from src/canonical/minisprites/gen5/pokemon/Stratagem.png rename to src/noncanonical/minisprites/gen5/pokemon/Stratagem.png diff --git a/src/canonical/minisprites/gen5/pokemon/Syclant.png b/src/noncanonical/minisprites/gen5/pokemon/Syclant.png similarity index 100% rename from src/canonical/minisprites/gen5/pokemon/Syclant.png rename to src/noncanonical/minisprites/gen5/pokemon/Syclant.png diff --git a/src/canonical/minisprites/gen5/pokemon/Tomohawk.png b/src/noncanonical/minisprites/gen5/pokemon/Tomohawk.png similarity index 100% rename from src/canonical/minisprites/gen5/pokemon/Tomohawk.png rename to src/noncanonical/minisprites/gen5/pokemon/Tomohawk.png diff --git a/src/canonical/minisprites/gen5/pokemon/Voodoom.png b/src/noncanonical/minisprites/gen5/pokemon/Voodoom.png similarity index 100% rename from src/canonical/minisprites/gen5/pokemon/Voodoom.png rename to src/noncanonical/minisprites/gen5/pokemon/Voodoom.png diff --git a/src/canonical/minisprites/gen6/pokemon/Argalis.png b/src/noncanonical/minisprites/gen6/pokemon/Argalis.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Argalis.png rename to src/noncanonical/minisprites/gen6/pokemon/Argalis.png diff --git a/src/canonical/minisprites/gen6/pokemon/Arghonaut.png b/src/noncanonical/minisprites/gen6/pokemon/Arghonaut.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Arghonaut.png rename to src/noncanonical/minisprites/gen6/pokemon/Arghonaut.png diff --git a/src/canonical/minisprites/gen6/pokemon/Aurumoth.png b/src/noncanonical/minisprites/gen6/pokemon/Aurumoth.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Aurumoth.png rename to src/noncanonical/minisprites/gen6/pokemon/Aurumoth.png diff --git a/src/canonical/minisprites/gen6/pokemon/Brattler.png b/src/noncanonical/minisprites/gen6/pokemon/Brattler.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Brattler.png rename to src/noncanonical/minisprites/gen6/pokemon/Brattler.png diff --git a/src/canonical/minisprites/gen6/pokemon/Breezi.png b/src/noncanonical/minisprites/gen6/pokemon/Breezi.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Breezi.png rename to src/noncanonical/minisprites/gen6/pokemon/Breezi.png diff --git a/src/canonical/minisprites/gen6/pokemon/Caimanoe.png b/src/noncanonical/minisprites/gen6/pokemon/Caimanoe.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Caimanoe.png rename to src/noncanonical/minisprites/gen6/pokemon/Caimanoe.png diff --git a/src/canonical/minisprites/gen6/pokemon/Caribolt.png b/src/noncanonical/minisprites/gen6/pokemon/Caribolt.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Caribolt.png rename to src/noncanonical/minisprites/gen6/pokemon/Caribolt.png diff --git a/src/canonical/minisprites/gen6/pokemon/Cawdet.png b/src/noncanonical/minisprites/gen6/pokemon/Cawdet.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Cawdet.png rename to src/noncanonical/minisprites/gen6/pokemon/Cawdet.png diff --git a/src/canonical/minisprites/gen6/pokemon/Cawmodore.png b/src/noncanonical/minisprites/gen6/pokemon/Cawmodore.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Cawmodore.png rename to src/noncanonical/minisprites/gen6/pokemon/Cawmodore.png diff --git a/src/canonical/minisprites/gen6/pokemon/Colossoil.png b/src/noncanonical/minisprites/gen6/pokemon/Colossoil.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Colossoil.png rename to src/noncanonical/minisprites/gen6/pokemon/Colossoil.png diff --git a/src/canonical/minisprites/gen6/pokemon/Coribalis.png b/src/noncanonical/minisprites/gen6/pokemon/Coribalis.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Coribalis.png rename to src/noncanonical/minisprites/gen6/pokemon/Coribalis.png diff --git a/src/canonical/minisprites/gen6/pokemon/Crucibelle--Mega.png b/src/noncanonical/minisprites/gen6/pokemon/Crucibelle--Mega.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Crucibelle--Mega.png rename to src/noncanonical/minisprites/gen6/pokemon/Crucibelle--Mega.png diff --git a/src/canonical/minisprites/gen6/pokemon/Crucibelle.png b/src/noncanonical/minisprites/gen6/pokemon/Crucibelle.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Crucibelle.png rename to src/noncanonical/minisprites/gen6/pokemon/Crucibelle.png diff --git a/src/canonical/minisprites/gen6/pokemon/Cupra.png b/src/noncanonical/minisprites/gen6/pokemon/Cupra.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Cupra.png rename to src/noncanonical/minisprites/gen6/pokemon/Cupra.png diff --git a/src/canonical/minisprites/gen6/pokemon/Cyclohm.png b/src/noncanonical/minisprites/gen6/pokemon/Cyclohm.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Cyclohm.png rename to src/noncanonical/minisprites/gen6/pokemon/Cyclohm.png diff --git a/src/canonical/minisprites/gen6/pokemon/Electrelk.png b/src/noncanonical/minisprites/gen6/pokemon/Electrelk.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Electrelk.png rename to src/noncanonical/minisprites/gen6/pokemon/Electrelk.png diff --git a/src/canonical/minisprites/gen6/pokemon/Embirch.png b/src/noncanonical/minisprites/gen6/pokemon/Embirch.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Embirch.png rename to src/noncanonical/minisprites/gen6/pokemon/Embirch.png diff --git a/src/canonical/minisprites/gen6/pokemon/Equilibra.png b/src/noncanonical/minisprites/gen6/pokemon/Equilibra.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Equilibra.png rename to src/noncanonical/minisprites/gen6/pokemon/Equilibra.png diff --git a/src/canonical/minisprites/gen6/pokemon/Fawnifer.png b/src/noncanonical/minisprites/gen6/pokemon/Fawnifer.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Fawnifer.png rename to src/noncanonical/minisprites/gen6/pokemon/Fawnifer.png diff --git a/src/canonical/minisprites/gen6/pokemon/Fidgit.png b/src/noncanonical/minisprites/gen6/pokemon/Fidgit.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Fidgit.png rename to src/noncanonical/minisprites/gen6/pokemon/Fidgit.png diff --git a/src/canonical/minisprites/gen6/pokemon/Flarelm.png b/src/noncanonical/minisprites/gen6/pokemon/Flarelm.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Flarelm.png rename to src/noncanonical/minisprites/gen6/pokemon/Flarelm.png diff --git a/src/canonical/minisprites/gen6/pokemon/Floatoy.png b/src/noncanonical/minisprites/gen6/pokemon/Floatoy.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Floatoy.png rename to src/noncanonical/minisprites/gen6/pokemon/Floatoy.png diff --git a/src/canonical/minisprites/gen6/pokemon/Jumbao.png b/src/noncanonical/minisprites/gen6/pokemon/Jumbao.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Jumbao.png rename to src/noncanonical/minisprites/gen6/pokemon/Jumbao.png diff --git a/src/canonical/minisprites/gen6/pokemon/Kerfluffle.png b/src/noncanonical/minisprites/gen6/pokemon/Kerfluffle.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Kerfluffle.png rename to src/noncanonical/minisprites/gen6/pokemon/Kerfluffle.png diff --git a/src/canonical/minisprites/gen6/pokemon/Kitsunoh.png b/src/noncanonical/minisprites/gen6/pokemon/Kitsunoh.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Kitsunoh.png rename to src/noncanonical/minisprites/gen6/pokemon/Kitsunoh.png diff --git a/src/canonical/minisprites/gen6/pokemon/Krilowatt.png b/src/noncanonical/minisprites/gen6/pokemon/Krilowatt.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Krilowatt.png rename to src/noncanonical/minisprites/gen6/pokemon/Krilowatt.png diff --git a/src/canonical/minisprites/gen6/pokemon/Malaconda.png b/src/noncanonical/minisprites/gen6/pokemon/Malaconda.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Malaconda.png rename to src/noncanonical/minisprites/gen6/pokemon/Malaconda.png diff --git a/src/canonical/minisprites/gen6/pokemon/Mollux.png b/src/noncanonical/minisprites/gen6/pokemon/Mollux.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Mollux.png rename to src/noncanonical/minisprites/gen6/pokemon/Mollux.png diff --git a/src/canonical/minisprites/gen6/pokemon/Mumbao.png b/src/noncanonical/minisprites/gen6/pokemon/Mumbao.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Mumbao.png rename to src/noncanonical/minisprites/gen6/pokemon/Mumbao.png diff --git a/src/canonical/minisprites/gen6/pokemon/Naviathan.png b/src/noncanonical/minisprites/gen6/pokemon/Naviathan.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Naviathan.png rename to src/noncanonical/minisprites/gen6/pokemon/Naviathan.png diff --git a/src/canonical/minisprites/gen6/pokemon/Necturine.png b/src/noncanonical/minisprites/gen6/pokemon/Necturine.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Necturine.png rename to src/noncanonical/minisprites/gen6/pokemon/Necturine.png diff --git a/src/canonical/minisprites/gen6/pokemon/Necturna.png b/src/noncanonical/minisprites/gen6/pokemon/Necturna.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Necturna.png rename to src/noncanonical/minisprites/gen6/pokemon/Necturna.png diff --git a/src/canonical/minisprites/gen6/pokemon/Pajantom.png b/src/noncanonical/minisprites/gen6/pokemon/Pajantom.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Pajantom.png rename to src/noncanonical/minisprites/gen6/pokemon/Pajantom.png diff --git a/src/canonical/minisprites/gen6/pokemon/Plasmanta.png b/src/noncanonical/minisprites/gen6/pokemon/Plasmanta.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Plasmanta.png rename to src/noncanonical/minisprites/gen6/pokemon/Plasmanta.png diff --git a/src/canonical/minisprites/gen6/pokemon/Pluffle.png b/src/noncanonical/minisprites/gen6/pokemon/Pluffle.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Pluffle.png rename to src/noncanonical/minisprites/gen6/pokemon/Pluffle.png diff --git a/src/canonical/minisprites/gen6/pokemon/Privatyke.png b/src/noncanonical/minisprites/gen6/pokemon/Privatyke.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Privatyke.png rename to src/noncanonical/minisprites/gen6/pokemon/Privatyke.png diff --git a/src/canonical/minisprites/gen6/pokemon/Pyroak.png b/src/noncanonical/minisprites/gen6/pokemon/Pyroak.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Pyroak.png rename to src/noncanonical/minisprites/gen6/pokemon/Pyroak.png diff --git a/src/canonical/minisprites/gen6/pokemon/Rebble.png b/src/noncanonical/minisprites/gen6/pokemon/Rebble.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Rebble.png rename to src/noncanonical/minisprites/gen6/pokemon/Rebble.png diff --git a/src/canonical/minisprites/gen6/pokemon/Revenankh.png b/src/noncanonical/minisprites/gen6/pokemon/Revenankh.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Revenankh.png rename to src/noncanonical/minisprites/gen6/pokemon/Revenankh.png diff --git a/src/canonical/minisprites/gen6/pokemon/Scratchet.png b/src/noncanonical/minisprites/gen6/pokemon/Scratchet.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Scratchet.png rename to src/noncanonical/minisprites/gen6/pokemon/Scratchet.png diff --git a/src/canonical/minisprites/gen6/pokemon/Smogecko.png b/src/noncanonical/minisprites/gen6/pokemon/Smogecko.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Smogecko.png rename to src/noncanonical/minisprites/gen6/pokemon/Smogecko.png diff --git a/src/canonical/minisprites/gen6/pokemon/Smoguana.png b/src/noncanonical/minisprites/gen6/pokemon/Smoguana.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Smoguana.png rename to src/noncanonical/minisprites/gen6/pokemon/Smoguana.png diff --git a/src/canonical/minisprites/gen6/pokemon/Smokomodo.png b/src/noncanonical/minisprites/gen6/pokemon/Smokomodo.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Smokomodo.png rename to src/noncanonical/minisprites/gen6/pokemon/Smokomodo.png diff --git a/src/canonical/minisprites/gen6/pokemon/Snaelstrom.png b/src/noncanonical/minisprites/gen6/pokemon/Snaelstrom.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Snaelstrom.png rename to src/noncanonical/minisprites/gen6/pokemon/Snaelstrom.png diff --git a/src/canonical/minisprites/gen6/pokemon/Snugglow.png b/src/noncanonical/minisprites/gen6/pokemon/Snugglow.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Snugglow.png rename to src/noncanonical/minisprites/gen6/pokemon/Snugglow.png diff --git a/src/canonical/minisprites/gen6/pokemon/Stratagem.png b/src/noncanonical/minisprites/gen6/pokemon/Stratagem.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Stratagem.png rename to src/noncanonical/minisprites/gen6/pokemon/Stratagem.png diff --git a/src/canonical/minisprites/gen6/pokemon/Swirlpool.png b/src/noncanonical/minisprites/gen6/pokemon/Swirlpool.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Swirlpool.png rename to src/noncanonical/minisprites/gen6/pokemon/Swirlpool.png diff --git a/src/canonical/minisprites/gen6/pokemon/Syclant.png b/src/noncanonical/minisprites/gen6/pokemon/Syclant.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Syclant.png rename to src/noncanonical/minisprites/gen6/pokemon/Syclant.png diff --git a/src/canonical/minisprites/gen6/pokemon/Syclar.png b/src/noncanonical/minisprites/gen6/pokemon/Syclar.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Syclar.png rename to src/noncanonical/minisprites/gen6/pokemon/Syclar.png diff --git a/src/canonical/minisprites/gen6/pokemon/Tactite.png b/src/noncanonical/minisprites/gen6/pokemon/Tactite.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Tactite.png rename to src/noncanonical/minisprites/gen6/pokemon/Tactite.png diff --git a/src/canonical/minisprites/gen6/pokemon/Tomohawk.png b/src/noncanonical/minisprites/gen6/pokemon/Tomohawk.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Tomohawk.png rename to src/noncanonical/minisprites/gen6/pokemon/Tomohawk.png diff --git a/src/canonical/minisprites/gen6/pokemon/Volkraken.png b/src/noncanonical/minisprites/gen6/pokemon/Volkraken.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Volkraken.png rename to src/noncanonical/minisprites/gen6/pokemon/Volkraken.png diff --git a/src/canonical/minisprites/gen6/pokemon/Volkritter.png b/src/noncanonical/minisprites/gen6/pokemon/Volkritter.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Volkritter.png rename to src/noncanonical/minisprites/gen6/pokemon/Volkritter.png diff --git a/src/canonical/minisprites/gen6/pokemon/Voodoll.png b/src/noncanonical/minisprites/gen6/pokemon/Voodoll.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Voodoll.png rename to src/noncanonical/minisprites/gen6/pokemon/Voodoll.png diff --git a/src/canonical/minisprites/gen6/pokemon/Voodoom.png b/src/noncanonical/minisprites/gen6/pokemon/Voodoom.png similarity index 100% rename from src/canonical/minisprites/gen6/pokemon/Voodoom.png rename to src/noncanonical/minisprites/gen6/pokemon/Voodoom.png