Skip unsupported commission offers and explain acceptance blockers
This commit is contained in:
@@ -409,6 +409,12 @@ class AutomationGuiTests(unittest.TestCase):
|
||||
reward = window.catalog.data["task_info"][key]["reward"]
|
||||
window.tabs.setCurrentWidget(window.quests_table.parentWidget())
|
||||
self.assertEqual(int(window.quests_table.item(0, 4).text()), reward["ke"])
|
||||
window.engine._progression_rows = [{"task_type_id": key, "category": "commission",
|
||||
"block_reason": "Unsupported monster controller: monSteps"}]
|
||||
window.render_quests(snapshot)
|
||||
self.assertEqual(window.quests_table.item(0, 2).text(), "等待条件")
|
||||
self.assertIn("尚未支持", window.quests_table.item(0, 5).text())
|
||||
self.assertNotIn("Unsupported", window.quests_table.item(0, 5).text())
|
||||
self.assertIn("氪金", window.summary.text())
|
||||
finally:
|
||||
window.close()
|
||||
|
||||
@@ -3,6 +3,7 @@ import unittest
|
||||
from unittest.mock import Mock
|
||||
|
||||
from ranch_assistant.engine import Engine, demo_snapshot
|
||||
from ranch_assistant.game_data import ProgressionData
|
||||
from ranch_assistant.model import Catalog, Policy
|
||||
from ranch_assistant.progression import ProgressionPlanner
|
||||
from ranch_assistant.quests import QuestPolicy, TaskPlanner
|
||||
@@ -34,6 +35,31 @@ class CommissionPriorityTests(unittest.TestCase):
|
||||
action = TaskPlanner(self.catalog).plan(self.snapshot, self.quest, self.ranch)[0]
|
||||
self.assertEqual(action.payload["taskTypeId"], "402")
|
||||
|
||||
def test_unsupported_high_reward_offer_does_not_block_other_feasible_offers(self):
|
||||
for fallback_reward in (20, 15):
|
||||
with self.subTest(fallback_reward=fallback_reward):
|
||||
self.tasks["401"]["reward"]["ke"] = fallback_reward
|
||||
engine = Engine(self.catalog, game_data=ProgressionData(config(self.tasks)))
|
||||
engine.snapshot, engine.quest_policy = self.snapshot, self.quest
|
||||
engine._commission_offer_reason = "该委托的保护目标规则暂不支持"
|
||||
engine._commission_offer_supported = Mock(side_effect=lambda key: str(key) != "402")
|
||||
# Keep the rejected 20-reward offer first even when the fallback is also 20.
|
||||
self.snapshot.raw["history"]["loopTask"] = {"1": ["402", "401", "400"]}
|
||||
engine._refresh_progression_cache(force=True)
|
||||
accepted = [i for i in engine._progression_intents if i.kind == "progression_loop_accept" and not i.block_reason]
|
||||
self.assertEqual([i.task_type_id for i in accepted], ["401"])
|
||||
|
||||
def test_all_unsupported_offers_keep_reasons_without_accepting(self):
|
||||
engine = Engine(self.catalog, game_data=ProgressionData(config(self.tasks)))
|
||||
engine.snapshot, engine.quest_policy = self.snapshot, self.quest
|
||||
engine._commission_offer_reason = "战斗规则尚未支持"
|
||||
engine._commission_offer_supported = Mock(return_value=False)
|
||||
engine._refresh_progression_cache(force=True)
|
||||
self.assertFalse(any(i.kind == "progression_loop_accept" and not i.block_reason for i in engine._progression_intents))
|
||||
rows = [r for r in engine.progression_rows() if r.get("state") == "offered"]
|
||||
self.assertTrue(rows)
|
||||
self.assertTrue(all("战斗规则尚未支持" in r.get("block_reason", "") for r in rows))
|
||||
|
||||
def test_active_commission_precedes_new_offer(self):
|
||||
self.tasks["400"]["steps"] = [step("passLevel", statusValue={"level": 99})]
|
||||
self.snapshot.raw["currentTasks"] = [{"id": 50, "typeId": "400", "curStep": 1}]
|
||||
|
||||
Reference in New Issue
Block a user