From d5275c13fd4a5a3c5af2bb279d4c9ea18721dd69 Mon Sep 17 00:00:00 2001 From: Jeremy Baxter Date: Thu, 22 Jan 2026 21:38:00 +1300 Subject: [PATCH 01/10] gears: remove redundant gear_id() --- gears/ball.gd | 2 -- gears/gear.gd | 4 ---- 2 files changed, 6 deletions(-) diff --git a/gears/ball.gd b/gears/ball.gd index fc30219..67ecd55 100644 --- a/gears/ball.gd +++ b/gears/ball.gd @@ -2,8 +2,6 @@ class_name Ball extends "gear.gd" func gear_name(): return "Ball" -func gear_id(): - return 1 func continuous(): return false diff --git a/gears/gear.gd b/gears/gear.gd index af79744..c4b4a5a 100644 --- a/gears/gear.gd +++ b/gears/gear.gd @@ -13,15 +13,11 @@ var pickup_basis = idle_basis func gear_name(): return "Gear" -func gear_id(): - return 0 func model_file(): return "hammer.glb" func continuous(): return false -# this can be redefined to make a custom -# gear mesh, e.g. a SphereMesh func use(player): basis = use_basis $Timer.start() -- 2.52.0 From 1112a9f6dac0de49356899cd159b3afed7431e7e Mon Sep 17 00:00:00 2001 From: Jeremy Baxter Date: Thu, 22 Jan 2026 22:28:28 +1300 Subject: [PATCH 02/10] player: add Gear.unequip() API --- gears/gear.gd | 6 ++++++ player/player.gd | 6 +++++- 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/gears/gear.gd b/gears/gear.gd index c4b4a5a..588416a 100644 --- a/gears/gear.gd +++ b/gears/gear.gd @@ -23,9 +23,15 @@ func use(player): $Timer.start() on_use(player) +func unequip(player): + on_unequip(player) + func on_use(_player): pass +func on_unequip(_player): + pass + func on_ready(): pass diff --git a/player/player.gd b/player/player.gd index 48f08e0..905b397 100644 --- a/player/player.gd +++ b/player/player.gd @@ -65,6 +65,7 @@ func die(): # strip gears for gear in $Backpack.get_children(): gear.queue_free() + $Pivot/Container/Gear.unequip(self) $Pivot/Container/Gear.queue_free() $RespawnTimer.start() @@ -103,6 +104,7 @@ func use_backpack_slot(n): # place current gear in first free slot var slot = find_free_slot() if slot: + old.unequip(self) old.name = slot old.reparent($Backpack, false) get_node(gear_node).reparent($Pivot/Container, false) @@ -111,7 +113,8 @@ func use_backpack_slot(n): return # couldn't find a free slot, so replace # the new slot with the current gear - get_node(gear_node).reparent($Pivot/Container, false) + get_node(gear_node).reparent($Pivot/Container, false) + old.unequip(self) old.reparent($Backpack, false) old.name = n get_node("Pivot/Container/" + n).name = "Gear" @@ -135,6 +138,7 @@ func equip(gear: Gear): # place current gear in first free slot var slot = find_free_slot() if slot: + old.unequip(self) old.name = slot old.reparent($Backpack, false) new_gear = gear.duplicate() -- 2.52.0 From 3e23bd48413f7e599a946839c06c0d970c0d553c Mon Sep 17 00:00:00 2001 From: Jeremy Baxter Date: Thu, 22 Jan 2026 23:26:25 +1300 Subject: [PATCH 03/10] gear: make basis properties overridable by child classes --- gears/gear.gd | 30 ++++++++++++++++-------------- 1 file changed, 16 insertions(+), 14 deletions(-) diff --git a/gears/gear.gd b/gears/gear.gd index 588416a..80eeb2e 100644 --- a/gears/gear.gd +++ b/gears/gear.gd @@ -1,25 +1,27 @@ @icon("./gear.png") class_name Gear extends Node3D -var idle_basis = Basis( - Vector3(1, 0, 0), - Vector3(0, 1, 0), - Vector3(0, 0, 1)) -var use_basis = Basis( - Vector3(1, 0, 0), - Vector3(0, 0, -1), - Vector3(0, 1, 0)) -var pickup_basis = idle_basis - func gear_name(): return "Gear" func model_file(): return "hammer.glb" func continuous(): return false +func idle_basis(): + return Basis( + Vector3(1, 0, 0), + Vector3(0, 1, 0), + Vector3(0, 0, 1)) +func use_basis(): + return Basis( + Vector3(1, 0, 0), + Vector3(0, 0, -1), + Vector3(0, 1, 0)) +func pickup_basis(): + return idle_basis() func use(player): - basis = use_basis + basis = use_basis() $Timer.start() on_use(player) @@ -36,10 +38,10 @@ func on_ready(): pass func _on_timer_timeout(): - basis = idle_basis + basis = idle_basis() func _ready(): - basis = idle_basis + basis = idle_basis() if get_parent() is GearPickup: - basis = pickup_basis + basis = pickup_basis() on_ready() -- 2.52.0 From 73fe669f5746c5e079cdafb008a9cbd516875263 Mon Sep 17 00:00:00 2001 From: Jeremy Baxter Date: Thu, 22 Jan 2026 23:35:32 +1300 Subject: [PATCH 04/10] player: start with Gear --- player/player.gd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/player/player.gd b/player/player.gd index 905b397..ae6067b 100644 --- a/player/player.gd +++ b/player/player.gd @@ -8,7 +8,7 @@ const gear_slots = ["1", "2", "3"] @onready var spawn = Vector3(position) -var starting_gear = preload("res://gears/ball.tscn") +var starting_gear = preload("res://gears/gear.tscn") var suspended = false var direction = Vector3.ZERO -- 2.52.0 From cda93d8177e93cdf0e53a59cc52210a698e49ff4 Mon Sep 17 00:00:00 2001 From: Jeremy Baxter Date: Sat, 24 Jan 2026 12:41:10 +1300 Subject: [PATCH 05/10] player: add check before unequipping gear --- player/player.gd | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/player/player.gd b/player/player.gd index ae6067b..312d369 100644 --- a/player/player.gd +++ b/player/player.gd @@ -65,8 +65,9 @@ func die(): # strip gears for gear in $Backpack.get_children(): gear.queue_free() - $Pivot/Container/Gear.unequip(self) - $Pivot/Container/Gear.queue_free() + if has_node("Pivot/Container/Gear"): + $Pivot/Container/Gear.unequip(self) + $Pivot/Container/Gear.queue_free() $RespawnTimer.start() message("Le gone") -- 2.52.0 From f1a10a1377f08f795c84e0aa9e97e65ccf7cb19a Mon Sep 17 00:00:00 2001 From: Jeremy Baxter Date: Sat, 24 Jan 2026 12:43:28 +1300 Subject: [PATCH 06/10] player: add protected and suspended members `suspended' is now for suspending a player's movement input keys; `protected' is for preventing a player's death except for special cases such as when health goes below 1 or the player drops out of the world. To kill a player without checking `protected', use _die(). --- player/player.gd | 45 +++++++++++++++++++++++++++++---------------- 1 file changed, 29 insertions(+), 16 deletions(-) diff --git a/player/player.gd b/player/player.gd index 312d369..6cf787c 100644 --- a/player/player.gd +++ b/player/player.gd @@ -10,6 +10,8 @@ const gear_slots = ["1", "2", "3"] var starting_gear = preload("res://gears/gear.tscn") +var dead = false +var protected = false var suspended = false var direction = Vector3.ZERO var target_velocity = Vector3.ZERO @@ -45,6 +47,8 @@ func message(string): # State functions func harm(hp): + if protected: + return assert(hp >= 0) _health -= hp make_hud() @@ -57,7 +61,8 @@ func heal(hp): func health(): return _health -func die(): +func _die(): + dead = true suspended = true visible = false $HUD.visible = false @@ -72,12 +77,17 @@ func die(): $RespawnTimer.start() message("Le gone") +func die(): + if protected: + return + _die() + func respawn(): position = Vector3(spawn) $CameraGimbal.reset() _health = 100 visible = true - suspended = false + dead = false # add starting gear var gear = starting_gear.instantiate() @@ -123,6 +133,8 @@ func use_backpack_slot(n): return func equip(gear: Gear): + if suspended: + return var gear_name = gear.gear_name() # do we have the gear equipped? if gear_name == $Pivot/Container/Gear.gear_name(): @@ -185,16 +197,17 @@ func do_movement(delta): var mx = 0 var mz = 0 - if Input.is_action_pressed("move_forward"): - mz -= 1 - if Input.is_action_pressed("move_back"): - mz += 1 - if Input.is_action_pressed("move_left"): - mx -= 1 - if Input.is_action_pressed("move_right"): - mx += 1 - if Input.is_action_pressed("jump") and is_on_floor(): - target_velocity.y = jump_power + if not suspended: + if Input.is_action_pressed("move_forward"): + mz -= 1 + if Input.is_action_pressed("move_back"): + mz += 1 + if Input.is_action_pressed("move_left"): + mx -= 1 + if Input.is_action_pressed("move_right"): + mx += 1 + if Input.is_action_pressed("jump") and is_on_floor(): + target_velocity.y = jump_power if !(mx == 0 and mz == 0): move_player(mx, mz) @@ -227,12 +240,12 @@ func _ready(): respawn() func _physics_process(delta): - if health() < 1 or position.y <= -1000: - die() - - if suspended: + if dead: return + if health() < 1 or position.y <= -1000: + _die() + # Backpack keys do_backpack_keys() # Movement -- 2.52.0 From 67666f9622be734a25cac14870c6d8cec61d196e Mon Sep 17 00:00:00 2001 From: Jeremy Baxter Date: Sat, 24 Jan 2026 12:59:09 +1300 Subject: [PATCH 07/10] player: reparent Pivot/PlayerMesh to Pivot/Mesh/ --- player/player.tscn | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/player/player.tscn b/player/player.tscn index 10a0f29..d87afa8 100644 --- a/player/player.tscn +++ b/player/player.tscn @@ -58,7 +58,9 @@ shape = SubResource("BoxShape3D_onrkg") [node name="Pivot" type="Node3D" parent="."] -[node name="PlayerMesh" type="MeshInstance3D" parent="Pivot"] +[node name="Mesh" type="Node3D" parent="Pivot"] + +[node name="MeshInstance3D" type="MeshInstance3D" parent="Pivot/Mesh"] transform = Transform3D(1, 0, 0, 0, -4.371139e-08, 1, 0, -1, -4.371139e-08, 0, -100, 0) mesh = SubResource("ArrayMesh_sweqy") skeleton = NodePath("") -- 2.52.0 From 35bdabd80750fd1c5751f6d94c42a48763a67995 Mon Sep 17 00:00:00 2001 From: Jeremy Baxter Date: Sat, 24 Jan 2026 13:01:28 +1300 Subject: [PATCH 08/10] world: set Player position --- main.tscn | 1 + 1 file changed, 1 insertion(+) diff --git a/main.tscn b/main.tscn index ae10ae9..cd73495 100644 --- a/main.tscn +++ b/main.tscn @@ -18,6 +18,7 @@ albedo_color = Color(0.49454, 0.79, 0.4424, 1) [node name="Main" type="Node3D"] [node name="Player" parent="." instance=ExtResource("1_ig7tw")] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 2, 0) [node name="Baseplate" type="StaticBody3D" parent="."] -- 2.52.0 From 5b2f2981ab913b58f18b41bb9f68c3cb72d91bc9 Mon Sep 17 00:00:00 2001 From: Jeremy Baxter Date: Sun, 25 Jan 2026 17:20:35 +1300 Subject: [PATCH 09/10] util: add class --- util/util.gd | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 util/util.gd diff --git a/util/util.gd b/util/util.gd new file mode 100644 index 0000000..1bd3c37 --- /dev/null +++ b/util/util.gd @@ -0,0 +1,4 @@ +class_name Util extends Node + +static func input_action_string(action): + return InputMap.action_get_events(action)[0].as_text() -- 2.52.0 From 15368f522c6902668a7f7d7c27aba685286861ea Mon Sep 17 00:00:00 2001 From: Jeremy Baxter Date: Sun, 25 Jan 2026 21:11:02 +1300 Subject: [PATCH 10/10] geep: add new gear --- gears/geep.gd | 62 ++++++++++++++++++++++++++++++ gears/geep.tscn | 87 +++++++++++++++++++++++++++++++++++++++++++ gears/geep_body.tres | 4 ++ gears/geep_wheel.tres | 4 ++ 4 files changed, 157 insertions(+) create mode 100644 gears/geep.gd create mode 100644 gears/geep.tscn create mode 100644 gears/geep_body.tres create mode 100644 gears/geep_wheel.tres diff --git a/gears/geep.gd b/gears/geep.gd new file mode 100644 index 0000000..b08f60a --- /dev/null +++ b/gears/geep.gd @@ -0,0 +1,62 @@ +class_name Geep extends "gear.gd" + +func gear_name(): + return "Geep" +func continuous(): + return false +func use_basis(): + return idle_basis() + +# multiplier of player's speed +const speed = 2 +# how far the vehicle lifts the player off the ground +const lift = 2 + +var box = null +var driver = null +var active = false + +func init_driver(player): + driver = player + if not box: + box = Vector3(driver.get_node("CollisionShape3D").shape.size) + +func mount(): + active = true + position = Vector3(-driver.get_node("Pivot/Container").position) + position.y += 1 + driver.message( + "Press [%s] to exit the Geep" + % Util.input_action_string("gear_use")) + driver.get_node("CameraGimbal").position.y += lift + driver.get_node("Pivot/Mesh").position.y += lift + driver.get_node("CollisionShape3D").shape.size = $GearMesh/Vehicle/CollisionShape3D.shape.size + driver.protected = true + driver.suspended = true + +func unmount(): + active = false + position = Vector3.ZERO + driver.message("") + driver.get_node("CameraGimbal").position = Vector3.ZERO + driver.get_node("Pivot/Mesh").position = Vector3.ZERO + driver.get_node("CollisionShape3D").shape.size = box + driver.protected = false + driver.suspended = false + +func on_use(player): + init_driver(player) + if active: + unmount() + else: + mount() + +func on_unequip(player): + init_driver(player) + unmount() + +func _physics_process(_delta): + if not active: + return + + driver.move_player(0, -speed) diff --git a/gears/geep.tscn b/gears/geep.tscn new file mode 100644 index 0000000..481e2bb --- /dev/null +++ b/gears/geep.tscn @@ -0,0 +1,87 @@ +[gd_scene load_steps=10 format=3 uid="uid://d3k7b6o56ue5k"] + +[ext_resource type="Script" uid="uid://fljad0m3jlt0" path="res://gears/geep.gd" id="1_8skgp"] +[ext_resource type="Material" uid="uid://dpacu3e7vsks5" path="res://gears/geep_body.tres" id="2_rhiad"] +[ext_resource type="Material" uid="uid://bt5aat64e478k" path="res://gears/geep_wheel.tres" id="3_lrfuo"] + +[sub_resource type="BoxShape3D" id="BoxShape3D_lrfuo"] +size = Vector3(3, 3, 6) + +[sub_resource type="BoxMesh" id="BoxMesh_rhiad"] +material = ExtResource("2_rhiad") +size = Vector3(3, 0.5, 6) + +[sub_resource type="BoxMesh" id="BoxMesh_kyikt"] +material = ExtResource("2_rhiad") +size = Vector3(0.5, 1.75, 6) + +[sub_resource type="BoxMesh" id="BoxMesh_wm067"] +material = ExtResource("2_rhiad") +size = Vector3(3, 2, 2.5) + +[sub_resource type="BoxMesh" id="BoxMesh_lrfuo"] +material = ExtResource("2_rhiad") +size = Vector3(3, 2, 0.5) + +[sub_resource type="CylinderMesh" id="CylinderMesh_lrfuo"] +material = ExtResource("3_lrfuo") +top_radius = 1.0 +bottom_radius = 1.0 +height = 0.25 + +[node name="Gear" type="Node3D"] +rotation_edit_mode = 2 +script = ExtResource("1_8skgp") + +[node name="Timer" type="Timer" parent="."] +one_shot = true + +[node name="GearMesh" type="Node3D" parent="."] + +[node name="Vehicle" type="StaticBody3D" parent="GearMesh"] +transform = Transform3D(1, 0, 0, 0, 1.0000001, 0, 0, 0, 1.0000001, 0, 0, 0) +collision_layer = 4 + +[node name="CollisionShape3D" type="CollisionShape3D" parent="GearMesh/Vehicle"] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 1.5, 0) +shape = SubResource("BoxShape3D_lrfuo") + +[node name="BaseMesh" type="MeshInstance3D" parent="GearMesh/Vehicle"] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0.9997004, 0) +mesh = SubResource("BoxMesh_rhiad") + +[node name="LeftSideMesh" type="MeshInstance3D" parent="GearMesh/Vehicle"] +transform = Transform3D(1, 0, 0, 0, 0.9999999, 0, 0, 0, 0.9999999, -1.25, 2.1247003, 0) +mesh = SubResource("BoxMesh_kyikt") +skeleton = NodePath("") + +[node name="RightSideMesh" type="MeshInstance3D" parent="GearMesh/Vehicle"] +transform = Transform3D(1, 0, 0, 0, 0.9999999, 0, 0, 0, 0.9999999, 1.25, 2.1247003, 0) +mesh = SubResource("BoxMesh_kyikt") +skeleton = NodePath("") + +[node name="BonnetMesh" type="MeshInstance3D" parent="GearMesh/Vehicle"] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 1.9997005, -1.75) +mesh = SubResource("BoxMesh_wm067") + +[node name="TailgateMesh" type="MeshInstance3D" parent="GearMesh/Vehicle"] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 1.9997005, 2.75) +mesh = SubResource("BoxMesh_lrfuo") + +[node name="WheelFLMesh" type="MeshInstance3D" parent="GearMesh/Vehicle"] +transform = Transform3D(-4.371139e-08, -1, 0, 1, -4.371139e-08, 0, 0, 0, 1, 1.65, 1, 2) +mesh = SubResource("CylinderMesh_lrfuo") + +[node name="WheelFRMesh" type="MeshInstance3D" parent="GearMesh/Vehicle"] +transform = Transform3D(-4.371139e-08, -1, 0, 1, -4.371139e-08, 0, 0, 0, 1, -1.65, 1, 2) +mesh = SubResource("CylinderMesh_lrfuo") + +[node name="WheelBLMesh" type="MeshInstance3D" parent="GearMesh/Vehicle"] +transform = Transform3D(-4.371139e-08, -1, 0, 1, -4.371139e-08, 0, 0, 0, 1, 1.65, 1, -2) +mesh = SubResource("CylinderMesh_lrfuo") + +[node name="WheelBRMesh" type="MeshInstance3D" parent="GearMesh/Vehicle"] +transform = Transform3D(-4.371139e-08, -1, 0, 1, -4.371139e-08, 0, 0, 0, 1, -1.65, 1, -2) +mesh = SubResource("CylinderMesh_lrfuo") + +[connection signal="timeout" from="Timer" to="." method="_on_timer_timeout"] diff --git a/gears/geep_body.tres b/gears/geep_body.tres new file mode 100644 index 0000000..4401665 --- /dev/null +++ b/gears/geep_body.tres @@ -0,0 +1,4 @@ +[gd_resource type="StandardMaterial3D" load_steps=0 format=3 uid="uid://dpacu3e7vsks5"] + +[resource] +albedo_color = Color(0.99607843, 0.99607843, 0.99607843, 1) diff --git a/gears/geep_wheel.tres b/gears/geep_wheel.tres new file mode 100644 index 0000000..fa76463 --- /dev/null +++ b/gears/geep_wheel.tres @@ -0,0 +1,4 @@ +[gd_resource type="StandardMaterial3D" load_steps=0 format=3 uid="uid://bt5aat64e478k"] + +[resource] +albedo_color = Color(0.1254902, 0.1254902, 0.1254902, 1) -- 2.52.0