Add simulated challenges to selected uncleared maps
This commit is contained in:
+54
-29
@@ -184,9 +184,9 @@ class BattleJournal:
|
||||
record.update(phase="done", outcome=outcome, message=message, finished_at=time.time())
|
||||
if state["pending"] == record["attempt_id"]:
|
||||
state["pending"] = None
|
||||
if outcome == "loss":
|
||||
if outcome == "loss" and record.get("kind") != "map_battle":
|
||||
state["losses"] += 1
|
||||
elif outcome == "win":
|
||||
elif outcome == "win" and record.get("kind") != "map_battle":
|
||||
state["losses"] = 0
|
||||
self.save()
|
||||
|
||||
@@ -365,7 +365,7 @@ class BattleOrchestrator:
|
||||
if base.get("ke"):
|
||||
return "入场需要氪金,未启用"
|
||||
money = float(base.get("money") or 0)
|
||||
if money > policy.max_money or float(master.get("money") or 0) - money < max(0, value(ranch, "keep_money", 0)):
|
||||
if money and (money > policy.max_money or float(master.get("money") or 0) - money < max(0, value(ranch, "keep_money", 0))):
|
||||
return "入场金币超过上限或保留金币不足"
|
||||
for item in base.get("items") or []:
|
||||
key, count = str(item["typeId"]), int(item["num"])
|
||||
@@ -451,21 +451,28 @@ class BattleOrchestrator:
|
||||
|
||||
@staticmethod
|
||||
def resumable_task_clock(record):
|
||||
return bool(record and record.get("kind") == "progression_battle" and record.get("task_id")
|
||||
and record.get("phase") in ("unknown", "waiting_for_battle_clock")
|
||||
and record.get("path") in ("", "battleService/battleStart")
|
||||
and not record.get("settlement_confirmed") and not record.get("settlement_dispatched")
|
||||
and (record.get("resume_clock_ready") is True or
|
||||
record.get("message") == "等待战斗时钟期间已取消,开战记录保留待核对")
|
||||
common = bool(record and ((record.get("kind") == "progression_battle" and record.get("task_id"))
|
||||
or (record.get("kind") == "map_battle" and not record.get("task_id")))
|
||||
and record.get("execution_mode") == "experimental" and record.get("execution_status") == "completed"
|
||||
and record.get("experimental_settlement_eligible") is True and record.get("terminal") is True
|
||||
and record.get("approximate") is True and record.get("faithful") is False
|
||||
and not record.get("anomalies") and not any(row.get("blocking") is True
|
||||
for row in record.get("diagnostics") or [] if isinstance(row, dict))
|
||||
and isinstance(record.get("battle_data"), dict) and record["battle_data"].get("win") is True)
|
||||
and isinstance(record.get("battle_data"), dict) and type(record["battle_data"].get("win")) is bool)
|
||||
if not common:
|
||||
return False
|
||||
if (record.get("kind") == "map_battle" and record.get("phase") == "settlement_acknowledged"
|
||||
and record.get("settlement_confirmed") is True):
|
||||
return (record["battle_data"]["win"] is True and isinstance(record.get("response"), dict)
|
||||
and record["response"].get("resCode", 0) in (0, "0"))
|
||||
return (record.get("phase") in ("unknown", "waiting_for_battle_clock")
|
||||
and record.get("path") in ("", "battleService/battleStart", "stageService/stageStart")
|
||||
and not record.get("settlement_confirmed") and not record.get("settlement_dispatched")
|
||||
and (record.get("resume_clock_ready") is True or
|
||||
record.get("message") == "等待战斗时钟期间已取消,开战记录保留待核对"))
|
||||
|
||||
def resume_task_clock(self, client, snapshot, intent, policy, *, cancel):
|
||||
"""Continue a saved result only when no settlement was ever dispatched."""
|
||||
"""Resume an unsent result, or finish recording a confirmed map settlement."""
|
||||
with self.journal.lock:
|
||||
record = self.journal.pending(snapshot)
|
||||
if not policy.enabled or cancel.is_set() or not self.resumable_task_clock(record):
|
||||
@@ -475,19 +482,24 @@ class BattleOrchestrator:
|
||||
if any(str(record.get(key)) != str(value(intent, key)) for key in
|
||||
("kind", "task_id", "task_type_id", "step_number")):
|
||||
return ""
|
||||
task = next((row for row in snapshot.raw.get("currentTasks", [])
|
||||
if str(row.get("id")) == str(record["task_id"])
|
||||
and str(row.get("typeId")) == str(record["task_type_id"])), None)
|
||||
if not task or int(task.get("curStep", 1)) != int(record["step_number"]):
|
||||
return ""
|
||||
expected = {"battleType": "task", "stageId": None, "stageLevel": None,
|
||||
"taskTypeId": str(record["task_type_id"]), "taskStep": int(record["step_number"]) - 1}
|
||||
task_battle = bool(record.get("task_id"))
|
||||
if task_battle:
|
||||
task = next((row for row in snapshot.raw.get("currentTasks", [])
|
||||
if str(row.get("id")) == str(record["task_id"])
|
||||
and str(row.get("typeId")) == str(record["task_type_id"])), None)
|
||||
if not task or int(task.get("curStep", 1)) != int(record["step_number"]):
|
||||
return ""
|
||||
expected = {"battleType": "task" if task_battle else "stage",
|
||||
"stageId": None if task_battle else str(record.get("stage_id")),
|
||||
"stageLevel": None if task_battle else str(record.get("difficulty")),
|
||||
"taskTypeId": str(record["task_type_id"]) if task_battle else None,
|
||||
"taskStep": int(record["step_number"]) - 1 if task_battle else 0}
|
||||
data = record["battle_data"]
|
||||
position = data.get("battlePosition")
|
||||
if not isinstance(position, dict) or {key: val for key, val in position.items() if val is not None} != {
|
||||
key: val for key, val in expected.items() if val is not None}:
|
||||
return ""
|
||||
ready = record.get("battle_ready_at")
|
||||
ready = 0 if record.get("settlement_confirmed") else record.get("battle_ready_at")
|
||||
if ready is None:
|
||||
duration = record.get("battle_clock_seconds")
|
||||
stamp = record.get("updated_at")
|
||||
@@ -500,22 +512,34 @@ class BattleOrchestrator:
|
||||
return ""
|
||||
if time.time() < ready:
|
||||
return "已核对保存的战果;尚未到结算时间,2分钟内自动复查"
|
||||
path = "taskService/taskCompleteStep"
|
||||
payload = {"taskId": int(record["task_id"]), "taskTypeId": str(record["task_type_id"]),
|
||||
"removeIds": None, "battleData": deepcopy(data)}
|
||||
self.journal.update(record, "settlement_pending", path=path, settlement_dispatched=True)
|
||||
try:
|
||||
response = self._call(client, path, payload, cancel=cancel)
|
||||
self.journal.update(record, "settlement_acknowledged", response=gameplay_response(response),
|
||||
settlement_confirmed=True, reward=response["stageReward"] if response.get("stageReward") is not None else response.get("reward"))
|
||||
if not data["win"]:
|
||||
if not task_battle or record.get("battle_kind") == "passStage":
|
||||
self._record(client, record, record["stage_id"], False, cancel=cancel)
|
||||
if self.observer:
|
||||
self.observer("loss", intent, None)
|
||||
self.journal.finish(snapshot, record, "loss", "打不过(保存的模拟结果);未提交胜利结算")
|
||||
return record["message"]
|
||||
response = record.get("response") if record.get("settlement_confirmed") else None
|
||||
if response is None:
|
||||
path = "taskService/taskCompleteStep" if task_battle else "battleService/battleEnd"
|
||||
payload = {"battleData": deepcopy(data)}
|
||||
if task_battle:
|
||||
payload.update(taskId=int(record["task_id"]), taskTypeId=str(record["task_type_id"]), removeIds=None)
|
||||
self.journal.update(record, "settlement_pending", path=path, settlement_dispatched=True)
|
||||
response = self._call(client, path, payload, cancel=cancel)
|
||||
self.journal.update(record, "settlement_acknowledged", response=gameplay_response(response),
|
||||
settlement_confirmed=True, reward=response["stageReward"] if response.get("stageReward") is not None else response.get("reward"))
|
||||
if not task_battle:
|
||||
self._record(client, record, record["stage_id"], True)
|
||||
if self.observer:
|
||||
self.observer("settled", intent, response)
|
||||
else:
|
||||
elif task_battle:
|
||||
self.journal.checkpoint(snapshot, intent, response)
|
||||
self.journal.finish(snapshot, record, "win", "已自动续交保存的战果;未重新开战或重新模拟")
|
||||
return record["message"]
|
||||
except CancelledBeforeDispatch:
|
||||
self.journal.update(record, "waiting_for_battle_clock", path="battleService/battleStart",
|
||||
self.journal.update(record, "waiting_for_battle_clock", path="battleService/battleStart" if task_battle else "stageService/stageStart",
|
||||
settlement_dispatched=False, resume_clock_ready=True)
|
||||
return "策略已停止,保存的战果将在重新开启后续交"
|
||||
except Exception as error:
|
||||
@@ -647,7 +671,8 @@ class BattleOrchestrator:
|
||||
else:
|
||||
self.journal.checkpoint(snapshot, intent, response)
|
||||
else:
|
||||
self._record(client, record, request["stage_id"], True, cancel=cancel)
|
||||
self._record(client, record, request["stage_id"], True,
|
||||
cancel=None if value(intent, "kind") == "map_battle" else cancel)
|
||||
if self.observer:
|
||||
self.observer("settled", intent, response)
|
||||
label = "实验模型胜利(近似)" if mode == "experimental" else "实际胜利"
|
||||
|
||||
Reference in New Issue
Block a user