#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:
parent
90c34f6c74
commit
2206b55873
5 changed files with 267 additions and 55 deletions
|
|
@ -10,6 +10,8 @@ extends SceneTree
|
|||
# A. #111 - the craft menu names no resources: prices are glyphs, and
|
||||
# every vessel gets a caption that does not overlap its neighbour
|
||||
# B. #111 - and a price strip really carries the vessel's cost
|
||||
# D. #143 - a hangar caption fits the box it was given and cannot draw
|
||||
# outside it, so it never lands on the icon of the row below
|
||||
# C. #120 - the hangar's captions have room for two lines, and there is a
|
||||
# rule between what is parked and what is flying
|
||||
# D. #112 - every skill node has a mark, and a node that unlocks a
|
||||
|
|
@ -124,6 +126,38 @@ func _process(delta: float) -> bool:
|
|||
print("hangar: %.0fpx captions, divider at %.0f between %.0f and %.0f" \
|
||||
% [caption_height, controller.hangar_divider_y, available_bottom, fleet_top])
|
||||
|
||||
# --- D. #143 - and the caption stays in its box --------------
|
||||
# The caption is two lines before autowrap and three after it in
|
||||
# a narrow column, at a size fixed in the scene - so the third
|
||||
# line was drawn over the icon of the row below. It is fitted to
|
||||
# the box now, and the box clips, so nothing can reach the next
|
||||
# row however the vessel names grow.
|
||||
controller._refresh_hangar()
|
||||
for pair in [[controller.hangar_available_labels, controller.hangar_available_slots],
|
||||
[controller.hangar_fleet_labels, controller.hangar_fleet_slots]]:
|
||||
for i in range(pair[0].size()):
|
||||
var caption: Label = pair[0][i]
|
||||
if not caption.clip_text:
|
||||
return _fail("hangar caption %d can draw outside its box" % i)
|
||||
var font: Font = caption.get_theme_font("font")
|
||||
var size_px: int = caption.get_theme_font_size("font_size")
|
||||
var needed: float = font.get_multiline_string_size(caption.text,
|
||||
HORIZONTAL_ALIGNMENT_CENTER, caption.size.x, size_px).y
|
||||
if needed > caption.size.y + 0.5:
|
||||
return _fail("caption \"%s\" needs %.0fpx at size %d and has %.0f" \
|
||||
% [caption.text.replace("\n", " / "), needed, size_px, caption.size.y])
|
||||
# And the box itself must not reach the row below it.
|
||||
for slot in pair[1]:
|
||||
var below: Rect2 = Rect2(slot.position, slot.size)
|
||||
if below.position.y > caption.position.y \
|
||||
and Rect2(caption.position, caption.size).intersects(below):
|
||||
return _fail("caption \"%s\" runs into the icon below it" \
|
||||
% caption.text.replace("\n", " / "))
|
||||
var probe: Label = controller.hangar_available_labels[0]
|
||||
print("captions fitted to %dpx and clipped; \"%s\" fits its %.0fpx box" \
|
||||
% [probe.get_theme_font_size("font_size"),
|
||||
probe.text.replace("\n", " / "), probe.size.y])
|
||||
|
||||
# --- D. every skill node has a mark -----------------------
|
||||
var tree_view: Control = scene.get_node("UI/SkillMenu/Tree")
|
||||
var marked: int = 0
|
||||
|
|
|
|||
Loading…
Reference in a new issue