diff --git a/assets/_regen.py b/assets/_regen.py index b2d1725..e5a39e9 100644 --- a/assets/_regen.py +++ b/assets/_regen.py @@ -121,6 +121,15 @@ if __name__ == '__main__': for k, v in B.items(): print(f'{k:16s} {len(v["sprites"]):2d} frames {", ".join(v["sprites"])}') sys.exit() dry = '--dry' in args + tries = 3 # a rejected sheet is usually just a bad roll: + for a in args: # frames merged, or a limb off the canvas + if a.startswith('--tries='): tries = int(a.split('=')[1]) names = list(B) if '--all' in args else [a for a in args if not a.startswith('--')] - bad = [n for n in names if not run(n, B[n], dry)] + bad = [] + for n in names: + for attempt in range(1, tries + 1): + if run(n, B[n], dry): break + print(f'[{n}] attempt {attempt}/{tries} rejected') + else: + bad.append(n) print('\nFAILED BATCHES (re-run):', ' '.join(bad) if bad else 'none') diff --git a/assets/o_bounce.png b/assets/o_bounce.png index ad21eb5..05dec4d 100644 Binary files a/assets/o_bounce.png and b/assets/o_bounce.png differ diff --git a/assets/o_bounce2.png b/assets/o_bounce2.png index b6d5ac2..18cd029 100644 Binary files a/assets/o_bounce2.png and b/assets/o_bounce2.png differ diff --git a/assets/o_idle1.png b/assets/o_idle1.png index c18ab26..42d97a3 100644 Binary files a/assets/o_idle1.png and b/assets/o_idle1.png differ diff --git a/assets/o_idle2.png b/assets/o_idle2.png index 01aa589..8719046 100644 Binary files a/assets/o_idle2.png and b/assets/o_idle2.png differ diff --git a/assets/o_run1.png b/assets/o_run1.png index 13e40b3..a73bda5 100644 Binary files a/assets/o_run1.png and b/assets/o_run1.png differ diff --git a/assets/o_run2.png b/assets/o_run2.png index 7149196..5b02624 100644 Binary files a/assets/o_run2.png and b/assets/o_run2.png differ diff --git a/assets/o_smash.png b/assets/o_smash.png index a4f49c2..8708fca 100644 Binary files a/assets/o_smash.png and b/assets/o_smash.png differ diff --git a/assets/o_swing1.png b/assets/o_swing1.png index 2fc750c..2de3ead 100644 Binary files a/assets/o_swing1.png and b/assets/o_swing1.png differ diff --git a/assets/o_swing2.png b/assets/o_swing2.png index 1933518..6a3a5f4 100644 Binary files a/assets/o_swing2.png and b/assets/o_swing2.png differ diff --git a/assets/o_toss.png b/assets/o_toss.png index ff1c9c8..4094a8d 100644 Binary files a/assets/o_toss.png and b/assets/o_toss.png differ diff --git a/assets/p_die1.png b/assets/p_die1.png index a873485..6bee4f6 100644 Binary files a/assets/p_die1.png and b/assets/p_die1.png differ diff --git a/assets/p_die2.png b/assets/p_die2.png index 69f82ac..846c55f 100644 Binary files a/assets/p_die2.png and b/assets/p_die2.png differ diff --git a/assets/p_die3.png b/assets/p_die3.png index 3a7bcf2..4caf988 100644 Binary files a/assets/p_die3.png and b/assets/p_die3.png differ diff --git a/assets/p_die4.png b/assets/p_die4.png index 834eec0..1b5023c 100644 Binary files a/assets/p_die4.png and b/assets/p_die4.png differ diff --git a/assets/p_die5.png b/assets/p_die5.png index adadea8..67f71c5 100644 Binary files a/assets/p_die5.png and b/assets/p_die5.png differ diff --git a/assets/p_run1.png b/assets/p_run1.png index 68a33ca..9e84525 100644 Binary files a/assets/p_run1.png and b/assets/p_run1.png differ diff --git a/assets/p_run2.png b/assets/p_run2.png index c58dfa2..f34342a 100644 Binary files a/assets/p_run2.png and b/assets/p_run2.png differ diff --git a/assets/p_run3.png b/assets/p_run3.png index 21feee7..09421d2 100644 Binary files a/assets/p_run3.png and b/assets/p_run3.png differ diff --git a/assets/p_run4.png b/assets/p_run4.png index a4b0f90..698481f 100644 Binary files a/assets/p_run4.png and b/assets/p_run4.png differ diff --git a/assets/p_smash.png b/assets/p_smash.png index e31cff1..abec71c 100644 Binary files a/assets/p_smash.png and b/assets/p_smash.png differ diff --git a/assets/p_swing1.png b/assets/p_swing1.png index b28b172..ed86d61 100644 Binary files a/assets/p_swing1.png and b/assets/p_swing1.png differ diff --git a/assets/p_swing2.png b/assets/p_swing2.png index 5d15c70..697f2f8 100644 Binary files a/assets/p_swing2.png and b/assets/p_swing2.png differ diff --git a/assets/p_toss.png b/assets/p_toss.png index d27d60d..3d0c156 100644 Binary files a/assets/p_toss.png and b/assets/p_toss.png differ diff --git a/index.html b/index.html index f475ebc..011ec73 100644 --- a/index.html +++ b/index.html @@ -97,6 +97,6 @@

- + diff --git a/render.js b/render.js index 07ab6dc..62dacbc 100644 --- a/render.js +++ b/render.js @@ -155,7 +155,7 @@ export function proj(x, y, z) { // ---------------------------------------------------------------- sprites ---- // assets/.png; game falls back to code-drawn figures until sprites load. -const SPRV = 62; // asset cache-buster — bump with main.js?v=N (see the img.src note below) +const SPRV = 63; // asset cache-buster — bump with main.js?v=N (see the img.src note below) const SPR = {}; for (const n of ['p_idle1','p_idle2','p_bounce','p_bounce2','p_toss','p_smash','p_run1','p_run2','p_run3','p_run4','p_swing1','p_swing2','p_die1','p_die2','p_die3','p_die4','p_die5', 'o_idle1','o_idle2','o_bounce','o_bounce2','o_toss','o_smash','o_run1','o_run2','o_swing1','o_swing2',