Unit now does not handle the MovementMarker anymore.

This commit is contained in:
gdz
2025-12-14 02:38:31 +01:00
parent a500e7ac3e
commit 4f9d5fc8bd
2 changed files with 36 additions and 13 deletions

View File

@@ -2,26 +2,36 @@ extends Node2D
class_name Unit
var _spawnPosition: Vector2
### Marker
# For now the marker will be spawned and deleted by the unit.
# Later it will be handled by the main scene.
# Load marker scene.
var marker_scene = preload("res://Scenes/Unit/marker.tscn")
var marker
# var marker_scene: PackedScene = preload("res://Scenes/Unit/marker.tscn")
# var marker
## WE NOW USE A SIMPLE SPRITE2D FOR THE MARKER
@onready var _readyToSelectMarker = $ReadyToSelectMarker
@onready var _selectedMarker = $SelectedMarker
var _selected = false
var _readyToSelect = false
@onready var _readyToSelectMarker: Sprite2D = $ReadyToSelectMarker
@onready var _selectedMarker: Sprite2D = $SelectedMarker
#@onready var _movingMarker: Sprite2D = $MovingMarker
var _readyToSelect: bool = false
var _selected: bool = false
#var _moving: bool = false
var TargetPosition: Vector2
# Called when the node enters the scene tree for the first time.
func _ready() -> void:
marker = marker_scene.instantiate()
marker.hide()
# marker = marker_scene.instantiate()
# marker.hide()
global_position = _spawnPosition
_readyToSelectMarker.hide()
_selectedMarker.hide()
# _movingMarker.hide()
# Called every frame. 'delta' is the elapsed time since the previous frame.
func _process(delta: float) -> void:
@@ -36,10 +46,14 @@ func _input(event: InputEvent):
else: _deselectUnit()
if event.is_action_pressed("SetMarker") and _selected:
marker.global_position = event.position
marker.show()
print_debug("Setting marker")
# if event.is_action_pressed("SetMarker"):
# print("Action is SetMarker")
# if _selected:
# print("Setting marker to ", event.position)
# #marker.global_position = event.position
## marker.show()
## _movingMarker.position = get_global_mouse_position()
## _movingMarker.show()
func _getUnitPosition():
return $AnimatedSprite2D.global_position
@@ -66,3 +80,6 @@ func _markUnit():
func _unMarkUnit():
_readyToSelect = false
_readyToSelectMarker.hide()
func moveToTarget():