From bf8444453b189fad73bbbdb8b5feb635e2d1e310 Mon Sep 17 00:00:00 2001
From: Christopher Monsanto <chris@monsan.to>
Date: Sat, 23 May 2020 17:47:32 -0400
Subject: [PATCH] fix g6 minisprite build/deploy

---
 Tupfile.lua      | 38 +++++++++++++++++++++++---------------
 ps.deploy.js     |  2 +-
 smogon.deploy.js | 12 ++++++------
 3 files changed, 30 insertions(+), 22 deletions(-)

diff --git a/Tupfile.lua b/Tupfile.lua
index 8bf8ca42..22b2f26d 100644
--- a/Tupfile.lua
+++ b/Tupfile.lua
@@ -1,28 +1,36 @@
 
 -- Generate uniform size minisprites
 
+-- foreach_rule{
+--     display="pad g6 minisprite %f",
+--     input="src/%{canon}/minisprites/gen6/%{dir}/*.png",
+--     command=pad{w=40, h=30},
+--     output="build/gen6-minisprites-padded/%{canon}/%{dir}/%b",
+--     dimensions={
+--         canon={"canonical", "noncanonical", "cap"},
+--         dir={"asymmetrical", "misc", "pokemon"}
+--     }
+-- }
+
+-- TODO: asymmetrical, misc, noncanonical
 foreach_rule{
     display="pad g6 minisprite %f",
-    input="src/%{canon}/minisprites/gen6/%{dir}/*.png",
+    input="newsrc/minisprites/pokemon/gen6/*.png",
     command=pad{w=40, h=30},
-    output="build/gen6-minisprites-padded/%{canon}/%{dir}/%b",
-    dimensions={
-        canon={"canonical", "noncanonical", "cap"},
-        dir={"asymmetrical", "misc", "pokemon"}
-    }
+    output="build/gen6-minisprites-padded/%b"
 }
 
 -- PS spritesheet
 
-rule{
-    display="ps pokemon sheet",
-    input={"ps-pokemon.sheet.mjs"},
-    command={
-        "node tools/sheet %f %o",
-        compresspng{config="SPRITESHEET"}
-    },
-    output={"build/ps/pokemonicons-sheet.png"}
-}
+-- rule{
+--     display="ps pokemon sheet",
+--     input={"ps-pokemon.sheet.mjs"},
+--     command={
+--         "node tools/sheet %f %o",
+--         compresspng{config="SPRITESHEET"}
+--     },
+--     output={"build/ps/pokemonicons-sheet.png"}
+-- }
 
 -- TODO: reenable when trainers are moved
 -- rule{
diff --git a/ps.deploy.js b/ps.deploy.js
index 423b15f6..cab681a8 100644
--- a/ps.deploy.js
+++ b/ps.deploy.js
@@ -146,7 +146,7 @@ sel(
 );
 
 dest(".");
-sel("build/ps/pokemonicons-pokeball-sheet.png");
+//sel("build/ps/pokemonicons-pokeball-sheet.png");
 // TODO
 //sel("build/ps/trainers-sheet.png");
 sel("build/ps/itemicons-sheet.png");
diff --git a/smogon.deploy.js b/smogon.deploy.js
index 71496d07..4aa60f1b 100644
--- a/smogon.deploy.js
+++ b/smogon.deploy.js
@@ -1,11 +1,11 @@
 
 transform(toSmogonSpriteAlias, () => {
-    dest("forumsprites");
-    sel(
-        "build/gen6-minisprites-padded/noncanonical/pokemon",
-        "build/gen6-minisprites-padded/canonical/pokemon",
-        "build/gen6-minisprites-padded/cap/pokemon"
-    );
+    // dest("forumsprites");
+    // sel(
+    //     "build/gen6-minisprites-padded/noncanonical/pokemon",
+    //     "build/gen6-minisprites-padded/canonical/pokemon",
+    //     "build/gen6-minisprites-padded/cap/pokemon"
+    // );
 
     // dest("fbsprites/xy");
     // sel("build/smogon/fbsprites/xy");