hz/territory-autobattler
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

implemented unit movement

Browse Source
This commit is contained in:
hz
2026-05-19 05:29:51 -05:00
parent b0b270f4d8
commit 14e2c26e74
6 changed files with 247 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
game/territory-autobattler/scenes/game/hex_grid_screen.gd
+94
View File
@@ -15,6 +15,7 @@ var visible_request: HTTPRequest
var resources_request: HTTPRequest
var units_request: HTTPRequest
var train_unit_request: HTTPRequest
var move_units_request: HTTPRequest
var claim_request: HTTPRequest
var build_request: HTTPRequest
var refresh_request: HTTPRequest
@@ -63,6 +64,9 @@ var selected_can_train_archer := false
var selected_is_home := false
var completed_scout_count := 0
var completed_archer_count := 0
var selected_archer_q := 9999
var selected_archer_r := 9999
var selected_archer_count := 0
var refresh_prompt_active := false
var refresh_request_active := false
@@ -258,6 +262,10 @@ func _build_ui() -> void:
train_unit_request.request_completed.connect(_on_train_unit_request_completed)
add_child(train_unit_request)
move_units_request = HTTPRequest.new()
move_units_request.request_completed.connect(_on_move_units_request_completed)
add_child(move_units_request)
claim_request = HTTPRequest.new()
claim_request.request_completed.connect(_on_claim_request_completed)
add_child(claim_request)
@@ -410,6 +418,9 @@ func _on_tile_hovered(q: int, r: int, terrain: String) -> void:
func _on_tile_selected(q: int, r: int, terrain: String) -> void:
if _handle_unit_selection_or_move(q, r):
return
selected_q = q
selected_r = r
selected_can_claim = terrain.contains("Unclaimed")
@@ -423,6 +434,27 @@ func _on_tile_selected(q: int, r: int, terrain: String) -> void:
coordinate_label.text = "Selected q:%d r:%d | %s territory" % [q, r, terrain]
func _handle_unit_selection_or_move(q: int, r: int) -> bool:
if not grid_view:
return false
var archer_count: int = grid_view.get_archer_count_at(q, r)
if archer_count > 0:
selected_archer_q = q
selected_archer_r = r
selected_archer_count = archer_count
grid_view.set_selected_unit_tile(q, r)
if coordinate_label:
coordinate_label.text = "Selected Archer squad: %d at q:%d r:%d. Select a visible non-rival tile to move." % [archer_count, q, r]
return true
if selected_archer_count > 0:
_move_selected_archers(q, r)
return true
return false
func _can_build_log_camp_on_selected_tile() -> bool:
return _can_build_on_selected_tile("Forest")
@@ -481,6 +513,14 @@ func _update_action_buttons() -> void:
build_barracks_button.disabled = false
func _clear_selected_archers() -> void:
selected_archer_q = 9999
selected_archer_r = 9999
selected_archer_count = 0
if grid_view:
grid_view.clear_selected_unit_tile()
func _selected_tile_is_home() -> bool:
if not grid_view:
return false
@@ -915,6 +955,60 @@ func _on_train_unit_request_completed(result: int, response_code: int, _headers:
_refresh_player_state()
func _move_selected_archers(to_q: int, to_r: int) -> void:
if selected_archer_count <= 0:
return
if to_q == selected_archer_q and to_r == selected_archer_r:
coordinate_label.text = "Archer squad is already on that tile."
return
if not grid_view.is_visible_non_rival_tile(to_q, to_r):
coordinate_label.text = "Archers can only move to visible non-rival tiles."
return
var access_token: String = str(session.get("accessToken", ""))
if access_token.is_empty():
coordinate_label.text = "No auth token available. Archer squad was not moved."
return
if move_units_request.get_http_client_status() != HTTPClient.STATUS_DISCONNECTED:
return
coordinate_label.text = "Moving %d Archers to q:%d r:%d..." % [selected_archer_count, to_q, to_r]
var error: int = move_units_request.request(
LOCATIONS_BASE_URL + "/api/units/move",
PackedStringArray([
"Content-Type: application/json",
"Authorization: Bearer %s" % access_token
]),
HTTPClient.METHOD_POST,
JSON.stringify({
"unitType": "Archer",
"fromQ": selected_archer_q,
"fromR": selected_archer_r,
"toQ": to_q,
"toR": to_r
})
)
if error != OK:
coordinate_label.text = "Could not contact the unit move service."
func _on_move_units_request_completed(result: int, response_code: int, _headers: PackedStringArray, body: PackedByteArray) -> void:
var text: String = body.get_string_from_utf8()
if result != HTTPRequest.RESULT_SUCCESS:
coordinate_label.text = "Archer move request failed."
return
if response_code < 200 or response_code >= 300:
coordinate_label.text = "Archer move failed: %s" % text
_refresh_player_state()
return
_clear_selected_archers()
coordinate_label.text = "Archer squad moved."
_refresh_player_state()
func _claim_selected_tile() -> void:
if not selected_can_claim:
coordinate_label.text = "Select a visible unclaimed tile to send a scout."
game/territory-autobattler/scenes/game/hex_grid_view.gd
+36 -6
View File
@@ -17,6 +17,7 @@ var drag_distance: float = 0.0
var last_mouse_position: Vector2 = Vector2.ZERO
var hovered_tile: Vector2i = Vector2i(9999, 9999)
var selected_tile: Vector2i = Vector2i(9999, 9999)
var selected_unit_tile: Vector2i = Vector2i(9999, 9999)
var home_tile: Vector2i = Vector2i(9999, 9999)
var tiles: Array[Dictionary] = []
var visible_tiles: Dictionary = {}
@@ -157,6 +158,8 @@ func _draw_tile(tile: Dictionary) -> void:
if not tile_visible:
draw_polyline(_closed_points(points), Color(0.11, 0.15, 0.15, 0.75), 1.0)
elif coord == selected_unit_tile:
draw_polyline(_closed_points(points), Color(0.90, 0.68, 0.28), 5.0)
elif is_selected:
draw_polyline(_closed_points(points), Color(0.95, 0.76, 0.28), 4.0)
elif coord == home_tile:
@@ -453,12 +456,20 @@ func _draw_archer_unit_marker(center: Vector2, height: float, count: int) -> voi
draw_line(marker_center + Vector2(18.0, -1.0) * marker_scale, marker_center + Vector2(14.0, -4.0) * marker_scale, arrow_color, 1.2 * marker_scale)
draw_line(marker_center + Vector2(18.0, -1.0) * marker_scale, marker_center + Vector2(14.0, 2.0) * marker_scale, arrow_color, 1.2 * marker_scale)
if count > 1:
var badge_center: Vector2 = marker_center + Vector2(10.0, 9.0) * marker_scale
draw_circle(badge_center, 6.0 * marker_scale, badge_color)
draw_arc(badge_center, 6.0 * marker_scale, 0.0, TAU, 18, badge_border, 1.4 * marker_scale)
var font := ThemeDB.fallback_font
draw_string(font, badge_center + Vector2(-3.5, 3.5) * marker_scale, str(min(count, 9)), HORIZONTAL_ALIGNMENT_LEFT, -1, 9 * marker_scale, Color(0.93, 0.86, 0.58))
var count_text := str(count)
var font := ThemeDB.fallback_font
var badge_font_size := int(round(9.0 * marker_scale))
var text_size := font.get_string_size(count_text, HORIZONTAL_ALIGNMENT_LEFT, -1, badge_font_size)
var badge_size := Vector2(max(14.0 * marker_scale, text_size.x + 7.0 * marker_scale), 12.0 * marker_scale)
var badge_rect := Rect2(marker_center + Vector2(5.0, 3.0) * marker_scale, badge_size)
draw_rect(badge_rect, badge_color, true)
draw_polyline(_closed_points(PackedVector2Array([
badge_rect.position,
badge_rect.position + Vector2(badge_rect.size.x, 0),
badge_rect.position + badge_rect.size,
badge_rect.position + Vector2(0, badge_rect.size.y)
])), badge_border, 1.2 * marker_scale)
draw_string(font, badge_rect.position + Vector2(3.5, 9.0) * marker_scale, count_text, HORIZONTAL_ALIGNMENT_LEFT, -1, badge_font_size, Color(0.93, 0.86, 0.58))
func _tile_data(q: int, r: int) -> Dictionary:
@@ -531,6 +542,25 @@ func set_unit_instances(units: Array) -> void:
queue_redraw()
func set_selected_unit_tile(q: int, r: int) -> void:
selected_unit_tile = Vector2i(q, r)
queue_redraw()
func clear_selected_unit_tile() -> void:
selected_unit_tile = Vector2i(9999, 9999)
queue_redraw()
func get_archer_count_at(q: int, r: int) -> int:
return _archer_count_at(q, r)
func is_visible_non_rival_tile(q: int, r: int) -> bool:
var key := _tile_key(q, r)
return visible_tiles.has(key) and not rival_tiles.has(key)
func _tile_key(q: int, r: int) -> String:
return "%d,%d" % [q, r]