move cap from src/noncanonical => src/cap

Tupfile.lua

@@ -1,11 +1,11 @@
 
 -- Generate uniform size minisprites
 
-for canon in iter{"canonical", "noncanonical"} do 
+for canon in iter{"canonical", "cap"} 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
+        if canon == "cap" and dir ~= "pokemon" then
             goto continue
         end
 
@@ -22,8 +22,8 @@ end
 -- PS spritesheet
 
 tup.rule(
-    {"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/gen6-minisprites-padded/canonical/pokemon/*", "build/gen6-minisprites-padded/cap/pokemon/*"},
+    "node tools/sprites/ps.js build/gen6-minisprites-padded/canonical/pokemon/ build/gen6-minisprites-padded/cap/pokemon/ --output-image build/ps/pokemonicons-sheet.png --output-metadata build/ps/pokemonicons.json",
     {"build/ps/pokemonicons-sheet.png", "build/ps/pokemonicons.json"}
 )
 
@@ -48,9 +48,9 @@ function twittersprite(input, output)
 end
 
 local files =
-    {"src/canonical/models/front/*", "src/noncanonical/models/front/*",
+    {"src/canonical/models/front/*", "src/cap/models/front/*",
      -- TODO: only pick noncanonical that aren't already in models/
-     "src/noncanonical/sprites/gen5/front/*"}
+     "src/cap/sprites/gen5/front/*"}
 
 fbsprite(files, "build/smogon/fbsprites/xy/%B.png")
 twittersprite(files, "build/smogon/twittersprites/xy/%B.png")

ps.deploy.js

@@ -5,8 +5,8 @@ transform(toPSSpriteID, () => {
         "src/canonical/models/front",
         "src/canonical/models/front-cosmetic",
         "src/canonical/models/front-misc",
-        "src/noncanonical/models/front",
-        "src/noncanonical/sprites/gen5/front"
+        "src/cap/models/front",
+        "src/cap/sprites/gen5/front"
     );
     
     dest("ani-back");
@@ -14,8 +14,8 @@ transform(toPSSpriteID, () => {
         "src/canonical/models/back",
         "src/canonical/models/back-cosmetic",
         "src/canonical/models/back-misc",
-        "src/noncanonical/models/back",
-        "src/noncanonical/sprites/gen5/back"
+        "src/cap/models/back",
+        "src/cap/sprites/gen5/back"
     );
     
     dest("ani-shiny");

smogon.deploy.js

@@ -3,7 +3,7 @@ transform(toSmogonAlias, () => {
     dest("forumsprites");
     sel(
         "build/gen6-minisprites-padded/canonical/pokemon",
-        "build/gen6-minisprites-padded/noncanonical/pokemon"
+        "build/gen6-minisprites-padded/cap/pokemon"
     );
 
     dest("fbsprites/xy");