Default egg restocking to ten draws and add single-draw opt-in
This commit is contained in:
+11
-4
@@ -543,8 +543,12 @@ class Window(ProgressionPages, ActivityPages, W.QMainWindow):
|
||||
form = W.QFormLayout()
|
||||
form.addRow(self.ranch_enabled)
|
||||
self.buy_eggs = W.QCheckBox("自动从金币市场购蛋 / 抽蛋")
|
||||
self.buy_ten = W.QCheckBox("优先十连;库存缺口累计到10再补货,无蛋且金币不足时单抽")
|
||||
self.buy_ten = W.QCheckBox("优先十连(允许单抽时生效)")
|
||||
self.buy_ten.setChecked(True)
|
||||
self.allow_single_draw = W.QCheckBox("允许单抽(关闭时只进行十连)")
|
||||
self.allow_single_draw.setToolTip("默认关闭。关闭时,补货缺口、可用金币或每日额度不足十连就等待,无蛋时也不会自动单抽;请将蛋规则的补货目标至少设为10。")
|
||||
self.buy_ten.setEnabled(False)
|
||||
self.allow_single_draw.toggled.connect(self.buy_ten.setEnabled)
|
||||
self.dispatch = W.QCheckBox("成熟后按策略自动派遣")
|
||||
self.collect = W.QCheckBox("保留或待喂养的魔物自动收取到牧场")
|
||||
self.feed = W.QCheckBox("按策略喂养选定目标(受当前突破上限限制)")
|
||||
@@ -561,7 +565,7 @@ class Window(ProgressionPages, ActivityPages, W.QMainWindow):
|
||||
self.egg_stock.setParent(self.session_fields)
|
||||
self.hatch_max_star.setParent(self.session_fields)
|
||||
for label, widget in (("买蛋", self.buy_eggs), ("新增规则默认市场", self.market),
|
||||
("购买方式", self.buy_ten), ("单抽时每批上限", self.buy_batch),
|
||||
("允许单抽", self.allow_single_draw), ("购买偏好", self.buy_ten), ("单抽时每批上限", self.buy_batch),
|
||||
("至少保留金币", self.keep_money), ("每日购蛋金币额度(0=不购买)", self.daily_buy_money),
|
||||
("孵蛋", self.fill), ("派遣", self.dispatch),
|
||||
("收取", self.collect)):
|
||||
@@ -671,6 +675,7 @@ class Window(ProgressionPages, ActivityPages, W.QMainWindow):
|
||||
for widget in (self.buy_eggs, self.fill, self.dispatch, self.collect):
|
||||
widget.setChecked(True)
|
||||
self.buy_ten.setChecked(True)
|
||||
self.allow_single_draw.setChecked(False)
|
||||
self.feed.setChecked(False)
|
||||
for widget, value in ((self.strategy, "gold"), (self.market, "sc_city1"), (self.egg_order, "shortest"), (self.protect_quality, 3), (self.hatch_max_star, 3)):
|
||||
widget.setCurrentIndex(widget.findData(value))
|
||||
@@ -892,7 +897,7 @@ class Window(ProgressionPages, ActivityPages, W.QMainWindow):
|
||||
message = message.replace(secret, "<隐藏>")
|
||||
if "策略暂不可用" in message or "页面数据暂不可用" in message:
|
||||
self.trace.emit("error", "本地策略 / 页面处理", scope="local", message=message)
|
||||
self.log.appendPlainText(time.strftime("%H:%M:%S ") + battle_message(message))
|
||||
self.log.appendPlainText(time.strftime("%H:%M:%S ") + battle_message(message, translate_unknown=False))
|
||||
|
||||
def remember_log_sizes(self, *args):
|
||||
if self.show_log.isChecked():
|
||||
@@ -1492,6 +1497,7 @@ class Window(ProgressionPages, ActivityPages, W.QMainWindow):
|
||||
collect=self.collect.isChecked(), dispatch=self.dispatch.isChecked(), feed=self.feed.isChecked(), hatch_max_star=self.hatch_max_star.currentData(),
|
||||
buy=self.buy_eggs.isChecked(), market_id=self.market.currentData(), egg_stock=self.egg_stock.value(), buy_batch=self.buy_batch.value(),
|
||||
buy_ten=self.buy_ten.isChecked(),
|
||||
allow_single_draw=self.allow_single_draw.isChecked(),
|
||||
manual_eggs=True, egg_rules=copy.deepcopy(self.egg_rules),
|
||||
feed_targets=copy.deepcopy(self.feed_targets),
|
||||
gift_enabled=self.gift_enabled.isChecked(), gift_targets=copy.deepcopy(self.gift_targets),
|
||||
@@ -1971,7 +1977,7 @@ class Window(ProgressionPages, ActivityPages, W.QMainWindow):
|
||||
self.auto_save_timer.timeout.connect(self.persist_settings)
|
||||
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",
|
||||
"buy_ten", "allow_single_draw", "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",
|
||||
"quest_monsters", "quest_money", "quest_battles", "quest_reserves", "keep_better_quality", "gift_auto_representative")
|
||||
for name in names:
|
||||
@@ -2134,6 +2140,7 @@ class Window(ProgressionPages, ActivityPages, W.QMainWindow):
|
||||
for widget, checked in ((self.buy_eggs, policy.buy), (self.collect, policy.collect), (self.dispatch, policy.dispatch), (self.feed, policy.feed)):
|
||||
widget.setChecked(checked)
|
||||
self.buy_ten.setChecked(policy.buy_ten)
|
||||
self.allow_single_draw.setChecked(policy.allow_single_draw)
|
||||
for widget, number in ((self.egg_stock, policy.egg_stock), (self.buy_batch, policy.buy_batch), (self.keep_money, policy.keep_money), (self.daily_buy_money, policy.daily_buy_money)):
|
||||
widget.setValue(number)
|
||||
for star, check in self.yield_stars.items():
|
||||
|
||||
Reference in New Issue
Block a user