Leahnaya/sprites
1
0
Fork 0
mirror of https://github.com/smogon/sprites.git synced 2026-07-18 16:31:33 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

tup-ext: makecmd takes display argument

Browse Source 
tup syntax `^ display^ ` is arcane
This commit is contained in:
Christopher Monsanto 2020-05-01 20:24:06 -04:00
parent 4c2dfe2202
commit f49484f901
2 changed files with 31 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
Tupfile.lua
View File

@ -11,7 +11,10 @@ for canon in iter{"canonical", "cap"} do
tup.foreach_rule(
rep{"src/{canon}/minisprites/gen6/{dir}/*", canon=canon, dir=dir},
"^ pad g6 minisprite %f^ " .. pad(40, 30, "%f", "%o"),
makecmd{
display="pad g6 minisprite %f",
pad(40, 30, "%f", "%o")
},
rep{"build/gen6-minisprites-padded/{canon}/{dir}/%b",canon=canon,dir=dir}
)
@ -32,8 +35,11 @@ tup.rule(
function fbsprite(input, output)
tup.foreach_rule(
input,
"^ fbsprite %f^ " .. makecmd{"tools/fbsprite.sh %f %o",
compresspng{config="MODELS"}},
makecmd{
display="fbsprite %f",
"tools/fbsprite.sh %f %o",
compresspng{config="MODELS"}
},
output
)
end
@ -41,8 +47,11 @@ end
function twittersprite(input, output)
tup.foreach_rule(
input,
"^ twittersprite %f^ " .. makecmd{"tools/twittersprite.sh %f %o",
compresspng{config="MODELS"}},
makecmd{
display="twittersprite %f",
"tools/twittersprite.sh %f %o",
compresspng{config="MODELS"}
},
output
)
end
@ -59,8 +68,11 @@ twittersprite(files, "build/smogon/twittersprites/xy/%B.png")
tup.foreach_rule(
{"src/canonical/trainers/*"},
"^ pad trainer %f^ " .. makecmd{pad(80, 80, "%f", "%o"),
compresspng{config="TRAINERS"}},
makecmd{
display="pad trainer %f",
pad(80, 80, "%f", "%o"),
compresspng{config="TRAINERS"}
},
{"build/padded-trainers/canonical/%b"}
)
@ -69,8 +81,11 @@ tup.foreach_rule(
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{config="DEX"}},
makecmd{
display="pad dex %f",
pad(120, 120, "%f", "%o"),
compresspng{config="DEX"}
},
rep{"build/padded-dex/canonical/{dir}/%b", dir=dir}
)
end

8
util/tup-ext.lua
View File

@ -45,5 +45,11 @@ function symlink(input, output)
end
function makecmd(cmds)
return table.concat(flatten(cmds), " && ")
local cmd = ""
if cmds.display then
cmd = rep{"^ {display}^ ", display=cmds.display}
cmds.display = nil
end
cmd = cmd .. table.concat(flatten(cmds), " && ")
return cmd
end