Recentre a released stick, slow extractors again, and unbreak the lab layout
Both sticks float - the base jumps to wherever the finger lands, so a player
does not have to hit an exact spot on a screen they cannot feel. Releasing put
only the KNOB back onto the base and left the base parked wherever that touch
had been, so an idle stick sat off-centre in a different place every time and
read as a control still in use. Release now returns base and knob to the
middle of the rect.
Extractors produce at 0.5 ore per second, halved again: at 1.0 they still
outran the rest of the economy. An extractor now pays back its 25-ore cost in
fifty seconds rather than twelve.
The ship lab and the crafter were both overlapping themselves. Enlarging the
shared resource table to 136px (so it could breathe and show bigger type)
pushed its bottom edge 34px into the vessel row beneath it in one and the
status text in the other - my regression, visible immediately on a real
screen and not at all in any test. The lab's second row of upgrade cards was
also already running into the detail text below it, by 13px, before any of
this. Both menus are re-spaced end to end rather than nudged, since moving one
collision into another is how the second one got there.
Two tests carried waits tuned to an extraction rate that has now changed
twice. Both derive them from EXTRACTOR_RATE instead, so the next balance pass
does not report a broken extractor that is working perfectly - the same fix
test_extractor_income already needed one round ago, in the file next to it.
Suite 112/112.
Co-Authored-By: Claude Opus 5 <noreply@anthropic.com>
2026-08-21 13:31:46 +02:00
|
|
|
extends SceneTree
|
|
|
|
|
|
|
|
|
|
# Headless test: run with
|
|
|
|
|
# godot --headless -s res://tests/test_joystick_recentres.gd
|
|
|
|
|
# Both sticks float: the base jumps to wherever the finger lands, so a player
|
|
|
|
|
# does not have to hit an exact spot on a screen they cannot feel. Releasing
|
|
|
|
|
# used to put only the KNOB back onto the base, leaving the base parked
|
|
|
|
|
# wherever that touch had been - so an idle stick sat off-centre, in a
|
|
|
|
|
# different place every time, and read as a control still in use.
|
|
|
|
|
#
|
|
|
|
|
# Covers, for the movement stick AND the fire stick:
|
|
|
|
|
# A. an untouched stick sits in the middle of its own rect
|
|
|
|
|
# B. pressing off-centre moves the base there - the floating behaviour is
|
|
|
|
|
# still intact, which is the thing this must not break
|
|
|
|
|
# C. releasing puts base AND knob back in the middle
|
|
|
|
|
# D. releasing also clears the reported direction, so nothing keeps acting
|
|
|
|
|
# on a stick nobody is holding
|
|
|
|
|
|
|
|
|
|
const OFFSET := Vector2(-58.0, 41.0)
|
|
|
|
|
|
|
|
|
|
var main: Node
|
|
|
|
|
var stage: int = 0
|
|
|
|
|
var elapsed: float = 0.0
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
func _initialize() -> void:
|
#84: move 215 root files into a folder hierarchy
Everything lived in one flat directory, so a diff gave no clue what area it
touched and finding the file you wanted meant knowing its exact name. Twelve
folders now, grouped by what a thing IS rather than what type it is - a
vessel's definition, its component scenes and its upgrade resources sit
together, because that is the set you read when you change one of them.
buildings core controllers enemies logistics planets
resources shaders surface ui vessels vfx world
332 files moved and every res:// reference rewritten - 306 files touched,
including the autoload and main-scene paths in project.godot. Nothing renamed:
this is purely where files sit, so the diff is a pile of pure moves and no
behaviour is buried in it. ui_theme.tres, icon.svg and web_shell.html stay at
the root, where Godot and the export preset expect them.
Verified three ways, because a suite alone would not have caught all of it:
the full 117 pass, the web export builds clean, and the game renders.
The export is why that matters. The FIRST export after the move failed with
"Attempt to open script 'res://GameState.gd'" - the old path - while
project.godot on disk plainly said res://core/GameState.gd. That is this
project's documented Android FUSE mtime trap: Godot served a cached copy of a
file whose content had changed. A `touch` fixed it. Nothing in the test suite
would have found that, because the suite runs from a copy on a native
filesystem - the one place the bug cannot happen.
Co-Authored-By: Claude Opus 5 <noreply@anthropic.com>
2026-08-21 19:44:14 +02:00
|
|
|
main = load("res://world/Main.tscn").instantiate()
|
Recentre a released stick, slow extractors again, and unbreak the lab layout
Both sticks float - the base jumps to wherever the finger lands, so a player
does not have to hit an exact spot on a screen they cannot feel. Releasing put
only the KNOB back onto the base and left the base parked wherever that touch
had been, so an idle stick sat off-centre in a different place every time and
read as a control still in use. Release now returns base and knob to the
middle of the rect.
Extractors produce at 0.5 ore per second, halved again: at 1.0 they still
outran the rest of the economy. An extractor now pays back its 25-ore cost in
fifty seconds rather than twelve.
The ship lab and the crafter were both overlapping themselves. Enlarging the
shared resource table to 136px (so it could breathe and show bigger type)
pushed its bottom edge 34px into the vessel row beneath it in one and the
status text in the other - my regression, visible immediately on a real
screen and not at all in any test. The lab's second row of upgrade cards was
also already running into the detail text below it, by 13px, before any of
this. Both menus are re-spaced end to end rather than nudged, since moving one
collision into another is how the second one got there.
Two tests carried waits tuned to an extraction rate that has now changed
twice. Both derive them from EXTRACTOR_RATE instead, so the next balance pass
does not report a broken extractor that is working perfectly - the same fix
test_extractor_income already needed one round ago, in the file next to it.
Suite 112/112.
Co-Authored-By: Claude Opus 5 <noreply@anthropic.com>
2026-08-21 13:31:46 +02:00
|
|
|
root.add_child(main)
|
|
|
|
|
current_scene = main
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
func _check(stick: Control, label: String) -> bool:
|
|
|
|
|
var home: Vector2 = stick.home_pos()
|
|
|
|
|
|
|
|
|
|
# --- A. idle means centred -------------------------------------------
|
|
|
|
|
if stick.base_pos.distance_to(home) > 0.01 or stick.knob_pos.distance_to(home) > 0.01:
|
|
|
|
|
return _fail("%s starts at base %s knob %s, expected both at %s" \
|
|
|
|
|
% [label, stick.base_pos, stick.knob_pos, home])
|
|
|
|
|
|
|
|
|
|
# --- B. it still floats to the finger ---------------------------------
|
|
|
|
|
var press := InputEventScreenTouch.new()
|
|
|
|
|
press.index = 2
|
|
|
|
|
press.pressed = true
|
|
|
|
|
press.position = stick.global_position + home + OFFSET
|
|
|
|
|
if not stick.handle_touch(press):
|
|
|
|
|
return _fail("%s refused a touch inside its own rect" % label)
|
|
|
|
|
if stick.base_pos.distance_to(home + OFFSET) > 0.01:
|
|
|
|
|
return _fail("%s did not float its base to the finger: base %s, expected %s" \
|
|
|
|
|
% [label, stick.base_pos, home + OFFSET])
|
|
|
|
|
|
|
|
|
|
var drag := InputEventScreenDrag.new()
|
|
|
|
|
drag.index = 2
|
|
|
|
|
drag.position = press.position + Vector2(stick.max_radius, 0.0)
|
|
|
|
|
stick.handle_drag(drag)
|
|
|
|
|
if stick.direction == Vector2.ZERO:
|
|
|
|
|
return _fail("%s reported no direction while pushed" % label)
|
|
|
|
|
if stick.knob_pos.distance_to(stick.base_pos) < stick.max_radius * 0.5:
|
|
|
|
|
return _fail("%s knob barely moved while pushed" % label)
|
|
|
|
|
|
|
|
|
|
# --- C/D. release recentres everything and stops reporting ------------
|
|
|
|
|
var release := InputEventScreenTouch.new()
|
|
|
|
|
release.index = 2
|
|
|
|
|
release.pressed = false
|
|
|
|
|
release.position = drag.position
|
|
|
|
|
stick.handle_touch(release)
|
|
|
|
|
if stick.base_pos.distance_to(home) > 0.01:
|
|
|
|
|
return _fail("%s left its base at %s after release, expected %s" \
|
|
|
|
|
% [label, stick.base_pos, home])
|
|
|
|
|
if stick.knob_pos.distance_to(home) > 0.01:
|
|
|
|
|
return _fail("%s left its knob at %s after release, expected %s" \
|
|
|
|
|
% [label, stick.knob_pos, home])
|
|
|
|
|
if stick.direction != Vector2.ZERO:
|
|
|
|
|
return _fail("%s still reports %s after release" % [label, stick.direction])
|
|
|
|
|
if stick.is_active():
|
|
|
|
|
return _fail("%s still claims to be held after release" % label)
|
|
|
|
|
print("%s: floats to the finger, and returns to centre on release" % label)
|
|
|
|
|
return true
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
func _process(delta: float) -> bool:
|
|
|
|
|
elapsed += delta
|
|
|
|
|
if stage != 0:
|
|
|
|
|
return false
|
|
|
|
|
if elapsed < 0.2:
|
|
|
|
|
return false
|
|
|
|
|
stage = 1
|
|
|
|
|
if not _check(main.get_node("UI/Joystick"), "movement stick"):
|
|
|
|
|
return true
|
|
|
|
|
if not _check(main.get_node("UI/FireStick"), "fire stick"):
|
|
|
|
|
return true
|
|
|
|
|
print("TEST_JOYSTICK_RECENTRES: PASS")
|
|
|
|
|
quit(0)
|
|
|
|
|
return true
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
func _fail(message: String) -> bool:
|
|
|
|
|
print("TEST_JOYSTICK_RECENTRES: FAIL (%s)" % message)
|
|
|
|
|
quit(1)
|
|
|
|
|
return false
|