diff --git a/Scripts/Player/Player.gd b/Scripts/Player/Player.gd index 1cb9d5d..d0b7f5f 100644 --- a/Scripts/Player/Player.gd +++ b/Scripts/Player/Player.gd @@ -73,19 +73,19 @@ func _unhandled_input(event: InputEvent) -> void: if ($Camera/Flashlight.visible): if ($Camera/Flashlight.spot_angle > 2): $Camera/Flashlight.spot_angle -= 2 - $FlashlightSFX.pitch_scale = $Camera/Flashlight.spot_angle/10.0 - $FlashlightSFX.play() + $FlashlightSizeSFX.pitch_scale = sqrt($Camera/Flashlight.spot_angle)-0.5 + $FlashlightSizeSFX.play() elif event.is_action_pressed(&"freeroam_flashlight_zoom_out"): if ($Camera/Flashlight.visible): if ($Camera/Flashlight.spot_angle < 88): $Camera/Flashlight.spot_angle += 2 - $FlashlightSFX.pitch_scale = $Camera/Flashlight.spot_angle/10.0 - $FlashlightSFX.play() + $FlashlightSizeSFX.pitch_scale = sqrt($Camera/Flashlight.spot_angle)-0.5 + $FlashlightSizeSFX.play() elif event.is_action_pressed(&"freeroam_flashlight_zoom_reset"): if ($Camera/Flashlight.visible): $Camera/Flashlight.spot_angle = 30 - $FlashlightSFX.pitch_scale = $Camera/Flashlight.spot_angle/10.0 - $FlashlightSFX.play() + $FlashlightSizeSFX.pitch_scale = sqrt($Camera/Flashlight.spot_angle)-0.5 + $FlashlightSizeSFX.play() elif event.is_action_pressed(&"freeroam_camera_zoom_in"): if ($Camera.fov > 2): $Camera.fov -= 2 @@ -139,6 +139,8 @@ func _physics_process(delta: float) -> void: running = false elif Input.is_action_just_pressed(&"freeroam_toggle_flashlight"): $Camera/Flashlight.visible = !$Camera/Flashlight.visible + if ($Camera/Flashlight.visible): $FlashlightOnSFX.play() + else: $FlashlightOffSFX.play() if mouse_captured: _handle_joypad_camera_rotation(delta) velocity = _walk(delta) + _gravity(delta) + _jump(delta) diff --git a/Scripts/Player/Player.tscn b/Scripts/Player/Player.tscn index 00ff94e..62708d8 100644 --- a/Scripts/Player/Player.tscn +++ b/Scripts/Player/Player.tscn @@ -1,10 +1,12 @@ -[gd_scene load_steps=7 format=3 uid="uid://cdk6hwb4hi2wc"] +[gd_scene load_steps=9 format=3 uid="uid://cdk6hwb4hi2wc"] [ext_resource type="Script" uid="uid://b0c02p6ckmpdq" path="res://Scripts/Player/Player.gd" id="1_2f8j2"] [ext_resource type="PackedScene" uid="uid://cd67bfok34xhy" path="res://Scenes/GUI/InGameMenu.tscn" id="2_0s4r2"] [ext_resource type="PackedScene" uid="uid://fjveglbs1vfv" path="res://Scenes/GUI/DebugMenu.tscn" id="3_ejydr"] [ext_resource type="AudioStream" uid="uid://gu2qnrfyvk0m" path="res://UI/Sounds/boing.wav" id="4_7s4cc"] -[ext_resource type="AudioStream" uid="uid://bd13mqgeswusd" path="res://UI/Sounds/flashlight_click.wav" id="5_nckbs"] +[ext_resource type="AudioStream" uid="uid://bfeslo2ldb40t" path="res://UI/Sounds/flashlight_size_change.wav" id="5_gfoho"] +[ext_resource type="AudioStream" uid="uid://8uh608yamqpj" path="res://UI/Sounds/flashlight_on.wav" id="6_gfoho"] +[ext_resource type="AudioStream" uid="uid://bwwl6h7uyog64" path="res://UI/Sounds/flashlight_off.wav" id="7_7v0xc"] [sub_resource type="CapsuleShape3D" id="CapsuleShape3D_ejydr"] radius = 0.3 @@ -42,6 +44,14 @@ visible = false [node name="BoingSFX" type="AudioStreamPlayer" parent="."] stream = ExtResource("4_7s4cc") -[node name="FlashlightSFX" type="AudioStreamPlayer" parent="."] -stream = ExtResource("5_nckbs") +[node name="FlashlightSizeSFX" type="AudioStreamPlayer" parent="."] +stream = ExtResource("5_gfoho") volume_db = -10.0 + +[node name="FlashlightOnSFX" type="AudioStreamPlayer" parent="."] +stream = ExtResource("6_gfoho") +volume_db = -5.0 + +[node name="FlashlightOffSFX" type="AudioStreamPlayer" parent="."] +stream = ExtResource("7_7v0xc") +volume_db = -5.0 diff --git a/UI/Sounds/flashlight_click.wav b/UI/Sounds/flashlight_click.wav deleted file mode 100644 index 055e09b..0000000 Binary files a/UI/Sounds/flashlight_click.wav and /dev/null differ diff --git a/UI/Sounds/flashlight_click.wav.import b/UI/Sounds/flashlight_click.wav.import deleted file mode 100644 index 35ff9e8..0000000 --- a/UI/Sounds/flashlight_click.wav.import +++ /dev/null @@ -1,24 +0,0 @@ -[remap] - -importer="wav" -type="AudioStreamWAV" -uid="uid://bd13mqgeswusd" -path="res://.godot/imported/flashlight_click.wav-045ee61892a45745c4f95a53eafba64d.sample" - -[deps] - -source_file="res://UI/Sounds/flashlight_click.wav" -dest_files=["res://.godot/imported/flashlight_click.wav-045ee61892a45745c4f95a53eafba64d.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=2 diff --git a/UI/Sounds/flashlight_off.wav b/UI/Sounds/flashlight_off.wav new file mode 100644 index 0000000..607cdb4 Binary files /dev/null and b/UI/Sounds/flashlight_off.wav differ diff --git a/UI/Sounds/flashlight_off.wav.import b/UI/Sounds/flashlight_off.wav.import new file mode 100644 index 0000000..4a4d04b --- /dev/null +++ b/UI/Sounds/flashlight_off.wav.import @@ -0,0 +1,24 @@ +[remap] + +importer="wav" +type="AudioStreamWAV" +uid="uid://bwwl6h7uyog64" +path="res://.godot/imported/flashlight_off.wav-35e5e53a3d8c7ae814ab25518fb4e49a.sample" + +[deps] + +source_file="res://UI/Sounds/flashlight_off.wav" +dest_files=["res://.godot/imported/flashlight_off.wav-35e5e53a3d8c7ae814ab25518fb4e49a.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=2 diff --git a/UI/Sounds/flashlight_on.wav b/UI/Sounds/flashlight_on.wav new file mode 100644 index 0000000..2e92b04 Binary files /dev/null and b/UI/Sounds/flashlight_on.wav differ diff --git a/UI/Sounds/flashlight_on.wav.import b/UI/Sounds/flashlight_on.wav.import new file mode 100644 index 0000000..151e255 --- /dev/null +++ b/UI/Sounds/flashlight_on.wav.import @@ -0,0 +1,24 @@ +[remap] + +importer="wav" +type="AudioStreamWAV" +uid="uid://8uh608yamqpj" +path="res://.godot/imported/flashlight_on.wav-ab09cd90c434f4e9e976330972a5ed44.sample" + +[deps] + +source_file="res://UI/Sounds/flashlight_on.wav" +dest_files=["res://.godot/imported/flashlight_on.wav-ab09cd90c434f4e9e976330972a5ed44.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=2 diff --git a/UI/Sounds/flashlight_size_change.wav b/UI/Sounds/flashlight_size_change.wav new file mode 100644 index 0000000..e7ae956 Binary files /dev/null and b/UI/Sounds/flashlight_size_change.wav differ diff --git a/UI/Sounds/flashlight_size_change.wav.import b/UI/Sounds/flashlight_size_change.wav.import new file mode 100644 index 0000000..4dc9daf --- /dev/null +++ b/UI/Sounds/flashlight_size_change.wav.import @@ -0,0 +1,24 @@ +[remap] + +importer="wav" +type="AudioStreamWAV" +uid="uid://bfeslo2ldb40t" +path="res://.godot/imported/flashlight_size_change.wav-66bef8a68f6dceb95e92e9591132dc34.sample" + +[deps] + +source_file="res://UI/Sounds/flashlight_size_change.wav" +dest_files=["res://.godot/imported/flashlight_size_change.wav-66bef8a68f6dceb95e92e9591132dc34.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=2 diff --git a/UI/Sounds/ui_select.wav b/UI/Sounds/ui_select.wav deleted file mode 100644 index 792bd19..0000000 Binary files a/UI/Sounds/ui_select.wav and /dev/null differ diff --git a/UI/Sounds/ui_select.wav.import b/UI/Sounds/ui_select.wav.import deleted file mode 100644 index 899d512..0000000 --- a/UI/Sounds/ui_select.wav.import +++ /dev/null @@ -1,24 +0,0 @@ -[remap] - -importer="wav" -type="AudioStreamWAV" -uid="uid://dmn3kqd4rdlh6" -path="res://.godot/imported/ui_select.wav-822850e003dd35cb22f9869939ace729.sample" - -[deps] - -source_file="res://UI/Sounds/ui_select.wav" -dest_files=["res://.godot/imported/ui_select.wav-822850e003dd35cb22f9869939ace729.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=2