b6427b080d
The loose end from #24. withdraw_to_fleet, unload_into_building and deliver_cargo were the old one-way moves behind "Load ore" and "Store ore here"; every one of them is a special case of transfer_to_building / transfer_to_fleet, and none had a caller left outside tests. The cargo_delivered signal had no listeners at all. Not just tidying: unload_into_building routed through deposit_to_building, which does NOT special-case the mothership - it writes b.stock, while building_holdings() returns `rocks` for a mothership and ignores stock entirely. So unload_into_building( mothership_id) would have parked ore in a field nothing reads, with no error. Nothing called it that way, but it is a plausibly-named function sitting there to be reached for later. transfer_to_building handles it. CARGO_LOAD_BATCH stays - the transfer menu's batch buttons use it; only its role as withdraw_to_fleet's default argument is gone. The #24 note expected folding these in to be costly for test_cargo_readout, which places no buildings. It is not: the transfer primitives work off GameState records rather than spawned nodes, so a single add_building() in setup is enough and it stays a display test. Co-Authored-By: Claude Opus 5 <noreply@anthropic.com>
59 lines
2 KiB
GDScript
59 lines
2 KiB
GDScript
extends Node2D
|
|
|
|
# Rebuilds every player-placed structure from GameState when the space
|
|
# scene loads, and answers "is the fleet standing on one?".
|
|
#
|
|
# Buildings live in GameState rather than in the scene because Main.tscn is
|
|
# torn down and recreated on every trip to a planet's surface - anything
|
|
# kept only as a node would be lost on the first landing.
|
|
|
|
@onready var fleet: Node2D = get_node("../Fleet")
|
|
|
|
var building_scene: PackedScene = preload("res://Building.tscn")
|
|
var spawned: Array = []
|
|
|
|
# Nothing happens here per frame any more. Arriving at the mothership used to
|
|
# bank the fleet's hold automatically (#14), edge-triggered so that ore
|
|
# withdrawn while parked was not instantly taken back. #24 removes it
|
|
# entirely: unloading is now an explicit move in the transfer menu, in both
|
|
# directions and at every building, so an automatic one-way exception at the
|
|
# mothership was the odd case out - and it silently overrode a player who had
|
|
# just loaded the hold in order to carry ore somewhere else.
|
|
|
|
|
|
func _ready() -> void:
|
|
rebuild_all()
|
|
|
|
|
|
func rebuild_all() -> void:
|
|
for b in spawned:
|
|
if is_instance_valid(b):
|
|
b.queue_free()
|
|
spawned.clear()
|
|
for record in GameState.buildings:
|
|
_spawn(record)
|
|
|
|
|
|
func place(type: String, at_position: Vector2) -> void:
|
|
GameState.add_building(type, at_position)
|
|
_spawn(GameState.buildings[-1])
|
|
|
|
|
|
func get_building_fleet_is_on() -> Node2D:
|
|
var centre: Vector2 = fleet.get_centroid()
|
|
for b in spawned:
|
|
if is_instance_valid(b) and b.position.distance_to(centre) <= b.interact_radius:
|
|
return b
|
|
return null
|
|
|
|
|
|
func _spawn(record: Dictionary) -> void:
|
|
var b: Node2D = building_scene.instantiate()
|
|
b.position = record.position
|
|
b.building_type = record.type
|
|
b.building_id = int(record.get("id", 0))
|
|
# Deferred for the same reason as the other field spawners: this can run
|
|
# from inside a parent's _ready() chain, where a direct add_child() is
|
|
# rejected while the tree is still setting up children.
|
|
get_parent().add_child.call_deferred(b)
|
|
spawned.append(b)
|