tweaks to oil drum

assets/Audio/Dropped Object/glass-bottle-drop-hit-bounce-SBA-300112827.mp3.import

@@ -0,0 +1,19 @@
+[remap]
+
+importer="mp3"
+type="AudioStreamMP3"
+uid="uid://cwly7qleb4unq"
+path="res://.godot/imported/glass-bottle-drop-hit-bounce-SBA-300112827.mp3-37e1f6d3035c25316a63f2aed8832808.mp3str"
+
+[deps]
+
+source_file="res://assets/Audio/Dropped Object/glass-bottle-drop-hit-bounce-SBA-300112827.mp3"
+dest_files=["res://.godot/imported/glass-bottle-drop-hit-bounce-SBA-300112827.mp3-37e1f6d3035c25316a63f2aed8832808.mp3str"]
+
+[params]
+
+loop=false
+loop_offset=0
+bpm=0
+beat_count=0
+bar_beats=4

assets/Audio/Dropped Object/gym-bag-drop-SBA-300021273.mp3.import

@@ -0,0 +1,19 @@
+[remap]
+
+importer="mp3"
+type="AudioStreamMP3"
+uid="uid://tlg5g7xyjp1w"
+path="res://.godot/imported/gym-bag-drop-SBA-300021273.mp3-7c7d467a5254fd621ca96a9b84534b86.mp3str"
+
+[deps]
+
+source_file="res://assets/Audio/Dropped Object/gym-bag-drop-SBA-300021273.mp3"
+dest_files=["res://.godot/imported/gym-bag-drop-SBA-300021273.mp3-7c7d467a5254fd621ca96a9b84534b86.mp3str"]
+
+[params]
+
+loop=false
+loop_offset=0
+bpm=0
+beat_count=0
+bar_beats=4

assets/Audio/Dropped Object/metal-heavy-drop-fall-SBA-300117028.wav.import

@@ -0,0 +1,24 @@
+[remap]
+
+importer="wav"
+type="AudioStreamWAV"
+uid="uid://dmt6bxnm00wfg"
+path="res://.godot/imported/metal-heavy-drop-fall-SBA-300117028.wav-13ff7b2b57d54f5bc885814d0fda083d.sample"
+
+[deps]
+
+source_file="res://assets/Audio/Dropped Object/metal-heavy-drop-fall-SBA-300117028.wav"
+dest_files=["res://.godot/imported/metal-heavy-drop-fall-SBA-300117028.wav-13ff7b2b57d54f5bc885814d0fda083d.sample"]
+
+[params]
+
+force/8_bit=false
+force/mono=false
+force/max_rate=false
+force/max_rate_hz=44100
+edit/trim=false
+edit/normalize=false
+edit/loop_mode=0
+edit/loop_begin=0
+edit/loop_end=-1
+compress/mode=0

assets/blockout_2.tscn

