feat(godot): deplacements mer et air depuis la carte

Cycle de selection des pieces sur une case, surbrillances par domaine, tests smoke QG vers Space_5.

Author: tom

godot/CHANGELOG.md

@@ -27,9 +27,13 @@ Format des entrées : `AAAA-MM-JJ HH:MM:SS` (heure locale).
 
 - **File d’ordres** — `%OrdersQueue` dans la sidebar (pad `O : HQ > CE`, compteur 0/5), journal `%OrdersLog` pour événements de manche
 
+### Réalisé (suite)
+
+- **Déplacements mer/air** — sélection pièce par reclic sur la case (cycle soldat/tank/chasseur/croiseur), surbrillance bleue mer / jaune air, tests smoke croiseur QG→`Space_5`
+
 ### À faire (prochaine étape critique)
 
-- [ ] Déplacements mer/air depuis la carte (pas seulement terre)
+- [ ] Bombes H et combats détaillés (résolution legacy)
 - [ ] Tuiles directionnelles emboîtées (échelle Unity) si souhaité
 - [ ] `Battleground.unity` pour calibration pixel-perfect
 - [ ] Bombes H, combats détaillés, animations

godot/scenes/battle/battle.tscn

@@ -60,6 +60,13 @@ unique_name_in_owner = true
 layout_mode = 2
 theme_override_colors/font_color = Color(0.9, 0.9, 0.92, 1)
 
+[node name="CasePiece" type="Label" parent="Sidebar/CasePanel/VBox"]
+unique_name_in_owner = true
+layout_mode = 2
+theme_override_colors/font_color = Color(0.55, 0.82, 0.95, 1)
+theme_override_font_sizes/font_size = 11
+text = ""
+
 [node name="ReservePanel" type="PanelContainer" parent="Sidebar"]
 layout_mode = 2
 

godot/scripts/battle/battle.gd

@@ -19,6 +19,7 @@ const AiPlanner = preload("res://scripts/ai/ai_planner.gd")
 var _state: GameState
 var _selected_sector: String = ""
 var _selected_piece_id: int = -1
+var _sector_pick_index: int = 0
 var _planning_elapsed: int = 1
 var _timer_accum: float = 0.0
 
@@ -54,6 +55,7 @@ func _process(delta: float) -> void:
 				_state.human_camp,
 				_selected_sector,
 				_planning_elapsed,
+				_selected_piece(),
 			)
 
 
@@ -98,6 +100,7 @@ func _refresh_ui() -> void:
 			_state.human_camp,
 			_selected_sector,
 			_planning_elapsed,
+			_selected_piece(),
 		)
 	if _status:
 		_status.text = "Phase %s | ordres %d/%d" % [
@@ -107,19 +110,50 @@ func _refresh_ui() -> void:
 		]
 
 
+func _selected_piece() -> PieceInstance:
+	if _selected_piece_id < 0:
+		return null
+	return _state.find_piece(_selected_piece_id)
+
+
+func _movable_human_on_sector(sector_id: String) -> Array[PieceInstance]:
+	var result: Array[PieceInstance] = []
+	for p: PieceInstance in _state.human_pieces_on_sector(sector_id):
+		if not _state.has_piece_moved(p.id):
+			result.append(p)
+	result.sort_custom(func(a: PieceInstance, b: PieceInstance) -> bool:
+		return int(a.type) < int(b.type)
+	)
+	return result
+
+
 func _update_move_highlights() -> void:
 	if not _board_map.has_method("set_move_highlights"):
 		return
 	if _selected_piece_id < 0:
 		_board_map.call("set_move_highlights", PackedStringArray())
+		if _board_map.has_method("set_highlight_color"):
+			_board_map.call("set_highlight_color", Color(0.95, 0.85, 0.35, 0.55))
 		return
-	var piece: PieceInstance = _state.find_piece(_selected_piece_id)
+	var piece: PieceInstance = _selected_piece()
 	if piece == null or piece.in_reserve:
 		_board_map.call("set_move_highlights", PackedStringArray())
 		return
