卡①T5(拆件批wr6/V13): damage_controller 拆分＋参数束——open_ticket 12参→(kind,source_class,display,spec)四参 spec 束（必载 channel/base_value/target_rule/ri 缺载 assert；可选 origin_cell/attack_type/rider/highlight/context 缺省同原签名；返回单据字典九栏目+requires/source_unit 逐字不变＝契约8）；类变量 19→15（dig_streak/charge_layers/rider_tier_bonus/rider_tier_crit→inject 束；fx_reveal_request/fx_ac_request→fx_calls 束 {reveal,ac}）；函数级拆分=_hero_attack_ctx→_ctx_rewrites(按序改写族四拍+armor_roll 发射+clamp_check 唯一发射点)+_ctx_clamp_delta(克制点数+订阅改写，消费同批命中禁重复发射)；_hero_attack_redeem→_kill_overflow(kill 发射+贯穿弹射)；_resolve_enemy_skill→_enemy_roll(掷点/折扣/克制/池乘/下限)+_enemy_shield_apply(damage_taken 施加面 {total,shield} 穿线，发射位留主函数保减伤落快照先后序)。调用点 30 处全改 spec 形（core 14＝reward_grant 3+grant_segment 7+combat_segment 3+控制器内部 overflow 1；damage_controller_test 15；system_contracts_test 1）＋inject/fx_calls 注入点改键（combat_segment :34/:37/:62、begin_battle :341-347）。验收：gdstyle 基线外 0 NEW（damage_controller 9 条存量键全清：branches/length/locals×3/class-vars 19→15/params 12→4）+ unit/integration 62 套件 1698 PASS 零 SCRIPT ERROR（〔dc1〕damage_controller 44 检查全绿含 A/B 模式/死亡作废/requires 门/flush_submit/AC 合流/池乘区；〔dc2〕system_contracts 九栏目契约绿；〔dc3〕round_flow/seal_polarity/level_shop 全绿）+ system_test 70 项 0 失败三闸过〔拆件批 V13〕
This commit is contained in:
DKChan committed
1 parent
e2a2fbf3ee
commit
139cef098e
8 files changed
+231
-172
No files matched your search
@@ -31,10 +31,10 @@ func run(ri: int) -> void:
|
||||
round_safe += 1
|
||||
elif evt.kind == "mine":
|
||||
round_mine = true
|
||||
oc._damage.dig_streak = 0 if round_mine else round_safe
|
||||
oc._damage.inject["dig_streak"] = 0 if round_mine else round_safe
|
||||
# 蓄力层注入（内容数据驱动扩展批 T3——整备军备「每层下轮首段 +1」/厚积薄发满层 spike/铁壁整备
|
||||
# 减伤——三件 fact charge_layers 同读 action_economy；battle 域每轮刷新）
|
||||
oc._damage.charge_layers = oc.action_economy.charge_layers
|
||||
oc._damage.inject["charge_layers"] = oc.action_economy.charge_layers
|
||||
_hero_strike(ri)
|
||||
_enemy_actions(ri)
|
||||
_board_deferred_settle(ri)
|
||||
@@ -52,19 +52,22 @@ func _hero_strike(ri: int) -> void:
|
||||
var hero_alive: bool = int(oc._enemy_system.hero_unit().get("hp", 0)) > 0
|
||||
var hero_target = oc._enemy_system.default_target()
|
||||
if hero_alive and hero_target != null:
|
||||
var ht := oc._damage.open_ticket(DamageController.KIND_HERO_ATTACK, "hero_attack", "主角攻击", "combat", oc._hero_atk, \
|
||||
DamageController.TARGET_FRONT_ALIVE, ri, Vector2i(-1, -1), String(oc._enemy_system.hero_unit().get("attack_type", "normal")))
|
||||
var ht := oc._damage.open_ticket(DamageController.KIND_HERO_ATTACK, "hero_attack", "主角攻击",
|
||||
{"channel": "combat", "base_value": oc._hero_atk, "target_rule": DamageController.TARGET_FRONT_ALIVE,
|
||||
"ri": ri, "origin_cell": Vector2i(-1, -1),
|
||||
"attack_type": String(oc._enemy_system.hero_unit().get("attack_type", "normal"))})
|
||||
oc._damage.submit(ht)
|
||||
# 连珠矢（内容数据驱动扩展批 T3——attack_commit 订阅施加面：开格节奏变攻击段数，本轮每开
|
||||
# ~3 安全格 +1 段穿刺附加（上限 cap；段值 provisional 固定值不乘 atk——台账披露）。施加位
|
||||
# 紧随主角攻击单开立=迁移前开单位（先于敌方行动单入队——flush 兑现序逐位一致）
|
||||
for h in oc._hits_of(ht.context.get("fx_attack_hits", []) as Array, "attack_segments"):
|
||||
var segments := mini(int(h.get("cap", 2)), oc._damage.dig_streak / maxi(1, int(h.get("divisor", 3))))
|
||||
var segments := mini(int(h.get("cap", 2)), int(oc._damage.inject["dig_streak"]) / maxi(1, int(h.get("divisor", 3))))
|
||||
for s in segments:
|
||||
# source_class 用中性名；attack_segments 兑付通道保留泛用面
|
||||
var ct := oc._damage.open_ticket(DamageController.KIND_BOARD_TYPED, "fx_streak_segments",
|
||||
"连击分段", "board", int(h.get("value", 0)), DamageController.TARGET_FRONT_ALIVE, ri,
|
||||
oc.minesweeper.hero_pos(), "pierce")
|
||||
var ct := oc._damage.open_ticket(DamageController.KIND_BOARD_TYPED, "fx_streak_segments", "连击分段",
|
||||
{"channel": "board", "base_value": int(h.get("value", 0)),
|
||||
"target_rule": DamageController.TARGET_FRONT_ALIVE, "ri": ri,
|
||||
"origin_cell": oc.minesweeper.hero_pos(), "attack_type": "pierce"})
|
||||
oc._damage.submit(ct)
|
||||
|
||||
|
||||
@@ -88,15 +91,18 @@ func _enemy_actions(ri: int) -> void:
|
||||
oc._enemy_system.commit_action(u)
|
||||
continue
|
||||
# 伤害技（含普攻——倍率恒 1）= 敌方伤害技单据：基线 = round(atk×倍率)、rider 预计算归开单侧
|
||||
# （表值算术零随机），掷点/克制查表（第 9 参 = 敌方 attack_type——迭代 24 N3 轴开列前恒空串不查表）/
|
||||
# （表值算术零随机），掷点/克制查表（spec 束 attack_type = 敌方攻击类型——迭代 24 N3 轴开列前恒空串不查表）/
|
||||
# hero_defense×enemy_output 池乘区/下限/rider 后置/commit 全归控制器管线（兑现序 = 开单序；
|
||||
# 来源敌已死在兑现时作废——死亡即不动手）。
|
||||
var baseline: int = int(round(float(u.atk) * float(srow.get("damage_mult", 1.0))))
|
||||
var rider := 0
|
||||
if srow.has("rider_mult"):
|
||||
rider = maxi(int(oc.db.settlement.damage_roll.damage_floor), int(floor(float(u.atk) * float(srow.rider_mult))))
|
||||
var et := oc._damage.open_ticket(DamageController.KIND_ENEMY_SKILL, "enemy_action", "%s %s" % [u.display_name, String(srow.display_name)], "combat", \
|
||||
baseline, DamageController.TARGET_HERO, ri, Vector2i(-1, -1), String(u.get("attack_type", "normal")), rider)
|
||||
var et := oc._damage.open_ticket(DamageController.KIND_ENEMY_SKILL, "enemy_action",
|
||||
"%s %s" % [u.display_name, String(srow.display_name)],
|
||||
{"channel": "combat", "base_value": baseline, "target_rule": DamageController.TARGET_HERO,
|
||||
"ri": ri, "origin_cell": Vector2i(-1, -1),
|
||||
"attack_type": String(u.get("attack_type", "normal")), "rider": rider})
|
||||
et["source_unit"] = u
|
||||
et["context"] = {"skill_id": skill_id, "baseline": baseline}
|
||||
oc._damage.submit(et)
|
||||
|
||||
@@ -93,9 +93,9 @@ func _reveal_safe_apply(dr_hits: Array, evt: Dictionary, ri: int) -> void:
|
||||
var spell_hits: Array[Variant] = oc._hits_of(dr_hits, "spawn_spell")
|
||||
if not spell_hits.is_empty() and not oc._feat_first_dig_used:
|
||||
oc._feat_first_dig_used = true
|
||||
var spell_t := oc._damage.open_ticket(DamageController.KIND_BOARD_TYPED, "feat_first_dig_spell",
|
||||
"奥术矢", "board", int((spell_hits[0] as Dictionary).get("value", 0)),
|
||||
DamageController.TARGET_FRONT_ALIVE, ri, evt.cell, "magic")
|
||||
var spell_t := oc._damage.open_ticket(DamageController.KIND_BOARD_TYPED, "feat_first_dig_spell", "奥术矢",
|
||||
{"channel": "board", "base_value": int((spell_hits[0] as Dictionary).get("value", 0)),
|
||||
"target_rule": DamageController.TARGET_FRONT_ALIVE, "ri": ri, "origin_cell": evt.cell, "attack_type": "magic"})
|
||||
reward_grant.submit(spell_t, false)
|
||||
|
||||
|
||||
@@ -118,8 +118,9 @@ func _reveal_mine(evt: Dictionary, snap: Dictionary, ri: int) -> void:
|
||||
reward_grant.grant_routed(oc._feat_yield_adjust(snap, false, 0, 0), "negative", {"source_class": "mine_hit", "cell": evt.cell, "ri": ri, "halve_pct": int(applied["halve_pct"])})
|
||||
for h in mh_hits:
|
||||
if String(h.get("kind", "")) == "open_ticket" and String(h.get("channel", "")) == "reflect":
|
||||
var nct := oc._damage.open_ticket(DamageController.KIND_BOARD_BLAST, "attune_nest_counter", "惊巢反制·反弹", "board",
|
||||
int(h.get("value", 0)), DamageController.TARGET_ALL_ALIVE, ri, evt.cell, "", 0, "", {})
|
||||
var nct := oc._damage.open_ticket(DamageController.KIND_BOARD_BLAST, "attune_nest_counter", "惊巢反制·反弹",
|
||||
{"channel": "board", "base_value": int(h.get("value", 0)), "target_rule": DamageController.TARGET_ALL_ALIVE,
|
||||
"ri": ri, "origin_cell": evt.cell})
|
||||
reward_grant.submit(nct, false)
|
||||
|
||||
|
||||
@@ -147,8 +148,9 @@ func _reveal_mine_apply(mh_hits: Array, snap: Dictionary, cell: Vector2i, ri: in
|
||||
fx_host._fx_bonus_delta[axis] += int(h.get("delta", 0))
|
||||
"blast_scaled":
|
||||
var blast_v := maxi(int(oc.db.settlement.damage_roll.damage_floor), int(float(int(snap.get("power", 0))) * float(h.get("mult", 1))))
|
||||
var bs_t := oc._damage.open_ticket(DamageController.KIND_BOARD_BLAST, "feat_blast_scaled", "陷阱爆发", "board",
|
||||
blast_v, DamageController.TARGET_ALL_ALIVE, ri, cell, "", 0, "", {})
|
||||
var bs_t := oc._damage.open_ticket(DamageController.KIND_BOARD_BLAST, "feat_blast_scaled", "陷阱爆发",
|
||||
{"channel": "board", "base_value": blast_v, "target_rule": DamageController.TARGET_ALL_ALIVE,
|
||||
"ri": ri, "origin_cell": cell})
|
||||
reward_grant.submit(bs_t, false)
|
||||
return {"halve_pct": halve_pct, "mine_reduce": mine_reduce}
|
||||
|
||||
@@ -173,8 +175,9 @@ func _terrain_batch(ri: int) -> void:
|
||||
"source": String(vid), "cell": evt.cell, "round": ri, "terrain_kind": String(vid),
|
||||
"hp_ratio": int(round(100.0 * float(int(oc._enemy_system.hero_unit().get("hp", 0))) / float(maxi(1, int(oc._enemy_system.hero_unit().get("max_hp", 1))))))})
|
||||
dt_amount = _terrain_damage_reduce(dt_hits, dt_amount)
|
||||
var vt := oc._damage.open_ticket(DamageController.KIND_BOARD_FLAT_HERO, "地形变异", String(vrow.get("display_name", vid)), "board", \
|
||||
dt_amount, DamageController.TARGET_HERO, ri, evt.cell, "", 0, "", {"variant_id": String(vid)})
|
||||
var vt := oc._damage.open_ticket(DamageController.KIND_BOARD_FLAT_HERO, "地形变异", String(vrow.get("display_name", vid)),
|
||||
{"channel": "board", "base_value": dt_amount, "target_rule": DamageController.TARGET_HERO,
|
||||
"ri": ri, "origin_cell": evt.cell, "context": {"variant_id": String(vid)}})
|
||||
reward_grant.submit(vt, false)
|
||||
for h in dt_hits:
|
||||
if String(h.get("kind", "")) == "grant_material":
|
||||
@@ -223,9 +226,9 @@ func _seal_strike_batch(ri: int) -> void:
|
||||
for fevt in oc._facts_seals:
|
||||
if not bool(fevt.get("hit", false)):
|
||||
continue
|
||||
var st_t := oc._damage.open_ticket(DamageController.KIND_BOARD_TYPED, "feat_seal_strike",
|
||||
"战封印军规", "board", int(strike["value"]), DamageController.TARGET_FRONT_ALIVE, ri,
|
||||
fevt.cell, "normal")
|
||||
var st_t := oc._damage.open_ticket(DamageController.KIND_BOARD_TYPED, "feat_seal_strike", "战封印军规",
|
||||
{"channel": "board", "base_value": int(strike["value"]), "target_rule": DamageController.TARGET_FRONT_ALIVE,
|
||||
"ri": ri, "origin_cell": fevt.cell, "attack_type": "normal"})
|
||||
reward_grant.submit(st_t, false)
|
||||
|
||||
|
||||
@@ -284,8 +287,9 @@ func _round_end_blast_tickets(re_fx: Array, ri: int) -> void:
|
||||
var mg_total := int(h.get("value", 0)) * mg_layers
|
||||
if mg_total > 0:
|
||||
var mg_t := oc._damage.open_ticket(DamageController.KIND_BOARD_BLAST, "fx_blast_counter",
|
||||
"积层反噬 ×%d" % mg_layers, "board", mg_total,
|
||||
DamageController.TARGET_ALL_ALIVE, ri, oc.minesweeper.hero_pos(), "", 0, "", {})
|
||||
"积层反噬 ×%d" % mg_layers,
|
||||
{"channel": "board", "base_value": mg_total, "target_rule": DamageController.TARGET_ALL_ALIVE,
|
||||
"ri": ri, "origin_cell": oc.minesweeper.hero_pos()})
|
||||
reward_grant.submit(mg_t, false)
|
||||
|
||||
|
||||
@@ -326,8 +330,9 @@ func _seal_burst_tickets(fh_hits: Array, cell: Vector2i, ri: int) -> void:
|
||||
for h in oc._hits_of(fh_hits, "open_ticket"):
|
||||
if String(h.get("channel", "")) != "blast":
|
||||
continue
|
||||
var fbt := oc._damage.open_ticket(DamageController.KIND_BOARD_BLAST, "feat_seal_burst", "封印爆裂", "board",
|
||||
int(h.get("value", 0)), DamageController.TARGET_ALL_ALIVE, ri, cell, "", 0, "highlight", {})
|
||||
var fbt := oc._damage.open_ticket(DamageController.KIND_BOARD_BLAST, "feat_seal_burst", "封印爆裂",
|
||||
{"channel": "board", "base_value": int(h.get("value", 0)), "target_rule": DamageController.TARGET_ALL_ALIVE,
|
||||
"ri": ri, "origin_cell": cell, "highlight": "highlight"})
|
||||
reward_grant.submit(fbt, false)
|
||||
|
||||
|
||||
|
||||
Reference in new issue
Block a user