blunderbuss working

assets/Models/blunderbus.metal.rough.png.import

@@ -0,0 +1,35 @@
+[remap]
+
+importer="texture"
+type="CompressedTexture2D"
+uid="uid://bf4m8j05ypctm"
+path.s3tc="res://.godot/imported/blunderbus.metal.rough.png-27758ccaeedeb6eecbee5c6fe642fb10.s3tc.ctex"
+metadata={
+"imported_formats": ["s3tc_bptc"],
+"vram_texture": true
+}
+
+[deps]
+
+source_file="res://assets/Models/blunderbus.metal.rough.png"
+dest_files=["res://.godot/imported/blunderbus.metal.rough.png-27758ccaeedeb6eecbee5c6fe642fb10.s3tc.ctex"]
+
+[params]
+
+compress/mode=2
+compress/high_quality=false
+compress/lossy_quality=0.7
+compress/hdr_compression=1
+compress/normal_map=0
+compress/channel_pack=0
+mipmaps/generate=true
+mipmaps/limit=-1
+roughness/mode=0
+roughness/src_normal=""
+process/fix_alpha_border=true
+process/premult_alpha=false
+process/normal_map_invert_y=false
+process/hdr_as_srgb=false
+process/hdr_clamp_exposure=false
+process/size_limit=0
+detect_3d/compress_to=0

assets/Models/blunderbus.stock.rough.png.import

@@ -0,0 +1,35 @@
+[remap]
+
+importer="texture"
+type="CompressedTexture2D"
+uid="uid://ddrqh51fsq8gm"
+path.s3tc="res://.godot/imported/blunderbus.stock.rough.png-d1267eec668d0b3781f4263190309c68.s3tc.ctex"
+metadata={
+"imported_formats": ["s3tc_bptc"],
+"vram_texture": true
+}
+
+[deps]
+
+source_file="res://assets/Models/blunderbus.stock.rough.png"
+dest_files=["res://.godot/imported/blunderbus.stock.rough.png-d1267eec668d0b3781f4263190309c68.s3tc.ctex"]
+
+[params]
+
+compress/mode=2
+compress/high_quality=false
+compress/lossy_quality=0.7
+compress/hdr_compression=1
+compress/normal_map=0
+compress/channel_pack=0
+mipmaps/generate=true
+mipmaps/limit=-1
+roughness/mode=0
+roughness/src_normal=""
+process/fix_alpha_border=true
+process/premult_alpha=false
+process/normal_map_invert_y=false
+process/hdr_as_srgb=false
+process/hdr_clamp_exposure=false
+process/size_limit=0
+detect_3d/compress_to=0

assets/blockout_2.tscn

@@ -3,7 +3,6 @@
 [ext_resource type="Script" path="res://scripts/LevelManager.gd" id="1_sbpvn"]
 [ext_resource type="PackedScene" uid="uid://brl0bsqjl5dg3" path="res://assets/mac_10.tscn" id="2_fn4vb"]
 [ext_resource type="Texture2D" uid="uid://ckjcv72jcojjh" path="res://assets/materials/91_laurel hedge PBR texture-seamless_hr/91_laurel hedge_DIFF (Custom).jpg" id="3_3ov8a"]
-[ext_resource type="PackedScene" uid="uid://dqwkal3t4gf2p" path="res://blunderbus.tscn" id="3_52ywj"]
 [ext_resource type="LightmapGIData" uid="uid://bwpvltmeo4cfl" path="res://assets/LevelBlockouts/blockout_2.lmbake" id="3_d2pxn"]
 [ext_resource type="Texture2D" uid="uid://d210plbmb7a2o" path="res://assets/materials/91_laurel hedge PBR texture-seamless_hr/91_laurel hedge_NORM (Custom).jpg" id="4_5u2rd"]
 [ext_resource type="PackedScene" uid="uid://20csd6dmwj4y" path="res://assets/jump_platform.tscn" id="4_j47q8"]
@@ -38,6 +37,7 @@
 [ext_resource type="Script" path="res://scripts/switch_door.gd" id="33_1m5er"]
 [ext_resource type="Script" path="res://scripts/switch_interactandshoot.gd" id="35_ybetb"]
 [ext_resource type="Script" path="res://levels/switch_target.gd" id="36_fuepo"]
+[ext_resource type="PackedScene" uid="uid://cucqbjb8bcha5" path="res://assets/blunderbuss_pickup.tscn" id="38_1e38i"]
 
 [sub_resource type="ProceduralSkyMaterial" id="ProceduralSkyMaterial_eiud5"]
 sky_horizon_color = Color(0.64625, 0.65575, 0.67075, 1)
@@ -1004,7 +1004,6 @@ player = NodePath("Player")
 money = 50
 start_health = 5
 gun_1 = ExtResource("2_fn4vb")
-gun_2 = ExtResource("3_52ywj")
 health_drop_enabled = false
 
 [node name="Player" parent="." instance=ExtResource("9_3usor")]
