Enter and exit combat state

Author: food-please

project.godot

@@ -142,6 +142,11 @@ interact={
 "events": [null, Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":0,"physical_keycode":32,"key_label":0,"unicode":0,"echo":false,"script":null)
 ]
 }
+back={
+"deadzone": 0.5,
+"events": [Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":0,"physical_keycode":4194305,"key_label":0,"unicode":0,"echo":false,"script":null)
+]
+}
 
 [layer_names]
 

src/combat/combat.gd

@@ -2,6 +2,13 @@ extends CanvasLayer
 
 var _active_arena: CombatArena = null
 
+@onready var _combat_containter: = $CenterContainer as CenterContainer
+
+
+func _ready() -> void:
+	CombatEvents.combat_initiated.connect(_on_combat_initiated)
+	CombatEvents.combat_finished.connect(_on_combat_finished)
+
 
 func _on_combat_initiated(arena: PackedScene) -> void:
 	# Don't start a new combat if one is currently ongoing.
@@ -12,4 +19,14 @@ func _on_combat_initiated(arena: PackedScene) -> void:
 	var new_arena: = arena.instantiate()
 	assert(new_arena is CombatArena,
 		"Failed to initiate combat. Provided 'arena' arugment is not a CombatArena.")
-	add_child(new_arena)
+	
+	_active_arena = new_arena
+	_combat_containter.add_child(_active_arena)
+
+
+func _on_combat_finished() -> void:
+	if not _active_arena:
+		return
+	
+	_active_arena.queue_free()
+	_active_arena = null

src/combat/combat_arena.gd

@@ -1,3 +1,15 @@
 class_name CombatArena extends Control
 
 @export var music: AudioStream
+
+
+# TODO: This is included to allow leaving the combat state.
+# In future releases, these signals will be emitted once battlers from one side have fallen.
+func _unhandled_input(event: InputEvent) -> void:
+	if event.is_action_released("back"):
+		CombatEvents.combat_lost.emit()
+		CombatEvents.combat_finished.emit()
+	
+	elif event.is_action_released("interact"):
+		CombatEvents.combat_won.emit()
+		CombatEvents.combat_finished.emit()

src/combat/combat_arena.tscn

@@ -24,3 +24,12 @@ y_sort_enabled = true
 anchors_preset = 0
 offset_right = 40.0
 offset_bottom = 40.0
+
+[node name="InstructionsLabel" type="Label" parent="Foreground"]
+layout_mode = 0
+offset_left = 890.0
+offset_top = 823.0
+offset_right = 1808.0
+offset_bottom = 970.0
+text = "Press 'ESCAPE' to lose combat.
+Press 'SPACE' to win combat."

src/common/combat_events.gd

@@ -3,3 +3,20 @@ extends Node
 
 ## Emitted whenever a combat is triggered. Technically, this event occurs within the field state.
 signal combat_initiated(arena: PackedScene)
+
+## Emitted immediately after the player has won combat and all animations have finished.
+## This is used to transition to the combat results screen and notify the combat-starting-trigger
+## of the combat result.
+signal combat_won
+
+## Emitted immediately after the player has lost combat and all animations have finished.
+## This is used to fade the screen post-combat and notify the combat-starting-trigger of the result.
+signal combat_lost
+
+## Emitted whenever the player has finished with the combat state regardless of whether or not the
+## combat was won by the player.
+## If the player won the combat, the battle results screen has been displayed and dismissed and the
+## screen has faded to black.
+## If the player lost combat, the screen has faded to black. In most places, the "gameover" screen
+## will be displayed next.
+signal combat_finished

src/field/cutscenes/templates/combat_trigger.gd

@@ -3,7 +3,42 @@ class_name CombatTrigger extends Trigger
 
 @export var combat_arena: PackedScene
 
+# An internal flag that tracks the outcome of a given combat instance. It is reset every time this
+# trigger is run.
+var _is_victory: = false
+
 
 func _execute() -> void:
-	print("FIGHT!")
 	CombatEvents.combat_initiated.emit(combat_arena)
+	
+	# The trigger wants to know if the player wins or loses combat, so we'll listen in for win/lose
+	# signals. We only want the trigger to know about THIS combat, so we need to track the method
+	# reference in order to disconnect it, since the callback will not be called on a loss.
+	_is_victory = false
+	CombatEvents.combat_won.connect(_on_combat_won)
+	await CombatEvents.combat_finished
+	CombatEvents.combat_won.disconnect(_on_combat_won)
+	
+	# We want to run post-combat events. In some cases, this may not involve much, such as playing a
+	# game-over screen or removing an AI combat-starting gamepiece from the field.
+	# In some cases, however, we'll want a dialogue to play or some creative event to occur if, for
+	# example, the player lost a difficult but non-essential battle.
+	if _is_victory:
+		await _run_victory_cutscene()
+	
+	else:
+		await _run_loss_cutscene() 
+
+
+func _on_combat_won() -> void:
+	_is_victory = true
+
+
+func _run_victory_cutscene() -> void:
+	await get_tree().process_frame
+	print("Player won")
+
+
+func _run_loss_cutscene() -> void:
+	await get_tree().process_frame
+	print("Player lost")

src/field/field.gd

@@ -14,6 +14,12 @@ func _ready() -> void:
 	assert(gameboard)
 	randomize()
 
+	# The field state must pause/unpause with combat accordingly.
+	# Note that pausing/unpausing input is already wrapped up in triggers, which are what will
+	# initiate combat.
+	CombatEvents.combat_initiated.connect(func(_arena): hide())
+	CombatEvents.combat_finished.connect(func(): show())
+	
 	Camera.scale = scale
 	Camera.gameboard = gameboard
 	Camera.make_current()

src/main.tscn

@@ -492,7 +492,6 @@ emote = 1
 
 [node name="Combat1" type="Node2D" parent="Field/Terrain/Gamepieces/Town"]
 position = Vector2(56, 216)
-scale = Vector2(1, 1)
 metadata/_edit_group_ = true
 
 [node name="Sprite2D" type="Sprite2D" parent="Field/Terrain/Gamepieces/Town/Combat1"]
@@ -507,7 +506,6 @@ emote = 0
 
 [node name="Combat2" type="Node2D" parent="Field/Terrain/Gamepieces/Town"]
 position = Vector2(70.4, 184)
-scale = Vector2(1, 1)
 metadata/_edit_group_ = true
 
 [node name="Sprite2D" type="Sprite2D" parent="Field/Terrain/Gamepieces/Town/Combat2"]