Stacking distorders, menu layouts, lab rewards, enemy detail, artillery cross
DISTORDER STACKING. Each space-time distorder vessel past the first raises the fleet's speed ceiling by 1.0, so a second one is worth crewing instead of being dead weight. GameState gains max_fleet_speed_multiplier, pushed by Fleet whenever composition changes - the same direction as every other fleet-derived figure, since GameState does not reach into the scene tree to count ships. The energy drain is normalised against the CURRENT ceiling, so full boost costs the same per second however wide it is: extra vessels buy more speed, not cheaper speed. Losing one re-clamps an over-ceiling boost rather than leaving the fleet travelling faster than its crew can sustain. TRANSFER MENU. Rows overlapped, and the last one ran into the hint text. row_height is divided from the available space, but each row's contents used a fixed pixel ladder - glyph at +10, buttons at +88, selector at +142 - which needs about 244px. Three resources fit; the fourth cut rows to 180 and every one spilled 64px into the next. Every offset is now a fraction of the row, so it cannot overflow. Also dropped the per-row AMOUNT caption (four copies of a word the footer hint already explains) and moved each glyph and name to the TOP of its row, where they read as its heading rather than the next row's. HANGAR. Six vessel types in one row gave each about 100px for a 155px label, so the names ran together. Now a 3x2 grid per section, sized from the space between the first heading and the status line, using the empty lower half. LAB RESEARCH REWARD. A harder enemy lab is worth more research points, and how hard a lab is depends on the layout authored for it - how many capture points, how many defenders - which the planet TYPE cannot know. PlanetSetup carries research_point_reward, set in the map editor, overriding the planet type's flat rate. 0 means "no opinion", so every map authored before this keeps its old value. RESEARCH LAB BACKGROUND. Its own shader instead of the crater field with a red tint, which read as "rocky planet, tinted" rather than someone's facility: plated floor, seams, service conduits, lit junctions. Loop-free by construction (#68's lesson applied up front) - conduits stay continuous across cells by keying a horizontal run to cell.y and a vertical to cell.x, so neighbouring cells agree without any cell scanning its neighbours. ENEMY DETAIL. Every enemy was a single flat outline, which left the artillery and the turret spawner as the same octagon at two sizes - the silhouette carried no information about what the thing did. EnemyDefinition gains detail_lines and detail_rings as DATA, so adding an enemy still means adding a definition rather than editing Enemy.gd, and the four non-default hulls are redrawn: a long-barrelled sniper, a squat mortar, a hive with launch bays, a capital ship with spine and ribs. Three things drew an enemy from its definition - the enemy, the map editor's markers, and the palette buttons - each reimplementing it from hull_points alone, so the new detail appeared in the game and nowhere else and an editor marker stopped matching what it placed. They now share EnemyDefinitions.draw_definition(). ARTILLERY. The 1.8s charge-up before the tower fired arrived long before the threat was legible and mostly read as the tower being stuck. It fires immediately now; the warning is the shell you can see in the air plus a small cross on the ground at the impact point. Deliberately not a blast-radius ring - a large translucent area was easy to read as the explosion having already happened, where the cross says "move off this spot". MAIN MENU. No Quit in any build (a web build has nothing to quit to, and Android's back gesture already does it), a plain black background, and the game is "Spaceship" - in the title and in config/name, which is what drives the browser tab for the web export. change_scene_to_file() returns an error and otherwise fails silently, leaving the menu up, which is indistinguishable from an unpressed button; it is now checked and reported on screen. Full suite green at 99/99. Co-Authored-By: Claude Opus 5 <noreply@anthropic.com>
This commit is contained in:
Loïc Wisniewski
parent
a3c6316676
commit
7817d1ffc6
48 changed files with 897 additions and 159 deletions
|
|
@ -62,6 +62,8 @@ const VESSEL_DEFINITIONS = preload("res://VesselDefinitions.gd")
|
|||
@onready var hangar_button: IconButton = get_node("../UI/HangarButton")
|
||||
@onready var hangar_menu: Control = get_node("../UI/HangarMenu")
|
||||
@onready var hangar_status: Label = get_node("../UI/HangarMenu/StatusLabel")
|
||||
@onready var hangar_available_title: Label = get_node("../UI/HangarMenu/AvailableTitle")
|
||||
@onready var hangar_fleet_title: Label = get_node("../UI/HangarMenu/FleetTitle")
|
||||
@onready var hangar_close_button: IconButton = get_node("../UI/HangarMenu/CloseButton")
|
||||
@onready var hangar_available_slots: Array = [
|
||||
get_node("../UI/HangarMenu/AvailableInterceptor"),
|
||||
|
|
@ -247,6 +249,7 @@ func _seat_hud_columns() -> void:
|
|||
|
||||
func _ready() -> void:
|
||||
_seat_hud_columns()
|
||||
_layout_hangar()
|
||||
build_button.pressed.connect(_on_build_pressed)
|
||||
build_close_button.pressed.connect(_close_build_menu)
|
||||
_configure_build_menu_entries()
|
||||
|
|
@ -1223,6 +1226,75 @@ func _hangar_types() -> Array:
|
|||
return types
|
||||
|
||||
|
||||
# How many vessel types sit side by side in the hangar. Six in a single row
|
||||
# gave each one about 100px while its two-line label needs 155, so the names
|
||||
# ran into each other - "InterceptSheld VessGas Bomber". Three columns give
|
||||
# each cell room, and the second row costs nothing: the lower half of the
|
||||
# menu was empty.
|
||||
const HANGAR_COLUMNS: int = 3
|
||||
|
||||
|
||||
# Arranges both hangar sections as grids sized from the space actually
|
||||
# available, rather than from the single row the scene authored. A seventh
|
||||
# vessel type now wraps instead of squeezing the other six.
|
||||
func _layout_hangar() -> void:
|
||||
var count: int = hangar_available_slots.size()
|
||||
if count == 0:
|
||||
return
|
||||
var width: float = hangar_menu.size.x
|
||||
var columns: int = mini(HANGAR_COLUMNS, count)
|
||||
var rows: int = int(ceil(float(count) / float(columns)))
|
||||
|
||||
# The band between the first section's heading and the status line under
|
||||
# both of them. Derived, so moving either in the scene moves the grids.
|
||||
var top: float = hangar_available_title.position.y + hangar_available_title.size.y + 8.0
|
||||
var bottom: float = hangar_status.position.y - 12.0
|
||||
var title_height: float = hangar_fleet_title.size.y
|
||||
var section_height: float = (bottom - top - title_height - 16.0) * 0.5
|
||||
if section_height <= 0.0:
|
||||
return
|
||||
|
||||
var cell_width: float = width / float(columns)
|
||||
var cell_height: float = section_height / float(rows)
|
||||
# Squarer than the authored 75x120: a grid cell is wider than it is tall
|
||||
# here, so height is what constrains the icon.
|
||||
var slot_size: float = minf(cell_height * 0.58, cell_width * 0.42)
|
||||
var label_height: float = maxf(cell_height - slot_size - 6.0, 1.0)
|
||||
|
||||
_layout_hangar_section(hangar_available_slots, hangar_available_labels,
|
||||
top, columns, cell_width, cell_height, slot_size, label_height, width)
|
||||
# AFTER the first section's last row, not before it. Placing the heading
|
||||
# by subtracting from the second section's top put it back inside the
|
||||
# first one, straight over its bottom row.
|
||||
var available_bottom: float = top + section_height
|
||||
hangar_fleet_title.position.y = available_bottom + 4.0
|
||||
var fleet_top: float = available_bottom + title_height + 8.0
|
||||
_layout_hangar_section(hangar_fleet_slots, hangar_fleet_labels,
|
||||
fleet_top, columns, cell_width, cell_height, slot_size, label_height, width)
|
||||
|
||||
|
||||
func _layout_hangar_section(slots: Array, labels: Array, top: float, columns: int,
|
||||
cell_width: float, cell_height: float, slot_size: float,
|
||||
label_height: float, width: float) -> void:
|
||||
for i in range(slots.size()):
|
||||
var column: int = i % columns
|
||||
var row: int = i / columns
|
||||
# Control.position is in PARENT space, whatever the node's anchors
|
||||
# are - the authored offsets being negative (anchored to the menu's
|
||||
# centre) does not make position centre-relative too.
|
||||
var cell_x: float = float(column) * cell_width
|
||||
var cell_y: float = top + float(row) * cell_height
|
||||
var slot: Control = slots[i]
|
||||
slot.position = Vector2(cell_x + (cell_width - slot_size) * 0.5, cell_y)
|
||||
slot.size = Vector2(slot_size, slot_size)
|
||||
var label: Label = labels[i]
|
||||
label.position = Vector2(cell_x, cell_y + slot_size + 4.0)
|
||||
label.size = Vector2(cell_width, label_height)
|
||||
label.horizontal_alignment = HORIZONTAL_ALIGNMENT_CENTER
|
||||
label.vertical_alignment = VERTICAL_ALIGNMENT_TOP
|
||||
label.autowrap_mode = TextServer.AUTOWRAP_WORD_SMART
|
||||
|
||||
|
||||
func _refresh_hangar() -> void:
|
||||
var types: Array = _hangar_types()
|
||||
for i in range(types.size()):
|
||||
|
|
|
|||
Loading…
Reference in a new issue