Default egg restocking to ten draws and add single-draw opt-in

This commit is contained in:
AttilaNet
2026-11-09 07:44:41 +08:00
parent d7ca68b5f9
commit df0259febf
7 changed files with 79 additions and 16 deletions
+54 -1
View File
@@ -30,7 +30,7 @@ class AutomationTests(unittest.TestCase):
self.snapshot.raw["items"] = []
self.planner = Planner(self.catalog)
self.policy = Policy(strategy="gold", buy=True, protect_star=4, protect_quality=5,
hatch_max_star=3, egg_stock=3, buy_batch=2, keep_money=1000, daily_buy_money=1000)
hatch_max_star=3, egg_stock=3, buy_batch=2, keep_money=1000, daily_buy_money=1000, allow_single_draw=True)
def test_market_city_price_and_nonpremium_payload(self):
action = self.planner.plan(self.snapshot, self.policy)[0]
@@ -98,6 +98,7 @@ class AutomationTests(unittest.TestCase):
self.assertEqual(plans[0].payload["eggs"][0]["itemId"], 503)
def test_ten_draw_waits_for_stock_gap_and_honors_money_limits(self):
self.policy.allow_single_draw = False
self.policy.egg_stock, self.policy.buy_batch = 12, 5
self.policy.fill = False
self.assertEqual(self.planner.plan(self.snapshot, self.policy)[0].payload["num"], 10)
@@ -108,11 +109,33 @@ class AutomationTests(unittest.TestCase):
self.snapshot.raw["master"]["money"] = 1900
self.assertEqual(self.planner.plan(self.snapshot, self.policy), [])
self.snapshot.raw["items"] = []
self.assertEqual(self.planner.plan(self.snapshot, self.policy), [])
self.policy.allow_single_draw = True
self.assertLess(self.planner.plan(self.snapshot, self.policy)[0].payload["num"], 10)
self.snapshot.raw["master"]["money"] = 12345
self.policy.buy_ten = False
self.assertEqual(self.planner.plan(self.snapshot, self.policy)[0].payload["num"], 5)
def test_single_draw_is_disabled_by_default_even_with_no_eggs(self):
policy = Policy(buy=True, fill=False, egg_stock=12, keep_money=1000, daily_buy_money=5000)
self.assertFalse(policy.allow_single_draw)
self.snapshot.raw["master"]["money"] = 1900
self.assertEqual(self.planner.plan(self.snapshot, policy), [])
self.assertIn("单抽已关闭", ";".join(self.planner.notes))
self.snapshot.raw["master"]["money"] = 2000
self.assertEqual(self.planner.plan(self.snapshot, policy)[0].payload["num"], 10)
self.assertEqual(self.planner.plan(self.snapshot, policy, 999), [])
policy.buy_ten = False
self.assertEqual(self.planner.plan(self.snapshot, policy)[0].payload["num"], 10)
def test_manual_refill_keeps_single_draw_disabled(self):
policy = Policy(buy=True, fill=False, manual_eggs=True, keep_money=1000, daily_buy_money=5000,
egg_rules={"1001010": asdict(EggRule(enabled=True, refill_below=1, refill_target=10, market_id="sc_city1"))})
self.snapshot.raw["master"]["money"] = 1900
self.assertEqual(self.planner.plan(self.snapshot, policy), [])
policy.allow_single_draw = True
self.assertLess(self.planner.plan(self.snapshot, policy)[0].payload["num"], 10)
def test_independent_dispatch_collection_and_feeding_switches(self):
snapshot = demo_snapshot(self.catalog)
policy = Policy(strategy="gold", fill=False, dispatch=False, collect=False)
@@ -314,6 +337,36 @@ class AutomationGuiTests(unittest.TestCase):
return
self.fail("Qt task did not finish")
def test_single_draw_switch_defaults_off_and_autosaves_across_restart(self):
with workspace_temp() as folder:
window = gui.Window(folder)
window.timer.stop()
try:
self.wait(window)
self.assertFalse(window.allow_single_draw.isChecked())
self.assertFalse(window.buy_ten.isEnabled())
window.allow_single_draw.setChecked(True)
self.assertTrue(window.buy_ten.isEnabled())
QTest.qWait(400)
self.wait(window)
saved = json.loads((folder / "settings.json").read_text(encoding="utf-8"))
self.assertTrue(saved["policy"]["allow_single_draw"])
from ranch_assistant.policy_io import portable_config, import_config
exported = portable_config(saved, window.engine.snapshot)
self.assertTrue(import_config(exported, window.engine.snapshot)["policy"]["allow_single_draw"])
finally:
window.close()
restored = gui.Window(folder)
restored.timer.stop()
try:
self.wait(restored)
self.assertTrue(restored.allow_single_draw.isChecked())
restored.allow_single_draw.setChecked(False)
self.assertFalse(restored.read_policy().allow_single_draw)
self.assertFalse(restored.buy_ten.isEnabled())
finally:
restored.close()
def test_strategy_toggle_off_keeps_refreshing_and_settings_restore_with_strategy_off(self):
with workspace_temp() as folder:
window = gui.Window(folder)