From df1930a4a05fd8573eef164a345ab4e09ee5e838 Mon Sep 17 00:00:00 2001 From: Rob Kelly Date: Sun, 9 Mar 2025 16:40:19 -0600 Subject: [PATCH] Grunkmap scaling adjustments --- levels/sandbox/sandbox.tscn | 9 ++++----- src/equipment/point_spray/point_spray.gd | 2 +- src/equipment/wide_spray/wide_spray.gd | 2 +- src/player/player.gd | 4 ++-- src/props/wall_switch/wall_switch.gd | 2 +- src/props/wall_switch/wall_switch.tscn | 2 +- src/world/gunk_body/gunk_body.gd | 2 +- 7 files changed, 11 insertions(+), 12 deletions(-) diff --git a/levels/sandbox/sandbox.tscn b/levels/sandbox/sandbox.tscn index 50b8d8d..f7064c5 100644 --- a/levels/sandbox/sandbox.tscn +++ b/levels/sandbox/sandbox.tscn @@ -317,6 +317,7 @@ shape = SubResource("WorldBoundaryShape3D_c8g65") [node name="Icosahedron" parent="Geometry" node_paths=PackedStringArray("mesh_instance") instance=ExtResource("1_a67lu")] transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -3.35498, 1.13294, -2.81423) +mask_dim = 128 mesh_instance = NodePath("MeshInstance3D") initial_mask = ExtResource("2_2roq2") @@ -328,6 +329,7 @@ shape = SubResource("ConcavePolygonShape3D_nxc47") [node name="Monkey" parent="Geometry" node_paths=PackedStringArray("mesh_instance") instance=ExtResource("1_a67lu")] transform = Transform3D(-0.616239, 0, 0.787559, 0, 1, 0, -0.787559, 0, -0.616239, -2.22512, 1.41158, 2.88581) +mask_dim = 128 mesh_instance = NodePath("MeshInstance3D") [node name="MeshInstance3D" type="MeshInstance3D" parent="Geometry/Monkey"] @@ -338,7 +340,7 @@ shape = SubResource("ConcavePolygonShape3D_hvf6a") [node name="Cube" parent="Geometry" node_paths=PackedStringArray("mesh_instance") instance=ExtResource("1_a67lu")] transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 8, 4, 0) -mask_dim = 1024 +mask_dim = 512 mesh_instance = NodePath("MeshInstance3D") [node name="MeshInstance3D" type="MeshInstance3D" parent="Geometry/Cube"] @@ -349,7 +351,7 @@ shape = SubResource("ConcavePolygonShape3D_0qjrr") [node name="Cylinder" parent="Geometry" node_paths=PackedStringArray("mesh_instance") instance=ExtResource("1_a67lu")] transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 1.33738, 6, -7.18125) -mask_dim = 1024 +mask_dim = 512 mesh_instance = NodePath("MeshInstance3D") [node name="MeshInstance3D" type="MeshInstance3D" parent="Geometry/Cylinder"] @@ -369,7 +371,6 @@ transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, 25) [node name="Hallway1" parent="LevelTiles" instance=ExtResource("1_a67lu")] transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, 6) -mask_dim = 512 [node name="MeshInstance3D" type="MeshInstance3D" parent="LevelTiles/Hallway1"] mesh = ExtResource("7_fk1xc") @@ -385,7 +386,6 @@ omni_range = 20.0 [node name="Hallway2" parent="LevelTiles" instance=ExtResource("1_a67lu")] transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, 18) -mask_dim = 512 [node name="MeshInstance3D" type="MeshInstance3D" parent="LevelTiles/Hallway2"] mesh = ExtResource("8_hrvvi") @@ -401,7 +401,6 @@ omni_range = 20.0 [node name="Hallway3" parent="LevelTiles" instance=ExtResource("1_a67lu")] transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, 30) -mask_dim = 512 [node name="MeshInstance3D" type="MeshInstance3D" parent="LevelTiles/Hallway3"] mesh = ExtResource("9_2roq2") diff --git a/src/equipment/point_spray/point_spray.gd b/src/equipment/point_spray/point_spray.gd index 02d14fa..32c10df 100644 --- a/src/equipment/point_spray/point_spray.gd +++ b/src/equipment/point_spray/point_spray.gd @@ -1,7 +1,7 @@ class_name PointSpray extends Spray ## Simple single-point spraygun -@export var spray_scale := 3.0 +@export var spray_scale := 1.5 @onready var laser: LaserCast = %LaserCast @onready var spray_effect: MeshInstance3D = %SprayEffect diff --git a/src/equipment/wide_spray/wide_spray.gd b/src/equipment/wide_spray/wide_spray.gd index f823dc1..b8733a1 100644 --- a/src/equipment/wide_spray/wide_spray.gd +++ b/src/equipment/wide_spray/wide_spray.gd @@ -3,7 +3,7 @@ class_name WideSpray extends Spray const SPRAYCAST_GROUP := "SprayCast" -@export var spray_scale := 2.0 +@export var spray_scale := 1.0 @onready var spray_casts: Node3D = %SprayCasts @onready var spray_effect: Node3D = %SprayEffect diff --git a/src/player/player.gd b/src/player/player.gd index dd76f4d..32c103f 100644 --- a/src/player/player.gd +++ b/src/player/player.gd @@ -1,6 +1,6 @@ class_name Player extends CharacterBody3D -const FOCUS_SPEED := 40.0 +const FOCUS_SPEED := 30.0 const RUN_SPEED := 80.0 const SPRINT_SPEED := 160.0 const AIR_SPEED := 10.0 @@ -28,7 +28,7 @@ func get_speed() -> float: if is_on_floor(): if firing: return FOCUS_SPEED - elif Input.is_action_pressed("sprint"): + if Input.is_action_pressed("sprint"): return SPRINT_SPEED return RUN_SPEED return AIR_SPEED diff --git a/src/props/wall_switch/wall_switch.gd b/src/props/wall_switch/wall_switch.gd index 43fc102..324ad46 100644 --- a/src/props/wall_switch/wall_switch.gd +++ b/src/props/wall_switch/wall_switch.gd @@ -3,7 +3,7 @@ extends Node3D signal cleared signal activated -const CLEAR_THRESHOLD := 2650 +const CLEAR_THRESHOLD := 1500 @export var enabled := false diff --git a/src/props/wall_switch/wall_switch.tscn b/src/props/wall_switch/wall_switch.tscn index 551488f..5c4a698 100644 --- a/src/props/wall_switch/wall_switch.tscn +++ b/src/props/wall_switch/wall_switch.tscn @@ -205,7 +205,7 @@ unique_name_in_owner = true [node name="GunkBody" parent="." index="2" node_paths=PackedStringArray("mesh_instance") instance=ExtResource("7_3ib1l")] unique_name_in_owner = true -mask_dim = 64 +mask_dim = 48 mesh_instance = NodePath("../Armature/Skeleton3D/WallSwitch_2") [node name="CollisionShape3D" type="CollisionShape3D" parent="GunkBody" index="1"] diff --git a/src/world/gunk_body/gunk_body.gd b/src/world/gunk_body/gunk_body.gd index cec859c..f93ef7f 100644 --- a/src/world/gunk_body/gunk_body.gd +++ b/src/world/gunk_body/gunk_body.gd @@ -4,7 +4,7 @@ class_name GunkBody extends StaticBody3D ## Emitted from the main thread after the clear total is asynchronously updated. signal clear_total_updated(clear_total: float) -const CONTINUITY_LIMIT := 16 +const CONTINUITY_LIMIT := 32 const BUFFER_LIMIT := 3 const FACE_EPSILON := 0.01 const CLEAR_COLOR := Color.BLACK