fix overlap with gen9species

This commit is contained in:
Christopher Monsanto
2024-01-22 18:57:43 -05:00
parent 23fb98ef33
commit 3608984f3e
2 changed files with 21 additions and 1 deletions

View File

@@ -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,

View File

@@ -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"});
}