Implement triggered ability target prompting (Option D)

When a Triggered ability fires and any of its actions require a human target
pick, the server now pauses execution instead of auto-resolving:

Server:
- AbilitySystem.FireTrigger detects actions needing client input via
  ActionNeedsClientTargets(); stores PendingTriggeredTarget in GameState and
  returns early rather than executing the ability
- PushStateToPlayersAsync (GameHandlerBase) checks for PendingTriggeredTarget
  after every state push and sends a game.ability.triggered_target_request push
  to the owning player carrying the action definition and range
- New GameTriggeredTargetHandler (game.triggered_target) receives the player's
  picks, calls AbilitySystem.ResumeTriggeredAbility, and broadcasts the result
- PendingTriggeredTarget model stored in GameState.PendingTriggeredTarget (JSONB)

Client:
- Game.gd handles the triggered_target_request push and emits a signal
- game_screen.gd connects the signal, re-uses the existing ABILITY_TARGET mode
  and _start_ability_targeting() flow, then sends game.triggered_target instead
  of game.activate_ability when done
- A brief banner ("Triggered: <name> — select a target") informs the player

"Warrant Cover" (OnChanneled, Owner unit pick) will now correctly prompt the
player to select which friendly unit gains +1 Defense.

Generated with [Claude Code](https://claude.ai/code)
via [Happy](https://happy.engineering)

Co-Authored-By: Claude <noreply@anthropic.com>
Co-Authored-By: Happy <yesreply@happy.engineering>
This commit is contained in:
dingo
2026-03-28 18:50:48 -04:00
co-authored by Claude Happy
parent cb601abd00
commit 515bfaabdf
9 changed files with 343 additions and 1 deletions
+14
View File
@@ -46,6 +46,10 @@ signal player_eliminated(session_id: String, eliminated_account_id: String, seat
## event_type: "started" | "ended"
signal game_activity(event_type: String, session_id: String)
## Emitted when a Triggered ability needs the local player to pick a target.
## Payload keys: requestId, sourceInstanceId, abilityName, actionJson, rangeJson
signal triggered_target_request(request_data: Dictionary)
# ── State ─────────────────────────────────────────────────────────────────────
var session_id : String = ""
@@ -333,6 +337,13 @@ func send_activate_ability(source_id: String, ability_index: int,
payload["targets"] = targets
_game_request("game.activate_ability", payload)
func send_triggered_target_response(request_id: String, targets: Array) -> void:
var payload : Dictionary = { "requestId": request_id }
if not targets.is_empty():
payload["targets"] = targets
_game_request("game.triggered_target", payload)
# ── Private ───────────────────────────────────────────────────────────────────
func _game_request(msg_type: String, extra: Dictionary) -> void:
@@ -648,3 +659,6 @@ func _on_server_push(type: String, payload: Variant) -> void:
var ev_type : String = str(d.get("eventType", ""))
var ev_sid : String = str(d.get("sessionId", ""))
game_activity.emit(ev_type, ev_sid)
"game.ability.triggered_target_request":
triggered_target_request.emit(payload as Dictionary)
@@ -152,6 +152,10 @@ var _ability_confirm_btn : Control = null # "Done" button shown for Up
var _ability_branch_panel : Control = null # ChooseOne branch selector panel
var _player_panel : Control = null
# Triggered ability target prompting
var _is_triggered_target : bool = false # true when targeting for a server-paused trigger
var _triggered_request_id : String = "" # requestId to echo back in the response
# Tile detail drawer (right-side slide-in panel)
var _tile_drawer : PanelContainer = null
var _tile_drawer_open : bool = false
@@ -256,6 +260,7 @@ func _ready() -> void:
get_tree().change_scene_to_file("res://scenes/main/MainScreen.tscn"))
_hold_timer.timeout.connect(_on_hold_timer_fired)
_create_tile_drawer()
Game.triggered_target_request.connect(_on_triggered_target_request)
# Chat overlay — add to viewport root so it renders above everything.
var _chat_overlay := _CHAT_OVERLAY_SCENE.instantiate()
@@ -308,6 +313,8 @@ func _exit_tree() -> void:
Game.player_eliminated.disconnect(_on_player_eliminated)
if Game.game_activity.is_connected(_on_game_activity):
Game.game_activity.disconnect(_on_game_activity)
if Game.triggered_target_request.is_connected(_on_triggered_target_request):
Game.triggered_target_request.disconnect(_on_triggered_target_request)
if Settings.settings_changed.is_connected(_on_skybox_setting_changed):
Settings.settings_changed.disconnect(_on_skybox_setting_changed)
_reset_unit_hover_glow()
@@ -3220,13 +3227,73 @@ func _hide_branch_panel() -> void:
## Fire the ability request with all collected targets.
func _send_ability() -> void:
if not _ability_card_id.is_empty():
if _is_triggered_target:
_is_triggered_target = false
var rid := _triggered_request_id
_triggered_request_id = ""
Game.send_triggered_target_response(rid, _ability_targets)
elif not _ability_card_id.is_empty():
Game.send_play_card_with_targets(_ability_card_id, _ability_targets)
else:
Game.send_activate_ability(_ability_unit_id, _ability_idx, _ability_targets)
_set_mode(Mode.NONE)
## Called when the server pushes a triggered_target_request for this player.
## Sets up the standard ability-targeting UI re-using the existing ABILITY_TARGET mode.
func _on_triggered_target_request(req: Dictionary) -> void:
# If already in a targeting mode, cancel it first to avoid stacking.
if _mode != Mode.NONE:
_set_mode(Mode.NONE)
_is_triggered_target = true
_triggered_request_id = str(req.get("requestId", ""))
_ability_unit_id = str(req.get("sourceInstanceId", ""))
_ability_idx = -1
_ability_card_id = ""
_ability_target_conditions = []
# Parse and normalise the action definition sent by the server.
var action_json : String = str(req.get("actionJson", "{}"))
var action_raw = JSON.parse_string(action_json)
if action_raw is Dictionary:
_ability_def = [_normalize_keys(action_raw)]
elif action_raw is Array:
_ability_def = _normalize_keys(action_raw) as Array
else:
_ability_def = []
var range_json : String = str(req.get("rangeJson", ""))
if not range_json.is_empty() and range_json != "null":
var r = JSON.parse_string(range_json)
_ability_range = _normalize_keys(r) as Dictionary if r is Dictionary else {}
else:
_ability_range = {}
_ability_targets = []
_ability_cur_action_idx = 0
_ability_target_n = 1
_ability_target_up_to = false
_ability_targets_this_action = 0
_show_triggered_banner(str(req.get("abilityName", "Triggered Ability")))
_start_ability_targeting()
## Brief top-centre banner indicating a triggered ability needs player input.
func _show_triggered_banner(ability_name: String) -> void:
var lbl := Label.new()
lbl.text = "Triggered: %s — select a target" % ability_name
lbl.set_anchors_preset(Control.PRESET_TOP_WIDE)
lbl.horizontal_alignment = HORIZONTAL_ALIGNMENT_CENTER
lbl.position = Vector2(0, 72)
lbl.add_theme_font_size_override("font_size", 15)
lbl.modulate = Color(1.0, 0.85, 0.2)
_hud.add_child(lbl)
get_tree().create_timer(4.0).timeout.connect(func() -> void:
if is_instance_valid(lbl): lbl.queue_free())
## Show a left-side panel to let the player select a player (and optionally a
## zone) as the ability target.
func _show_player_panel(scope: String, ownership: String) -> void: