diff --git a/ps.deploy.js b/ps.deploy.js index d83857bf..7bd024f3 100644 --- a/ps.deploy.js +++ b/ps.deploy.js @@ -6,10 +6,10 @@ transform(toPSSpriteID, () => { "src/canonical/models/front-cosmetic", "src/canonical/models/front-misc/Substitute.gif", ); - overwrite(() => { + ignore(() => { sel( + "src/cap/models/front", "src/cap/sprites/gen5/front", - "src/cap/models/front" ); }); @@ -19,10 +19,10 @@ transform(toPSSpriteID, () => { "src/canonical/models/back-cosmetic", "src/canonical/models/back-misc/Substitute.gif", ); - overwrite(() => { + ignore(() => { sel( + "src/cap/models/back", "src/cap/sprites/gen5/back", - "src/cap/models/back" ); }); @@ -31,10 +31,10 @@ transform(toPSSpriteID, () => { "src/canonical/models/front-shiny", "src/canonical/models/front-shiny-cosmetic", ); - overwrite(() => { + ignore(() => { sel( + "src/cap/models/front-shiny", "src/cap/sprites/gen5/front-shiny", - "src/cap/models/front-shiny" ); }); @@ -43,10 +43,10 @@ transform(toPSSpriteID, () => { "src/canonical/models/back-shiny", "src/canonical/models/back-shiny-cosmetic", ); - overwrite(() => { + ignore(() => { sel( - "src/cap/sprites/gen5/back-shiny", - "src/cap/models/back-shiny" + "src/cap/models/back-shiny", + "src/cap/sprites/gen5/back-shiny" ); }); diff --git a/tools/deploy/lang.js b/tools/deploy/lang.js index c9591c6d..086174e9 100644 --- a/tools/deploy/lang.js +++ b/tools/deploy/lang.js @@ -15,7 +15,7 @@ function resetState(srcDir, map) { srcDir, transform: (dst) => dst, map, - allowOverwrite: false + allowIgnore: false }; }; @@ -28,11 +28,13 @@ function addPair(src, dst) { dst = pathlib.join(STATE.destDir, dst); - if (STATE.map.has(dst) && !STATE.allowOverwrite) { - throw new Error(`Duplicate entry: ${dst}`); + if (STATE.map.has(dst)) { + if (!STATE.allowIgnore) { + throw new Error(`Duplicate entry: ${dst}`); + } + } else { + STATE.map.set(dst, src); } - - STATE.map.set(dst, src); } const ENV = { @@ -57,13 +59,13 @@ const ENV = { STATE.transform = oldTransform; }, - overwrite(body) { - if (STATE.allowOverwrite) { - throw new Error("Already in overwrite mode"); + ignore(body) { + if (STATE.allowIgnore) { + throw new Error("Already in ignore mode"); } - STATE.allowOverwrite = true; + STATE.allowIgnore = true; body(); - STATE.allowOverwrite = false; + STATE.allowIgnore = false; }, dest(path) {