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

Implement #160, #161, #162, #163, #164 and #165

Browse source 
#162 - a single tap bought a research node outright. One physical tap arrives
TWICE: Godot emulates a mouse button from every touch AND a touch from every
mouse button, both project settings are on, and the menu's dispatcher routes
InputEventScreenTouch and InputEventMouseButton alike to the tree. The second
arrival found the node already selected and took itself for the confirming
tap. Measured, not reasoned about - one tap produced two picks and two
confirms.

What is ignored is specifically the TWIN: same frame, same place, arriving
through the other input kind. Deduping on frame and position alone also
swallowed two genuine taps in one frame, which the test caught.

#164 - the build menu predicted a caption's height from the COLUMN WIDTH:
wide column, assume one line. Right for most names and wrong for the long
ones, so "Spacial Workshop" wrapped onto the price beneath it. Captions are
now measured against the font that draws them, and prices sized from
PriceTag.wanted_height(), which existed for exactly this and was not being
asked. Prices are set before anything is measured, because the old order laid
out first and priced afterwards.

The ship lab: its buy button is gone and a second tap on an option buys it,
the same rule as the research tree; the explanation drops into the room that
freed; research points move up into the resource table, where everything else
being spent already is; the second row of options is placed from the first
row's measured bottom rather than a constant; and the vessel strip is spaced
from the panel's own width, so the eighth vessel is no longer half off the
right edge.

#160 - the quest panel was drawn BEFORE the sticks and the pivot pair, so
they sat on top of it. Moved after them, under the narration banner. Its title
rule ran straight through the close button; the header band is now as tall as
that button.

#161 - the prologue widens the formation into a freight convoy by writing over
GameState.formation, and nothing put it back. The player flew the convoy's
600-unit spread for the rest of the game - a shape nobody chose, which reads
as the fleet having drifted apart.

#163 - a quest to station a vessel at the outpost, after the one that asks for
the outpost. Building one and crewing it are different acts, and an empty
outpost holds nothing.

#165 - the gas bomb's blast and a vessel arriving fast both damage a
structure. The blast used to stop politely at anything the player owned, which
made a bomb dropped on a besieged mothership a free way to sweep the attackers
off it.

Collisions are caught on ENTRY, not on the 0.7s strike tick: a vessel is only
moving fast for the instant it arrives, and a ship sent in at 900 did no
damage at all until this moved. Docking is free - the fleet sits on its own
mothership constantly to bank ore - and garrison vessels are exempt outright,
because they launch from their outpost and re-dock with it at speed. The suite
caught that one: the ram rule was destroying the garrison as it launched.

Suite 153/153. Four tests changed because what they pinned moved: the lab's
buy button, the intro's formation, the research tree's tap delivery, and the
build menu's own preview.

Co-Authored-By: Claude Opus 5 <noreply@anthropic.com>
This commit is contained in:
Loïc Wisniewski 2026-08-30 02:27:44 +02:00
commit 3fcc26c8bc
18 changed files with 645 additions and 173 deletions
Download patch file Download diff file Expand all files Collapse all files

9
world/IntroDirector.gd
View file

@ -178,6 +178,15 @@ func finish() -> void:
if not _is_starting_fleet():
fleet.spawn_ships(GameState.STARTING_SHIP_COUNT, fleet.get_centroid(),
PackedStringArray([GameState.VESSEL_INTERCEPTOR]))
# #161: and the SHAPE goes back too. The prologue widens the formation
# into a freight convoy - a 600-unit box, roughly three times the fleet's
# own wedge - by writing over GameState.formation, and nothing put it
# back. The player was left flying the convoy's spread for the rest of the
# game, which is not a formation anyone chose and reads as the fleet
# having drifted apart. apply_formation() re-seats the ships that already
# exist, not only the ones built later.
GameState.reset_formation()
fleet.apply_formation()
finished.emit()
queue_free()

195
world/Main.tscn
View file

@ -279,27 +279,6 @@ offset_bottom = 172.0
script = ExtResource("10")
icon = 44
[node name="QuestPanel" type="Control" parent="UI" groups=["modal_menus"]]
visible = false
mouse_filter = 2
anchor_right = 1.0
anchor_bottom = 1.0
offset_left = 24.0
offset_top = 24.0
offset_right = -24.0
offset_bottom = -24.0
script = ExtResource("quest_panel")
[node name="CloseButton" type="Control" parent="UI/QuestPanel"]
anchor_left = 1.0
anchor_right = 1.0
offset_left = -140.0
offset_right = -24.0
offset_top = 20.0
offset_bottom = 136.0
script = ExtResource("10")
icon = 1
[node name="Joystick" type="Control" parent="UI"]
mouse_filter = 2
script = ExtResource("13")
@ -498,18 +477,18 @@ horizontal_alignment = 1
mouse_filter = 2
anchor_right = 1.0
offset_left = 24.0
offset_top = 148.0
offset_top = 148
offset_right = -24.0
offset_bottom = 284.0
offset_bottom = 330
script = ExtResource("24")
[node name="StatusLabel" type="Label" parent="UI/BuildMenu"]
mouse_filter = 2
anchor_right = 1.0
offset_left = 24
offset_top = 292
offset_top = 338
offset_right = -24
offset_bottom = 372
offset_bottom = 418
theme_override_font_sizes/font_size = 40
autowrap_mode = 2
text = ""
@ -1421,7 +1400,7 @@ anchor_right = 1.0
offset_left = 24
offset_top = 148
offset_right = -24
offset_bottom = 284
offset_bottom = 330
script = ExtResource("24")
[node name="VesselA" type="Control" parent="UI/LabMenu"]
@ -1429,8 +1408,8 @@ anchor_left = 0.5
anchor_right = 0.5
offset_left = -300
offset_right = -240
offset_top = 300
offset_bottom = 420
offset_top = 346
offset_bottom = 466
script = ExtResource("10")
icon = 2
glow_color = Color(0.25, 0.85, 1, 1)
@ -1440,8 +1419,8 @@ anchor_left = 0.5
anchor_right = 0.5
offset_left = -210
offset_right = -150
offset_top = 300
offset_bottom = 420
offset_top = 346
offset_bottom = 466
script = ExtResource("10")
icon = 2
glow_color = Color(0.45, 0.8, 1, 1)
@ -1451,8 +1430,8 @@ anchor_left = 0.5
anchor_right = 0.5
offset_left = -120
offset_right = -60
offset_top = 300
offset_bottom = 420
offset_top = 346
offset_bottom = 466
script = ExtResource("10")
icon = 31
glow_color = Color(0.96, 0.32, 0.78, 1)
@ -1462,8 +1441,8 @@ anchor_left = 0.5
anchor_right = 0.5
offset_left = -30
offset_right = 30
offset_top = 300
offset_bottom = 420
offset_top = 346
offset_bottom = 466
script = ExtResource("10")
icon = 12
glow_color = Color(0.95, 0.55, 0.85, 1)
@ -1473,8 +1452,8 @@ anchor_left = 0.5
anchor_right = 0.5
offset_left = 60
offset_right = 120
offset_top = 300
offset_bottom = 420
offset_top = 346
offset_bottom = 466
script = ExtResource("10")
icon = 34
glow_color = Color(1, 0.78, 0.3, 1)
@ -1484,8 +1463,8 @@ anchor_left = 0.5
anchor_right = 0.5
offset_left = 150
offset_right = 210
offset_top = 300
offset_bottom = 420
offset_top = 346
offset_bottom = 466
script = ExtResource("10")
icon = 35
glow_color = Color(0.3, 0.9, 1, 1)
@ -1495,8 +1474,8 @@ anchor_left = 0.5
anchor_right = 0.5
offset_left = 240
offset_right = 300
offset_top = 300
offset_bottom = 420
offset_top = 346
offset_bottom = 466
script = ExtResource("10")
icon = 37
glow_color = Color(0.7, 0.3, 1, 1)
@ -1506,8 +1485,8 @@ anchor_left = 0.5
anchor_right = 0.5
offset_left = 320
offset_right = 380
offset_top = 300
offset_bottom = 420
offset_top = 346
offset_bottom = 466
script = ExtResource("10")
icon = 43
glow_color = Color(0.5, 0.95, 0.8, 1)
@ -1517,9 +1496,9 @@ visible = false
mouse_filter = 2
anchor_right = 1.0
offset_left = 24
offset_top = 424
offset_top = 470
offset_right = -24
offset_bottom = 482
offset_bottom = 528
theme_override_font_sizes/font_size = 34
horizontal_alignment = 1
text = ""
@ -1530,8 +1509,8 @@ anchor_left = 0.5
anchor_right = 0.5
offset_left = -310
offset_right = -230
offset_top = 424
offset_bottom = 496
offset_top = 470
offset_bottom = 542
theme_override_font_sizes/font_size = 15
autowrap_mode = 2
horizontal_alignment = 1
@ -1543,8 +1522,8 @@ anchor_left = 0.5
anchor_right = 0.5
offset_left = -220
offset_right = -140
offset_top = 424
offset_bottom = 496
offset_top = 470
offset_bottom = 542
theme_override_font_sizes/font_size = 15
autowrap_mode = 2
horizontal_alignment = 1
@ -1556,8 +1535,8 @@ anchor_left = 0.5
anchor_right = 0.5
offset_left = -130
offset_right = -50
offset_top = 424
offset_bottom = 496
offset_top = 470
offset_bottom = 542
theme_override_font_sizes/font_size = 15
autowrap_mode = 2
horizontal_alignment = 1
@ -1569,8 +1548,8 @@ anchor_left = 0.5
anchor_right = 0.5
offset_left = -40
offset_right = 40
offset_top = 424
offset_bottom = 496
offset_top = 470
offset_bottom = 542
theme_override_font_sizes/font_size = 15
autowrap_mode = 2
horizontal_alignment = 1
@ -1582,8 +1561,8 @@ anchor_left = 0.5
anchor_right = 0.5
offset_left = 50
offset_right = 130
offset_top = 424
offset_bottom = 496
offset_top = 470
offset_bottom = 542
theme_override_font_sizes/font_size = 15
autowrap_mode = 2
horizontal_alignment = 1
@ -1595,8 +1574,8 @@ anchor_left = 0.5
anchor_right = 0.5
offset_left = 140
offset_right = 220
offset_top = 424
offset_bottom = 496
offset_top = 470
offset_bottom = 542
theme_override_font_sizes/font_size = 15
autowrap_mode = 2
horizontal_alignment = 1
@ -1608,8 +1587,8 @@ anchor_left = 0.5
anchor_right = 0.5
offset_left = 230
offset_right = 310
offset_top = 424
offset_bottom = 496
offset_top = 470
offset_bottom = 542
theme_override_font_sizes/font_size = 15
autowrap_mode = 2
horizontal_alignment = 1
@ -1621,8 +1600,8 @@ anchor_left = 0.5
anchor_right = 0.5
offset_left = 310
offset_right = 390
offset_top = 424
offset_bottom = 496
offset_top = 470
offset_bottom = 542
theme_override_font_sizes/font_size = 15
autowrap_mode = 2
horizontal_alignment = 1
@ -1632,9 +1611,9 @@ text = "Repair Drone"
mouse_filter = 2
anchor_right = 1.0
offset_left = 48
offset_top = 502
offset_top = 550
offset_right = -48
offset_bottom = 506
offset_bottom = 554
color = Color(0.25, 0.85, 1, 0.6)
[node name="UpgradeList" type="Label" parent="UI/LabMenu"]
@ -1643,7 +1622,7 @@ mouse_filter = 2
anchor_right = 1.0
anchor_bottom = 1.0
offset_left = 32
offset_top = 514
offset_top = 562
offset_right = -32
offset_bottom = -390
theme_override_font_sizes/font_size = 30
@ -1656,9 +1635,9 @@ anchor_right = 1.0
anchor_top = 1.0
anchor_bottom = 1.0
offset_left = 32
offset_top = -380
offset_top = -300
offset_right = -32
offset_bottom = -280
offset_bottom = -180
theme_override_font_sizes/font_size = 32
autowrap_mode = 2
horizontal_alignment = 1
@ -1670,9 +1649,9 @@ anchor_right = 1.0
anchor_top = 1.0
anchor_bottom = 1.0
offset_left = 32
offset_top = -274
offset_top = -174
offset_right = -32
offset_bottom = -226
offset_bottom = -120
theme_override_font_sizes/font_size = 30
autowrap_mode = 2
horizontal_alignment = 1
@ -1686,25 +1665,12 @@ anchor_right = 0.5
anchor_bottom = 1.0
offset_left = -230
offset_right = -110
offset_top = -218
offset_bottom = -108
offset_top = -112
offset_bottom = -22
script = ExtResource("10")
icon = 6
glow_color = Color(0.55, 0.95, 0.9, 1)
[node name="BuyButton" type="Control" parent="UI/LabMenu"]
anchor_left = 0.5
anchor_top = 1.0
anchor_right = 0.5
anchor_bottom = 1.0
offset_left = 110
offset_right = 230
offset_top = -218
offset_bottom = -108
script = ExtResource("10")
icon = 4
glow_color = Color(0.45, 0.9, 0.55, 1)
[node name="HintLabel" type="Label" parent="UI/LabMenu"]
visible = false
mouse_filter = 2
@ -1725,8 +1691,8 @@ anchor_left = 0.5
anchor_right = 0.5
offset_left = -240
offset_right = -120
offset_top = 514
offset_bottom = 624
offset_top = 562
offset_bottom = 672
script = ExtResource("10")
icon = 13
glow_color = Color(0.25, 0.85, 1, 1)
@ -1737,8 +1703,8 @@ anchor_left = 0.5
anchor_right = 0.5
offset_left = -310
offset_right = -50
offset_top = 628
offset_bottom = 698
offset_top = 676
offset_bottom = 746
theme_override_font_sizes/font_size = 22
autowrap_mode = 2
horizontal_alignment = 1
@ -1749,8 +1715,8 @@ anchor_left = 0.5
anchor_right = 0.5
offset_left = 120
offset_right = 240
offset_top = 514
offset_bottom = 624
offset_top = 562
offset_bottom = 672
script = ExtResource("10")
icon = 13
glow_color = Color(0.25, 0.85, 1, 1)
@ -1761,8 +1727,8 @@ anchor_left = 0.5
anchor_right = 0.5
offset_left = 50
offset_right = 310
offset_top = 628
offset_bottom = 698
offset_top = 676
offset_bottom = 746
theme_override_font_sizes/font_size = 22
autowrap_mode = 2
horizontal_alignment = 1
@ -1773,8 +1739,8 @@ anchor_left = 0.5
anchor_right = 0.5
offset_left = -240
offset_right = -120
offset_top = 706
offset_bottom = 816
offset_top = 790
offset_bottom = 900
script = ExtResource("10")
icon = 13
glow_color = Color(0.25, 0.85, 1, 1)
@ -1785,8 +1751,8 @@ anchor_left = 0.5
anchor_right = 0.5
offset_left = -310
offset_right = -50
offset_top = 820
offset_bottom = 890
offset_top = 904
offset_bottom = 974
theme_override_font_sizes/font_size = 22
autowrap_mode = 2
horizontal_alignment = 1
@ -1797,8 +1763,8 @@ anchor_left = 0.5
anchor_right = 0.5
offset_left = 120
offset_right = 240
offset_top = 706
offset_bottom = 816
offset_top = 790
offset_bottom = 900
script = ExtResource("10")
icon = 13
glow_color = Color(0.25, 0.85, 1, 1)
@ -1809,8 +1775,8 @@ anchor_left = 0.5
anchor_right = 0.5
offset_left = 50
offset_right = 310
offset_top = 820
offset_bottom = 890
offset_top = 904
offset_bottom = 974
theme_override_font_sizes/font_size = 22
autowrap_mode = 2
horizontal_alignment = 1
@ -1853,16 +1819,16 @@ mouse_filter = 2
offset_left = 24
offset_top = 148
offset_right = -24
offset_bottom = 284
offset_bottom = 330
script = ExtResource("24")
[node name="StatusLabel" type="Label" parent="UI/CraftMenu"]
mouse_filter = 2
anchor_right = 1.0
offset_left = 24
offset_top = 300
offset_top = 344
offset_right = -200
offset_bottom = 446
offset_bottom = 490
theme_override_font_sizes/font_size = 36
autowrap_mode = 2
text = ""
@ -2409,9 +2375,9 @@ color = Color(0.03, 0.03, 0.08, 0.94)
mouse_filter = 2
anchor_right = 1.0
offset_left = 24.0
offset_top = 20.0
offset_top = 20
offset_right = -160.0
offset_bottom = 156.0
offset_bottom = 202
script = ExtResource("24")
[node name="Tree" type="Control" parent="UI/SkillMenu"]
@ -2420,7 +2386,7 @@ clip_contents = true
anchor_right = 1.0
anchor_bottom = 1.0
offset_left = 24.0
offset_top = 168.0
offset_top = 214
offset_right = -24.0
offset_bottom = -280.0
script = ExtResource("21")
@ -2476,6 +2442,27 @@ offset_bottom = 136.0
script = ExtResource("10")
icon = 1
glow_color = Color(0.55, 0.6, 1, 1)
[node name="QuestPanel" type="Control" parent="UI" groups=["modal_menus"]]
visible = false
mouse_filter = 2
anchor_right = 1.0
anchor_bottom = 1.0
offset_left = 24.0
offset_top = 24.0
offset_right = -24.0
offset_bottom = -24.0
script = ExtResource("quest_panel")
[node name="CloseButton" type="Control" parent="UI/QuestPanel"]
anchor_left = 1.0
anchor_right = 1.0
offset_left = -140.0
offset_right = -24.0
offset_top = 20.0
offset_bottom = 136.0
script = ExtResource("10")
icon = 1
[node name="NarrationBanner" type="Control" parent="UI"]
visible = false
mouse_filter = 2