merge: 玩家向显示名改名批——货架三行「锻升」→「祝福」+ 临时 AC 状态「护甲强化」→「盾牌加护」(C/D 裁点执行,锻造工坊裁决会话 8a 连带)

合入 rename-blessing-20261012(ae96a2b):
- shop.tres: pool_shelf 现役 70/74/78 + products 遗留 38/45/52 三行锻升→祝福
- reward.tres / status_effects.tres: 护甲强化→盾牌加护
- smoke_all.gd:1199 断言同步

冒烟:864 项检查 / 0 项失败;FAIL 仅存量 fx_reveal 脚本错误(iter21 在册,与本批无关)。
This commit is contained in:
DKChan committed 2026-10-12 07:44:51 +08:00
commit 0c93a71826
4 files changed
+10 -10

No files matched your search

+1 -1
View File
@@ -19,7 +19,7 @@ rows = [{
"cell_type": "defense",
"polarity": "positive",
"effect_id": "ac_up",
"display_name": "护甲强化",
"display_name": "盾牌加护",
"power": 0,
"weight": 11,
"pool_tag": "cell",
+6 -6
View File
@@ -35,21 +35,21 @@ level_gp_bonus = [{
}]
products = [{
"product_id": "atk_up",
"display_name": "攻击锻升",
"display_name": "攻击祝福",
"attr": "atk",
"flat_value": 1,
"base_price": 4,
"price_increment": 2
}, {
"product_id": "hp_up",
"display_name": "生命锻升",
"display_name": "生命祝福",
"attr": "max_hp",
"flat_value": 3,
"base_price": 2,
"price_increment": 2
}, {
"product_id": "armor_up",
"display_name": "护甲锻升",
"display_name": "护甲祝福",
"attr": "armor_class",
"flat_value": 1,
"base_price": 4,
@@ -67,15 +67,15 @@ price_level_bonus = [{
}]
pool_shelf = [{
"kind_id": "attack",
"display_name": "攻击锻升",
"display_name": "攻击祝福",
"base_price": 4
}, {
"kind_id": "max_hp",
"display_name": "生命锻升",
"display_name": "生命祝福",
"base_price": 4
}, {
"kind_id": "armor",
"display_name": "护甲锻升",
"display_name": "护甲祝福",
"base_price": 4
}, {
"kind_id": "ap",
+1 -1
View File
@@ -15,7 +15,7 @@ rows = [{
"max_stack": 2
}, {
"effect_id": "ac_up",
"display_name": "护甲强化",
"display_name": "盾牌加护",
"target_side": "hero",
"magnitude": 1,
"unit": "ac",
+2 -2
View File
@@ -1196,8 +1196,8 @@ func _smoke_ac_swap_guard() -> void:
for row in _db.reward.rows:
if String(row.get("cell_type", "")) == "defense" and String(row.get("polarity", "")) == "positive":
ac_reward = row
check(String(ac_reward.get("effect_id", "")) == "ac_up" and String(ac_reward.get("display_name", "")) == "护甲强化",
"奖励表 defense 正向行 effect_id = ac_up(显示名暂定护甲强化,权重/tier 不变)")
check(String(ac_reward.get("effect_id", "")) == "ac_up" and String(ac_reward.get("display_name", "")) == "盾牌加护",
"奖励表 defense 正向行 effect_id = ac_up(显示名盾牌加护,权重/tier 不变)")
check(not _db.settlement.effect_pool_map.has("defense_up") and not _db.settlement.effect_pool_map.has("ac_up"),
"effect_pool_map 无 defense_up/ac_up 键(减伤不入池——AC 不经乘区)")
# ② 免伤墙归零护栏(泛化——BUG-0003 免疫)