From d5275c13fd4a5a3c5af2bb279d4c9ea18721dd69 Mon Sep 17 00:00:00 2001 From: Jeremy Baxter Date: Thu, 22 Jan 2026 21:38:00 +1300 Subject: [PATCH 1/6] 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() From 1112a9f6dac0de49356899cd159b3afed7431e7e Mon Sep 17 00:00:00 2001 From: Jeremy Baxter Date: Thu, 22 Jan 2026 22:28:28 +1300 Subject: [PATCH 2/6] 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() From 3e23bd48413f7e599a946839c06c0d970c0d553c Mon Sep 17 00:00:00 2001 From: Jeremy Baxter Date: Thu, 22 Jan 2026 23:26:25 +1300 Subject: [PATCH 3/6] 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() From b1cbbb1312d00abeedbf9939c6d6d5bdf0621b39 Mon Sep 17 00:00:00 2001 From: Jeremy Baxter Date: Thu, 22 Jan 2026 23:27:13 +1300 Subject: [PATCH 4/6] geep: add new gear --- gears/geep.gd | 34 ++++++++++++++++++++ gears/geep.tscn | 82 +++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 116 insertions(+) create mode 100644 gears/geep.gd create mode 100644 gears/geep.tscn diff --git a/gears/geep.gd b/gears/geep.gd new file mode 100644 index 0000000..fe59a81 --- /dev/null +++ b/gears/geep.gd @@ -0,0 +1,34 @@ +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 + +var driver = null +var active = false + +func on_use(player): + driver = player + if active: + active = false + position = Vector3.ZERO + driver.message("You are no longer driving a Geep") + return + active = true + position = Vector3(-driver.get_node("Pivot/Container").position) + driver.message("You are now driving a Geep") + +func on_unequip(player): + active = false + +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..b983d7b --- /dev/null +++ b/gears/geep.tscn @@ -0,0 +1,82 @@ +[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"] + +[sub_resource type="BoxShape3D" id="BoxShape3D_8skgp"] +size = Vector3(3, 0.5, 6) + +[sub_resource type="BoxMesh" id="BoxMesh_rhiad"] +size = Vector3(3, 0.5, 6) + +[sub_resource type="BoxShape3D" id="BoxShape3D_lrfuo"] +size = Vector3(0.5, 1.75, 6) + +[sub_resource type="BoxMesh" id="BoxMesh_kyikt"] +size = Vector3(0.5, 1.75, 6) + +[sub_resource type="BoxShape3D" id="BoxShape3D_vjakw"] +size = Vector3(3, 2, 2.5) + +[sub_resource type="BoxMesh" id="BoxMesh_wm067"] +size = Vector3(3, 2, 2.5) + +[sub_resource type="BoxShape3D" id="BoxShape3D_rhiad"] +size = Vector3(3, 2, 0.5) + +[sub_resource type="BoxMesh" id="BoxMesh_lrfuo"] +size = Vector3(3, 2, 0.5) + +[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="BaseShape" type="CollisionShape3D" parent="GearMesh/Vehicle"] +shape = SubResource("BoxShape3D_8skgp") + +[node name="BaseMesh" type="MeshInstance3D" parent="GearMesh/Vehicle"] +mesh = SubResource("BoxMesh_rhiad") + +[node name="LeftSideShape" type="CollisionShape3D" parent="GearMesh/Vehicle"] +transform = Transform3D(1, 0, 0, 0, 0.9999999, 0, 0, 0, 0.9999999, -1.25, 1.1249999, 0) +shape = SubResource("BoxShape3D_lrfuo") + +[node name="LeftSideMesh" type="MeshInstance3D" parent="GearMesh/Vehicle"] +transform = Transform3D(1, 0, 0, 0, 0.9999999, 0, 0, 0, 0.9999999, -1.25, 1.1249999, 0) +mesh = SubResource("BoxMesh_kyikt") +skeleton = NodePath("") + +[node name="RightSideShape" type="CollisionShape3D" parent="GearMesh/Vehicle"] +transform = Transform3D(1, 0, 0, 0, 0.9999999, 0, 0, 0, 0.9999999, 1.25, 1.1249999, 0) +shape = SubResource("BoxShape3D_lrfuo") + +[node name="RightSideMesh" type="MeshInstance3D" parent="GearMesh/Vehicle"] +transform = Transform3D(1, 0, 0, 0, 0.9999999, 0, 0, 0, 0.9999999, 1.25, 1.1249999, 0) +mesh = SubResource("BoxMesh_kyikt") +skeleton = NodePath("") + +[node name="BonnetShape" type="CollisionShape3D" parent="GearMesh/Vehicle"] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 1, -1.75) +shape = SubResource("BoxShape3D_vjakw") + +[node name="BonnetMesh" type="MeshInstance3D" parent="GearMesh/Vehicle"] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 1, -1.75) +mesh = SubResource("BoxMesh_wm067") + +[node name="TailgateShape" type="CollisionShape3D" parent="GearMesh/Vehicle"] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 1, 2.75) +shape = SubResource("BoxShape3D_rhiad") + +[node name="TailgateMesh" type="MeshInstance3D" parent="GearMesh/Vehicle"] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 1, 2.75) +mesh = SubResource("BoxMesh_lrfuo") + +[connection signal="timeout" from="Timer" to="." method="_on_timer_timeout"] From ba2b7c8dda50c71e4c111208cdd0dd195eacb805 Mon Sep 17 00:00:00 2001 From: Jeremy Baxter Date: Thu, 22 Jan 2026 23:35:32 +1300 Subject: [PATCH 5/6] 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 From e32e7dca2411beab6199a9849c5f6108ffd5f816 Mon Sep 17 00:00:00 2001 From: Jeremy Baxter Date: Thu, 22 Jan 2026 23:36:50 +1300 Subject: [PATCH 6/6] world: add new Ball and Geep pickups --- main.tscn | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/main.tscn b/main.tscn index ae10ae9..5200292 100644 --- a/main.tscn +++ b/main.tscn @@ -1,10 +1,11 @@ -[gd_scene load_steps=9 format=3 uid="uid://eiaw4xbs3suk"] +[gd_scene load_steps=10 format=3 uid="uid://eiaw4xbs3suk"] [ext_resource type="PackedScene" uid="uid://qb8cbljxgnub" path="res://world/killbrick.tscn" id="1_h2yge"] [ext_resource type="PackedScene" uid="uid://cfceg80unq0pe" path="res://player/player.tscn" id="1_ig7tw"] [ext_resource type="PackedScene" uid="uid://bcmrj6qkemrll" path="res://world/radiohead_cube.tscn" id="2_0xm2m"] [ext_resource type="PackedScene" uid="uid://of6tq8gpjxtu" path="res://gears/gear_pickup.tscn" id="3_lquwl"] -[ext_resource type="PackedScene" uid="uid://bafl8q0r61xrg" path="res://gears/gear.tscn" id="4_7mycd"] +[ext_resource type="PackedScene" uid="uid://c117buhmmkvkt" path="res://gears/ball.tscn" id="5_7mycd"] +[ext_resource type="PackedScene" uid="uid://d3k7b6o56ue5k" path="res://gears/geep.tscn" id="6_272bh"] [sub_resource type="BoxShape3D" id="BoxShape3D_7dm0k"] size = Vector3(100, 2, 100) @@ -47,8 +48,13 @@ transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -12, 7, 0) [node name="Killbrick" parent="." instance=ExtResource("1_h2yge")] transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -40, 1.5, -40) -[node name="GearPickup" parent="." instance=ExtResource("3_lquwl")] +[node name="BallPickup" parent="." instance=ExtResource("3_lquwl")] transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -12, 2, -21) -[node name="Gear" parent="GearPickup" instance=ExtResource("4_7mycd")] -transform = Transform3D(1, 0, 0, 0, -0.012967386, 0.9999159, 0, -0.9999159, -0.012967386, 0, 0.5, 0) +[node name="Gear" parent="BallPickup" instance=ExtResource("5_7mycd")] + +[node name="GeepPickup" parent="." instance=ExtResource("3_lquwl")] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 1.25, -20) +one_shot = true + +[node name="Gear" parent="GeepPickup" instance=ExtResource("6_272bh")]