+	if _board_map.has_method("set_highlight_color"):
+		_board_map.call("set_highlight_color", _highlight_color_for_piece(piece))
 	_board_map.call("set_move_highlights", _state.destinations_for(piece))
 
 
+func _highlight_color_for_piece(piece: PieceInstance) -> Color:
+	match GameConstants.piece_movement_domain(piece.type):
+		GameConstants.MovementDomain.SEA:
+			return Color(0.45, 0.75, 0.95, 0.65)
+		GameConstants.MovementDomain.AIR:
+			return Color(0.85, 0.9, 0.45, 0.65)
+		_:
+			return Color(0.95, 0.85, 0.35, 0.55)
+
+
 func _log_last_order() -> void:
 	pass
 
@@ -133,24 +167,43 @@ func _phase_name(phase: GameConstants.GamePhase) -> String:
 
 func _select_sector(sector_id: String) -> void:
 	if _selected_piece_id >= 0:
-		var active: PieceInstance = _state.find_piece(_selected_piece_id)
+		var active: PieceInstance = _selected_piece()
 		if active != null and not active.in_reserve and sector_id != active.sector_id:
 			var dests := _state.destinations_for(active)
 			if sector_id in dests:
 				_try_move_to(sector_id)
 				return
 
-	_selected_sector = sector_id
-	_selected_piece_id = -1
+	if sector_id == _selected_sector:
+		_cycle_movable_piece(sector_id)
+	else:
+		_selected_sector = sector_id
+		_sector_pick_index = 0
+		_select_movable_piece_by_index(sector_id, 0)
+
 	if _board_map.has_method("set_selected"):
 		_board_map.call("set_selected", sector_id)
 	_update_sector_panel()
-	for i in range(_piece_list.get_item_count()):
-		_on_piece_selected(i)
-		break
 	_refresh_ui()
 
 
+func _cycle_movable_piece(sector_id: String) -> void:
+	var movable := _movable_human_on_sector(sector_id)
+	if movable.size() <= 1:
+		return
+	_sector_pick_index = (_sector_pick_index + 1) % movable.size()
+	_selected_piece_id = movable[_sector_pick_index].id
+
+
+func _select_movable_piece_by_index(sector_id: String, index: int) -> void:
+	var movable := _movable_human_on_sector(sector_id)
+	if movable.is_empty():
+		_selected_piece_id = -1
+		return
+	_sector_pick_index = index % movable.size()
+	_selected_piece_id = movable[_sector_pick_index].id
+
+
 func _try_move_to(to_sector: String) -> void:
 	var piece: PieceInstance = _state.find_piece(_selected_piece_id)
 	if piece == null:

godot/scripts/battle/battle_sidebar.gd

@@ -5,6 +5,7 @@ extends Control
 @onready var _case_title: Label = %CaseTitle
 @onready var _case_hq: Label = %CaseHq
 @onready var _case_stats: Label = %CaseStats
+@onready var _case_piece: Label = %CasePiece
 @onready var _reserve_power: Label = %ReservePower
 @onready var _reserve_outline: Label = %ReserveOutline
 @onready var _reserve_counts: Label = %ReserveCounts
@@ -18,9 +19,11 @@ func refresh(
 	human_camp: GameConstants.Camp,
 	selected_sector: String,
 	planning_elapsed: int = 1,
+	selected_piece: PieceInstance = null,
 ) -> void:
 	_case_hq.visible = false
 	_case_stats.text = ""
+	_case_piece.text = ""
 	if selected_sector != "":
 		var short := BoardCatalog.sector_short_label(selected_sector)
 		_case_title.text = "Case Info — %s" % short
