gen 5 cap animations

Tupfile.lua

@@ -56,10 +56,12 @@ function twittersprite(input, output)
     )
 end
 
-local files =
-    {"src/canonical/models/front/*", "src/cap/models/front/*",
-     -- TODO: only pick noncanonical that aren't already in models/
-     "src/cap/sprites/gen5/front/*"}
+-- TODO: nicer API
+local files = mergededup(
+    glob("src/cap/sprites/gen5/front/*"),
+    glob{"src/canonical/models/front/*", "src/cap/models/front/*"},
+    tup.base
+)
 
 fbsprite(files, "build/smogon/fbsprites/xy/%B.png")
 twittersprite(files, "build/smogon/twittersprites/xy/%B.png")

ps.deploy.js

@@ -5,32 +5,50 @@ transform(toPSSpriteID, () => {
         "src/canonical/models/front",
         "src/canonical/models/front-cosmetic",
         "src/canonical/models/front-misc/Substitute.gif",
-        "src/cap/models/front",
-        "src/cap/sprites/gen5/front"
     );
+    overwrite(() => {
+        sel(
+            "src/cap/sprites/gen5/front",
+            "src/cap/models/front"
+        );
+    });
     
     dest("ani-back");
     sel(
         "src/canonical/models/back",
         "src/canonical/models/back-cosmetic",
         "src/canonical/models/back-misc/Substitute.gif",
-        "src/cap/models/back",
-        "src/cap/sprites/gen5/back"
     );
+    overwrite(() => {
+        sel(
+            "src/cap/sprites/gen5/back",
+            "src/cap/models/back"
+        );
+    });
     
     dest("ani-shiny");
     sel(
         "src/canonical/models/front-shiny",
         "src/canonical/models/front-shiny-cosmetic",
-        "src/cap/models/front-shiny",
     );
+    overwrite(() => {
+        sel(
+            "src/cap/sprites/gen5/front-shiny",
+            "src/cap/models/front-shiny"
+        );
+    });
     
     dest("ani-back-shiny");
     sel(
         "src/canonical/models/back-shiny",
         "src/canonical/models/back-shiny-cosmetic",
-        "src/cap/models/back-shiny",
     );
+    overwrite(() => {
+        sel(
+            "src/cap/sprites/gen5/back-shiny",
+            "src/cap/models/back-shiny"
+        );
+    });
 
     dest("gen5ani");
     sel(

util/lua-ext.lua

@@ -51,4 +51,19 @@ function rep(str, vars)
     end))
 end
 
-
+-- Merge, preferring elem2 when f(elem1) == f(elem2) 
+function mergededup(table1, table2, f)
+    local seen = {}
+    for v in iter(table1) do
+        seen[f(v)] = v
+    end
+    for v in iter(table2) do
+        seen[f(v)] = v
+    end
+    local result = {}
+    -- Can't be iter, because non-numeric keys
+    for _, v in pairs(seen) do
+        table.insert(result, v)
+    end
+    return result
+end