Automatically reconcile and resume interrupted task battle clock waits
This commit is contained in:
@@ -62,6 +62,7 @@ class Engine:
|
||||
self.demo = client is None
|
||||
self.auto = False
|
||||
self.last_heartbeat = 0
|
||||
self.last_pending_check = 0
|
||||
self.heartbeat_enabled = True
|
||||
self.purchase_budget = PurchaseBudget(budget_path)
|
||||
self.last_draw = ""
|
||||
@@ -123,7 +124,7 @@ class Engine:
|
||||
|
||||
def _require_no_battle(self):
|
||||
if self._progression_pending():
|
||||
raise ValueError("有待核对的任务 / 战斗,已暂停牧场、赠礼和任务写操作;请先刷新核对")
|
||||
raise ValueError("有待核对的任务 / 战斗,已暂停冲突写操作;后台每2分钟自动核对")
|
||||
|
||||
def _ensure_progression(self):
|
||||
if self.game_data is None:
|
||||
@@ -284,6 +285,27 @@ class Engine:
|
||||
self.battle_journal.finish(self.snapshot, record, "win" if battle else "task",
|
||||
"已从持久化成功回包恢复本地任务检查点;未重发请求")
|
||||
|
||||
def pending_recovery_due(self):
|
||||
return not self.demo and bool(self._progression_pending()) and time.monotonic() - self.last_pending_check >= 120
|
||||
|
||||
def _resume_pending_task_clock(self):
|
||||
record = self.battle_journal.pending(self.snapshot)
|
||||
if not self.auto or self._progression_cancel.is_set() or not self.battles.resumable_task_clock(record):
|
||||
return ""
|
||||
pending = self.progression_planner.pending(self.snapshot) if self.progression_planner else None
|
||||
if not pending or not isinstance(pending.get("intent"), dict):
|
||||
return ""
|
||||
intent = ProgressionIntent(**pending["intent"])
|
||||
if (pending.get("token") != intent.token or intent.token != record.get("intent_id")
|
||||
or intent.account_key != record.get("account_key")):
|
||||
return ""
|
||||
issued = self.progression_planner._issued
|
||||
if intent.token in issued and issued[intent.token] != intent.to_dict():
|
||||
return ""
|
||||
issued[intent.token] = intent.to_dict()
|
||||
return self.battles.resume_task_clock(self.client, self.snapshot, intent, self._intent_policy(intent),
|
||||
cancel=self._progression_cancel)
|
||||
|
||||
def _battle_capability(self, intent):
|
||||
try:
|
||||
if self._is_commission(intent) and not self.quest_policy.battle_tasks:
|
||||
@@ -510,7 +532,10 @@ class Engine:
|
||||
else:
|
||||
message = self._execute_task_intent(intent)
|
||||
if self.battle_journal.pending(self.snapshot) and kind == "progression_battle":
|
||||
self.progression_planner.mark_uncertain(self.snapshot, intent, "战斗待核对,禁止重放")
|
||||
record = self.battle_journal.pending(self.snapshot)
|
||||
reason = ("战果已保存;后台每2分钟核对,开启策略后自动续交" if self.battles.resumable_task_clock(record)
|
||||
else "战斗待核对;后台每2分钟查询服务器状态,禁止重复提交")
|
||||
self.progression_planner.mark_uncertain(self.snapshot, intent, reason)
|
||||
self._persist_progression()
|
||||
if not self._progression_cancel.is_set():
|
||||
self.read_snapshot(sync_master=False)
|
||||
@@ -568,6 +593,8 @@ class Engine:
|
||||
|
||||
@account_serial
|
||||
def read_snapshot(self, *, sync_master=True):
|
||||
if self._progression_pending():
|
||||
self.last_pending_check = time.monotonic()
|
||||
self.snapshot = self.client.snapshot()
|
||||
self.battle_journal.reconcile(self.snapshot, trusted=True)
|
||||
self.master_sync.apply(self.snapshot)
|
||||
@@ -713,8 +740,14 @@ class Engine:
|
||||
self._refresh_progression_cache()
|
||||
if self._progression_pending():
|
||||
self.pending_hatches = []
|
||||
recovered = self._resume_pending_task_clock() if not self.demo else ""
|
||||
if recovered:
|
||||
self.last_executed = True
|
||||
if not self.battle_journal.pending(self.snapshot):
|
||||
self.read_snapshot(sync_master=False)
|
||||
return self.snapshot, self.plans(), recovered
|
||||
pending = self.battle_journal.pending(self.snapshot) or {}
|
||||
return self.snapshot, [], message + ";" + (pending.get("message") or "有待核对的任务 / 战斗,已暂停冲突操作")
|
||||
return self.snapshot, [], message + ";" + (pending.get("message") or "有待核对的任务 / 战斗,已暂停冲突操作") + ";后台每2分钟自动核对"
|
||||
try:
|
||||
plans = self.plans()
|
||||
except (ValueError, TypeError, KeyError, AttributeError) as error:
|
||||
|
||||
Reference in New Issue
Block a user