Merge branch 'master' of codeberg.org:hurrycurry/hurrycurry

4 files changed, 33 insertions, 14 deletions

diff --git a/client/game.gd b/client/game.gd
index 04aa7518..51981713 100644
--- a/client/game.gd
+++ b/client/game.gd
@@ -148,7 +148,9 @@ func _ready():
 
 	mp.remove_player_item.connect(func(player: int):
 		var p: Player = players[player]
-		p.remove_item().queue_free()
+		var removed = p.remove_item()
+		if removed != null:
+			removed.queue_free()
 	)
 
 	mp.take_item.connect(func(tile: Vector2i, player: int):
diff --git a/client/player/follow_camera.gd b/client/player/follow_camera.gd
index 4fb2d560..5440f8b1 100644
--- a/client/player/follow_camera.gd
+++ b/client/player/follow_camera.gd
@@ -27,6 +27,7 @@ const ANGLE_UP_MAX: float = 1.2
 const LOOK_WEIGHT: float = 8.0
 const MOVE_WEIGHT: float = 2.0
 const ZOOM_SPEED: float = 10.0
+const ZOOM_SPEED_DISCRETE: float = 1.0
 const ZOOM_WEIGHT: float = 10.0
 const MAX_ZOOM: float = 20.0
 const MIN_ZOOM: float = 2.0
@@ -88,6 +89,12 @@ func follow(delta):
 	ground = G.interpolate(ground, target.position + Vector3(0., 0.5, 0.), delta * MOVE_WEIGHT)
 
 	camera_distance_target += Input.get_axis("zoom_in", "zoom_out") * ZOOM_SPEED * delta
+	
+	if Input.is_action_just_pressed("zoom_in_discrete"):
+		camera_distance_target -= ZOOM_SPEED_DISCRETE
+	elif Input.is_action_just_pressed("zoom_out_discrete"):
+		camera_distance_target += ZOOM_SPEED_DISCRETE
+	
 	camera_distance_target = clamp(camera_distance_target, MIN_ZOOM, MAX_ZOOM)
 
 	camera_distance = G.interpolate(camera_distance, camera_distance_target, delta * ZOOM_WEIGHT)
diff --git a/client/project.godot b/client/project.godot
index 3ff0fc0f..cdbe6362 100644
--- a/client/project.godot
+++ b/client/project.godot
@@ -55,49 +55,49 @@ ui_menu={
 ]
 }
 forward={
-"deadzone": 0.1,
+"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":87,"key_label":0,"unicode":119,"echo":false,"script":null)
 , Object(InputEventJoypadMotion,"resource_local_to_scene":false,"resource_name":"","device":-1,"axis":1,"axis_value":-1.0,"script":null)
 ]
 }
 backwards={
-"deadzone": 0.1,
+"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":83,"key_label":0,"unicode":115,"echo":false,"script":null)
 , Object(InputEventJoypadMotion,"resource_local_to_scene":false,"resource_name":"","device":-1,"axis":1,"axis_value":1.0,"script":null)
 ]
 }
 left={
-"deadzone": 0.1,
+"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":65,"key_label":0,"unicode":97,"echo":false,"script":null)
 , Object(InputEventJoypadMotion,"resource_local_to_scene":false,"resource_name":"","device":-1,"axis":0,"axis_value":-1.0,"script":null)
 ]
 }
 right={
-"deadzone": 0.1,
+"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":68,"key_label":0,"unicode":100,"echo":false,"script":null)
 , Object(InputEventJoypadMotion,"resource_local_to_scene":false,"resource_name":"","device":-1,"axis":0,"axis_value":1.0,"script":null)
 ]
 }
 rotate_left={
-"deadzone": 0.1,
+"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":4194319,"key_label":0,"unicode":0,"echo":false,"script":null)
 , Object(InputEventJoypadMotion,"resource_local_to_scene":false,"resource_name":"","device":-1,"axis":2,"axis_value":-1.0,"script":null)
 ]
 }
 rotate_right={
-"deadzone": 0.1,
+"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":4194321,"key_label":0,"unicode":0,"echo":false,"script":null)
 , Object(InputEventJoypadMotion,"resource_local_to_scene":false,"resource_name":"","device":-1,"axis":2,"axis_value":1.0,"script":null)
 ]
 }
 rotate_up={
-"deadzone": 0.1,
+"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":4194320,"key_label":0,"unicode":0,"echo":false,"script":null)
 , Object(InputEventJoypadMotion,"resource_local_to_scene":false,"resource_name":"","device":-1,"axis":3,"axis_value":-1.0,"script":null)
 ]
 }
 rotate_down={
-"deadzone": 0.1,
+"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":4194322,"key_label":0,"unicode":0,"echo":false,"script":null)
 , Object(InputEventJoypadMotion,"resource_local_to_scene":false,"resource_name":"","device":-1,"axis":3,"axis_value":1.0,"script":null)
 ]
@@ -171,6 +171,16 @@ join_spectate={
 "events": [Object(InputEventJoypadButton,"resource_local_to_scene":false,"resource_name":"","device":-1,"button_index":3,"pressure":0.0,"pressed":true,"script":null)
 ]
 }
+zoom_in_discrete={
+"deadzone": 0.5,
+"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":8,"position":Vector2(124, 18),"global_position":Vector2(128, 59),"factor":1.0,"button_index":4,"canceled":false,"pressed":true,"double_click":false,"script":null)
+]
+}
+zoom_out_discrete={
+"deadzone": 0.5,
+"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":16,"position":Vector2(214, 28),"global_position":Vector2(218, 69),"factor":1.0,"button_index":5,"canceled":false,"pressed":true,"double_click":false,"script":null)
+]
+}
 
 [internationalization]
 
diff --git a/data/maps/sophomore.yaml b/data/maps/sophomore.yaml
index 4d0b9288..b376019f 100644
--- a/data/maps/sophomore.yaml
+++ b/data/maps/sophomore.yaml
@@ -16,15 +16,15 @@
 map:
     - "*''''*'''*'''*''*'''"
     - "'''*''''*'*'*''''*'*"
-    - "''████▒███████▒███*'"
+    - "''████▒███████▒███'*"
     - "*'█tc.ctc.d...~.s█''"
     - "''▒c...c..█.⌷C..L█'*"
-    - "*'█.......w.⌷⌷..R█*'"
-    - "*'█c......w.p⌷..T█*'"
+    - "*'█.......w.⌷⌷..R█''"
+    - "*'█c......w.p⌷..T█''"
     - "'*█tc.....w.....F█'*"
     - "''█c....ct█oofSSX█''"
-    - "*'████dd█████▒████*'"
-    - "'*''''__'''''''''''*"
+    - "*'████dd█████▒████''"
+    - "'*''''__''''''''''''"
     - "*'*'''______________"
     - "'''*''_____________!"
     - "'*''''''''''''''''''"