gears/ball.gd

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

gears/gear.gd

@@ -1,47 +1,43 @@
 @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()

gears/geep.gd

@@ -1,62 +0,0 @@
-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)

gears/geep.tscn

@@ -1,87 +0,0 @@
-[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"]

gears/geep_body.tres

@@ -1,4 +0,0 @@
-[gd_resource type="StandardMaterial3D" load_steps=0 format=3 uid="uid://dpacu3e7vsks5"]
-
-[resource]
-albedo_color = Color(0.99607843, 0.99607843, 0.99607843, 1)

gears/geep_wheel.tres

@@ -1,4 +0,0 @@
-[gd_resource type="StandardMaterial3D" load_steps=0 format=3 uid="uid://bt5aat64e478k"]
-
-[resource]
-albedo_color = Color(0.1254902, 0.1254902, 0.1254902, 1)

main.tscn

@@ -1,13 +1,12 @@
-[gd_scene load_steps=17 format=3 uid="uid://eiaw4xbs3suk"]
+[gd_scene load_steps=16 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="Texture2D" uid="uid://dnt0vfav03ris" path="res://world/textures/grass.jpg" id="2_272bh"]
+[ext_resource type="Texture2D" uid="uid://wdjmyv260he1" path="res://world/textures/grass.jpg" id="2_272bh"]
 [ext_resource type="PackedScene" uid="uid://of6tq8gpjxtu" path="res://gears/gear_pickup.tscn" id="3_lquwl"]
-[ext_resource type="PackedScene" uid="uid://c117buhmmkvkt" path="res://gears/ball.tscn" id="6_5vw27"]
+[ext_resource type="PackedScene" uid="uid://bafl8q0r61xrg" path="res://gears/gear.tscn" id="4_7mycd"]
-[ext_resource type="PackedScene" uid="uid://d3k7b6o56ue5k" path="res://gears/geep.tscn" id="7_kek77"]
+[ext_resource type="Texture2D" uid="uid://2ku62tk8r74x" path="res://world/textures/sky.hdr" id="8_5vw27"]
-[ext_resource type="Texture2D" uid="uid://bl4yvm44o6gcf" path="res://world/textures/sky.hdr" id="8_5vw27"]
 
 [sub_resource type="BoxShape3D" id="BoxShape3D_7dm0k"]
 size = Vector3(1000, 2, 1000)
@@ -43,7 +42,6 @@ glow_hdr_luminance_cap = 0.0
 [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="."]
 
@@ -69,16 +67,11 @@ 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="BallPickup" parent="." instance=ExtResource("3_lquwl")]
+[node name="GearPickup" parent="." instance=ExtResource("3_lquwl")]
 transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -12, 2, -21)
 
-[node name="Gear" parent="BallPickup" instance=ExtResource("6_5vw27")]
+[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="GeepPickup" parent="." instance=ExtResource("3_lquwl")]
-transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 8, 1.75, -30)
-
-[node name="Gear" parent="GeepPickup" instance=ExtResource("7_kek77")]
-transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, -0.75, 0)
 
 [node name="WorldEnvironment" type="WorldEnvironment" parent="."]
 environment = SubResource("Environment_7mycd")

player/camera.gd

