diff --git a/game.py b/game.py index 274f726..eb187c9 100644 --- a/game.py +++ b/game.py @@ -3214,8 +3214,6 @@ def queue_add(world: dict, player: dict, action_id: str, qty: int, now: float) - return reason if not (player["action"] and "left" in player["action"]): return start_action(world, player, action_id, now, once=qty) - if len(player["queue"]) >= QUEUE_MAX: - return f"Queue full ({QUEUE_MAX})" player["queue"].append({"id": action_id, "n": qty}) return None @@ -3983,8 +3981,7 @@ def working_order(world: dict, player: dict, action: dict) -> dict | None: return order_by_id(world, current["order"]) -MAKE_MAX = 1000 # most you can ask for in one "Make X" -QUEUE_MAX = 5 # makes lined up after the current one +MAKE_MAX = 9999 # most you can ask for in one "Make X" def start_action(world: dict, player: dict, action_id: str, now: float, once: int = 0, skip: bool = False) -> str | None: @@ -6289,6 +6286,7 @@ ORDER_RECIPES, ORDER_RAW = _order_sources() # line here (new / balance / fix), and a new release a new entry on top. PATCH_NOTES = [ {"date": "2026-10-27", "title": "Prayer", "notes": [ + ("new", "Make X and queue counts go up to 9,999. Queue has no length cap."), ("balance", "Rebalanced favour values of items"), ("balance", "Prospecting: 3 ore per try (was 5), 50% gem chance (was 15%)."), ("new", "Dungeons: runs go on while anyone is watching. Members who look away fight on auto."), @@ -6426,7 +6424,7 @@ def content() -> dict: "city_uses": {item: city_uses(item) for item in ITEMS}, "prayers": [{**prayer, "text": describe_prayer(prayer)} for prayer in PRAYERS], "max_prayers": MAX_PRAYERS, "potion_charges": POTION_CHARGES, "jerkin_defence": JERKIN_DEFENCE, "order_recipes": ORDER_RECIPES, "order_raw": ORDER_RAW, - "order_limit": ORDER_LIMIT, "order_max": ORDER_MAX, "make_max": MAKE_MAX, "queue_max": QUEUE_MAX, "input_share": INPUT_SHARE, "problems": PROBLEMS, "fittings": list(FITTING_BY_ID.values()), + "order_limit": ORDER_LIMIT, "order_max": ORDER_MAX, "make_max": MAKE_MAX, "input_share": INPUT_SHARE, "problems": PROBLEMS, "fittings": list(FITTING_BY_ID.values()), "equip_slots": EQUIP_SLOTS, "class_speed": CLASS_SPEED, "rest_rate": REST_RATE, "bite": BITE, "eat_below": EAT_BELOW, "eat_choices": EAT_CHOICES, "abilities": combat.ABILITIES, "enemy_abilities": combat.ENEMY_ABILITIES, "unlock": combat.UNLOCK, "auto_cd": combat.AUTO_CD, "watch": combat.WATCH, "gcd": combat.GCD, "weapon_kits": combat.WEAPON_KITS, "group_size": GROUP_SIZE, "dungeon_size": DUNGEON_SIZE, "dungeon_wipes": DUNGEON_WIPES, "trade_ability": combat.TRADE_ABILITY, "potion_below": combat.POTION_BELOW, diff --git a/static/app.js b/static/app.js index d4512b3..7044b5e 100644 --- a/static/app.js +++ b/static/app.js @@ -805,7 +805,7 @@ function queuePanel() { `; }).join(""); return `
-
⏳ Crafting queue${q.length} / ${C.queue_max}
+
⏳ Crafting queue${q.length}
${now ? `
${now.icon}${esc(now.name)}${fmt(me.action.left)} left
` : ""} ${rows ? `
    ${rows}
` : `

Empty. +Q on a recipe adds to it.

`} @@ -1744,8 +1744,8 @@ function actionCard(a) { // or with nothing being made, start one: whatever you were doing is what comes after. const making = Boolean(me.action?.left); const canQueue = !active && me.queue_why[a.id] === null; - const queueOff = making ? me.queue.length >= C.queue_max : Boolean(why); - const queueTitle = making ? (queueOff ? `Queue full (${C.queue_max})` : "Queue: make this many after the current make") + const queueOff = !making && Boolean(why); + const queueTitle = making ? "Queue: make this many after the current make" : why || "Make this many, then queue more behind it"; const queued = me.queue.map((q, i) => q.id === a.id ? i + 1 : 0).filter(Boolean); const out = Object.keys(a.outputs)[0]; diff --git a/static/styles.css b/static/styles.css index 90b44c8..b90c0bb 100644 --- a/static/styles.css +++ b/static/styles.css @@ -858,7 +858,7 @@ button.swatch { width: 36px; height: 36px; } .qp-head, .qp-row, .qp-foot { display: flex; align-items: center; gap: 8px; } .qp-head b { flex: 1; } .qp-head .x { background: none; border: 0; color: var(--muted); cursor: pointer; font-size: 14px; } -.qp-list { list-style: none; margin: 0; padding: 0; display: grid; grid-template-columns: minmax(0, 1fr); gap: 6px; } +.qp-list { list-style: none; margin: 0; padding: 0; display: grid; grid-template-columns: minmax(0, 1fr); gap: 6px; max-height: 60vh; overflow-y: auto; } .qp-row .gi { width: 1.4em; height: 1.4em; } .qp-row.now { padding-bottom: 8px; border-bottom: 1px solid var(--line); } .qp-pos { width: 1.2em; text-align: right; color: var(--muted); font-size: 12px; } diff --git a/tests/test_game.py b/tests/test_game.py index 4e76f19..b7025be 100644 --- a/tests/test_game.py +++ b/tests/test_game.py @@ -138,13 +138,12 @@ class ActionTest(unittest.TestCase): self.assertEqual(p["action"]["id"], "smith_copper_helmet") # nothing being made: it just starts self.assertEqual(p["action"]["resume"], "mine_stone") p["bank"] = {} - for _ in range(game.QUEUE_MAX): - self.assertIsNone(game.queue_add(world, p, "smith_copper_helmet", 1, T0)) # bars aren't checked yet - self.assertEqual(game.queue_add(world, p, "smith_copper_helmet", 1, T0), f"Queue full ({game.QUEUE_MAX})") + for _ in range(20): + self.assertIsNone(game.queue_add(world, p, "smith_copper_helmet", 1, T0)) # no cap; bars aren't checked yet high = next(a["id"] for a in game.ACTIONS if game.queueable(a) and a["skill"] == "smithing" and a["level"] > 10) self.assertTrue(game.queue_add(world, p, high, 1, T0).startswith("Needs level")) self.assertIsNone(game.queue_remove(p, 0)) - self.assertEqual(len(p["queue"]), game.QUEUE_MAX - 1) + self.assertEqual(len(p["queue"]), 19) game.drop_out(world, p, T0) self.assertEqual(p["queue"], []) game.start_action(world, p, "cut_logs", T0)