Release ranch assistant 1.1.0
This commit is contained in:
@@ -9,12 +9,14 @@ from .sweeping import SweepPolicy, SweepRunner
|
||||
from .quests import QuestPolicy, TaskPlanner
|
||||
from .market import PurchaseBudget
|
||||
from .management import expansion_quote, manual_monster_actions
|
||||
from .gifts import GiftPlanner
|
||||
|
||||
|
||||
class Engine:
|
||||
def __init__(self, catalog, client=None, budget_path=None):
|
||||
self.catalog, self.client = catalog, client
|
||||
self.planner = Planner(catalog)
|
||||
self.gift_planner = GiftPlanner(catalog)
|
||||
self.policy = Policy()
|
||||
self.quest_policy = QuestPolicy()
|
||||
self.tasks = TaskPlanner(catalog)
|
||||
@@ -194,7 +196,7 @@ class Engine:
|
||||
daily = [row.action for row in selected_entries(self.catalog, self.snapshot, self.daily_policy, self.daily_ledger)] if self.daily_policy.enabled else []
|
||||
sweep = self.sweeper.next(self.snapshot, self.sweep_policy) if self.sweep_policy.enabled and not self.demo else None
|
||||
sweep_actions = [Action(kind="sweep", path="", payload={}, description=f"扫荡 {sweep.number} {sweep.name} / 难度{sweep.level}")] if sweep else []
|
||||
return daily + quests + self.planner.plan(self.snapshot, policy, left) + sweep_actions
|
||||
return daily + quests + self.gift_planner.plan(self.snapshot, policy, self.quest_policy) + self.planner.plan(self.snapshot, policy, left) + sweep_actions
|
||||
|
||||
def claim_daily_entry(self, entry):
|
||||
self.daily_ledger.record(self.snapshot, entry.key)
|
||||
@@ -340,6 +342,14 @@ class Engine:
|
||||
target = self.snapshot.monsters[action.payload["targetId"]]
|
||||
target["exp"] = target.get("exp", 0) + self.catalog.feed_exp(mon)
|
||||
raw["monsters"] = [m for m in raw["monsters"] if m["id"] != mid]
|
||||
elif action.kind == "gift":
|
||||
target = self.snapshot.monsters[action.payload["monsterId"]]
|
||||
item = next(i for i in raw["items"] if int(i["typeId"]) == action.payload["itemId"])
|
||||
gain = int(self.catalog.monster(target.get("typeId")).get("like", {}).get(str(item["typeId"]), 0))
|
||||
target["feel"] = max(0, min(self.catalog.max_feel(target), int(target.get("feel") or 0) + gain))
|
||||
target["giftTime"] = int(time.time())
|
||||
item["num"] -= 1
|
||||
return
|
||||
else:
|
||||
egg = action.payload["eggs"][0]
|
||||
item = next(i for i in raw["items"] if i["id"] == egg["itemId"])
|
||||
@@ -408,8 +418,8 @@ def demo_snapshot(catalog):
|
||||
monsters.append(mon)
|
||||
target = dict(monsters[0]) | {"id": 900, "process": 3, "mode": 2, "level": 20, "potentialLevel": 7, "roomId": 1, "lock": 1}
|
||||
room_type = next(k for k, row in catalog.data["room_info"].items() if row.get("maxNum", 0) >= 10)
|
||||
return Snapshot({"master": {"id": 1, "roleName": "离线演示", "level": 62, "money": 12345, "ke": 2000, "ti": 100},
|
||||
return Snapshot({"master": {"id": 1, "roleName": "离线演示", "level": 62, "exp": 456789, "money": 12345, "ke": 2000, "ti": 100},
|
||||
"stacks": [{"id": i + 1, "position": i, "monsterId": 101 + i if i < 4 else 0, "openType": 3} for i in range(6)],
|
||||
"monsters": monsters + [target], "items": [{"id": 501 + i, "typeId": t, "num": 8} for i, t in enumerate(types)] + [{"id": 600, "typeId": 20047, "num": 3}],
|
||||
"rooms": [{"id": 1, "typeId": int(room_type), "openType": 3}], "teams": [{"monsters": [900]}], "activityHistory": {},
|
||||
"rooms": [{"id": 1, "typeId": int(room_type), "openType": 3, "name": "主牧场"}], "teams": [{"monsters": [900]}], "activityHistory": {},
|
||||
"history": {"unlockCity": {"1": True}, "openFarmBuild": True, "numAddStack": 0, "numKeAddStack": 0, "numAddRoom": 0, "numKeAddRoom": 0}})
|
||||
|
||||
Reference in New Issue
Block a user