@@ -2231,6 +2230,9 @@ transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -63.7211, 1.01162, 81.5595)
 [node name="Spikes 36" parent="." instance=ExtResource("12_w4dk0")]
 transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -63.7211, 1.01162, 73.1301)
 
+[node name="blunderbuss_pickup" parent="." instance=ExtResource("38_1e38i")]
+transform = Transform3D(0.680363, 0, 0.732875, 0, 1, 0, -0.732875, 0, 0.680363, -2.95896, 1.92659, 16.5021)
+
 [connection signal="body_entered" from="Room1/RoomCheck" to="Room1/RoomCheck" method="_on_body_entered"]
 [connection signal="body_exited" from="Room1/RoomCheck" to="Room1/RoomCheck" method="_on_body_exited"]
 [connection signal="body_entered" from="Room3/RoomCheck2" to="Room3/RoomCheck2" method="_on_body_entered"]

assets/mac_10.tscn

@@ -426,7 +426,7 @@ audio_empty = NodePath("Audio/Empty")
 audio_reload = NodePath("Audio/Reload")
 
 [node name="mac10" parent="." index="0"]
-transform = Transform3D(-1.086e-06, 0, -0.3, 0, 0.3, 0, 0.3, 0, -1.086e-06, 0, 0, 0)
+transform = Transform3D(-0.120695, -0.0946483, -0.257826, 0.172433, -0.245315, 0.00933491, -0.213774, -0.144437, 0.153097, 0.948953, -2.62066, 0.655643)
 
 [node name="RHandLocation" type="Node3D" parent="mac10" index="0"]
 transform = Transform3D(-1.20667e-05, 0, 3.33333, 0, 3.33333, 0, -3.33333, 0, -1.20667e-05, 0.255734, -0.514002, -9.25759e-07)

assets/shotgun_pellet.tscn

@@ -0,0 +1,43 @@
+[gd_scene load_steps=6 format=3 uid="uid://717hhehp83k8"]
+
+[ext_resource type="Script" path="res://scripts/shotgun_pellet.gd" id="1_1v1ju"]
+
+[sub_resource type="PhysicsMaterial" id="PhysicsMaterial_0ewk3"]
+bounce = 0.3
+
+[sub_resource type="SphereMesh" id="SphereMesh_5okb1"]
+radius = 0.05
+height = 0.1
+
+[sub_resource type="StandardMaterial3D" id="StandardMaterial3D_we7vv"]
+metallic = 1.0
+roughness = 0.3
+emission_enabled = true
+emission = Color(1, 0.476275, 0.212537, 1)
+emission_energy_multiplier = 20.0
+
+[sub_resource type="SphereShape3D" id="SphereShape3D_55xw1"]
+radius = 0.05
+
+[node name="ShotgunPellet" type="RigidBody3D" groups=["pellet", "spawned"]]
+collision_layer = 160
+collision_mask = 237
+mass = 0.01
+physics_material_override = SubResource("PhysicsMaterial_0ewk3")
+continuous_cd = true
+contact_monitor = true
+max_contacts_reported = 1
+script = ExtResource("1_1v1ju")
+
+[node name="MeshInstance3D" type="MeshInstance3D" parent="."]
+mesh = SubResource("SphereMesh_5okb1")
+surface_material_override/0 = SubResource("StandardMaterial3D_we7vv")
+
+[node name="CollisionShape3D" type="CollisionShape3D" parent="."]
+shape = SubResource("SphereShape3D_55xw1")
+
+[node name="Timer" type="Timer" parent="."]
+wait_time = 10.0
+
+[connection signal="body_entered" from="." to="." method="_on_body_entered"]
+[connection signal="timeout" from="Timer" to="." method="_on_timer_timeout"]

assets/spider2.tscn

@@ -879,8 +879,8 @@ mesh = SubResource("ArrayMesh_d210d")
 
 [node name="Area3D" type="Area3D" parent="body" groups=["enemy_target"]]
 transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, -1.03709, 0)
-collision_layer = 8
-collision_mask = 13
+collision_layer = 136
+collision_mask = 141
 script = ExtResource("7_8vkma")
 
 [node name="TargetShape" type="CollisionShape3D" parent="body/Area3D" groups=["enemy"]]
@@ -922,6 +922,7 @@ volume_db = 10.0
 transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0.0258179, 1.03281, 0.00894165)
 shape = SubResource("BoxShape3D_xxx55")
 
+[connection signal="body_entered" from="body/Area3D" to="body/Area3D" method="_on_body_entered"]
 [connection signal="body_part_hit" from="body/Area3D" to="." method="_on_area_3d_body_part_hit"]
 [connection signal="timeout" from="Timers/prefire_timer" to="." method="_on_prefire_timer_timeout"]
 [connection signal="timeout" from="Timers/postfire_timer" to="." method="_on_postfire_timer_timeout"]