@@ -1,87 +0,0 @@
-class_name CameraGimbal extends Node3D
-
-@export var rotation_speed = (PI / 180) * 120
-@export var default_zoom = 8
-
-# is mouse captured by game permanently?
-# (i.e. not just holding right click)
-var locked = false
-var mouse_velocity = Vector2.ZERO
-
-var current_zoom = default_zoom
-var zoom_min = 4
-var zoom_max = 80
-var zoom_speed = 20
-
-func _lock():
-	Input.set_mouse_mode(Input.MOUSE_MODE_CAPTURED)
-
-func _unlock():
-	Input.set_mouse_mode(Input.MOUSE_MODE_VISIBLE)
-	mouse_velocity = Vector2.ZERO
-
-func lock():
-	_lock()
-	locked = true
-
-# optional API function for nodes that want
-# to unlock the mouse for a period of time
-func unlock():
-	_unlock()
-	locked = false
-
-func reset():
-	basis = Basis()
-	$InnerGimbal.basis = Basis()
-	current_zoom = default_zoom
-
-# y is before x because the outer gimbal is
-# in charge of rotating the y axis
-func rotate_camera(delta):
-	var y = 0
-	var x = 0
-
-	if mouse_velocity.x > 5 or mouse_velocity.x < -5:
-		y -= clamp(mouse_velocity.x / 12.5, -10, 10)
-	if mouse_velocity.y > 5 or mouse_velocity.y < -5:
-		x -= clamp(mouse_velocity.y / 12.5, -10, 10)
-
-	rotate_object_local(Vector3.UP, y * rotation_speed * delta)
-	$InnerGimbal.rotate_object_local(
-		Vector3.RIGHT, x * rotation_speed * delta)
-	$InnerGimbal.rotation.x = clamp($InnerGimbal.rotation.x, -0.8, 0.7)
-
-func _input(event):
-	if event is InputEventMouseMotion:
-		mouse_velocity = event.relative
-	elif event.is_action_pressed("cam_zoom_out"):
-		current_zoom += 1
-	elif event.is_action_pressed("cam_zoom_in"):
-		current_zoom -= 1
-
-	current_zoom = clamp(current_zoom, zoom_min, zoom_max)
-
-func _process(delta):
-	# rotate camera
-	if locked:
-		rotate_camera(delta)
-	else:
-		if Input.is_mouse_button_pressed(MOUSE_BUTTON_RIGHT):
-			_lock()
-			rotate_camera(delta)
-		else:
-			_unlock()
-
-	# zoom in/out
-	var pos = Vector3($InnerGimbal/Camera3D.position)
-	pos.y = lerp(pos.y, float(current_zoom), zoom_speed * delta)
-	pos.z = lerp(pos.z, float(current_zoom), zoom_speed * delta)
-
-	$InnerGimbal/Camera3D.position = pos
-
-	# reset camera
-	if Input.is_action_pressed("cam_reset"):
-		reset()
-
-func _ready():
-	lock()

player/camera_gimbal.gd

@@ -0,0 +1,75 @@
+class_name CameraGimbal extends Node3D
+
+@export var rotation_speed = (PI / 180) * 120
+@export var shift_lock = false
+
+var locked_mouse_positon = Vector2(0,0)
+var mouse_locked = false
+var mouse_x_velocity = 0
+var mouse_y_velocity = 0
+
+var zoom_min = 4
+var zoom_max = 80
+var zoom_speed = 20
+var current_zoom = 8
+
+func reset():
+	basis = Basis()
+	$InnerGimbal.basis = Basis()
+
+func rotate_camera_y(y, delta):
+	rotate_object_local(Vector3.UP, y * rotation_speed * delta)
+func rotate_camera_x(x, delta):
+	$InnerGimbal.rotate_object_local(
+		Vector3.RIGHT, x * rotation_speed * delta)
+	$InnerGimbal.rotation.x = clamp($InnerGimbal.rotation.x,-0.8,0.7)
+	
+func _input(event):
+	if event is InputEventMouseMotion:
+		mouse_x_velocity = event.relative.x
+		mouse_y_velocity = event.relative.y
+	elif event.is_action_pressed("zoom_out"):
+		current_zoom += 1
+	elif event.is_action_pressed("zoom_in"):
+		current_zoom -= 1
+
+func _process(delta):
+ 	# rotate outer gimbal around y axis
+	var y = 0
+	var x = 0
+
+	if Input.is_action_just_pressed("shift_lock"):
+		if shift_lock == true:
+			shift_lock = false
+		else:
+			shift_lock = true
+	elif Input.is_mouse_button_pressed(MOUSE_BUTTON_RIGHT) or shift_lock == true:
+		if mouse_locked == false:
+			mouse_locked = true
+			locked_mouse_positon = get_viewport().get_mouse_position()
+		Input.set_mouse_mode(Input.MOUSE_MODE_CAPTURED)
+
+		if mouse_x_velocity > 5 or mouse_x_velocity < -5:
+			y -= clamp(mouse_x_velocity / 12.5, -10, 10)
+		if mouse_y_velocity > 5 or mouse_y_velocity < -5:
+			x -= clamp(mouse_y_velocity / 12.5, -10, 10)
+	else:
+		Input.set_mouse_mode(Input.MOUSE_MODE_VISIBLE)
+		mouse_locked = false
+		mouse_x_velocity = 0
+		mouse_y_velocity = 0
+
+	rotate_camera_y(y, delta)
+	rotate_camera_x(x, delta)
+
+	# reset gimbals
+	if Input.is_action_pressed("cam_reset"):
+		reset()
+
+	current_zoom = clamp(current_zoom, zoom_min, zoom_max)
+	
+	var pos = Vector3($InnerGimbal/Camera3D.position)
+	pos.y = lerp(pos.y, float(current_zoom), zoom_speed*delta)
+	pos.z = lerp(pos.z, float(current_zoom), zoom_speed*delta)
+	
+	$InnerGimbal/Camera3D.position = pos

