Wickedness/heros
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add Huarong camp and Jiangling rearguard bridge

Browse Source
This commit is contained in:
Wickedness
2026-06-19 04:45:25 +09:00
parent 4086fd37aa
commit 7abe2b36c1
4 changed files with 358 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

213
tools/smoke_camp_conversation_rewards.gd
View File

@@ -118,6 +118,10 @@ const RED_CLIFFS_FIRE_CHAIN_MEDICINE_CONVERSATION_ID := "red_cliffs_reinforced_c
const RED_CLIFFS_FIRE_NIGHT_BEANS_CONVERSATION_ID := "red_cliffs_night_raid_beans"
const HUARONG_SCENARIO_ID := "031_huarong_retreat"
const HUARONG_SCENARIO_PATH := "res://data/scenarios/031_huarong_retreat.json"
const HUARONG_HELD_MEDICINE_CONVERSATION_ID := "huarong_held_line_medicine"
const HUARONG_OPEN_RETREAT_BEANS_CONVERSATION_ID := "huarong_open_retreat_beans"
const JIANGLING_REARGUARD_SCENARIO_ID := "032_jiangling_rearguard"
const JIANGLING_REARGUARD_SCENARIO_PATH := "res://data/scenarios/032_jiangling_rearguard.json"
const SAVE_PATH := "user://campaign_save.json"
const MANUAL_SAVE_PATH := "user://campaign_manual_save.json"
@@ -157,6 +161,7 @@ func _init() -> void:
_check_xiakou_post_battle_choice_bridges_to_red_cliffs(failures)
_check_red_cliffs_post_battle_choice_bridges_to_fire(failures)
_check_red_cliffs_fire_post_battle_choice_bridges_to_huarong(failures)
_check_huarong_post_battle_choice_bridges_to_jiangling_rearguard(failures)
_check_manual_checkpoint_reverts_claim(failures)
_check_completed_replay_cannot_claim(failures)
_check_conditional_camp_conversations(failures)
@@ -179,6 +184,7 @@ func _init() -> void:
_check_xiakou_branch_camp_conversations(failures)
_check_red_cliffs_branch_camp_conversations(failures)
_check_red_cliffs_fire_branch_camp_conversations(failures)
_check_huarong_branch_camp_conversations(failures)
_check_talk_menu_closes_on_cancel_and_reload(failures)
if not _restore_user_file(SAVE_PATH, save_backup):
@@ -1399,6 +1405,25 @@ func _check_red_cliffs_fire_post_battle_choice_bridges_to_huarong(failures: Arra
)
func _check_huarong_post_battle_choice_bridges_to_jiangling_rearguard(failures: Array[String]) -> void:
_check_huarong_choice_branch_to_jiangling_rearguard(
failures,
"secure_huarong_rearguard",
"secured_huarong_rearguard",
"rushed_xuchang_return",
"imperial_seal",
"war_drum"
)
_check_huarong_choice_branch_to_jiangling_rearguard(
failures,
"rush_xuchang_return",
"rushed_xuchang_return",
"secured_huarong_rearguard",
"war_drum",
"imperial_seal"
)
func _check_wuchao_choice_branch_to_cangting(
failures: Array[String],
choice_id: String,
@@ -2713,6 +2738,79 @@ func _check_red_cliffs_fire_choice_branch_to_huarong(
scene.free()
func _check_huarong_choice_branch_to_jiangling_rearguard(
failures: Array[String],
choice_id: String,
expected_flag: String,
cleared_flag: String,
expected_shop_item_id: String,
hidden_shop_item_id: String
) -> void:
var scene = _new_prebattle_scene_for(failures, "Huarong choice bridge %s" % choice_id, HUARONG_SCENARIO_ID, HUARONG_SCENARIO_PATH)
if scene == null:
return
if not scene.campaign_state.joined_officers.has("zhang_he"):
scene.campaign_state.joined_officers.append("zhang_he")
if not scene.state.load_battle(
HUARONG_SCENARIO_PATH,
scene.campaign_state.get_roster_overrides(),
scene.campaign_state.get_inventory_snapshot(),
scene.campaign_state.get_flags_snapshot(),
scene.campaign_state.get_joined_officers_snapshot()
):
failures.append("Huarong choice bridge %s could not reload Huarong with Zhang He joined" % choice_id)
scene.free()
return
scene.state.battle_status = "victory"
var result: Dictionary = scene.campaign_state.apply_battle_result(scene.state)
if not bool(result.get("saved", false)):
failures.append("Huarong choice bridge %s should save 031 victory" % choice_id)
scene.free()
return
if not scene.campaign_state.get_joined_officers_snapshot().has("zhang_he"):
failures.append("Huarong choice bridge %s should keep Zhang He before Jiangling Rearguard" % choice_id)
if bool(result.get("choice_applied", true)):
failures.append("Huarong choice bridge %s should wait for a selected post-battle choice" % choice_id)
if scene.campaign_state.pending_post_battle_choice_scenario_id != HUARONG_SCENARIO_ID:
failures.append("Huarong choice bridge %s should mark Huarong choice pending" % choice_id)
var choice := _find_choice_by_id(result.get("post_battle_choices", []), choice_id)
if choice.is_empty():
failures.append("Huarong choice bridge missing choice: %s" % choice_id)
scene.free()
return
if not scene.campaign_state.try_apply_post_battle_choice(choice, HUARONG_SCENARIO_ID):
failures.append("Huarong choice bridge %s should save selected choice" % choice_id)
scene.free()
return
var flags: Dictionary = scene.campaign_state.get_flags_snapshot()
if flags.get(expected_flag, false) != true:
failures.append("Huarong choice bridge %s should set %s" % [choice_id, expected_flag])
if flags.get(cleared_flag, true) != false:
failures.append("Huarong choice bridge %s should clear %s" % [choice_id, cleared_flag])
if scene.campaign_state.current_scenario_id != JIANGLING_REARGUARD_SCENARIO_ID:
failures.append("Huarong choice bridge %s should advance to Jiangling Rearguard, got %s" % [choice_id, scene.campaign_state.current_scenario_id])
if not scene.state.load_battle(
JIANGLING_REARGUARD_SCENARIO_PATH,
scene.campaign_state.get_roster_overrides(),
scene.campaign_state.get_inventory_snapshot(),
flags,
scene.campaign_state.get_joined_officers_snapshot()
):
failures.append("Huarong choice bridge %s could not load Jiangling Rearguard" % choice_id)
scene.free()
return
if scene.state.get_unit("zhang_he_ch32").is_empty():
failures.append("Huarong choice bridge %s should deploy Zhang He in Jiangling Rearguard" % choice_id)
elif not scene.state.is_required_deployment("zhang_he_ch32"):
failures.append("Huarong choice bridge %s should require Zhang He in Jiangling Rearguard" % choice_id)
var shop_items: Array = scene.state.get_shop_item_ids()
if not shop_items.has(expected_shop_item_id):
failures.append("Huarong choice bridge %s should expose shop item %s" % [choice_id, expected_shop_item_id])
if shop_items.has(hidden_shop_item_id):
failures.append("Huarong choice bridge %s should hide shop item %s" % [choice_id, hidden_shop_item_id])
scene.free()
func _find_choice_by_id(choices, choice_id: String) -> Dictionary:
if typeof(choices) != TYPE_ARRAY:
return {}
@@ -4548,6 +4646,121 @@ func _check_red_cliffs_fire_branch_camp_conversations(failures: Array[String]) -
raid_scene.free()
func _check_huarong_branch_camp_conversations(failures: Array[String]) -> void:
var base_scene = _new_prebattle_scene_for(failures, "Huarong base camp", HUARONG_SCENARIO_ID, HUARONG_SCENARIO_PATH)
if base_scene != null:
if not base_scene.campaign_state.joined_officers.has("zhang_he"):
base_scene.campaign_state.joined_officers.append("zhang_he")
if not base_scene.state.load_battle(
HUARONG_SCENARIO_PATH,
base_scene.campaign_state.get_roster_overrides(),
base_scene.campaign_state.get_inventory_snapshot(),
base_scene.campaign_state.get_flags_snapshot(),
base_scene.campaign_state.get_joined_officers_snapshot()
):
failures.append("Huarong base camp should reload with Zhang He joined")
else:
if base_scene._camp_conversation_by_id("huarong_retreat_council").is_empty():
failures.append("Huarong should expose the retreat council conversation")
if base_scene._camp_conversation_by_id("huarong_zhang_he_mud_road").is_empty():
failures.append("Huarong should expose Zhang He's mud road conversation")
if not base_scene._camp_conversation_by_id(HUARONG_HELD_MEDICINE_CONVERSATION_ID).is_empty():
failures.append("Huarong held medicine should be hidden without held line flag")
if not base_scene._camp_conversation_by_id(HUARONG_OPEN_RETREAT_BEANS_CONVERSATION_ID).is_empty():
failures.append("Huarong retreat beans should be hidden without opened retreat flag")
var merchant: Dictionary = base_scene.state.get_shop_merchant()
if str(merchant.get("name", "")) != "Huarong Road Sutler":
failures.append("Huarong shop merchant name should be present")
var merchant_lines: Array = merchant.get("lines", [])
if merchant_lines.size() < 2:
failures.append("Huarong shop merchant should expose flavor lines")
if base_scene._format_talk_status_text(base_scene._camp_conversation_entries()) != "Camp conversations | 2 topics":
failures.append("Huarong base talk status should summarize two non-supply topics")
base_scene.free()
var held_scene = _new_prebattle_scene_for(
failures,
"Huarong held line camp",
HUARONG_SCENARIO_ID,
HUARONG_SCENARIO_PATH,
{"held_red_cliffs_line": true}
)
if held_scene != null:
if not held_scene.campaign_state.joined_officers.has("zhang_he"):
held_scene.campaign_state.joined_officers.append("zhang_he")
if not held_scene.state.load_battle(
HUARONG_SCENARIO_PATH,
held_scene.campaign_state.get_roster_overrides(),
held_scene.campaign_state.get_inventory_snapshot(),
held_scene.campaign_state.get_flags_snapshot(),
held_scene.campaign_state.get_joined_officers_snapshot()
):
failures.append("Huarong held line camp should reload with Zhang He joined")
else:
var held_medicine: Dictionary = held_scene._camp_conversation_by_id(HUARONG_HELD_MEDICINE_CONVERSATION_ID)
if held_medicine.is_empty():
failures.append("held Red Cliffs line flag should expose Huarong medicine")
if not held_scene._camp_conversation_by_id(HUARONG_OPEN_RETREAT_BEANS_CONVERSATION_ID).is_empty():
failures.append("held Red Cliffs line flag should not expose Huarong retreat beans")
if not held_medicine.is_empty():
if held_scene._format_talk_status_text(held_scene._camp_conversation_entries()) != "Camp conversations | 3 topics | 1 supplies ready":
failures.append("Huarong held line talk status should show one ready supply")
if not held_scene._format_camp_conversation_button_text(held_medicine).contains("보급 Panacea"):
failures.append("Huarong held medicine button should show Panacea supply")
var before_panacea := int(held_scene.campaign_state.get_inventory_snapshot().get("panacea", 0))
held_scene._apply_camp_conversation_effects(held_medicine)
if int(held_scene.campaign_state.get_inventory_snapshot().get("panacea", 0)) != before_panacea + 1:
failures.append("Huarong held medicine should add Panacea to campaign inventory")
if int(held_scene.state.get_inventory_snapshot().get("panacea", 0)) != before_panacea + 1:
failures.append("Huarong held medicine should refresh battle Panacea inventory")
if not held_scene.campaign_state.has_claimed_camp_conversation_effects(HUARONG_SCENARIO_ID, HUARONG_HELD_MEDICINE_CONVERSATION_ID):
failures.append("Huarong held medicine claim should be saved")
if held_scene._format_talk_status_text(held_scene._camp_conversation_entries()) != "Camp conversations | 3 topics | 1 claimed":
failures.append("Huarong held line talk status should show claimed supply after claim")
held_scene.free()
var opened_scene = _new_prebattle_scene_for(
failures,
"Huarong opened retreat camp",
HUARONG_SCENARIO_ID,
HUARONG_SCENARIO_PATH,
{"opened_huarong_retreat": true}
)
if opened_scene != null:
if not opened_scene.campaign_state.joined_officers.has("zhang_he"):
opened_scene.campaign_state.joined_officers.append("zhang_he")
if not opened_scene.state.load_battle(
HUARONG_SCENARIO_PATH,
opened_scene.campaign_state.get_roster_overrides(),
opened_scene.campaign_state.get_inventory_snapshot(),
opened_scene.campaign_state.get_flags_snapshot(),
opened_scene.campaign_state.get_joined_officers_snapshot()
):
failures.append("Huarong opened retreat camp should reload with Zhang He joined")
else:
var retreat_beans: Dictionary = opened_scene._camp_conversation_by_id(HUARONG_OPEN_RETREAT_BEANS_CONVERSATION_ID)
if retreat_beans.is_empty():
failures.append("opened Huarong retreat flag should expose Huarong beans")
if not opened_scene._camp_conversation_by_id(HUARONG_HELD_MEDICINE_CONVERSATION_ID).is_empty():
failures.append("opened Huarong retreat flag should not expose Huarong medicine")
if not retreat_beans.is_empty():
if opened_scene._format_talk_status_text(opened_scene._camp_conversation_entries()) != "Camp conversations | 3 topics | 1 supplies ready":
failures.append("Huarong opened retreat talk status should show one ready supply")
if not opened_scene._format_camp_conversation_button_text(retreat_beans).contains("보급 Bean"):
failures.append("Huarong retreat beans button should show Bean supply")
var before_bean := int(opened_scene.campaign_state.get_inventory_snapshot().get("bean", 0))
opened_scene._apply_camp_conversation_effects(retreat_beans)
if int(opened_scene.campaign_state.get_inventory_snapshot().get("bean", 0)) != before_bean + 1:
failures.append("Huarong retreat beans should add Bean to campaign inventory")
if int(opened_scene.state.get_inventory_snapshot().get("bean", 0)) != before_bean + 1:
failures.append("Huarong retreat beans should refresh battle Bean inventory")
if not opened_scene.campaign_state.has_claimed_camp_conversation_effects(HUARONG_SCENARIO_ID, HUARONG_OPEN_RETREAT_BEANS_CONVERSATION_ID):
failures.append("Huarong retreat beans claim should be saved")
if opened_scene._format_talk_status_text(opened_scene._camp_conversation_entries()) != "Camp conversations | 3 topics | 1 claimed":
failures.append("Huarong opened retreat talk status should show claimed supply after claim")
opened_scene.free()
func _check_talk_menu_closes_on_cancel_and_reload(failures: Array[String]) -> void:
var scene = _new_prebattle_scene(failures, "talk menu close guards")
if scene == null:

81
tools/smoke_visual_assets.gd
View File

@@ -2066,6 +2066,17 @@ func _check_battle_visual_data(failures: Array[String]) -> void:
failures.append("could not load Huarong Retreat data")
else:
_check_shop_items_unique(failures, huarong_state, "031 base")
var huarong_conversations: Array = huarong_state.get_briefing().get("camp_conversations", [])
if huarong_conversations.size() != 2:
failures.append("031 base briefing should expose exactly two camp conversations")
else:
_check_camp_conversation(failures, _find_camp_conversation(huarong_conversations, "huarong_retreat_council"), "huarong_retreat_council", "topic", "")
_check_camp_conversation(failures, _find_camp_conversation(huarong_conversations, "huarong_zhang_he_mud_road"), "huarong_zhang_he_mud_road", "officer", "zhang_he")
var huarong_merchant := huarong_state.get_shop_merchant()
if str(huarong_merchant.get("name", "")) != "Huarong Road Sutler":
failures.append("031 shop should expose Huarong Road merchant name")
if (huarong_merchant.get("lines", []) as Array).size() < 2:
failures.append("031 shop should expose merchant flavor lines")
if huarong_state.get_unit("zhang_he_ch31").is_empty() or not huarong_state.is_required_deployment("zhang_he_ch31"):
failures.append("031 should deploy Zhang He as a required officer")
_check_shop_item_visibility(failures, huarong_state, "war_drum", false, "031 base")
@@ -2075,6 +2086,19 @@ func _check_battle_visual_data(failures: Array[String]) -> void:
if not huarong_held_state.load_battle("res://data/scenarios/031_huarong_retreat.json", {}, {}, {"held_red_cliffs_line": true}, ["zhang_he"]):
failures.append("could not load Huarong held Red Cliffs line data")
else:
var held_medicine: Dictionary = _find_camp_conversation(
huarong_held_state.get_briefing().get("camp_conversations", []),
"huarong_held_line_medicine"
)
if held_medicine.is_empty():
failures.append("031 held Red Cliffs line should expose held line medicine")
else:
_check_camp_conversation_effect(failures, held_medicine, "panacea", 1)
if not _find_camp_conversation(
huarong_held_state.get_briefing().get("camp_conversations", []),
"huarong_open_retreat_beans"
).is_empty():
failures.append("031 held Red Cliffs line should not expose opened retreat beans")
_check_shop_item_visibility(failures, huarong_held_state, "imperial_seal", true, "031 held Red Cliffs line")
_check_shop_item_visibility(failures, huarong_held_state, "war_drum", false, "031 held Red Cliffs line")
@@ -2082,6 +2106,19 @@ func _check_battle_visual_data(failures: Array[String]) -> void:
if not huarong_opened_state.load_battle("res://data/scenarios/031_huarong_retreat.json", {}, {}, {"opened_huarong_retreat": true}, ["zhang_he"]):
failures.append("could not load Huarong opened retreat data")
else:
var open_retreat_beans: Dictionary = _find_camp_conversation(
huarong_opened_state.get_briefing().get("camp_conversations", []),
"huarong_open_retreat_beans"
)
if open_retreat_beans.is_empty():
failures.append("031 opened Huarong retreat should expose retreat beans")
else:
_check_camp_conversation_effect(failures, open_retreat_beans, "bean", 1)
if not _find_camp_conversation(
huarong_opened_state.get_briefing().get("camp_conversations", []),
"huarong_held_line_medicine"
).is_empty():
failures.append("031 opened Huarong retreat should not expose held line medicine")
_check_shop_item_visibility(failures, huarong_opened_state, "war_drum", true, "031 opened Huarong retreat")
_check_shop_item_visibility(failures, huarong_opened_state, "imperial_seal", false, "031 opened Huarong retreat")
@@ -2092,6 +2129,50 @@ func _check_battle_visual_data(failures: Array[String]) -> void:
_check_shop_items_unique(failures, huarong_old_flags_state, "031 old Red Cliffs Fire setup flags")
_check_shop_item_visibility(failures, huarong_old_flags_state, "war_drum", false, "031 old Red Cliffs Fire setup flags")
_check_shop_item_visibility(failures, huarong_old_flags_state, "imperial_seal", false, "031 old Red Cliffs Fire setup flags")
if not _find_camp_conversation(
huarong_old_flags_state.get_briefing().get("camp_conversations", []),
"huarong_held_line_medicine"
).is_empty():
failures.append("031 old Red Cliffs Fire setup flags should not expose held line medicine")
if not _find_camp_conversation(
huarong_old_flags_state.get_briefing().get("camp_conversations", []),
"huarong_open_retreat_beans"
).is_empty():
failures.append("031 old Red Cliffs Fire setup flags should not expose opened retreat beans")
var jiangling_rearguard_state = BattleStateScript.new()
if not jiangling_rearguard_state.load_battle("res://data/scenarios/032_jiangling_rearguard.json", {}, {}, {}, ["zhang_he"]):
failures.append("could not load Jiangling Rearguard data")
else:
_check_shop_items_unique(failures, jiangling_rearguard_state, "032 base")
if jiangling_rearguard_state.get_unit("zhang_he_ch32").is_empty() or not jiangling_rearguard_state.is_required_deployment("zhang_he_ch32"):
failures.append("032 should deploy Zhang He as a required officer")
_check_shop_item_visibility(failures, jiangling_rearguard_state, "war_drum", false, "032 base")
_check_shop_item_visibility(failures, jiangling_rearguard_state, "imperial_seal", false, "032 base")
var jiangling_rearguard_secured_state = BattleStateScript.new()
if not jiangling_rearguard_secured_state.load_battle("res://data/scenarios/032_jiangling_rearguard.json", {}, {}, {"secured_huarong_rearguard": true}, ["zhang_he"]):
failures.append("could not load Jiangling Rearguard secured Huarong data")
else:
_check_shop_items_unique(failures, jiangling_rearguard_secured_state, "032 secured Huarong rearguard")
_check_shop_item_visibility(failures, jiangling_rearguard_secured_state, "imperial_seal", true, "032 secured Huarong rearguard")
_check_shop_item_visibility(failures, jiangling_rearguard_secured_state, "war_drum", false, "032 secured Huarong rearguard")
var jiangling_rearguard_rushed_state = BattleStateScript.new()
if not jiangling_rearguard_rushed_state.load_battle("res://data/scenarios/032_jiangling_rearguard.json", {}, {}, {"rushed_xuchang_return": true}, ["zhang_he"]):
failures.append("could not load Jiangling Rearguard rushed Xuchang data")
else:
_check_shop_items_unique(failures, jiangling_rearguard_rushed_state, "032 rushed Xuchang return")
_check_shop_item_visibility(failures, jiangling_rearguard_rushed_state, "war_drum", true, "032 rushed Xuchang return")
_check_shop_item_visibility(failures, jiangling_rearguard_rushed_state, "imperial_seal", false, "032 rushed Xuchang return")
var jiangling_rearguard_old_flags_state = BattleStateScript.new()
if not jiangling_rearguard_old_flags_state.load_battle("res://data/scenarios/032_jiangling_rearguard.json", {}, {}, {"held_red_cliffs_line": true, "opened_huarong_retreat": true}, ["zhang_he"]):
failures.append("could not load Jiangling Rearguard old Huarong setup flag data")
else:
_check_shop_items_unique(failures, jiangling_rearguard_old_flags_state, "032 old Huarong setup flags")
_check_shop_item_visibility(failures, jiangling_rearguard_old_flags_state, "war_drum", false, "032 old Huarong setup flags")
_check_shop_item_visibility(failures, jiangling_rearguard_old_flags_state, "imperial_seal", false, "032 old Huarong setup flags")
for item_id in ["bronze_sword", "training_spear", "short_bow", "hand_axe", "iron_armor", "panacea"]:
var item := state.get_item_def(item_id)