From fafe7404618856ac3377a2b7424b7fb6b654d7f2 Mon Sep 17 00:00:00 2001
From: Christopher Monsanto <chris@monsan.to>
Date: Thu, 7 May 2020 09:12:45 -0400
Subject: [PATCH] Update deploy to new pokemon naming scheme

---
 ps.deploy.js         | 18 ++++++++++++++----
 smogon.deploy.js     |  2 +-
 tools/deploy/lang.js | 14 ++++++++++++++
 tools/deploy/util.js | 13 +++++++++++--
 4 files changed, 40 insertions(+), 7 deletions(-)

diff --git a/ps.deploy.js b/ps.deploy.js
index 759cc416..0271d1ce 100644
--- a/ps.deploy.js
+++ b/ps.deploy.js
@@ -4,7 +4,6 @@ transform(toPSSpriteID, () => {
     sel(
         "src/canonical/models/front",
         "src/canonical/models/front-cosmetic",
-        "src/canonical/models/front-misc/Substitute.gif",
     );
     ignore(() => {
         sel(
@@ -17,7 +16,6 @@ transform(toPSSpriteID, () => {
     sel(
         "src/canonical/models/back",
         "src/canonical/models/back-cosmetic",
-        "src/canonical/models/back-misc/Substitute.gif",
     );
     ignore(() => {
         sel(
@@ -64,7 +62,6 @@ transform(toPSSpriteID, () => {
     sel(
         "src/afd/sprites/front",
         "src/afd/sprites/front-cosmetic",
-        "src/afd/sprites/front-misc/Substitute.png",
     )
 
     dest("afd-shiny");
@@ -77,7 +74,6 @@ transform(toPSSpriteID, () => {
     sel(
         "src/afd/sprites/back",
         "src/afd/sprites/back-cosmetic",
-        "src/afd/sprites/back-misc/Substitute.png",
     )
 
     dest("afd-back-shiny");
@@ -101,6 +97,20 @@ transform(toPSSpriteID, () => {
         "build/padded-dex/cap/front",
         "build/padded-dex/cap/front-cosmetic",
     );
+});
+
+transform(toPSID, () => {
+    dest("ani");
+    sel("src/canonical/models/front-misc/Substitute.gif");
+
+    dest("ani-back");
+    sel("src/canonical/models/back-misc/Substitute.gif");
+
+    dest("afd");
+    sel("src/afd/sprites/front-misc/Substitute.png");
+    
+    dest("afd-back");
+    sel("src/afd/sprites/back-misc/Substitute.png");
 
     dest("misc");
     sel(
diff --git a/smogon.deploy.js b/smogon.deploy.js
index b763280e..c981cc8d 100644
--- a/smogon.deploy.js
+++ b/smogon.deploy.js
@@ -1,5 +1,5 @@
 
-transform(toSmogonAlias, () => {
+transform(toSmogonSpriteAlias, () => {
     dest("forumsprites");
     sel(
         "build/gen6-minisprites-padded/canonical/pokemon",
diff --git a/tools/deploy/lang.js b/tools/deploy/lang.js
index 086174e9..85953a99 100644
--- a/tools/deploy/lang.js
+++ b/tools/deploy/lang.js
@@ -38,6 +38,13 @@ function addPair(src, dst) {
 }
 
 const ENV = {
+    toPSID(dst) {
+        const parsed = pathlib.parse(dst);
+        delete parsed.base;
+        parsed.name = util.toPSID(util.decode(parsed.name));
+        return pathlib.format(parsed);
+    },
+    
     toPSSpriteID(dst) {
         const parsed = pathlib.parse(dst);
         delete parsed.base;
@@ -51,6 +58,13 @@ const ENV = {
         parsed.name = util.toSmogonAlias(util.decode(parsed.name));
         return pathlib.format(parsed);
     },
+
+    toSmogonSpriteAlias(dst) {
+        const parsed = pathlib.parse(dst);
+        delete parsed.base;
+        parsed.name = util.toSmogonSpriteAlias(util.decode(parsed.name));
+        return pathlib.format(parsed);
+    },
     
     transform(f, body) {
         const oldTransform = STATE.transform;
diff --git a/tools/deploy/util.js b/tools/deploy/util.js
index 9f21bda6..16985c61 100644
--- a/tools/deploy/util.js
+++ b/tools/deploy/util.js
@@ -4,8 +4,8 @@ export function decode(s) {
 }
 
 export function decomposeName(name) {
-    const [base, forme=null] = name.split("--");
-    return {base, forme};
+    const [num, formeNum, base, forme=null] = name.split("--");
+    return {num, formeNum, base, forme};
 }
 
 export function toPSID(name) {
@@ -30,3 +30,12 @@ export function toSmogonAlias(name) {
         replace(/[ _]+/, "-").
         replace(/[^a-z0-9-]+/g, '');
 }
+
+export function toSmogonSpriteAlias(name) {
+    const info = decomposeName(name);
+    let result = toSmogonAlias(info.base);
+    if (info.forme !== null) {
+        result += '-' + toSmogonAlias(info.forme);
+    }
+    return result;
+}