player/player.gd

@@ -8,10 +8,8 @@ const gear_slots = ["1", "2", "3"]
 
 @onready var spawn = Vector3(position)
 
-var starting_gear = preload("res://gears/gear.tscn")
+var starting_gear = preload("res://gears/ball.tscn")
 
-var dead = false
-var protected = false
 var suspended = false
 var direction = Vector3.ZERO
 var target_velocity = Vector3.ZERO
@@ -47,8 +45,6 @@ func message(string):
 # State functions
 
 func harm(hp):
-	if protected:
-		return
 	assert(hp >= 0)
 	_health -= hp
 	make_hud()
@@ -61,8 +57,7 @@ func heal(hp):
 func health():
 	return _health
 
-func _die():
+func die():
-	dead = true
 	suspended = true
 	visible = false
 	$HUD.visible = false
@@ -70,24 +65,17 @@ func _die():
 	# strip gears
 	for gear in $Backpack.get_children():
 		gear.queue_free()
-	if has_node("Pivot/Container/Gear"):
+	$Pivot/Container/Gear.queue_free()
-		$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
-	dead = false
+	suspended = false
 
 	# add starting gear
 	var gear = starting_gear.instantiate()
@@ -115,7 +103,6 @@ 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)
@@ -125,7 +112,6 @@ func use_backpack_slot(n):
 	# couldn't find a free slot, so replace
 	# the new slot with the current gear
 	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"
@@ -133,8 +119,6 @@ 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():
@@ -151,7 +135,6 @@ 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()
@@ -197,17 +180,16 @@ func do_movement(delta):
 	var mx = 0
 	var mz = 0
 
-	if not suspended:
+	if Input.is_action_pressed("move_forward"):
-		if Input.is_action_pressed("move_forward"):
+		mz -= 1
-			mz -= 1
+	if Input.is_action_pressed("move_back"):
-		if Input.is_action_pressed("move_back"):
+		mz += 1
-			mz += 1
+	if Input.is_action_pressed("move_left"):
-		if Input.is_action_pressed("move_left"):
+		mx -= 1
-			mx -= 1
+	if Input.is_action_pressed("move_right"):
-		if Input.is_action_pressed("move_right"):
+		mx += 1
-			mx += 1
+	if Input.is_action_pressed("jump") and is_on_floor():
-		if Input.is_action_pressed("jump") and is_on_floor():
+		target_velocity.y = jump_power
-			target_velocity.y = jump_power
 
 	if !(mx == 0 and mz == 0):
 		move_player(mx, mz)
@@ -240,11 +222,11 @@ func _ready():
 	respawn()
 
 func _physics_process(delta):
