diff options
Diffstat (limited to 'Game/States/Build')
| -rw-r--r-- | Game/States/Build/BuilderElement.gd | 4 | ||||
| -rw-r--r-- | Game/States/Build/StateBuild.gd | 30 | ||||
| -rw-r--r-- | Game/States/Build/StateBuild.tscn | 2 | ||||
| -rw-r--r-- | Game/States/Build/build_grid.gd | 6 |
4 files changed, 32 insertions, 10 deletions
diff --git a/Game/States/Build/BuilderElement.gd b/Game/States/Build/BuilderElement.gd index b564379..e04d4c3 100644 --- a/Game/States/Build/BuilderElement.gd +++ b/Game/States/Build/BuilderElement.gd @@ -79,11 +79,11 @@ func _process(_delta): func can_build(): for area in collision_areas: if area.get_overlapping_areas().size() > 0: - Client.current_stage.add_status_message("Can't build there") + Client.current_stage.notification_manager.add_status_message("Can't build there") return false if area.get_overlapping_bodies().size() > 0: - Client.current_stage.add_status_message("Can't build there") + Client.current_stage.notification_manager.add_status_message("Can't build there") return false #if Client.current_stage.has_method("can_build"): diff --git a/Game/States/Build/StateBuild.gd b/Game/States/Build/StateBuild.gd index 84bfa2c..bd44524 100644 --- a/Game/States/Build/StateBuild.gd +++ b/Game/States/Build/StateBuild.gd @@ -4,11 +4,18 @@ extends State static var current_builder_element: BuilderElement +@export var hud: HUD @export var selection_manager: SelectionManager +@export var tower_manager: TowerManager + + +func _ready() -> void: + Client.placed_tower.connect(_on_placed_tower) func _state_enter(): %BuildGrid.visible = true + hud.tower_configurations_container.visible = true for tower: Tower in selection_manager.get_nodes().duplicate(): tower.is_selected = false @@ -16,9 +23,10 @@ func _state_enter(): func _state_exit(): %BuildGrid.visible = false + hud.tower_configurations_container.visible = false -func _state_input(event: InputEvent): +func _input(event: InputEvent): if event.is_action_pressed("builder_tower_select"): if current_builder_element: get_viewport().set_input_as_handled() @@ -28,7 +36,7 @@ func _state_input(event: InputEvent): placed_tower.global_position = current_builder_element.global_position - Client.place_tower(placed_tower) + tower_manager.place_tower(placed_tower) if not Input.is_action_pressed("builder_tower_place_keep"): current_builder_element.queue_free() @@ -41,7 +49,7 @@ func _state_input(event: InputEvent): current_builder_element.queue_free() current_builder_element = null - set_state("StateDefault") + state_manager.set_state(state_manager.state_default) if event.is_action_pressed("builder_cancel") and current_builder_element: get_viewport().set_input_as_handled() @@ -50,6 +58,18 @@ func _state_input(event: InputEvent): current_builder_element = null -func _state_unhandled_input(event: InputEvent) -> void: +func _unhandled_input(event: InputEvent) -> void: if event.is_action_pressed("select"): - set_state("StateDefault") + state_manager.set_state(state_manager.state_default) + + +func _on_placed_tower(tower: Tower) -> void: + tower.selected_secondary.connect(_on_tower_selected_secondary.bind(tower)) + + +func _on_tower_selected_secondary(tower: Tower) -> void: + if state_manager.current_state != self: + return + + if Input.is_action_just_pressed("builder_cancel"): + Client.remove_tower(tower) diff --git a/Game/States/Build/StateBuild.tscn b/Game/States/Build/StateBuild.tscn index ee721cf..cbdba9b 100644 --- a/Game/States/Build/StateBuild.tscn +++ b/Game/States/Build/StateBuild.tscn @@ -3,7 +3,7 @@ [ext_resource type="Script" uid="uid://dvxow1cgbr44o" path="res://Game/States/Build/StateBuild.gd" id="1_s0n2d"] [ext_resource type="PackedScene" uid="uid://8oq8aa1q4c1h" path="res://Game/States/Build/BuildGrid.tscn" id="2_iheti"] -[node name="StateBuild" type="Node"] +[node name="StateBuild" type="Node2D"] script = ExtResource("1_s0n2d") [node name="BuildGrid" parent="." instance=ExtResource("2_iheti")] diff --git a/Game/States/Build/build_grid.gd b/Game/States/Build/build_grid.gd index 67c962e..22bc344 100644 --- a/Game/States/Build/build_grid.gd +++ b/Game/States/Build/build_grid.gd @@ -1,6 +1,8 @@ extends Node2D +@export var stage: Stage + @onready var camera: Camera = get_viewport().get_camera_2d() @@ -11,8 +13,8 @@ func _ready() -> void: func _draw(): - var area = Client.current_stage.map.get_used_rect() - var cell_size = Client.current_stage.map.tile_set.tile_size + var area = stage.map.get_used_rect() + var cell_size = stage.map.tile_set.tile_size var offset = area.position for row in range(0, area.size.y + 1): draw_line( |