Bag: rock goes in as rubble, older saves convert, list shows everything held

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
2026-10-27 16:53:40 -04:00
parent 569ec6e5b6
commit a671dcb59a
7 changed files with 34 additions and 3 deletions
@@ -26,7 +26,13 @@ function selectTool(k) {
  if (k === GAME.tool) return;
  GAME.tool = k; GAME.drag = null; hudDirty = true; renderHotbar(); playSfx('ui');
 }
-function bagMaterials() { return BAG_ORDER.filter(m => bag[m] > 0); }
+// The bag's usual order first, then anything else it holds, so nothing in it is ever hidden.
+const IN_BAG_ORDER = new Uint8Array(NMAT); for (const m of BAG_ORDER) IN_BAG_ORDER[m] = 1;
+function bagMaterials() {
+  const l = BAG_ORDER.filter(m => bag[m] > 0);
+  for (let m = 1; m < NMAT; m++) if (bag[m] > 0 && !IN_BAG_ORDER[m]) l.push(m);
+  return l;
+}
 function blowList() { return [...GAME.blow].filter(m => bag[m] > 0); }
 // Shift + right click: an even mix of everything loose in the bag (bars never mix)
 function blowAllList() { return bagMaterials().filter(m => PH[m] !== PH_ITEM && (PH[m] !== PH_LIQUID || player.flask)); }