diff --git a/Tupfile.lua b/Tupfile.lua index c52be06d..ff1ea209 100644 --- a/Tupfile.lua +++ b/Tupfile.lua @@ -146,7 +146,23 @@ rule( -- Smogdex social images -local input = spriteglob({"src/models/*", "src/gen9species/*"}, {b = false, s = false}) +local input = spriteglob({"src/models/*"}, {b = false, s = false}) + +-- Copied from the CAP bit, dedup, should probably make a routine for it +local dexSet = {} +for file in iter(input) do + dexSet[tup.base(file)] = true +end + +for file in iter(spriteglob({"src/gen9species/*"}, {b = false, s = false})) do + local base = tup.base(file) + if dexSet[base] then + goto continue + end + input += file + dexSet[base] = true + ::continue:: +end foreach_rule( input, diff --git a/smogon.deploy.js b/smogon.deploy.js index 6c262838..30ce5c5a 100644 --- a/smogon.deploy.js +++ b/smogon.deploy.js @@ -78,17 +78,21 @@ for (const f of list("src/models")) { } for (const f of list("build/gen9-modelslike")) { + if (seenModels.has(f.name)) continue; + seenModels.add(f.name); spritecopy(f, {dir: "xy"}); } // Non-model CAPs for (const f of list("src/sprites/gen5")) { if (f.ext !== 'gif' || seenModels.has(f.name)) continue; + seenModels.add(f.name); spritecopy(f, {dir: "xy"}); } for (const f of list("build/gen5-gif")) { if (seenModels.has(f.name)) continue; + seenModels.add(f.name); spritecopy(f, {dir: "xy"}); }