don
/
neon-sprawl
mirror of https://github.com/ViPro-Technologies/neon-sprawl
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

NEON-16: satisfy GDScript lint hooks 

Refactor the bump escape helper and shared test script loading so the branch passes the repo's pre-push GDScript lint checks. This keeps the runtime behavior intact while unblocking push and PR creation.
pull/37/head
VinPropane 2026-04-10 00:48:11 -04:00
parent 1f5c1e7619
commit 4b861a69df
2 changed files with 25 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
client/scripts/player.gd
View File

@ -374,34 +374,27 @@ func _maybe_idle_bump_proximity_escape() -> bool:
var radial: Vector3 = Vector3(dx / d, 0.0, dz / d) var radial: Vector3 = Vector3(dx / d, 0.0, dz / d)
var away: Vector3 = radial * IDLE_BUMP_ESCAPE_STEP var away: Vector3 = radial * IDLE_BUMP_ESCAPE_STEP
var wall_band_outer: float = col_r + PLAYER_CAPSULE_RADIUS + 0.22 var wall_band_outer: float = col_r + PLAYER_CAPSULE_RADIUS + 0.22
# Outside visual disc but inside fat collision — clear the invisible lip. var should_escape: bool = d > r_mesh * 0.9 and d < col_r + 0.32
if d > r_mesh * 0.9 and d < col_r + 0.32:
if not test_move(global_transform, away, null, safe_margin):
global_position += away
return true
return false
# On / above the disc, hugging the **visual** rim — step onto open slab. # On / above the disc, hugging the **visual** rim — step onto open slab.
if ( should_escape = should_escape or (
feet_y >= bottom_y - 0.06 feet_y >= bottom_y - 0.06
and feet_y <= top_y + 0.1 and feet_y <= top_y + 0.1
and d >= r_mesh * 0.86 and d >= r_mesh * 0.86
and d <= r_mesh + 0.14 and d <= r_mesh + 0.14
): )
if not test_move(global_transform, away, null, safe_margin):
global_position += away
return true
return false
# Beside vertical cylinder: axis distance may exceed **`col_r`** while capsule still touches wall. # Beside vertical cylinder: axis distance may exceed **`col_r`** while capsule still touches wall.
if ( should_escape = should_escape or (
feet_y <= top_y + 0.14 feet_y <= top_y + 0.14
and d > r_mesh * 0.82 and d > r_mesh * 0.82
and d < wall_band_outer and d < wall_band_outer
and (is_on_wall() or _idle_ridged_floor_contacts()) and (is_on_wall() or _idle_ridged_floor_contacts())
): )
if not test_move(global_transform, away, null, safe_margin): if not should_escape:
global_position += away continue
return true if test_move(global_transform, away, null, safe_margin):
return false return false
global_position += away
return true
return false return false
@ -497,7 +490,8 @@ func _physics_process(_delta: float) -> void:
_snap_capsule_upright() _snap_capsule_upright()
return return
if _auth_walk_goal.y < capsule_feet_y(global_position.y, CAPSULE_HALF_HEIGHT) - DESCEND_GOAL_Y_MARGIN: var feet_y: float = capsule_feet_y(global_position.y, CAPSULE_HALF_HEIGHT)
if _auth_walk_goal.y < feet_y - DESCEND_GOAL_Y_MARGIN:
_set_horizontal_velocity_toward(_auth_walk_goal) _set_horizontal_velocity_toward(_auth_walk_goal)
floor_snap_length = FLOOR_SNAP_MOVING floor_snap_length = FLOOR_SNAP_MOVING
move_and_slide() move_and_slide()

28
client/test/player_test.gd
View File

