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

fix build for new naming scheme

Browse Source
This commit is contained in:
Christopher Monsanto 2020-05-24 16:15:18 -04:00
parent 8d3935c52a
commit b2e7d3c8b9
2 changed files with 26 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Tupfile.lua
View File

@ -74,7 +74,7 @@ rule{
-- Smogdex social images
for file in iglob("newsrc/models/*") do
if tup.base(file):find("b") or tup.base(file):find("s") then
if tup.base(file):find("-b") or tup.base(file):find("-s") then
goto continue
end
@ -139,7 +139,7 @@ foreach_rule{
},
key="%B",
filter=function()
return not ((expand("%B")):find("b") or (expand("%B")):find("s")) and not glob_matches("newsrc/dex/%B.png")
return not ((expand("%B")):find("-b") or (expand("%B")):find("-s")) and not glob_matches("newsrc/dex/%B.png")
end,
output="build/padded-dex/%B-missing.png",
}

44
ps-pokemon.sheet.mjs
View File

@ -485,35 +485,39 @@ const table = JSON.parse(fs.readFileSync(json, 'utf8'));
const entries = [];
for (const name of fs.readdirSync(spritesDir)) {
// if (dir.includes("/misc")) {
// const id = toPSID(decodeComponent(path.parse(name).name));
// index = BattlePokemonIconIndexes[id];
// BattlePokemonIconIndexes[id] = 'found';
// } else
const parsed = path.parse(name);
const m = parsed.name.match(/^(\d+)([a-z]*)(-\w+)?$/);
const m = parsed.name.match(/^([^-]+)(.*)$/);
if (!m) {
throw new Error(`can't parse ${name}`);
}
const [, sid, flags, vendor] = m;
const [, sid, flagstr] = m;
const flags = new Map;
for (let [, flag, data] of flagstr.matchAll(/-([a-z])([^-]*)/g)) {
flags.set(flag, data);
}
const entry = table[sid];
let id = toPSID(entry.base + entry.forme);
if (flags.includes("f")) id += 'f';
if (flags.includes("g")) id += 'gmax';
let id = toPSID(entry ? entry.base + entry.forme : sid);
if (flags.has("f")) id += 'f';
if (flags.has("g")) id += 'gmax';
let index;
if (flags.includes("a")) {
if (flags.has("a")) {
index = BattlePokemonIconIndexesLeft[id];
BattlePokemonIconIndexesLeft[id] = 'found';
} else {
index = BattlePokemonIconIndexes[id];
BattlePokemonIconIndexes[id] = 'found';
}
if (!index) {
index = entry.num;
if (index === undefined) {
if (entry) {
index = entry.num;
} else {
throw new Error(`can't find ${name}`)
}
}
entries[index] = path.join(spritesDir, name);
@ -525,11 +529,11 @@ for (const name of fs.readdirSync(spritesDir)) {
// }
// }
// for (const [id, num] of Object.entries(BattlePokemonIconIndexesLeft)) {
// if (num !== 'found') {
// throw new Error(`didn't find left ${id}`);
// }
// }
for (const [id, num] of Object.entries(BattlePokemonIconIndexesLeft)) {
if (num !== 'found') {
throw new Error(`didn't find left ${id}`);
}
}
for (let i = 0; i < entries.length; i++) {
if (entries[i] === undefined)