@@ -36,6 +39,15 @@ func refresh(
 			lines.append("%s %d" % [key, int(counts[key])])
 		_case_stats.text = "\n".join(lines) if not lines.is_empty() else "—"
 
+	if selected_piece != null and selected_sector != "" and selected_piece.sector_id == selected_sector:
+		var domain := GameConstants.movement_domain_label(
+			GameConstants.piece_movement_domain(selected_piece.type)
+		)
+		_case_piece.text = "Pièce : %s (%s) — recliquez la case pour changer" % [
+			selected_piece.label(),
+			domain,
+		]
+
 	_reserve_power.text = "F %d" % state.camp_power(human_camp)
 	var res: Dictionary = {}
 	for p: PieceInstance in state.reserve_pieces(human_camp):

godot/scripts/battle/board_map.gd

@@ -14,6 +14,7 @@ var _layout_meta: Dictionary = {}
 var _hits: Dictionary = {}
 var _selected: String = ""
 var _move_highlights: PackedStringArray = PackedStringArray()
+var _highlight_color: Color = Color(0.95, 0.85, 0.35, 0.55)
 var _state: GameState
 
 
@@ -112,6 +113,11 @@ func set_move_highlights(sectors: PackedStringArray) -> void:
 	queue_redraw()
 
 
+func set_highlight_color(color: Color) -> void:
+	_highlight_color = color
+	queue_redraw()
+
+
 func _on_hit(event: InputEvent, sector_id: String) -> void:
 	if event is InputEventMouseButton:
 		var mb := event as InputEventMouseButton
@@ -143,7 +149,7 @@ func _draw() -> void:
 		var hr: float = float(hd.get("r", 10)) * scale * 1.25
 		var hcx := board.position.x + float(hd["x"]) * sx
 		var hcy := board.position.y + float(hd["y"]) * sy
-		draw_arc(Vector2(hcx, hcy), hr, 0.0, TAU, 32, Color(0.95, 0.85, 0.35, 0.55), 2.0)
+		draw_arc(Vector2(hcx, hcy), hr, 0.0, TAU, 32, _highlight_color, 2.0)
 
 	if _selected != "" and _layout.has(_selected):
 		var d: Dictionary = _layout[_selected] as Dictionary

godot/scripts/core/game_constants.gd

@@ -78,6 +78,18 @@ static func piece_movement_domain(piece: PieceType) -> MovementDomain:
 			return MovementDomain.NONE
 
 
+static func movement_domain_label(domain: MovementDomain) -> String:
+	match domain:
+		MovementDomain.LAND:
+			return "terre"
+		MovementDomain.SEA:
+			return "mer"
+		MovementDomain.AIR:
+			return "air"
+		_:
+			return "—"
+
+
 static func is_basic_buy(piece: PieceType) -> bool:
 	return piece in [PieceType.SOLDIER, PieceType.RAIDER, PieceType.HUNTER, PieceType.CRUISER]
 

godot/scripts/headless_test.gd

@@ -48,6 +48,28 @@ func _run_checks() -> PackedStringArray:
 	var dests: PackedStringArray = BoardGraph.land_destinations("HQ_Green", 2)
 	if dests.is_empty():
 		failures.append("BoardGraph: pas de voisins HQ_Green")
+	var cruiser: PieceInstance = null
+	for p: PieceInstance in state.pieces:
+		if p.camp == GameConstants.Camp.GREEN and p.type == GameConstants.PieceType.CRUISER:
+			cruiser = p
+			break
+	if cruiser == null:
+		failures.append("GameState: pas de croiseur vert")
+	elif "Space_5" not in state.destinations_for(cruiser):
+		failures.append("GameState: croiseur sans destination mer depuis QG")
+	else:
+		var err: String = state.try_move_human_piece(cruiser, "Space_5")
+		if not err.is_empty():
+			failures.append("GameState: déplacement mer refusé (%s)" % err)
+	var hunter: PieceInstance = null
+	for p: PieceInstance in state.pieces:
+		if p.camp == GameConstants.Camp.GREEN and p.type == GameConstants.PieceType.HUNTER:
+			hunter = p
+			break
+	if hunter != null and not hunter.in_reserve:
+		var air_dests: PackedStringArray = state.destinations_for(hunter)
+		if air_dests.is_empty():
+			failures.append("GameState: chasseur sans destination air depuis QG")
 	for path: String in [
 		"res://scenes/menu/main_menu.tscn",
 		"res://scenes/menu/game_setup.tscn",