@@ -1,4 +1,4 @@
-[gd_scene load_steps=112 format=4 uid="uid://6agmt1hqlhww"]
+[gd_scene load_steps=113 format=4 uid="uid://6agmt1hqlhww"]
 
 [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"]
@@ -44,6 +44,7 @@
 [ext_resource type="PackedScene" uid="uid://ciw10g8q4td1y" path="res://assets/tv.tscn" id="42_5scug"]
 [ext_resource type="PackedScene" uid="uid://bcmd7elfjhppe" path="res://assets/tree_1.tscn" id="43_o23bq"]
 [ext_resource type="PackedScene" uid="uid://df34olntmk0wl" path="res://assets/vent_1.tscn" id="44_b0rr7"]
+[ext_resource type="PackedScene" uid="uid://dlhjacsike5a4" path="res://assets/oildrum1.tscn" id="45_eatji"]
 
 [sub_resource type="ProceduralSkyMaterial" id="ProceduralSkyMaterial_eiud5"]
 sky_horizon_color = Color(0.64625, 0.65575, 0.67075, 1)
@@ -898,6 +899,7 @@ _data = {
 [node name="BLOCKOUT2Test" type="Node3D" node_paths=PackedStringArray("player")]
 transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0.016016, 0.0225029, -0.0192337)
 script = ExtResource("1_sbpvn")
+load_save = false
 player = NodePath("Player")
 money = 50
 start_health = 5
@@ -2035,6 +2037,12 @@ transform = Transform3D(4.135, 0, 0, 0, 4.135, 0, 0, 0, 4.135, 26.563, 13.3468,
 [node name="Vent1" parent="." instance=ExtResource("44_b0rr7")]
 transform = Transform3D(0.462863, 0, 0.88643, 0, 1, 0, -0.88643, 0, 0.462863, -1.87132, 0.546506, 10.544)
 
+[node name="Oildrum1" parent="." instance=ExtResource("45_eatji")]
+transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -1.46674, 27.457, -7.49986)
+
+[node name="Oildrum2" parent="." instance=ExtResource("45_eatji")]
+transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 5.84071, 27.457, 3.20335)
+
 [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/oildrum1.tscn

@@ -1,4 +1,4 @@
-[gd_scene load_steps=14 format=4 uid="uid://dlhjacsike5a4"]
+[gd_scene load_steps=16 format=4 uid="uid://dlhjacsike5a4"]
 
 [ext_resource type="Texture2D" uid="uid://ch7jxw5ghkgij" path="res://assets/Models/oildrum1.albedo.png" id="1_uppfj"]
 [ext_resource type="Script" path="res://scripts/oildrum.gd" id="1_yvhou"]
@@ -7,6 +7,7 @@
 [ext_resource type="Texture2D" uid="uid://ioiy6cm2ypl7" path="res://assets/Models/oildrum1.normal.png" id="3_ouyr7"]
 [ext_resource type="Texture2D" uid="uid://dhm0fgqc3nx2t" path="res://assets/Models/oildrum1.rough.png" id="4_t4407"]
 [ext_resource type="AudioStream" uid="uid://8w8imybwyxxa" path="res://assets/Audio/Various SFX/gas-leak-SBA-300149983.mp3" id="6_iai82"]
+[ext_resource type="AudioStream" uid="uid://dmt6bxnm00wfg" path="res://assets/Audio/Dropped Object/metal-heavy-drop-fall-SBA-300117028.wav" id="8_u73t3"]
 
 [sub_resource type="StandardMaterial3D" id="StandardMaterial3D_ah05b"]
 resource_name = "oildrum1"
@@ -17,7 +18,6 @@ metallic_texture = ExtResource("2_ip3os")
 metallic_texture_channel = 2
 roughness_texture = ExtResource("4_t4407")
 roughness_texture_channel = 1
-normal_enabled = true
 normal_scale = 0.57
 normal_texture = ExtResource("3_ouyr7")
 texture_filter = 2
@@ -56,21 +56,29 @@ _surfaces = [{
 blend_shape_mode = 0
 shadow_mesh = SubResource("ArrayMesh_exg16")
 
-[sub_resource type="CylinderShape3D" id="CylinderShape3D_xutd7"]
-height = 1.29119
-radius = 0.448775
-
 [sub_resource type="AudioStreamRandomizer" id="AudioStreamRandomizer_urstu"]
 streams_count = 1
 stream_0/stream = ExtResource("6_iai82")
 
+[sub_resource type="AudioStreamRandomizer" id="AudioStreamRandomizer_64m2m"]
+random_pitch = 1.2
+streams_count = 1
+stream_0/stream = ExtResource("8_u73t3")
+
 [sub_resource type="SphereShape3D" id="SphereShape3D_p1wn3"]
 radius = 10.0
 
-[node name="Oildrum1" type="RigidBody3D"]
+[sub_resource type="CylinderShape3D" id="CylinderShape3D_uiqtq"]
+height = 1.26931
+radius = 0.425725
+
+[node name="Oildrum1" type="RigidBody3D" groups=["leak"]]
 collision_layer = 160
 collision_mask = 253
 mass = 10.0
+continuous_cd = true
+contact_monitor = true
+max_contacts_reported = 1
 script = ExtResource("1_yvhou")
 explosion = ExtResource("2_507ct")
 blast_power = 50.0
@@ -81,16 +89,21 @@ transform = Transform3D(0.445, 0, 0, 0, 0.625, 0, 0, 0, 0.445, 0, 0, 0)
 mesh = SubResource("ArrayMesh_xxlsu")
 skeleton = NodePath("")
 
-[node name="CollisionShape3D" type="CollisionShape3D" parent="."]
-transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0.0089671, 0)
-shape = SubResource("CylinderShape3D_xutd7")
-
 [node name="leak_audio" type="AudioStreamPlayer3D" parent="."]
 stream = SubResource("AudioStreamRandomizer_urstu")
 
+[node name="audio_drop" type="AudioStreamPlayer3D" parent="."]
+stream = SubResource("AudioStreamRandomizer_64m2m")
+
 [node name="BlastRadius" type="Area3D" parent="."]
 collision_layer = 0
 collision_mask = 109
 
 [node name="CollisionShape3D" type="CollisionShape3D" parent="BlastRadius"]
 shape = SubResource("SphereShape3D_p1wn3")
+
+[node name="CollisionShape3D" type="CollisionShape3D" parent="."]
+transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0.0143872, 0)
+shape = SubResource("CylinderShape3D_uiqtq")
+
+[connection signal="body_entered" from="." to="." method="_on_body_entered"]

assets/water_leak.tscn

@@ -0,0 +1,61 @@
+[gd_scene load_steps=11 format=3 uid="uid://tvaontvjhaf6"]
+
+[ext_resource type="Texture2D" uid="uid://dn3b6uw8xr63m" path="res://assets/Textures/Smoke/smoketest_v1_0043.png" id="1_x22sq"]
+
+[sub_resource type="Curve" id="Curve_ua3ok"]
+_data = [Vector2(0, 0), 0.0, 1.4, 0, 0, Vector2(1, 1), 0.0, 0.0, 0, 0]
+point_count = 2
+
+[sub_resource type="CurveTexture" id="CurveTexture_a61ob"]
+curve = SubResource("Curve_ua3ok")
+
+[sub_resource type="Gradient" id="Gradient_yha4d"]
+colors = PackedColorArray(1, 1, 1, 1, 1, 1, 1, 0)
+
+[sub_resource type="GradientTexture1D" id="GradientTexture1D_qejk1"]
+gradient = SubResource("Gradient_yha4d")
+
+[sub_resource type="Curve" id="Curve_0y7gl"]
+min_value = -1.0
+_data = [Vector2(0, -1), 0.0, 2.8, 0, 0, Vector2(1, 1), 0.0, 0.0, 0, 0]
+point_count = 2
+
+[sub_resource type="CurveTexture" id="CurveTexture_td4g1"]
+curve = SubResource("Curve_0y7gl")
+
+[sub_resource type="ParticleProcessMaterial" id="ParticleProcessMaterial_rpyn6"]
+particle_flag_rotate_y = true
+velocity_pivot = Vector3(0, 1, 0)
+direction = Vector3(0, 0, -1)
+spread = 30.0
+initial_velocity_min = 0.1
+initial_velocity_max = 1.0
+scale_min = 0.1
+color_ramp = SubResource("GradientTexture1D_qejk1")
+alpha_curve = SubResource("CurveTexture_a61ob")
+hue_variation_curve = SubResource("CurveTexture_td4g1")
+turbulence_noise_strength = 0.0
+turbulence_noise_scale = 0.5
+collision_mode = 1
+collision_friction = 0.0
+collision_bounce = 0.0
+
+[sub_resource type="StandardMaterial3D" id="StandardMaterial3D_ntlp5"]
+transparency = 1
+blend_mode = 1
+shading_mode = 0
+albedo_color = Color(0.278431, 0.647059, 0.85098, 0.937255)
+albedo_texture = ExtResource("1_x22sq")
+billboard_mode = 1
+
+[sub_resource type="PlaneMesh" id="PlaneMesh_ktpc0"]
+material = SubResource("StandardMaterial3D_ntlp5")
+size = Vector2(0.1, 0.1)
+orientation = 2
+
+[node name="Water_leak" type="GPUParticles3D"]
+amount = 100
+lifetime = 4.0
+fixed_fps = 60
+process_material = SubResource("ParticleProcessMaterial_rpyn6")
+draw_pass_1 = SubResource("PlaneMesh_ktpc0")

blunderbus.tscn

@@ -232,13 +232,13 @@ shadow_mesh = SubResource("ArrayMesh_3f3hx")
 _data = [Vector2(0, 0), 0.0, 1.4, 0, 0, Vector2(1, 1), 0.0, 0.0, 0, 0]
 point_count = 2
 
-[sub_resource type="CurveTexture" id="CurveTexture_a61ob"]
+[sub_resource type="CurveTexture" id="CurveTexture_csbqc"]
 curve = SubResource("Curve_h8f1e")
 
 [sub_resource type="Gradient" id="Gradient_0viso"]
 colors = PackedColorArray(1, 1, 1, 1, 1, 1, 1, 0)
 
-[sub_resource type="GradientTexture1D" id="GradientTexture1D_qejk1"]
+[sub_resource type="GradientTexture1D" id="GradientTexture1D_rly2i"]
 gradient = SubResource("Gradient_0viso")
 
 [sub_resource type="Curve" id="Curve_hewln"]
@@ -246,7 +246,7 @@ min_value = -1.0
 _data = [Vector2(0, -1), 0.0, 2.8, 0, 0, Vector2(1, 1), 0.0, 0.0, 0, 0]
 point_count = 2
 
-[sub_resource type="CurveTexture" id="CurveTexture_td4g1"]
+[sub_resource type="CurveTexture" id="CurveTexture_6yvtl"]
 curve = SubResource("Curve_hewln")
 
 [sub_resource type="ParticleProcessMaterial" id="ParticleProcessMaterial_xmjr3"]
@@ -259,14 +259,14 @@ spread = 9.706
 initial_velocity_max = 1.0
 gravity = Vector3(0, 0.5, 0)
 scale_min = 0.1
-color_ramp = SubResource("GradientTexture1D_qejk1")
+color_ramp = SubResource("GradientTexture1D_rly2i")
-alpha_curve = SubResource("CurveTexture_a61ob")
+alpha_curve = SubResource("CurveTexture_csbqc")
-hue_variation_curve = SubResource("CurveTexture_td4g1")
+hue_variation_curve = SubResource("CurveTexture_6yvtl")
 turbulence_enabled = true
 turbulence_noise_strength = 0.0
 turbulence_noise_scale = 0.5
 
-[sub_resource type="StandardMaterial3D" id="StandardMaterial3D_ntlp5"]
+[sub_resource type="StandardMaterial3D" id="StandardMaterial3D_dgj1t"]
 transparency = 1
 blend_mode = 1
 shading_mode = 0
@@ -275,7 +275,7 @@ albedo_texture = ExtResource("9_fldbw")
 billboard_mode = 1
 
 [sub_resource type="PlaneMesh" id="PlaneMesh_756l0"]
-material = SubResource("StandardMaterial3D_ntlp5")
+material = SubResource("StandardMaterial3D_dgj1t")
 size = Vector2(1, 1)
 orientation = 2
 

levels/switch_target.gd

@@ -2,5 +2,5 @@ extends StaticBody3D
 
 signal switch_hit()
 
-func hit():
+func hit(bullet_damage):
 	emit_signal("switch_hit")

project.godot

@@ -11,7 +11,7 @@ config_version=5
 [application]
 
 config/name="First Person Test"
-run/main_scene="res://scenes/asset_checker.tscn"
+run/main_scene="res://assets/blockout_2.tscn"
 config/features=PackedStringArray("4.3", "Forward Plus")
 config/icon="res://icon.svg"
 
@@ -55,6 +55,7 @@ door=""
 spawned=""
 persist=""
 breakable=""
+leak="will leak if damaged"
 
 [input]
 

scripts/bullet.gd

@@ -16,7 +16,7 @@ var bullet_active = true
 @onready var enemy_particles = $GPUParticlesEnemy
 @onready var hit_indicator = $Audio/HitIndicator
 @onready var ray: RayCast3D = $RayCast3D
-
+@onready var water_leak : Resource = preload("res://assets/water_leak.tscn")
 
 # Called when the node enters the scene tree for the first time.
 func _ready():
@@ -55,6 +55,17 @@ func _physics_process(delta):
 				instance_bullethole.look_at(ray.get_collision_point() + ray.get_collision_normal())
 			instance_bullethole.rotation.z = deg_to_rad(randf_range(0,360))
 			
+			# Leaking effect
+			if body.is_in_group("leak"):
+				var leakspawn = water_leak.instantiate()
+				body.add_child(leakspawn)
+				leakspawn.global_transform.origin = ray.get_collision_point()
+				if (abs(ray.get_collision_normal().y) > 0.99):
+					leakspawn.look_at(ray.get_collision_point() + ray.get_collision_normal(), Vector3(0,0,1))
+				else:
+					leakspawn.look_at(ray.get_collision_point() + ray.get_collision_normal())
+				leakspawn.rotation.z = deg_to_rad(randf_range(0,360))
+				
 			if body.is_in_group("switch"):
 				body.hit()
 			

scripts/oildrum.gd

@@ -8,6 +8,7 @@ extends RigidBody3D
 @onready var leak_audio: AudioStreamPlayer3D = $leak_audio
 @onready var blast_radius_area: Area3D = $BlastRadius
 @onready var radius_shape: CollisionShape3D = $BlastRadius/CollisionShape3D
+@onready var audio_drop: AudioStreamPlayer3D = $audio_drop
 
 var leak_hp = false
 var blast_amount
@@ -86,3 +87,9 @@ func explode():
 	explosionspawn.transform.basis = self.global_transform.basis
 	get_tree().get_root().add_child(explosionspawn)
 	queue_free()
+
+func _on_body_shape_entered(body: Node) -> void:
+	audio_drop.play()
+	print("BODY")
+	if body.get_collision_layer() == 1:
+		audio_drop.play()