metaheavens/spaceship
Watch
1
0
Fork
You've already forked spaceship
 0
Code Issues 4 Pull requests Projects 1 Releases Packages Wiki Activity

#145, #144, #143: a quest that could not be finished, and two boxes that overhung

Browse source 
#145 - the extractor quest could never be completed. Extractors are placed
onto a planet from space and live in GameState.extractors, with their own
position, stock and id; they are not in `buildings`. So the goal asked
has_building_of_type("extractor"), which is false however many the player
builds. Not the death the reporter guessed at - the quest was simply asking
a question that had no yes.

structure_exists() is the question anything wanting "does the player have
one of these" should ask, and the quest model asks it now. The regression
test builds every structure quest's target THE WAY THE GAME BUILDS IT and
watches the goal flip, rather than knowing which array each one lands in -
the knowing is what got this wrong in the first place.

#144 - the build menu's status line is anchored to the top of the panel and
its grid to the panel's centre, so the gap between the two is half the panel
height. It was a written-down constant, correct only at 1280 tall; at 1080
the grid started four pixels ABOVE the status line and drew through it.

Nothing about that geometry is written against a screen size any more. The
band is measured from the header that is actually there, the pitch closes up
to fit it (never below a row's own height, which is what makes overlap
impossible rather than unlikely), and the column count rises until the rows
fit - so a short window gets a wide grid instead of one running off the
bottom. Ten structures now lay out as 5 columns at 900px tall, 4 at 1080, 3
at 1280 and 2 at 1600, clearing the header at every one, which is what the
test walks.

#143 - a hangar caption is "Gas Bomber\n2 available": two lines before
autowrap and three after it in a narrow column, at a size fixed in the
scene. Labels do not clip by default, so the third line was drawn over the
icon of the row below. The size is fitted to the box the layout works out,
and the box clips - the first keeps it legible, the second keeps it correct
however the vessel names grow.

Its box also overhung by exactly HANGAR_LABEL_GAP: the layout subtracted one
gap where it needed two, above the caption and below it. Two pixels, but two
pixels inside the next row's icon.
This commit is contained in:
Loïc Wisniewski 2026-08-29 12:51:09 +02:00
commit 2206b55873
5 changed files with 267 additions and 55 deletions
Download patch file Download diff file Expand all files Collapse all files

51
tests/test_build_menu_hides_locked.gd
View file

@ -20,6 +20,10 @@ extends SceneTree
# 6. #136 - with every structure researched, no two entries overlap. The
# grid used to be a fixed list of row positions read with a clamp, so
# the first row that would not fit was drawn on top of another one
# 7. #144 - and that holds at any window shape. The header is anchored to
# the top of the panel and the grid to its centre, so the gap between
# them is half the panel height - it was a constant measured at 1280,
# and at 1080 the grid started above the status line and drew through it
var game_state: Node
var scene: Node
@ -122,8 +126,8 @@ func _process(delta: float) -> bool:
print("TEST_BUILD_MENU_HIDES_LOCKED: FAIL (a gap was left where a hidden entry used to be)")
quit(1)
return true
var col_x: float = float(controller.MENU_COL_X[columns])
var want_x: float = -col_x if i % 2 == 0 else col_x
var spacing: float = controller.menu_column_spacing(columns)
var want_x: float = -spacing * 0.5 if i % 2 == 0 else spacing * 0.5
if absf(slots[i][1] - want_x) > 0.01:
print("TEST_BUILD_MENU_HIDES_LOCKED: FAIL (entry %d at x=%.1f, expected %.1f)" % [i, slots[i][1], want_x])
quit(1)
@ -154,6 +158,49 @@ func _process(delta: float) -> bool:
print("%d structures on offer, in %d columns, nothing overlapping" \
% [all_shown.size(), controller.menu_columns(all_shown.size())])
# --- 7. #144: and at any window shape ------------------------
# The grid is anchored to the panel's CENTRE and the status line
# above it to the panel's TOP, so the gap between them is half
# the panel height. It used to be a written-down constant, right
# only at 1280 - at 1080 the grid started above the status line
# and drew through it, which is what the ticket reported.
var menu: Control = scene.get_node("UI/BuildMenu")
var status: Control = scene.get_node("UI/BuildMenu/StatusLabel")
var restore: float = menu.offset_bottom
for panel_height in [900.0, 1080.0, 1280.0, 1600.0]:
menu.anchor_bottom = 0.0
menu.offset_top = 0.0
menu.offset_bottom = panel_height
controller._refresh_build_status()
var half: float = menu.size.y * 0.5
# The status line's own bottom, in the grid's centre-anchored
# frame - which is the comparison that was never made.
var header_bottom: float = status.offset_bottom - half
var placed: Array = _shown()
for a in range(placed.size()):
for part in [1, 2, 3]:
var box: Rect2 = _rect(placed[a][part])
if box.position.y < header_bottom:
print("TEST_BUILD_MENU_HIDES_LOCKED: FAIL (at %.0fpx tall, %s is drawn at y=%.0f, above the status line at %.0f)" \
% [panel_height, placed[a][0], box.position.y, header_bottom])
quit(1)
return true
for b in range(a + 1, placed.size()):
for part2 in [1, 2, 3]:
if _rect(placed[a][part2]).intersects(_rect(placed[b][part2])):
print("TEST_BUILD_MENU_HIDES_LOCKED: FAIL (at %.0fpx tall, %s and %s overlap)" \
% [panel_height, placed[a][0], placed[b][0]])
quit(1)
return true
print(" %.0fpx tall: %d columns, top row at %.0f, clear of the status line at %.0f" \
% [panel_height, controller.menu_columns(placed.size()),
_rect(placed[0][1]).position.y, header_bottom])
menu.anchor_bottom = 1.0
menu.offset_top = 0.0
menu.offset_bottom = restore
controller._refresh_build_status()
print("the grid clears the header at every window shape")
# --- 5. researched but not usable is shown, greyed ----------
var extractor_shown: bool = false
for e in shown2: