From 0c037206f638dbe735de8c697d237f7f0594ce5e Mon Sep 17 00:00:00 2001
From: Christopher Monsanto <chris@monsan.to>
Date: Wed, 22 Dec 2021 16:12:39 -0500
Subject: [PATCH] Rename newsrc -> src in scripts

---
 Tupfile.lua          | 20 ++++++++++----------
 ps-items.sheet.mjs   |  2 +-
 ps-pokemon.sheet.mjs |  2 +-
 ps.deploy.js         |  6 +++---
 smogon.deploy.js     |  2 +-
 5 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/Tupfile.lua b/Tupfile.lua
index 6897dff3..f69ec0f2 100644
--- a/Tupfile.lua
+++ b/Tupfile.lua
@@ -2,7 +2,7 @@
 -- Generate uniform size minisprites
 
 foreach_rule(
-    "newsrc/minisprites/pokemon/gen6/*.png",
+    "src/minisprites/pokemon/gen6/*.png",
     {
         display="pad g6 minisprite %f",
         pad{w=40, h=30},
@@ -12,7 +12,7 @@ foreach_rule(
 )
 
 foreach_rule(
-    "newsrc/minisprites/items/*.png",
+    "src/minisprites/items/*.png",
     {
         display="pad item minisprite %f",
         pad{w=24, h=24},
@@ -22,7 +22,7 @@ foreach_rule(
 )
 
 foreach_rule(
-    "newsrc/minisprites/pokemon/gen6/*.png",
+    "src/minisprites/pokemon/gen6/*.png",
     {
         display="trim g6 minisprite %f",
         trimimg{},
@@ -32,7 +32,7 @@ foreach_rule(
 )
 
 foreach_rule(
-    "newsrc/minisprites/items/*.png",
+    "src/minisprites/items/*.png",
     {
         display="trim item minisprite %f",
         trimimg{},
@@ -77,9 +77,9 @@ rule(
 -- PS pokeball icons
 
 local balls = {
-    "src/noncanonical/ui/battle/Ball-Normal.png",
-    "src/noncanonical/ui/battle/Ball-Sick.png",
-    "src/noncanonical/ui/battle/Ball-Null.png",
+    "src/_uncategorized/noncanonical/ui/battle/Ball-Normal.png",
+    "src/_uncategorized/noncanonical/ui/battle/Ball-Sick.png",
+    "src/_uncategorized/noncanonical/ui/battle/Ball-Null.png",
 }
 
 rule(
@@ -94,7 +94,7 @@ rule(
 
 -- Smogdex social images
 
-local input = spriteglob("newsrc/models/*", {b = false, s = false})
+local input = spriteglob("src/models/*", {b = false, s = false})
 
 foreach_rule(
     input,
@@ -133,7 +133,7 @@ foreach_rule(
 -- Padded Dex
 
 local dexOutput = foreach_rule(
-    "newsrc/dex/*",
+    "src/dex/*",
     {
         display="pad dex %f",
         pad{w=120, h=120},
@@ -152,7 +152,7 @@ end
 
 local dexMissing = {}
 for file in iter(spriteglob(
-                     {"newsrc/sprites/gen5/*.gif", "newsrc/models/*.gif"},
+                     {"src/sprites/gen5/*.gif", "src/models/*.gif"},
                      {b = false, s = false})) do
     local base = tup.base(file)
     if dexSet[base] then
diff --git a/ps-items.sheet.mjs b/ps-items.sheet.mjs
index dd6e6756..37900110 100644
--- a/ps-items.sheet.mjs
+++ b/ps-items.sheet.mjs
@@ -534,7 +534,7 @@ for (const {type, sid, names} of spritedata.entries()) {
     for (let name of names) {
         const id = toPSID(name);
         const filename = spritedata.formatFilename({id: sid});
-        found.set(id, path.join(root, "newsrc/minisprites/items", filename + ".png"));
+        found.set(id, path.join(root, "src/minisprites/items", filename + ".png"));
     }
 }
 
diff --git a/ps-pokemon.sheet.mjs b/ps-pokemon.sheet.mjs
index 4ed25f30..4ca12c35 100644
--- a/ps-pokemon.sheet.mjs
+++ b/ps-pokemon.sheet.mjs
@@ -4,7 +4,7 @@ import path from 'path';
 import * as spritedata from '@smogon/sprite-data';
 import root from '@smogon/sprite-root';
 
-const srcDir = path.join(root, "newsrc");
+const srcDir = path.join(root, "src");
 const spritesDir = path.join(srcDir, "minisprites/pokemon/gen6");
 
 function toPSID(name) {
diff --git a/ps.deploy.js b/ps.deploy.js
index 8ae919e7..1aa6cc34 100644
--- a/ps.deploy.js
+++ b/ps.deploy.js
@@ -31,15 +31,15 @@ function spritecopy(f, {dir, ext}) {
     copy(f, {dir, ext, name});
 }
 
-for (const f of list("newsrc/models")) {
+for (const f of list("src/models")) {
     spritecopy(f, {dir: "ani"});
 }
 
-for (const f of list("newsrc/sprites/gen5")) {
+for (const f of list("src/sprites/gen5")) {
     spritecopy(f, {dir: "gen5ani"});
 }
 
-for (const f of list("newsrc/afd")) {
+for (const f of list("src/afd")) {
     spritecopy(f, {dir: "afd"});
 }
 
diff --git a/smogon.deploy.js b/smogon.deploy.js
index 44ea2003..54a34c82 100644
--- a/smogon.deploy.js
+++ b/smogon.deploy.js
@@ -44,7 +44,7 @@ function itemspritecopy(f, {dir, ext}) {
     }
 }
 
-for (const f of list("newsrc/models")) {
+for (const f of list("src/models")) {
     spritecopy(f, {dir: "xy"});
 }