Merge branch 'master' into iter41

# Conflicts:
#	game/tests/unit/battle_settlement/roll_multiplier_test.gd
#	game/tests/unit/core/adventure_feats_test.gd
#	game/tests/unit/core/config_db_resolver_test.gd
#	game/tests/unit/core/level_shop_economy_test.gd
#	game/tests/unit/core/save_boot_no_activate_test.gd

game/presentation/hud_presenter.gd

@@ -97,7 +97,7 @@ static func _refresh_economy(ap_bar: ApBarView, s: Dictionary, db: ConfigDb, ref
 # 无 archetype 字段，聚合形态会空键兜底实显「流派 ×N · 档一」僵尸文案；流派档位非现行机制）
 static func feat_holdings_lines(db: ConfigDb, held: Array) -> Array[String]:
 	var rlines: Array[String] = []
-	if db == null or db.feats == null or (db.crossrun.feats.rows as Array).is_empty() or held.is_empty():
+	if db == null or db.crossrun.feats == null or (db.crossrun.feats.rows as Array).is_empty() or held.is_empty():
 		return rlines
 	var counts := {}
 	for rid in held:
@@ -114,7 +114,7 @@ static func feat_holdings_lines(db: ConfigDb, held: Array) -> Array[String]:
 # 文案用常规表述，不用俚语
 static func board_variant_lines(db: ConfigDb, ids: Array) -> Array[String]:
 	var lines: Array[String] = []
-	if db == null or db.variation == null:
+	if db == null or db.combat.variation == null:
 		return lines
 	for vid in ids:
 		var row: Dictionary[Variant, Variant] = db.combat.variation.row_by_id(String(vid))

game/presentation/main.gd

@@ -360,7 +360,7 @@ func _wire_adventure() -> void:
 # meta.attune_refresh_charges（当前等级行表值）、树 rule 键集=meta.tree_rule_keys（Fork 激活侧 effects）；
 # hero_override 沿用既有 meta 现算口径。static 形态=冒烟直呼单测本函数，免实例化整菜单场景）。
 # 两根类型轴随开局下传（attack_type/armor_type——契约 2 所有权移交+契约 8 冒险开始快照；
-# 取值=meta.hero_attack_type/hero_armor_type=存档选中路线类型轴，未解锁/异常选中态回退锻造配置默认值）。
+# 取值=meta.hero_type_axes()=存档选中路线类型轴（attack/armor 两键），未解锁/异常选中态回退锻造配置默认值）。
 # 注：runner 侧 resume_adventure 受理面收 attunement/attune_refresh_y/tree_rules 三键
 # （传参/受理两侧对齐）。
 static func build_adventure_params(save_manager_ref: SaveManagerCore, meta_ref: MetaProgressionCore, extra: Dictionary = {}) -> Dictionary: