aboutsummaryrefslogtreecommitdiffstats
path: root/godot/scenes
diff options
context:
space:
mode:
authorLibravatar IcECreAm777 <31211782+IcECreAm777@users.noreply.github.com>2022-07-17 13:20:13 +0200
committerLibravatar IcECreAm777 <31211782+IcECreAm777@users.noreply.github.com>2022-07-17 13:20:13 +0200
commit83985c5b2f9829c7f335e31158bd7d3b56a3e2d6 (patch)
treebb7648f0a1b77275bc8ee9b8364bede847dba589 /godot/scenes
parentf48908a84490657bc03f4b41d0fc977c1381d0b9 (diff)
download2022-83985c5b2f9829c7f335e31158bd7d3b56a3e2d6.tar.gz
2022-83985c5b2f9829c7f335e31158bd7d3b56a3e2d6.tar.bz2
2022-83985c5b2f9829c7f335e31158bd7d3b56a3e2d6.zip
jingle at the end
Diffstat (limited to 'godot/scenes')
-rw-r--r--godot/scenes/Game.gd15
-rw-r--r--godot/scenes/Game.tscn10
2 files changed, 21 insertions, 4 deletions
diff --git a/godot/scenes/Game.gd b/godot/scenes/Game.gd
index 10bfad0..fef2cc8 100644
--- a/godot/scenes/Game.gd
+++ b/godot/scenes/Game.gd
@@ -1,7 +1,7 @@
extends Spatial
const NUM_LEVELS = 9
-const PAR = [1,2,3,4,5,6,7,8,9]
+const PAR = [5,2,3,4,5,6,7,8,9]
# level control
var current_level_id = 0
@@ -19,6 +19,8 @@ func _ready():
current_strokes = 0
levels[0].show()
+
+ $JinglePlayer.stream.loop_mode = AudioStreamSample.LOOP_DISABLED
# Called every frame. 'delta' is the elapsed time since the previous frame.
@@ -49,6 +51,8 @@ func _on_MainMenuButton_pressed():
func end_level():
open_scoreboard()
evaluate_player(current_strokes, PAR[current_level_id])
+ $BGMPLayer.stream_paused = true
+ $JinglePlayer.play()
post_game = true
@@ -91,6 +95,9 @@ func next_level():
close_scoreboard()
$Evaluation.hide()
+
+ $BGMPLayer.stream_paused = false
+ $JinglePlayer.stop()
func evaluate_player(strokes, par):
@@ -113,6 +120,10 @@ func evaluate_player(strokes, par):
elif diff == 2:
$Evaluation/EvaluationLabel.text = "DOUBLE BOGEY"
else:
- $Evaluation/EvaluationLabel.text = "+%d" % diff
+ $Evaluation/EvaluationLabel.text = "+ %d" % diff
$Evaluation.show()
+
+
+func _on_JinglePlayer_finished():
+ $BGMPLayer.stream_paused = false
diff --git a/godot/scenes/Game.tscn b/godot/scenes/Game.tscn
index 56f5c55..f7223a4 100644
--- a/godot/scenes/Game.tscn
+++ b/godot/scenes/Game.tscn
@@ -1,4 +1,4 @@
-[gd_scene load_steps=7 format=2]
+[gd_scene load_steps=8 format=2]
[ext_resource path="res://scenes/Game.gd" type="Script" id=1]
[ext_resource path="res://scenes/levels/level1/level1.tscn" type="PackedScene" id=2]
@@ -6,6 +6,7 @@
[ext_resource path="res://assets/fonts/format.tres" type="DynamicFont" id=4]
[ext_resource path="res://scenes/objects/Scoreboard.tscn" type="PackedScene" id=5]
[ext_resource path="res://assets/sounds/bgm.mp3" type="AudioStream" id=6]
+[ext_resource path="res://assets/sounds/jingle.wav" type="AudioStream" id=7]
[node name="Game" type="Spatial"]
script = ExtResource( 1 )
@@ -32,10 +33,14 @@ text = "Finished
align = 1
valign = 1
-[node name="AudioStreamPlayer" type="AudioStreamPlayer" parent="."]
+[node name="BGMPLayer" type="AudioStreamPlayer" parent="."]
stream = ExtResource( 6 )
autoplay = true
+[node name="JinglePlayer" type="AudioStreamPlayer2D" parent="."]
+stream = ExtResource( 7 )
+volume_db = 1.0
+
[node name="Level1" parent="." instance=ExtResource( 2 )]
[node name="PausePopup" type="Control" parent="."]
@@ -91,6 +96,7 @@ margin_right = 360.0
margin_bottom = 393.0
text = "Quit"
+[connection signal="finished" from="JinglePlayer" to="." method="_on_JinglePlayer_finished"]
[connection signal="pressed" from="PausePopup/Panel/VBoxContainer/ResumeButton" to="." method="_on_ResumeButton_pressed"]
[connection signal="pressed" from="PausePopup/Panel/VBoxContainer/MainMenuButton" to="." method="_on_MainMenuButton_pressed"]
[connection signal="pressed" from="PausePopup/Panel/VBoxContainer/QuitButton" to="." method="_on_QuitButton_pressed"]