From 9dcb1c6f551fb41af14c1af28ff1932af19adfbd Mon Sep 17 00:00:00 2001 From: Christopher Monsanto Date: Thu, 16 Apr 2020 17:59:20 -0400 Subject: [PATCH] Move CAPs out of canonical --- Tupfile.lua | 10 +++++----- .../models/back/Aurumoth.gif | Bin .../models/back/Caribolt.gif | Bin .../models/back/Cawmodore.gif | Bin .../models/back/Crucibelle--Mega.gif | Bin .../models/back/Crucibelle.gif | Bin .../models/back/Equilibra.gif | Bin .../models/back/Fidgit.gif | Bin .../models/back/Jumbao.gif | Bin .../models/back/Kerfluffle.gif | Bin .../models/back/Krilowatt.gif | Bin .../models/back/Malaconda.gif | Bin .../models/back/Mollux.gif | Bin .../models/back/Naviathan.gif | Bin .../models/back/Necturna.gif | Bin .../models/back/Pajantom.gif | Bin .../models/back/Plasmanta.gif | Bin .../models/back/Pluffle.gif | Bin .../models/back/Scratchet.gif | Bin .../models/back/Smogecko.gif | Bin .../models/back/Smokomodo.gif | Bin .../models/back/Snaelstrom.gif | Bin .../models/back/Stratagem.gif | Bin .../models/back/Tomohawk.gif | Bin .../models/back/Volkraken.gif | Bin .../models/front/Aurumoth.gif | Bin .../models/front/Caribolt.gif | Bin .../models/front/Cawmodore.gif | Bin .../models/front/Crucibelle--Mega.gif | Bin .../models/front/Crucibelle.gif | Bin .../models/front/Equilibra.gif | Bin .../models/front/Fidgit.gif | Bin .../models/front/Jumbao.gif | Bin .../models/front/Kerfluffle.gif | Bin .../models/front/Krilowatt.gif | Bin .../models/front/Malaconda.gif | Bin .../models/front/Mollux.gif | Bin .../models/front/Naviathan.gif | Bin .../models/front/Necturna.gif | Bin .../models/front/Pajantom.gif | Bin .../models/front/Plasmanta.gif | Bin .../models/front/Pluffle.gif | Bin .../models/front/Pyroak.gif | Bin .../models/front/Scratchet.gif | Bin .../models/front/Smogecko.gif | Bin .../models/front/Smokomodo.gif | Bin .../models/front/Snaelstrom.gif | Bin .../models/front/Stratagem.gif | Bin .../models/front/Tomohawk.gif | Bin .../models/front/Volkraken.gif | Bin 50 files changed, 5 insertions(+), 5 deletions(-) rename src/{canonical => noncanonical}/models/back/Aurumoth.gif (100%) rename src/{canonical => noncanonical}/models/back/Caribolt.gif (100%) rename src/{canonical => noncanonical}/models/back/Cawmodore.gif (100%) rename src/{canonical => noncanonical}/models/back/Crucibelle--Mega.gif (100%) rename src/{canonical => noncanonical}/models/back/Crucibelle.gif (100%) rename src/{canonical => noncanonical}/models/back/Equilibra.gif (100%) rename src/{canonical => noncanonical}/models/back/Fidgit.gif (100%) rename src/{canonical => noncanonical}/models/back/Jumbao.gif (100%) rename src/{canonical => noncanonical}/models/back/Kerfluffle.gif (100%) rename src/{canonical => noncanonical}/models/back/Krilowatt.gif (100%) rename src/{canonical => noncanonical}/models/back/Malaconda.gif (100%) rename src/{canonical => noncanonical}/models/back/Mollux.gif (100%) rename src/{canonical => noncanonical}/models/back/Naviathan.gif (100%) rename src/{canonical => noncanonical}/models/back/Necturna.gif (100%) rename src/{canonical => noncanonical}/models/back/Pajantom.gif (100%) rename src/{canonical => noncanonical}/models/back/Plasmanta.gif (100%) rename src/{canonical => noncanonical}/models/back/Pluffle.gif (100%) rename src/{canonical => noncanonical}/models/back/Scratchet.gif (100%) rename src/{canonical => noncanonical}/models/back/Smogecko.gif (100%) rename src/{canonical => noncanonical}/models/back/Smokomodo.gif (100%) rename src/{canonical => noncanonical}/models/back/Snaelstrom.gif (100%) rename src/{canonical => noncanonical}/models/back/Stratagem.gif (100%) rename src/{canonical => noncanonical}/models/back/Tomohawk.gif (100%) rename src/{canonical => noncanonical}/models/back/Volkraken.gif (100%) rename src/{canonical => noncanonical}/models/front/Aurumoth.gif (100%) rename src/{canonical => noncanonical}/models/front/Caribolt.gif (100%) rename src/{canonical => noncanonical}/models/front/Cawmodore.gif (100%) rename src/{canonical => noncanonical}/models/front/Crucibelle--Mega.gif (100%) rename src/{canonical => noncanonical}/models/front/Crucibelle.gif (100%) rename src/{canonical => noncanonical}/models/front/Equilibra.gif (100%) rename src/{canonical => noncanonical}/models/front/Fidgit.gif (100%) rename src/{canonical => noncanonical}/models/front/Jumbao.gif (100%) rename src/{canonical => noncanonical}/models/front/Kerfluffle.gif (100%) rename src/{canonical => noncanonical}/models/front/Krilowatt.gif (100%) rename src/{canonical => noncanonical}/models/front/Malaconda.gif (100%) rename src/{canonical => noncanonical}/models/front/Mollux.gif (100%) rename src/{canonical => noncanonical}/models/front/Naviathan.gif (100%) rename src/{canonical => noncanonical}/models/front/Necturna.gif (100%) rename src/{canonical => noncanonical}/models/front/Pajantom.gif (100%) rename src/{canonical => noncanonical}/models/front/Plasmanta.gif (100%) rename src/{canonical => noncanonical}/models/front/Pluffle.gif (100%) rename src/{canonical => noncanonical}/models/front/Pyroak.gif (100%) rename src/{canonical => noncanonical}/models/front/Scratchet.gif (100%) rename src/{canonical => noncanonical}/models/front/Smogecko.gif (100%) rename src/{canonical => noncanonical}/models/front/Smokomodo.gif (100%) rename src/{canonical => noncanonical}/models/front/Snaelstrom.gif (100%) rename src/{canonical => noncanonical}/models/front/Stratagem.gif (100%) rename src/{canonical => noncanonical}/models/front/Tomohawk.gif (100%) rename src/{canonical => noncanonical}/models/front/Volkraken.gif (100%) diff --git a/Tupfile.lua b/Tupfile.lua index 1e7f67ab..9531b0a0 100644 --- a/Tupfile.lua +++ b/Tupfile.lua @@ -40,22 +40,22 @@ tup.rule( -- PS models -for file in iglob{"src/canonical/models/front/*", "src/canonical/models/front-cosmetic/*", "src/canonical/models/front-misc/*"} do +for file in iglob{"src/canonical/models/front/*", "src/canonical/models/front-cosmetic/*", "src/canonical/models/front-misc/*", "src/noncanonical/models/front/*"} do local output = toPSSpriteID(decodeBase(file)) .. "." .. tup.ext(file) symlink(file, "build/ps/ani/" .. output) end -for file in iglob{"src/canonical/models/back/*", "src/canonical/models/back-cosmetic/*", "src/canonical/models/back-misc/*"} do +for file in iglob{"src/canonical/models/back/*", "src/canonical/models/back-cosmetic/*", "src/canonical/models/back-misc/*", "src/noncanonical/models/back/*"} do local output = toPSSpriteID(decodeBase(file)) .. "." .. tup.ext(file) symlink(file, "build/ps/ani-back/" .. output) end -for file in iglob{"src/canonical/models/shiny/*", "src/canonical/models/shiny-cosmetic/*"} do +for file in iglob{"src/canonical/models/shiny/*", "src/canonical/models/shiny-cosmetic/*", "src/noncanonical/models/shiny/*"} do local output = toPSSpriteID(decodeBase(file)) .. "." .. tup.ext(file) symlink(file, "build/ps/ani-shiny/" .. output) end -for file in iglob{"src/canonical/models/back-shiny/*", "src/canonical/models/back-shiny-cosmetic/*"} do +for file in iglob{"src/canonical/models/back-shiny/*", "src/canonical/models/back-shiny-cosmetic/*", "src/noncanonical/models/back-shiny/*"} do local output = toPSSpriteID(decodeBase(file)) .. "." .. tup.ext(file) symlink(file, "build/ps/ani-back-shiny/" .. output) end @@ -78,7 +78,7 @@ function twittersprite(input, output) ) end -for file in iglob{"src/canonical/models/front/*"} do +for file in iglob{"src/canonical/models/front/*", "src/noncanonical/models/front/*"} do local base = toSmogonAlias(decodeBase(file)) symlink(file, "build/smogon/xy/" .. base .. ".%e") fbsprite(file, "build/smogon/fbsprites/xy/" .. base .. ".png") diff --git a/src/canonical/models/back/Aurumoth.gif b/src/noncanonical/models/back/Aurumoth.gif similarity index 100% rename from src/canonical/models/back/Aurumoth.gif rename to src/noncanonical/models/back/Aurumoth.gif diff --git a/src/canonical/models/back/Caribolt.gif b/src/noncanonical/models/back/Caribolt.gif similarity index 100% rename from src/canonical/models/back/Caribolt.gif rename to src/noncanonical/models/back/Caribolt.gif diff --git a/src/canonical/models/back/Cawmodore.gif b/src/noncanonical/models/back/Cawmodore.gif similarity index 100% rename from src/canonical/models/back/Cawmodore.gif rename to src/noncanonical/models/back/Cawmodore.gif diff --git a/src/canonical/models/back/Crucibelle--Mega.gif b/src/noncanonical/models/back/Crucibelle--Mega.gif similarity index 100% rename from src/canonical/models/back/Crucibelle--Mega.gif rename to src/noncanonical/models/back/Crucibelle--Mega.gif diff --git a/src/canonical/models/back/Crucibelle.gif b/src/noncanonical/models/back/Crucibelle.gif similarity index 100% rename from src/canonical/models/back/Crucibelle.gif rename to src/noncanonical/models/back/Crucibelle.gif diff --git a/src/canonical/models/back/Equilibra.gif b/src/noncanonical/models/back/Equilibra.gif similarity index 100% rename from src/canonical/models/back/Equilibra.gif rename to src/noncanonical/models/back/Equilibra.gif diff --git a/src/canonical/models/back/Fidgit.gif b/src/noncanonical/models/back/Fidgit.gif similarity index 100% rename from src/canonical/models/back/Fidgit.gif rename to src/noncanonical/models/back/Fidgit.gif diff --git a/src/canonical/models/back/Jumbao.gif b/src/noncanonical/models/back/Jumbao.gif similarity index 100% rename from src/canonical/models/back/Jumbao.gif rename to src/noncanonical/models/back/Jumbao.gif diff --git a/src/canonical/models/back/Kerfluffle.gif b/src/noncanonical/models/back/Kerfluffle.gif similarity index 100% rename from src/canonical/models/back/Kerfluffle.gif rename to src/noncanonical/models/back/Kerfluffle.gif diff --git a/src/canonical/models/back/Krilowatt.gif b/src/noncanonical/models/back/Krilowatt.gif similarity index 100% rename from src/canonical/models/back/Krilowatt.gif rename to src/noncanonical/models/back/Krilowatt.gif diff --git a/src/canonical/models/back/Malaconda.gif b/src/noncanonical/models/back/Malaconda.gif similarity index 100% rename from src/canonical/models/back/Malaconda.gif rename to src/noncanonical/models/back/Malaconda.gif diff --git a/src/canonical/models/back/Mollux.gif b/src/noncanonical/models/back/Mollux.gif similarity index 100% rename from src/canonical/models/back/Mollux.gif rename to src/noncanonical/models/back/Mollux.gif diff --git a/src/canonical/models/back/Naviathan.gif b/src/noncanonical/models/back/Naviathan.gif similarity index 100% rename from src/canonical/models/back/Naviathan.gif rename to src/noncanonical/models/back/Naviathan.gif diff --git a/src/canonical/models/back/Necturna.gif b/src/noncanonical/models/back/Necturna.gif similarity index 100% rename from src/canonical/models/back/Necturna.gif rename to src/noncanonical/models/back/Necturna.gif diff --git a/src/canonical/models/back/Pajantom.gif b/src/noncanonical/models/back/Pajantom.gif similarity index 100% rename from src/canonical/models/back/Pajantom.gif rename to src/noncanonical/models/back/Pajantom.gif diff --git a/src/canonical/models/back/Plasmanta.gif b/src/noncanonical/models/back/Plasmanta.gif similarity index 100% rename from src/canonical/models/back/Plasmanta.gif rename to src/noncanonical/models/back/Plasmanta.gif diff --git a/src/canonical/models/back/Pluffle.gif b/src/noncanonical/models/back/Pluffle.gif similarity index 100% rename from src/canonical/models/back/Pluffle.gif rename to src/noncanonical/models/back/Pluffle.gif diff --git a/src/canonical/models/back/Scratchet.gif b/src/noncanonical/models/back/Scratchet.gif similarity index 100% rename from src/canonical/models/back/Scratchet.gif rename to src/noncanonical/models/back/Scratchet.gif diff --git a/src/canonical/models/back/Smogecko.gif b/src/noncanonical/models/back/Smogecko.gif similarity index 100% rename from src/canonical/models/back/Smogecko.gif rename to src/noncanonical/models/back/Smogecko.gif diff --git a/src/canonical/models/back/Smokomodo.gif b/src/noncanonical/models/back/Smokomodo.gif similarity index 100% rename from src/canonical/models/back/Smokomodo.gif rename to src/noncanonical/models/back/Smokomodo.gif diff --git a/src/canonical/models/back/Snaelstrom.gif b/src/noncanonical/models/back/Snaelstrom.gif similarity index 100% rename from src/canonical/models/back/Snaelstrom.gif rename to src/noncanonical/models/back/Snaelstrom.gif diff --git a/src/canonical/models/back/Stratagem.gif b/src/noncanonical/models/back/Stratagem.gif similarity index 100% rename from src/canonical/models/back/Stratagem.gif rename to src/noncanonical/models/back/Stratagem.gif diff --git a/src/canonical/models/back/Tomohawk.gif b/src/noncanonical/models/back/Tomohawk.gif similarity index 100% rename from src/canonical/models/back/Tomohawk.gif rename to src/noncanonical/models/back/Tomohawk.gif diff --git a/src/canonical/models/back/Volkraken.gif b/src/noncanonical/models/back/Volkraken.gif similarity index 100% rename from src/canonical/models/back/Volkraken.gif rename to src/noncanonical/models/back/Volkraken.gif diff --git a/src/canonical/models/front/Aurumoth.gif b/src/noncanonical/models/front/Aurumoth.gif similarity index 100% rename from src/canonical/models/front/Aurumoth.gif rename to src/noncanonical/models/front/Aurumoth.gif diff --git a/src/canonical/models/front/Caribolt.gif b/src/noncanonical/models/front/Caribolt.gif similarity index 100% rename from src/canonical/models/front/Caribolt.gif rename to src/noncanonical/models/front/Caribolt.gif diff --git a/src/canonical/models/front/Cawmodore.gif b/src/noncanonical/models/front/Cawmodore.gif similarity index 100% rename from src/canonical/models/front/Cawmodore.gif rename to src/noncanonical/models/front/Cawmodore.gif diff --git a/src/canonical/models/front/Crucibelle--Mega.gif b/src/noncanonical/models/front/Crucibelle--Mega.gif similarity index 100% rename from src/canonical/models/front/Crucibelle--Mega.gif rename to src/noncanonical/models/front/Crucibelle--Mega.gif diff --git a/src/canonical/models/front/Crucibelle.gif b/src/noncanonical/models/front/Crucibelle.gif similarity index 100% rename from src/canonical/models/front/Crucibelle.gif rename to src/noncanonical/models/front/Crucibelle.gif diff --git a/src/canonical/models/front/Equilibra.gif b/src/noncanonical/models/front/Equilibra.gif similarity index 100% rename from src/canonical/models/front/Equilibra.gif rename to src/noncanonical/models/front/Equilibra.gif diff --git a/src/canonical/models/front/Fidgit.gif b/src/noncanonical/models/front/Fidgit.gif similarity index 100% rename from src/canonical/models/front/Fidgit.gif rename to src/noncanonical/models/front/Fidgit.gif diff --git a/src/canonical/models/front/Jumbao.gif b/src/noncanonical/models/front/Jumbao.gif similarity index 100% rename from src/canonical/models/front/Jumbao.gif rename to src/noncanonical/models/front/Jumbao.gif diff --git a/src/canonical/models/front/Kerfluffle.gif b/src/noncanonical/models/front/Kerfluffle.gif similarity index 100% rename from src/canonical/models/front/Kerfluffle.gif rename to src/noncanonical/models/front/Kerfluffle.gif diff --git a/src/canonical/models/front/Krilowatt.gif b/src/noncanonical/models/front/Krilowatt.gif similarity index 100% rename from src/canonical/models/front/Krilowatt.gif rename to src/noncanonical/models/front/Krilowatt.gif diff --git a/src/canonical/models/front/Malaconda.gif b/src/noncanonical/models/front/Malaconda.gif similarity index 100% rename from src/canonical/models/front/Malaconda.gif rename to src/noncanonical/models/front/Malaconda.gif diff --git a/src/canonical/models/front/Mollux.gif b/src/noncanonical/models/front/Mollux.gif similarity index 100% rename from src/canonical/models/front/Mollux.gif rename to src/noncanonical/models/front/Mollux.gif diff --git a/src/canonical/models/front/Naviathan.gif b/src/noncanonical/models/front/Naviathan.gif similarity index 100% rename from src/canonical/models/front/Naviathan.gif rename to src/noncanonical/models/front/Naviathan.gif diff --git a/src/canonical/models/front/Necturna.gif b/src/noncanonical/models/front/Necturna.gif similarity index 100% rename from src/canonical/models/front/Necturna.gif rename to src/noncanonical/models/front/Necturna.gif diff --git a/src/canonical/models/front/Pajantom.gif b/src/noncanonical/models/front/Pajantom.gif similarity index 100% rename from src/canonical/models/front/Pajantom.gif rename to src/noncanonical/models/front/Pajantom.gif diff --git a/src/canonical/models/front/Plasmanta.gif b/src/noncanonical/models/front/Plasmanta.gif similarity index 100% rename from src/canonical/models/front/Plasmanta.gif rename to src/noncanonical/models/front/Plasmanta.gif diff --git a/src/canonical/models/front/Pluffle.gif b/src/noncanonical/models/front/Pluffle.gif similarity index 100% rename from src/canonical/models/front/Pluffle.gif rename to src/noncanonical/models/front/Pluffle.gif diff --git a/src/canonical/models/front/Pyroak.gif b/src/noncanonical/models/front/Pyroak.gif similarity index 100% rename from src/canonical/models/front/Pyroak.gif rename to src/noncanonical/models/front/Pyroak.gif diff --git a/src/canonical/models/front/Scratchet.gif b/src/noncanonical/models/front/Scratchet.gif similarity index 100% rename from src/canonical/models/front/Scratchet.gif rename to src/noncanonical/models/front/Scratchet.gif diff --git a/src/canonical/models/front/Smogecko.gif b/src/noncanonical/models/front/Smogecko.gif similarity index 100% rename from src/canonical/models/front/Smogecko.gif rename to src/noncanonical/models/front/Smogecko.gif diff --git a/src/canonical/models/front/Smokomodo.gif b/src/noncanonical/models/front/Smokomodo.gif similarity index 100% rename from src/canonical/models/front/Smokomodo.gif rename to src/noncanonical/models/front/Smokomodo.gif diff --git a/src/canonical/models/front/Snaelstrom.gif b/src/noncanonical/models/front/Snaelstrom.gif similarity index 100% rename from src/canonical/models/front/Snaelstrom.gif rename to src/noncanonical/models/front/Snaelstrom.gif diff --git a/src/canonical/models/front/Stratagem.gif b/src/noncanonical/models/front/Stratagem.gif similarity index 100% rename from src/canonical/models/front/Stratagem.gif rename to src/noncanonical/models/front/Stratagem.gif diff --git a/src/canonical/models/front/Tomohawk.gif b/src/noncanonical/models/front/Tomohawk.gif similarity index 100% rename from src/canonical/models/front/Tomohawk.gif rename to src/noncanonical/models/front/Tomohawk.gif diff --git a/src/canonical/models/front/Volkraken.gif b/src/noncanonical/models/front/Volkraken.gif similarity index 100% rename from src/canonical/models/front/Volkraken.gif rename to src/noncanonical/models/front/Volkraken.gif