Use ranch feeding priorities and current breakthrough caps
This commit is contained in:
+11
-18
@@ -442,8 +442,6 @@ class Window(ProgressionPages, ActivityPages, W.QMainWindow):
|
||||
self.protect_quality.setCurrentIndex(1)
|
||||
self.keep_better_quality = W.QCheckBox("保留资质高于牧场同种培养代表的新魔物")
|
||||
self.keep_better_quality.setToolTip("独立于S/A/B/C及4S条件:按四项成长范围归一化后的平均值比较,严格更高才算提升;牧场没有同种魔物时保留首只。")
|
||||
self.target = combo([("未设置:不自动喂养", 0)])
|
||||
self.target_level = spin(1, 100, 70)
|
||||
self.room = combo([("自动选择有空位的牧场", 0)])
|
||||
self.coin_exp = spin(0, 10000, 5, True)
|
||||
self.reserved_types = W.QLineEdit()
|
||||
@@ -463,14 +461,12 @@ class Window(ProgressionPages, ActivityPages, W.QMainWindow):
|
||||
for widget in (self.strategy, self.coin_exp, self.egg_order, self.min_gold, self.min_exp):
|
||||
widget.setParent(self.session_fields)
|
||||
form.addRow(W.QLabel("孵蛋开关、优先级和去向在“背包 → 魔物蛋”逐项配置。"))
|
||||
self.target_status = W.QLabel("选择喂养目标后显示当前突破上限")
|
||||
self.target_status = W.QLabel("在“牧场”勾选喂养目标并设置优先级")
|
||||
self.target_status.setWordWrap(True)
|
||||
feed_page = W.QWidget()
|
||||
self.feed_form = W.QFormLayout(feed_page)
|
||||
self.feed_form.addRow("默认喂养目标", self.target)
|
||||
self.feed_form.addRow("喂养达到此等级后停止", self.target_level)
|
||||
self.feed_form.addRow("实际喂养上限", self.target_status)
|
||||
feed_note = W.QLabel("在“牧场”勾选喂养目标并设置优先级,优先采用这些目标。达到当前突破等级上限后转向下一只;用于喂养的魔物由蛋规则指定。")
|
||||
self.feed_form.addRow("当前喂养状态", self.target_status)
|
||||
feed_note = W.QLabel("喂养目标统一在“牧场”勾选并设置优先级,数字越小越先喂。达到当前突破等级上限后自动喂下一只;未勾选目标时不喂养。用于喂养的素材由魔物蛋规则指定。")
|
||||
feed_note.setWordWrap(True)
|
||||
self.feed_form.addRow(feed_note)
|
||||
self.feed_form.setSizeConstraint(W.QLayout.SizeConstraint.SetMinimumSize)
|
||||
@@ -478,8 +474,6 @@ class Window(ProgressionPages, ActivityPages, W.QMainWindow):
|
||||
self.feed_scroll.setWidgetResizable(True)
|
||||
self.feed_scroll.setFrameShape(W.QFrame.Shape.NoFrame)
|
||||
self.feed_scroll.setWidget(feed_page)
|
||||
self.target.currentIndexChanged.connect(self.update_target_status)
|
||||
self.target_level.valueChanged.connect(self.update_target_status)
|
||||
form.addRow(W.QLabel("仅处理本次运行观察到的培育室魔物;已有牧场魔物不作为自动派遣/喂养素材。\n锁定、羁绊、已装备、队伍/探索中的魔物会保留。蛋的手机本地锁定无法从服务器读取,请设置保留蛋数量。"))
|
||||
for label in tab.findChildren(W.QLabel):
|
||||
label.setWordWrap(True)
|
||||
@@ -1490,7 +1484,7 @@ class Window(ProgressionPages, ActivityPages, W.QMainWindow):
|
||||
type_id, count = item.split(":")
|
||||
eggs[str(int(type_id))] = max(0, int(count))
|
||||
return Policy(enabled=self.ranch_enabled.isChecked(), strategy=self.strategy.currentData(), protect_star=self.protect_star.value(), protect_quality=self.protect_quality.currentData(),
|
||||
feed_target=getattr(self, "restore_target", self.target.currentData() or 0), target_level=self.target_level.value(), room_id=getattr(self, "restore_room", self.room.currentData() or 0),
|
||||
feed_target=0, room_id=getattr(self, "restore_room", self.room.currentData() or 0),
|
||||
coins_per_exp=self.coin_exp.value(), fill=self.fill.isChecked(), egg_order=self.egg_order.currentData(),
|
||||
reserved_types=reserved, reserved_eggs=eggs, min_gold_per_hour=self.min_gold.value(), min_exp_per_hour=self.min_exp.value(),
|
||||
collect=self.collect.isChecked(), dispatch=self.dispatch.isChecked(), feed=self.feed.isChecked(), hatch_max_star=self.hatch_max_star.currentData(),
|
||||
@@ -1729,7 +1723,7 @@ class Window(ProgressionPages, ActivityPages, W.QMainWindow):
|
||||
self.render_gift_representatives(snapshot)
|
||||
elif page in (self.progression_page, self.battle_records_page):
|
||||
self.render_progression()
|
||||
elif page is self.target.parentWidget() or page is self.automation_page:
|
||||
elif page is self.automation_page:
|
||||
self.refresh_target_choices(snapshot)
|
||||
except (ValueError, TypeError, KeyError, AttributeError) as error:
|
||||
self.report("页面数据暂不可用:" + str(error))
|
||||
@@ -1768,12 +1762,9 @@ class Window(ProgressionPages, ActivityPages, W.QMainWindow):
|
||||
include_monsters=self.monster_view_visible and self.presentation_active and not self.closed))
|
||||
|
||||
def refresh_target_choices(self, snapshot):
|
||||
self.update_combo(self.target, [("未设置:不自动喂养", 0)] + [(f"{self.catalog.monster(m['typeId']).get('name')} Lv.{m.get('level', 1)}/{self.catalog.max_level(m) or '?'} #{m['id']}", int(m["id"])) for m in snapshot.raw["monsters"] if m.get("process") == 3])
|
||||
self.update_combo(self.room, [("自动选择有空位的牧场", 0)] + [(f"牧场 {r['id']}", int(r["id"])) for r in snapshot.raw["rooms"]])
|
||||
if hasattr(self, "restore_target"):
|
||||
self.target.setCurrentIndex(max(0, self.target.findData(self.restore_target)))
|
||||
if hasattr(self, "restore_room"):
|
||||
self.room.setCurrentIndex(max(0, self.room.findData(self.restore_room)))
|
||||
del self.restore_target
|
||||
del self.restore_room
|
||||
self.update_target_status()
|
||||
self.update_combo(self.monster_room, [("全部牧场", 0)] + [(f"{r.get('name') or '牧场'} #{r['id']}", int(r["id"])) for r in snapshot.raw["rooms"]])
|
||||
@@ -1963,7 +1954,7 @@ class Window(ProgressionPages, ActivityPages, W.QMainWindow):
|
||||
self.auto_save_timer = C.QTimer(self)
|
||||
self.auto_save_timer.setSingleShot(True)
|
||||
self.auto_save_timer.timeout.connect(self.persist_settings)
|
||||
names = ("ranch_enabled", "strategy", "protect_star", "protect_quality", "target", "target_level", "room",
|
||||
names = ("ranch_enabled", "strategy", "protect_star", "protect_quality", "room",
|
||||
"coin_exp", "reserved_types", "reserve_eggs", "fill", "egg_order", "min_gold", "min_exp", "buy_eggs",
|
||||
"buy_ten", "dispatch", "collect", "feed", "market", "egg_stock", "buy_batch", "keep_money", "daily_buy_money",
|
||||
"hatch_max_star", "gift_enabled", "gift_liked_only", "quest_enabled", "quest_accept", "quest_city", "quest_items",
|
||||
@@ -2108,6 +2099,8 @@ class Window(ProgressionPages, ActivityPages, W.QMainWindow):
|
||||
self.load_progression_policy(progression)
|
||||
self.egg_rules = copy.deepcopy(policy.egg_rules)
|
||||
self.feed_targets = copy.deepcopy(policy.feed_targets)
|
||||
if not self.feed_targets and policy.feed_target:
|
||||
self.feed_targets[str(policy.feed_target)] = 1
|
||||
self.gift_targets = copy.deepcopy(policy.gift_targets)
|
||||
self.gift_items = copy.deepcopy(policy.gift_items)
|
||||
self.gift_enabled.setChecked(policy.gift_enabled)
|
||||
@@ -2120,7 +2113,7 @@ class Window(ProgressionPages, ActivityPages, W.QMainWindow):
|
||||
for widget, data in ((self.strategy, policy.strategy), (self.protect_quality, policy.protect_quality), (self.egg_order, policy.egg_order),
|
||||
(self.market, policy.market_id), (self.hatch_max_star, policy.hatch_max_star)):
|
||||
widget.setCurrentIndex(max(0, widget.findData(data)))
|
||||
for widget, number in ((self.protect_star, policy.protect_star), (self.target_level, policy.target_level), (self.coin_exp, policy.coins_per_exp), (self.min_gold, policy.min_gold_per_hour), (self.min_exp, policy.min_exp_per_hour)):
|
||||
for widget, number in ((self.protect_star, policy.protect_star), (self.coin_exp, policy.coins_per_exp), (self.min_gold, policy.min_gold_per_hour), (self.min_exp, policy.min_exp_per_hour)):
|
||||
widget.setValue(number)
|
||||
self.fill.setChecked(policy.fill)
|
||||
for widget, checked in ((self.buy_eggs, policy.buy), (self.collect, policy.collect), (self.dispatch, policy.dispatch), (self.feed, policy.feed)):
|
||||
@@ -2142,7 +2135,7 @@ class Window(ProgressionPages, ActivityPages, W.QMainWindow):
|
||||
self.quest_reserves.setText(",".join(f"{k}:{v}" for k, v in quest.item_reserves.items()))
|
||||
self.reserved_types.setText(",".join(map(str, policy.reserved_types)))
|
||||
self.reserve_eggs.setText(",".join(f"{k}:{v}" for k, v in policy.reserved_eggs.items()))
|
||||
self.restore_target, self.restore_room = policy.feed_target, policy.room_id
|
||||
self.restore_room = policy.room_id
|
||||
self.catalog.overrides = value.get("overrides", {})
|
||||
self.render_egg_rules()
|
||||
self.render_catalog()
|
||||
|
||||
Reference in New Issue
Block a user