From 64ec7b12b6c77a9debfe464f7bbf0dd0123c09f3 Mon Sep 17 00:00:00 2001 From: Derek Date: Tue, 11 Mar 2025 08:29:13 -0500 Subject: [PATCH] tweaks to weapon pickups --- MainMenu.tscn | 7 ++----- Tools/playlist_generator.tscn | 2 -- assets/mac10_pickup.tscn | 5 ++--- assets/machete_pickup.tscn | 2 +- assets/pistol1_pickup.tscn | 5 ++--- assets/revolver1_pickup.tscn | 2 +- assets/rocketlauncher_pickup.tscn | 5 ++--- scenes/asset_checker.tscn | 4 ++-- scripts/player.gd | 2 +- 9 files changed, 13 insertions(+), 21 deletions(-) diff --git a/MainMenu.tscn b/MainMenu.tscn index fbb5e19..4de99ee 100644 --- a/MainMenu.tscn +++ b/MainMenu.tscn @@ -1,4 +1,4 @@ -[gd_scene load_steps=20 format=3 uid="uid://sa1d1rftyn87"] +[gd_scene load_steps=19 format=3 uid="uid://sa1d1rftyn87"] [ext_resource type="Script" uid="uid://civx1w876wd7n" path="res://scripts/main_menu.gd" id="1_haaol"] [ext_resource type="PackedScene" uid="uid://dpootbr7qgac1" path="res://Tools/playlist_generator.tscn" id="2_2rg1o"] @@ -12,7 +12,6 @@ [ext_resource type="Shader" uid="uid://cerm6i7o65okt" path="res://assets/Shaders/blur.gdshader" id="6_x75tm"] [ext_resource type="Texture2D" uid="uid://bt6utik8unkxa" path="res://assets/Textures/ObjectTextures/money.png" id="7_ia0hc"] [ext_resource type="Resource" uid="uid://u32xafejp3rq" path="res://GameModes/standard_stam_regen.tres" id="7_vm4j1"] -[ext_resource type="Resource" uid="uid://cwwvseoidm6ha" path="res://GameModes/DoNotGetHit.tres" id="8_bexpg"] [sub_resource type="ShaderMaterial" id="ShaderMaterial_a5tps"] shader = ExtResource("2_hyw7c") @@ -80,10 +79,8 @@ offset_bottom = 2160.0 [node name="PlaylistGenerator" parent="." instance=ExtResource("2_2rg1o")] visible = false layout_mode = 1 -generate_playlist_now = false -checksum_test = false maps_in_rotation = Array[ExtResource("4_p7b2e")]([SubResource("Resource_3w5k4"), SubResource("Resource_t5q6w"), SubResource("Resource_2pkld"), SubResource("Resource_hgnbd")]) -gamemodes_in_rotation = Array[ExtResource("4_p0ng4")]([ExtResource("5_lv7ko"), ExtResource("7_vm4j1"), ExtResource("8_bexpg")]) +gamemodes_in_rotation = Array[ExtResource("4_p0ng4")]([ExtResource("5_lv7ko"), ExtResource("7_vm4j1")]) levels_per_round = 4 [node name="MarginContainer" type="MarginContainer" parent="."] diff --git a/Tools/playlist_generator.tscn b/Tools/playlist_generator.tscn index 25a2945..0fc0793 100644 --- a/Tools/playlist_generator.tscn +++ b/Tools/playlist_generator.tscn @@ -36,7 +36,5 @@ anchor_bottom = 1.0 grow_horizontal = 2 grow_vertical = 2 script = ExtResource("1_qvqs2") -generate_playlist_now = null -checksum_test = null maps_in_rotation = Array[ExtResource("2_3l62y")]([SubResource("Resource_3w5k4"), SubResource("Resource_t5q6w"), SubResource("Resource_2pkld"), SubResource("Resource_13n7k")]) gamemodes_in_rotation = Array[ExtResource("2_hoyqc")]([ExtResource("2_85uje"), ExtResource("3_t0mxh"), ExtResource("4_8wht4"), ExtResource("6_vu1w7")]) diff --git a/assets/mac10_pickup.tscn b/assets/mac10_pickup.tscn index 2f67e8b..ccc5562 100644 --- a/assets/mac10_pickup.tscn +++ b/assets/mac10_pickup.tscn @@ -235,12 +235,11 @@ points = PackedVector3Array(-0.899645, -0.235985, -0.176739, 0.797351, 0.356305, [sub_resource type="SphereShape3D" id="SphereShape3D_87tum"] radius = 1.26183 -[node name="mac10_pickup" type="RigidBody3D" node_paths=PackedStringArray("collision_shape") groups=["pickup", "weapon_pickup"]] -collision_layer = 17 +[node name="mac10_pickup" type="RigidBody3D" groups=["pickup", "weapon_pickup"]] +collision_layer = 16 collision_mask = 17 script = ExtResource("1_46utd") gun_resource = ExtResource("2_kkmr5") -collision_shape = NodePath("CollisionShape3D") [node name="mac11" type="MeshInstance3D" parent="."] transform = Transform3D(-1.31134e-08, 0, -0.3, 0, 0.3, 0, 0.3, 0, -1.31134e-08, 0, 0, 0) diff --git a/assets/machete_pickup.tscn b/assets/machete_pickup.tscn index e8828de..39f7d4b 100644 --- a/assets/machete_pickup.tscn +++ b/assets/machete_pickup.tscn @@ -100,7 +100,7 @@ size = Vector3(0.162, 0.05, 1) radius = 1.26183 [node name="machete_pickup" type="RigidBody3D" groups=["pickup", "weapon_pickup"]] -collision_layer = 17 +collision_layer = 16 collision_mask = 17 continuous_cd = true contact_monitor = true diff --git a/assets/pistol1_pickup.tscn b/assets/pistol1_pickup.tscn index aa4d240..c8dc53f 100644 --- a/assets/pistol1_pickup.tscn +++ b/assets/pistol1_pickup.tscn @@ -153,12 +153,11 @@ points = PackedVector3Array(-0.860472, 0.302737, 0.0809691, -0.860472, 0.302737, [sub_resource type="SphereShape3D" id="SphereShape3D_87tum"] radius = 1.26183 -[node name="pistol1_pickup" type="RigidBody3D" node_paths=PackedStringArray("collision_shape") groups=["pickup", "weapon_pickup"]] -collision_layer = 17 +[node name="pistol1_pickup" type="RigidBody3D" groups=["pickup", "weapon_pickup"]] +collision_layer = 16 collision_mask = 17 script = ExtResource("1_pw3bx") gun_resource = ExtResource("2_x7kb7") -collision_shape = NodePath("CollisionShape3D") [node name="gun" type="MeshInstance3D" parent="."] transform = Transform3D(-3.23167e-06, 0, -0.892729, 0, 0.892728, 0, 0.892728, 0, -3.23167e-06, 0, -0.000397999, 0) diff --git a/assets/revolver1_pickup.tscn b/assets/revolver1_pickup.tscn index 4bff383..cc0408a 100644 --- a/assets/revolver1_pickup.tscn +++ b/assets/revolver1_pickup.tscn @@ -741,7 +741,7 @@ points = PackedVector3Array(0.930093, 0.100662, 0.798251, 0.930093, -0.0820646, radius = 1.26183 [node name="pistol1_pickup" type="RigidBody3D" groups=["pickup", "weapon_pickup"]] -collision_layer = 17 +collision_layer = 16 collision_mask = 17 script = ExtResource("1_8fbqg") gun_resource = ExtResource("2_qbywk") diff --git a/assets/rocketlauncher_pickup.tscn b/assets/rocketlauncher_pickup.tscn index bb4336a..022c4a2 100644 --- a/assets/rocketlauncher_pickup.tscn +++ b/assets/rocketlauncher_pickup.tscn @@ -221,12 +221,11 @@ points = PackedVector3Array(0.25648, 1.26062, 0.0939077, -0.271823, -1.21875, -0 [sub_resource type="SphereShape3D" id="SphereShape3D_87tum"] radius = 1.26183 -[node name="rocketlauncher1_pickup" type="RigidBody3D" node_paths=PackedStringArray("collision_shape") groups=["pickup", "weapon_pickup"]] -collision_layer = 17 +[node name="rocketlauncher1_pickup" type="RigidBody3D" groups=["pickup", "weapon_pickup"]] +collision_layer = 16 collision_mask = 17 script = ExtResource("1_mytm1") gun_resource = ExtResource("2_5t04l") -collision_shape = NodePath("CollisionShape3D2") [node name="rocketlauncher1" type="MeshInstance3D" parent="."] transform = Transform3D(3.57628e-07, 1, 0, -1, 3.57628e-07, 0, 0, 0, 1, 0, 0, 0) diff --git a/scenes/asset_checker.tscn b/scenes/asset_checker.tscn index 71130d5..a451648 100644 --- a/scenes/asset_checker.tscn +++ b/scenes/asset_checker.tscn @@ -13,7 +13,7 @@ [ext_resource type="PackedScene" uid="uid://be3x56aehx4ks" path="res://assets/Models/spider.blend" id="18_axqdp"] [ext_resource type="PackedScene" uid="uid://cnfc8rtk6l1d8" path="res://assets/crate1.tscn" id="19_7tuy7"] [ext_resource type="Texture2D" uid="uid://cy4cwv7ppdclm" path="res://assets/Models/rat1.albedo.png" id="19_e5pct"] -[ext_resource type="Texture2D" uid="uid://caboww85wl3r3" path="res://assets/Models/rat1.roughness.png" id="20_p1ixv"] +[ext_resource type="Texture2D" uid="uid://cuiwcyxkgx0ki" path="res://assets/Models/rat1.roughness.png" id="20_p1ixv"] [ext_resource type="Texture2D" uid="uid://ch863c8gv6ec5" path="res://assets/Models/rat1.normal.png" id="21_1uqck"] [ext_resource type="Texture2D" uid="uid://4hcotl7lxuph" path="res://assets/Models/rat1.skin.albedo.png" id="22_e4prk"] [ext_resource type="Material" uid="uid://dy2pswr330jnk" path="res://assets/materials/prototype/brick.tres" id="23_pyop4"] @@ -599,6 +599,6 @@ fov = 42.0 [node name="AnimationPlayer" type="AnimationPlayer" parent="."] libraries = { -"": SubResource("AnimationLibrary_ey8td") +&"": SubResource("AnimationLibrary_ey8td") } autoplay = "Menu" diff --git a/scripts/player.gd b/scripts/player.gd index 183111b..cecaa8f 100644 --- a/scripts/player.gd +++ b/scripts/player.gd @@ -621,7 +621,7 @@ func grab_moveable(body): body.global_position = moveable_holder.global_position for i in body.get_children(): if i.get_class() == "CollisionShape3D": - i.disabled = true + i.collision_layer = true held_item = body func hold_item(_delta):