diff --git a/src3/Actor/actor.gd b/src3/Actor/actor.gd index 6bc2c04..6f697d4 100644 --- a/src3/Actor/actor.gd +++ b/src3/Actor/actor.gd @@ -27,6 +27,7 @@ func sprite() -> AnimatedSprite2D: func explode(): sprite().visible = false + $SFXExplode.play() $CPUParticles2D.restart() func anim_walk(): diff --git a/src3/Actor/actor.tscn b/src3/Actor/actor.tscn index 4b9478a..038d42a 100644 --- a/src3/Actor/actor.tscn +++ b/src3/Actor/actor.tscn @@ -1,8 +1,10 @@ -[gd_scene load_steps=6 format=3 uid="uid://chsmfcu2ww1rf"] +[gd_scene load_steps=8 format=3 uid="uid://chsmfcu2ww1rf"] [ext_resource type="Script" path="res://Actor/actor.gd" id="1_idlnt"] [ext_resource type="Texture2D" path="res://Assets/particle.png" id="3_303hw"] [ext_resource type="SpriteFrames" uid="uid://qasmquyomf8y" path="res://Actor/sprite_frames.tres" id="3_svw0v"] +[ext_resource type="AudioStream" uid="uid://b2gyst7ghnt34" path="res://Assets/clone.ogg" id="4_3hpxv"] +[ext_resource type="AudioStream" uid="uid://bj51jgg1gmsu3" path="res://Assets/explode.ogg" id="5_ousue"] [sub_resource type="CircleShape2D" id="CircleShape2D_4na4j"] radius = 34.1321 @@ -40,4 +42,10 @@ initial_velocity_min = 366.83 initial_velocity_max = 814.07 color_ramp = SubResource("Gradient_qb1gn") +[node name="SFXClone" type="AudioStreamPlayer" parent="."] +stream = ExtResource("4_3hpxv") + +[node name="SFXExplode" type="AudioStreamPlayer" parent="."] +stream = ExtResource("5_ousue") + [connection signal="finished" from="CPUParticles2D" to="." method="_on_cpu_particles_2d_finished"] diff --git a/src3/Actor/actor_convulse.gd b/src3/Actor/actor_convulse.gd index 2bc6856..36d4eec 100644 --- a/src3/Actor/actor_convulse.gd +++ b/src3/Actor/actor_convulse.gd @@ -51,6 +51,7 @@ func _process(delta): n_actor.set_state(ActorPossessed.new(n_actor)) n_actor.player = true Gstate.kill(n_actor) + n_actor.get_node('SFXClone').play() found = true diff --git a/src3/Assets/clone.ogg b/src3/Assets/clone.ogg index e4c8809..582ff77 100644 Binary files a/src3/Assets/clone.ogg and b/src3/Assets/clone.ogg differ diff --git a/src3/Assets/explode.ogg b/src3/Assets/explode.ogg new file mode 100644 index 0000000..10ae4af Binary files /dev/null and b/src3/Assets/explode.ogg differ diff --git a/src3/Assets/lose.ogg b/src3/Assets/lose.ogg new file mode 100644 index 0000000..2c20b74 Binary files /dev/null and b/src3/Assets/lose.ogg differ diff --git a/src3/Assets/win.ogg b/src3/Assets/win.ogg new file mode 100644 index 0000000..a245213 Binary files /dev/null and b/src3/Assets/win.ogg differ diff --git a/src3/GameOver/game_over.tscn b/src3/GameOver/game_over.tscn index 727289f..fe19192 100644 --- a/src3/GameOver/game_over.tscn +++ b/src3/GameOver/game_over.tscn @@ -1,7 +1,8 @@ -[gd_scene load_steps=4 format=3 uid="uid://c3brx1b41l0io"] +[gd_scene load_steps=5 format=3 uid="uid://c3brx1b41l0io"] [ext_resource type="Script" path="res://GameOver/game_over.gd" id="1_o6k3r"] [ext_resource type="PackedScene" uid="uid://2ld14yig6m07" path="res://Pentagram/pentagram.tscn" id="2_ajtpg"] +[ext_resource type="AudioStream" uid="uid://c8btv7n5lears" path="res://Assets/lose.ogg" id="3_n40u8"] [sub_resource type="CanvasTexture" id="CanvasTexture_v15nk"] @@ -60,5 +61,9 @@ layout_mode = 2 text = "QUIT " +[node name="AudioStreamPlayer" type="AudioStreamPlayer" parent="."] +stream = ExtResource("3_n40u8") +autoplay = true + [connection signal="pressed" from="CanvasLayer/VBoxContainer/TryAgainButton" to="." method="_on_try_again_button_pressed"] [connection signal="pressed" from="CanvasLayer/VBoxContainer/QuitButton" to="." method="_on_quit_button_pressed"] diff --git a/src3/Level/final_level.gd b/src3/Level/final_level.gd index 39fd0fd..3290710 100644 --- a/src3/Level/final_level.gd +++ b/src3/Level/final_level.gd @@ -7,7 +7,7 @@ func _ready(): # Called every frame. 'delta' is the elapsed time since the previous frame. -func _process(delta): +func _process(_delta): pass diff --git a/src3/Level/final_level.tscn b/src3/Level/final_level.tscn index ccaa06e..4bff676 100644 --- a/src3/Level/final_level.tscn +++ b/src3/Level/final_level.tscn @@ -1,6 +1,7 @@ -[gd_scene load_steps=2 format=3 uid="uid://bvtot1d6jceil"] +[gd_scene load_steps=3 format=3 uid="uid://bvtot1d6jceil"] [ext_resource type="Script" path="res://Level/final_level.gd" id="1_0ivrk"] +[ext_resource type="AudioStream" uid="uid://cpm6bucn5yfae" path="res://Assets/win.ogg" id="2_x3xf4"] [node name="FinalLevel" type="Control"] layout_mode = 3 @@ -39,5 +40,9 @@ theme_override_font_sizes/font_size = 32 text = "Quit " +[node name="AudioStreamPlayer" type="AudioStreamPlayer" parent="."] +stream = ExtResource("2_x3xf4") +autoplay = true + [connection signal="pressed" from="CanvasLayer/VBoxContainer/RestartButton" to="." method="_on_restart_button_pressed"] [connection signal="pressed" from="CanvasLayer/VBoxContainer/QuitButton" to="." method="_on_quit_button_pressed"] diff --git a/src3/export_presets.cfg b/src3/export_presets.cfg index 5f8bb18..d120419 100644 --- a/src3/export_presets.cfg +++ b/src3/export_presets.cfg @@ -8,7 +8,7 @@ custom_features="" export_filter="all_resources" include_filter="" exclude_filter="" -export_path="../../Export/ldbog55.zip" +export_path="../../Export/macos_ld55_bog.zip" encryption_include_filters="" encryption_exclude_filters="" encrypt_pck=false @@ -102,3 +102,106 @@ open \"{temp_dir}/{exe_name}.app\" --args {cmd_args}" ssh_remote_deploy/cleanup_script="#!/usr/bin/env bash kill $(pgrep -x -f \"{temp_dir}/{exe_name}.app/Contents/MacOS/{exe_name} {cmd_args}\") rm -rf \"{temp_dir}\"" + +[preset.1] + +name="Linux/X11" +platform="Linux/X11" +runnable=true +dedicated_server=false +custom_features="" +export_filter="all_resources" +include_filter="" +exclude_filter="" +export_path="../../Export/gnu_linux_ld55_bog.x86_64" +encryption_include_filters="" +encryption_exclude_filters="" +encrypt_pck=false +encrypt_directory=false + +[preset.1.options] + +custom_template/debug="" +custom_template/release="" +debug/export_console_wrapper=1 +binary_format/embed_pck=false +texture_format/bptc=true +texture_format/s3tc=true +texture_format/etc=false +texture_format/etc2=false +binary_format/architecture="x86_64" +ssh_remote_deploy/enabled=false +ssh_remote_deploy/host="user@host_ip" +ssh_remote_deploy/port="22" +ssh_remote_deploy/extra_args_ssh="" +ssh_remote_deploy/extra_args_scp="" +ssh_remote_deploy/run_script="#!/usr/bin/env bash +export DISPLAY=:0 +unzip -o -q \"{temp_dir}/{archive_name}\" -d \"{temp_dir}\" +\"{temp_dir}/{exe_name}\" {cmd_args}" +ssh_remote_deploy/cleanup_script="#!/usr/bin/env bash +kill $(pgrep -x -f \"{temp_dir}/{exe_name} {cmd_args}\") +rm -rf \"{temp_dir}\"" + +[preset.2] + +name="Windows Desktop" +platform="Windows Desktop" +runnable=true +dedicated_server=false +custom_features="" +export_filter="all_resources" +include_filter="" +exclude_filter="" +export_path="../../Export/win64_ld55_bog.exe" +encryption_include_filters="" +encryption_exclude_filters="" +encrypt_pck=false +encrypt_directory=false + +[preset.2.options] + +custom_template/debug="" +custom_template/release="" +debug/export_console_wrapper=1 +binary_format/embed_pck=false +texture_format/bptc=true +texture_format/s3tc=true +texture_format/etc=false +texture_format/etc2=false +binary_format/architecture="x86_64" +codesign/enable=false +codesign/timestamp=true +codesign/timestamp_server_url="" +codesign/digest_algorithm=1 +codesign/description="" +codesign/custom_options=PackedStringArray() +application/modify_resources=true +application/icon="" +application/console_wrapper_icon="" +application/icon_interpolation=4 +application/file_version="" +application/product_version="" +application/company_name="" +application/product_name="" +application/file_description="" +application/copyright="" +application/trademarks="" +application/export_angle=0 +ssh_remote_deploy/enabled=false +ssh_remote_deploy/host="user@host_ip" +ssh_remote_deploy/port="22" +ssh_remote_deploy/extra_args_ssh="" +ssh_remote_deploy/extra_args_scp="" +ssh_remote_deploy/run_script="Expand-Archive -LiteralPath '{temp_dir}\\{archive_name}' -DestinationPath '{temp_dir}' +$action = New-ScheduledTaskAction -Execute '{temp_dir}\\{exe_name}' -Argument '{cmd_args}' +$trigger = New-ScheduledTaskTrigger -Once -At 00:00 +$settings = New-ScheduledTaskSettingsSet +$task = New-ScheduledTask -Action $action -Trigger $trigger -Settings $settings +Register-ScheduledTask godot_remote_debug -InputObject $task -Force:$true +Start-ScheduledTask -TaskName godot_remote_debug +while (Get-ScheduledTask -TaskName godot_remote_debug | ? State -eq running) { Start-Sleep -Milliseconds 100 } +Unregister-ScheduledTask -TaskName godot_remote_debug -Confirm:$false -ErrorAction:SilentlyContinue" +ssh_remote_deploy/cleanup_script="Stop-ScheduledTask -TaskName godot_remote_debug -ErrorAction:SilentlyContinue +Unregister-ScheduledTask -TaskName godot_remote_debug -Confirm:$false -ErrorAction:SilentlyContinue +Remove-Item -Recurse -Force '{temp_dir}'"