From fb10d85d4ed423f75b15308b2e82b602470be554 Mon Sep 17 00:00:00 2001 From: Christopher Monsanto Date: Thu, 30 Apr 2020 07:01:14 -0400 Subject: [PATCH] ps pad dex/deploy --- Tupfile.lua | 9 ++- ps.deploy.json | 156 +++++++++++++++++++++++++++---------------------- 2 files changed, 94 insertions(+), 71 deletions(-) diff --git a/Tupfile.lua b/Tupfile.lua index 3cea314e..9dec96a3 100644 --- a/Tupfile.lua +++ b/Tupfile.lua @@ -61,5 +61,12 @@ tup.foreach_rule( {"build/padded-trainers/canonical/%b"} ) +-- Padded Dex - +for dir in iter{"front", "front-cosmetic", "front-shiny", "front-shiny-cosmetic"} do + tup.foreach_rule( + rep{"src/canonical/dex/{dir}/*", dir=dir}, + "^ pad dex %f^ " .. makecmd{pad(120, 120, "%f", "%o"), compresspng("%f", {})}, + rep{"build/padded-dex/canonical/{dir}/%b", dir=dir} + ) +end diff --git a/ps.deploy.json b/ps.deploy.json index eacedc71..b2a9f045 100644 --- a/ps.deploy.json +++ b/ps.deploy.json @@ -1,72 +1,88 @@ [ { - chdir: "src", - in: { - psSpriteId: [ - { - mount: "ani", - in: [ - "canonical/models/front", - "canonical/models/front-cosmetic", - "canonical/models/front-misc", - "noncanonical/models/front", - "noncanonical/sprites/gen5/front" - ] - }, - { - mount: "ani-back", - in: [ - "canonical/models/back", - "canonical/models/back-cosmetic", - "canonical/models/back-misc", - "noncanonical/models/back", - "noncanonical/sprites/gen5/back" - ] - }, - { - mount: "ani-shiny", - in: [ - "canonical/models/front-shiny", - "canonical/models/front-shiny-cosmetic" - ] - }, - { - mount: "ani-back-shiny", - in: [ - "canonical/models/back-shiny", - "canonical/models/back-shiny-cosmetic" - ] - }, - { - mount: "afd", - in: [ - "noncanonical/sprites/afd/front", - "noncanonical/sprites/afd/front-cosmetic" - ] - }, - { - mount: "afd-shiny", - in: [ - "noncanonical/sprites/afd/front-shiny", - "noncanonical/sprites/afd/front-shiny-cosmetic" - ] - }, - { - mount: "afd-back", - in: [ - "noncanonical/sprites/afd/back", - "noncanonical/sprites/afd/back-cosmetic" - ] - }, - { - mount: "afd-back-shiny", - in: [ - "noncanonical/sprites/afd/back-shiny", - "noncanonical/sprites/afd/back-shiny-cosmetic" - ] - }, - ] + psSpriteId: [ + { + chdir: "src", + in: [ + { + mount: "ani", + in: [ + "canonical/models/front", + "canonical/models/front-cosmetic", + "canonical/models/front-misc", + "noncanonical/models/front", + "noncanonical/sprites/gen5/front" + ] + }, + { + mount: "ani-back", + in: [ + "canonical/models/back", + "canonical/models/back-cosmetic", + "canonical/models/back-misc", + "noncanonical/models/back", + "noncanonical/sprites/gen5/back" + ] + }, + { + mount: "ani-shiny", + in: [ + "canonical/models/front-shiny", + "canonical/models/front-shiny-cosmetic" + ] + }, + { + mount: "ani-back-shiny", + in: [ + "canonical/models/back-shiny", + "canonical/models/back-shiny-cosmetic" + ] + }, + { + mount: "afd", + in: [ + "noncanonical/sprites/afd/front", + "noncanonical/sprites/afd/front-cosmetic" + ] + }, + { + mount: "afd-shiny", + in: [ + "noncanonical/sprites/afd/front-shiny", + "noncanonical/sprites/afd/front-shiny-cosmetic" + ] + }, + { + mount: "afd-back", + in: [ + "noncanonical/sprites/afd/back", + "noncanonical/sprites/afd/back-cosmetic" + ] + }, + { + mount: "afd-back-shiny", + in: [ + "noncanonical/sprites/afd/back-shiny", + "noncanonical/sprites/afd/back-shiny-cosmetic" + ] + }, + ] + }, + { + mount: "dex", + in: [ + "build/padded-dex/canonical/front", + "build/padded-dex/canonical/front-cosmetic", + ] + }, + { + mount: "dex-shiny", + in: [ + "build/padded-dex/canonical/front-shiny", + "build/padded-dex/canonical/front-shiny-cosmetic", + ] } + ] }, { mount: "trainers", @@ -76,9 +92,9 @@ }, { mount: "types", - in: [ - {replace: "Unknown", with: "???", in: "src/canonical/ui/types/gen4"}, - "src/noncanonical/ui/types/gen4", - ] + in: [ + {replace: "Unknown", with: "???", in: "src/canonical/ui/types/gen4"}, + "src/noncanonical/ui/types/gen4", + ] } ]