-	if dead:
-		return
-
 	if health() < 1 or position.y <= -1000:
-		_die()
+		die()
+
+	if suspended:
+		return
 
 	# Backpack keys
 	do_backpack_keys()

player/player.tscn

@@ -1,7 +1,7 @@
 [gd_scene load_steps=8 format=4 uid="uid://cfceg80unq0pe"]
 
-[ext_resource type="Script" uid="uid://djeyfi7vm2vw0" path="res://player/player.gd" id="1_onrkg"]
+[ext_resource type="Script" uid="uid://bfflnag3p4gen" path="res://player/player.gd" id="1_onrkg"]
-[ext_resource type="Script" uid="uid://oi6sint7jkc6" path="res://player/camera.gd" id="2_onrkg"]
+[ext_resource type="Script" uid="uid://oi6sint7jkc6" path="res://player/camera_gimbal.gd" id="2_onrkg"]
 [ext_resource type="Texture2D" uid="uid://cfb0gbwm57hm4" path="res://models/player_0.png" id="3_hqtel"]
 
 [sub_resource type="BoxShape3D" id="BoxShape3D_onrkg"]
@@ -58,9 +58,7 @@ shape = SubResource("BoxShape3D_onrkg")
 
 [node name="Pivot" type="Node3D" parent="."]
 
-[node name="Mesh" type="Node3D" parent="Pivot"]
+[node name="PlayerMesh" type="MeshInstance3D" 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("")

project.godot

@@ -42,6 +42,26 @@ jump={
 "events": [Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":-1,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":32,"physical_keycode":0,"key_label":0,"unicode":32,"location":0,"echo":false,"script":null)
 ]
 }
+cam_left={
+"deadzone": 0.2,
+"events": [Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":-1,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":4194319,"physical_keycode":0,"key_label":0,"unicode":0,"location":0,"echo":false,"script":null)
+]
+}
+cam_right={
+"deadzone": 0.2,
+"events": [Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":-1,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":4194321,"physical_keycode":0,"key_label":0,"unicode":0,"location":0,"echo":false,"script":null)
+]
+}
+cam_up={
+"deadzone": 0.2,
+"events": [Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":-1,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":4194320,"physical_keycode":0,"key_label":0,"unicode":0,"location":0,"echo":false,"script":null)
+]
+}
+cam_down={
+"deadzone": 0.2,
+"events": [Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":-1,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":4194322,"physical_keycode":0,"key_label":0,"unicode":0,"location":0,"echo":false,"script":null)
+]
+}
 cam_reset={
 "deadzone": 0.2,
 "events": [Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":-1,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":79,"physical_keycode":0,"key_label":0,"unicode":111,"location":0,"echo":false,"script":null)
@@ -67,12 +87,17 @@ backpack_3={
 "events": [Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":-1,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":51,"physical_keycode":0,"key_label":0,"unicode":51,"location":0,"echo":false,"script":null)
 ]
 }
-cam_zoom_in={
+shift_lock={
+"deadzone": 0.2,
+"events": [Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":-1,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":0,"physical_keycode":4194325,"key_label":0,"unicode":0,"location":0,"echo":false,"script":null)
+]
+}
+zoom_in={
 "deadzone": 0.2,
 "events": [Object(InputEventMouseButton,"resource_local_to_scene":false,"resource_name":"","device":-1,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"button_mask":0,"position":Vector2(0, 0),"global_position":Vector2(0, 0),"factor":1.0,"button_index":4,"canceled":false,"pressed":false,"double_click":false,"script":null)
 ]
 }
-cam_zoom_out={
+zoom_out={
 "deadzone": 0.2,
 "events": [Object(InputEventMouseButton,"resource_local_to_scene":false,"resource_name":"","device":-1,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"button_mask":0,"position":Vector2(0, 0),"global_position":Vector2(0, 0),"factor":1.0,"button_index":5,"canceled":false,"pressed":false,"double_click":false,"script":null)
 ]

util/util.gd

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