@ -1,13 +1,15 @@
# Tests for res://scripts/player.gd (minimal tree: CharacterBody3D + NavigationAgent3D). # Tests for res://scripts/player.gd (minimal tree: CharacterBody3D + NavigationAgent3D).
extends GdUnitTestSuite extends GdUnitTestSuite
const PLAYER_SCRIPT: Script = preload("res://scripts/player.gd")
func _make_player() -> CharacterBody3D: func _make_player() -> CharacterBody3D:
var body := CharacterBody3D.new() var body := CharacterBody3D.new()
var nav := NavigationAgent3D.new() var nav := NavigationAgent3D.new()
nav.name = "NavigationAgent3D" nav.name = "NavigationAgent3D"
body.add_child(nav) body.add_child(nav)
body.set_script(load("res://scripts/player.gd")) body.set_script(PLAYER_SCRIPT)
auto_free(body) auto_free(body)
add_child(body) add_child(body)
return body return body
@ -48,7 +50,7 @@ func test_clear_nav_goal_clears_velocity_and_nav_target() -> void:
func test_idle_support_is_stable_on_flat_floor_without_wall_contacts() -> void: func test_idle_support_is_stable_on_flat_floor_without_wall_contacts() -> void:
var slide_normals: Array[Vector3] = [Vector3.UP] var slide_normals: Array[Vector3] = [Vector3.UP]
var stable: bool = load("res://scripts/player.gd").idle_support_is_stable( var stable: bool = PLAYER_SCRIPT.idle_support_is_stable(
true, true,
Vector3.UP, Vector3.UP,
slide_normals, slide_normals,
@ -59,7 +61,7 @@ func test_idle_support_is_stable_on_flat_floor_without_wall_contacts() -> void:
func test_idle_support_is_stable_false_when_floor_is_not_flat_enough() -> void: func test_idle_support_is_stable_false_when_floor_is_not_flat_enough() -> void:
var slide_normals: Array[Vector3] = [Vector3.UP] var slide_normals: Array[Vector3] = [Vector3.UP]
var stable: bool = load("res://scripts/player.gd").idle_support_is_stable( var stable: bool = PLAYER_SCRIPT.idle_support_is_stable(
true, true,
Vector3(0.02, 0.995, 0.0).normalized(), Vector3(0.02, 0.995, 0.0).normalized(),
slide_normals, slide_normals,
@ -70,7 +72,7 @@ func test_idle_support_is_stable_false_when_floor_is_not_flat_enough() -> void:
func test_idle_support_is_stable_true_when_flat_floor_has_extra_contacts() -> void: func test_idle_support_is_stable_true_when_flat_floor_has_extra_contacts() -> void:
var slide_normals: Array[Vector3] = [Vector3.UP, Vector3(0.0, 0.6, 0.8).normalized()] var slide_normals: Array[Vector3] = [Vector3.UP, Vector3(0.0, 0.6, 0.8).normalized()]
var stable: bool = load("res://scripts/player.gd").idle_support_is_stable( var stable: bool = PLAYER_SCRIPT.idle_support_is_stable(
true, true,
Vector3.UP, Vector3.UP,
slide_normals, slide_normals,
@ -81,7 +83,7 @@ func test_idle_support_is_stable_true_when_flat_floor_has_extra_contacts() -> vo
func test_idle_support_is_stable_false_when_loose_ticks_active() -> void: func test_idle_support_is_stable_false_when_loose_ticks_active() -> void:
var slide_normals: Array[Vector3] = [Vector3.UP] var slide_normals: Array[Vector3] = [Vector3.UP]
var stable: bool = load("res://scripts/player.gd").idle_support_is_stable( var stable: bool = PLAYER_SCRIPT.idle_support_is_stable(
true, true,
Vector3.UP, Vector3.UP,
slide_normals, slide_normals,
@ -92,7 +94,7 @@ func test_idle_support_is_stable_false_when_loose_ticks_active() -> void:
func test_idle_support_is_stable_false_when_not_on_floor() -> void: func test_idle_support_is_stable_false_when_not_on_floor() -> void:
var slide_normals: Array[Vector3] = [Vector3.UP] var slide_normals: Array[Vector3] = [Vector3.UP]
var stable: bool = load("res://scripts/player.gd").idle_support_is_stable( var stable: bool = PLAYER_SCRIPT.idle_support_is_stable(
false, false,
Vector3.UP, Vector3.UP,
slide_normals, slide_normals,
@ -122,33 +124,29 @@ func test_snap_to_server_clears_idle_anchor() -> void:
func test_capsule_feet_y_uses_body_origin_minus_half_height() -> void: func test_capsule_feet_y_uses_body_origin_minus_half_height() -> void:
var script := load("res://scripts/player.gd") var feet_y: float = PLAYER_SCRIPT.capsule_feet_y(0.545678, 0.5)
var feet_y: float = script.capsule_feet_y(0.545678, 0.5)
assert_that(absf(feet_y - 0.045678)).is_less(0.000001) assert_that(absf(feet_y - 0.045678)).is_less(0.000001)
func test_vertical_arrival_error_uses_capsule_feet_height() -> void: func test_vertical_arrival_error_uses_capsule_feet_height() -> void:
var script := load("res://scripts/player.gd")
var goal_y := 0.045678 var goal_y := 0.045678
var body_origin_y := 0.545678 var body_origin_y := 0.545678
var err: float = script.vertical_arrival_error(goal_y, body_origin_y, 0.5) var err: float = PLAYER_SCRIPT.vertical_arrival_error(goal_y, body_origin_y, 0.5)
assert_that(absf(err)).is_less(0.000001) assert_that(absf(err)).is_less(0.000001)
func test_vertical_arrival_error_stays_large_for_origin_height_only_match() -> void: func test_vertical_arrival_error_stays_large_for_origin_height_only_match() -> void:
var script := load("res://scripts/player.gd")
var goal_y := 0.545678 var goal_y := 0.545678
var body_origin_y := 0.545678 var body_origin_y := 0.545678
var err: float = script.vertical_arrival_error(goal_y, body_origin_y, 0.5) var err: float = PLAYER_SCRIPT.vertical_arrival_error(goal_y, body_origin_y, 0.5)
assert_that(absf(err - 0.5)).is_less(0.000001) assert_that(absf(err - 0.5)).is_less(0.000001)
func test_flat_floor_goal_is_not_below_feet_height_margin() -> void: func test_flat_floor_goal_is_not_below_feet_height_margin() -> void:
var script := load("res://scripts/player.gd")
var goal_y := 0.0 var goal_y := 0.0
var body_origin_y := 0.4 var body_origin_y := 0.4
var descend_margin := script.get("DESCEND_GOAL_Y_MARGIN") as float var descend_margin := PLAYER_SCRIPT.get("DESCEND_GOAL_Y_MARGIN") as float
var below_feet_margin: bool = ( var below_feet_margin: bool = (
goal_y < script.capsule_feet_y(body_origin_y, 0.5) - descend_margin goal_y < PLAYER_SCRIPT.capsule_feet_y(body_origin_y, 0.5) - descend_margin
) )
assert_that(below_feet_margin).is_false() assert_that(below_feet_margin).is_false()