Compare commits

..

11 commits

Author SHA1 Message Date
f1a4ad761c multiplayer: added basic server and client functionality 2026-01-27 12:29:44 +13:00
e16f87cbfa geep: add new gear 2026-01-27 10:56:16 +13:00
20d1f62a7d util: add class 2026-01-27 10:56:16 +13:00
bc88fed830 world: set Player position 2026-01-27 10:56:16 +13:00
7ba423e6c5 player: reparent Pivot/PlayerMesh to Pivot/Mesh/ 2026-01-27 10:56:16 +13:00
5b7ab7811e 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().
2026-01-27 10:56:16 +13:00
1e4aeddbb5 player: add check before unequipping gear 2026-01-27 10:56:16 +13:00
f22364ce39 player: start with Gear 2026-01-27 10:56:16 +13:00
907508c4eb gear: make basis properties overridable by child classes 2026-01-27 10:56:16 +13:00
10dd8ce719 player: add Gear.unequip() API 2026-01-27 10:56:16 +13:00
f16e26c981 gears: remove redundant gear_id() 2026-01-27 10:56:16 +13:00
9 changed files with 225 additions and 38 deletions

View file

@ -2,8 +2,6 @@ class_name Ball extends "gear.gd"
func gear_name():
return "Ball"
func gear_id():
return 1
func continuous():
return false

View file

@ -1,43 +1,47 @@
@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 gear_id():
return 0
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()
# this can be redefined to make a custom
# gear mesh, e.g. a SphereMesh
func use(player):
basis = use_basis
basis = use_basis()
$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
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()

62
gears/geep.gd Normal file
View file

@ -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)

87
gears/geep.tscn Normal file
View file

@ -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"]

4
gears/geep_body.tres Normal file
View file

@ -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)

4
gears/geep_wheel.tres Normal file
View file

@ -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)

View file

@ -8,8 +8,10 @@ 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 dead = false
var protected = false
var suspended = false
var direction = Vector3.ZERO
var target_velocity = Vector3.ZERO
@ -50,6 +52,8 @@ func message(string):
# State functions
func harm(hp):
if protected:
return
assert(hp >= 0)
_health -= hp
make_hud()
@ -62,7 +66,8 @@ func heal(hp):
func health():
return _health
func die():
func _die():
dead = true
suspended = true
visible = false
$HUD.visible = false
@ -70,17 +75,24 @@ func die():
# strip gears
for gear in $Backpack.get_children():
gear.queue_free()
$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")
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()
@ -108,6 +120,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)
@ -116,7 +129,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"
@ -124,6 +138,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():
@ -140,6 +156,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()
@ -185,16 +202,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)
@ -225,20 +243,24 @@ func _ready():
get_viewport().size_changed.connect(resize_ui)
resize_ui()
respawn()
if is_multiplayer_authority():
$CameraGimbal/InnerGimbal/Camera3D.current = true
else:
$CameraGimbal/InnerGimbal/Camera3D.current = false
func _physics_process(delta):
if not is_multiplayer_authority(): return
if dead or not is_multiplayer_authority():
return
if health() < 1 or position.y <= -1000:
die()
if suspended:
return
if health() < 1 or position.y <= -1000:
_die()
# Backpack keys
do_backpack_keys()
# Movement

View file

@ -84,7 +84,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("")

4
util/util.gd Normal file
View file

@ -0,0 +1,4 @@
class_name Util extends Node
static func input_action_string(action):
return InputMap.action_get_events(action)[0].as_text()