better sound effects

.import/A#.wav-9ef26cd8708600de0a9bffb284ec0e48.md5

@@ -0,0 +1,3 @@
+source_md5="65409e40dd3242a33af1f8d632de9a5c"
+dest_md5="a9b825a8846e8b4ca6d1654d9d9cdbc7"
+

.import/A.wav-5b6c1c6634da62a7647953cdafd8d80c.md5

@@ -0,0 +1,3 @@
+source_md5="6de160677b742b04da120f93b4c2d2b5"
+dest_md5="0c381684cc06c0dfa068ec7dc31f46c7"
+

.import/B.wav-e5748ec65d418ce4060344491a66a395.md5

@@ -0,0 +1,3 @@
+source_md5="6e920f4f12cb77e19a5259585ec9a02b"
+dest_md5="63839259e4ce20520e00e3043ebe6138"
+

.import/BallReset.ogg-8b552df8fc63693a21202072c19d4626.md5

@@ -0,0 +1,3 @@
+source_md5="4b15d1c767da6a84e8fe628ca271bb66"
+dest_md5="10d15aba7394eaa3451d5471b6947393"
+

.import/BallReset.wav-030c4988d19e35a5110e64ae6fdc34a9.md5

@@ -0,0 +1,3 @@
+source_md5="0f29473df2cae3b6b8d5386b82a5bfb2"
+dest_md5="20a815fad51ee4a90ba28f7a49cb2996"
+

.import/C#.wav-96d693e537180cc41a39bdd6716be216.md5

@@ -0,0 +1,3 @@
+source_md5="5bb214d18235bea6a07ea78af102772a"
+dest_md5="f3bc5ac9f836e74b855e9878fb026f41"
+

.import/C.wav-e4bd7df767f25fea0dc0787e53863aad.md5

@@ -0,0 +1,3 @@
+source_md5="3094de7abaecdbabc6530d0066893c99"
+dest_md5="5b5bf017ae691da607b73e861cbb67a5"
+

.import/D#.wav-d6f3dee8719098c7f7912a8384b82d9f.md5

@@ -0,0 +1,3 @@
+source_md5="75cc49446f075f5230cdf2e808673502"
+dest_md5="609bb0c44f02b447032fa27eb8e7acbd"
+

.import/D.wav-84f2ac366a166d00e768b1e01ace06e9.md5

@@ -0,0 +1,3 @@
+source_md5="31e5dda4737f767944ea507b85152f7e"
+dest_md5="38bb821820bfd784b584e8aa61c1b10e"
+

.import/E.wav-6a76c314a03a675e2204acd78fcb0588.md5

@@ -0,0 +1,3 @@
+source_md5="f3b710f8bfedc0c1c4a772c305c5d90d"
+dest_md5="318857f76a28d998eefc47f3668f8e86"
+

.import/F#.wav-a5a586721aca3a8f6c3cf3705ceea89f.md5

@@ -0,0 +1,3 @@
+source_md5="11d0f72767688762febb4cd746575ca5"
+dest_md5="c63895fa9efedc5a2fa71f8ca208bd46"
+

.import/F.wav-1cdcf546c8a65aef8760177f6703338a.md5

@@ -0,0 +1,3 @@
+source_md5="1d665dbc7c658fbde426e58441e7fae0"
+dest_md5="626ba19bd72e7df77891a26d8493687c"
+

.import/Fadein.ogg-eadb2cc899c1b292da7f0ec850c5fe3d.md5

@@ -0,0 +1,3 @@
+source_md5="cae0e8bad917aa340ff3ae3842549de7"
+dest_md5="a28209c1e78ea62ad3ad85685b64076b"
+

.import/Fadeout.ogg-17b61e79fb22b1755df3142b0dd92b2e.md5

@@ -0,0 +1,3 @@
+source_md5="6c201f22bc1bb60273ea35bc0f51445f"
+dest_md5="2d150ae16a014852f5da0e4c32f15953"
+

.import/G#.wav-4df8639aa965734c341b3616dd348b06.md5

@@ -0,0 +1,3 @@
+source_md5="52bd90b0ba6e1486c46c4d8d68b48852"
+dest_md5="2e63c68eeeebece467db20a10ebfb839"
+

.import/G.wav-9cc75de310289e0fca71de569cd981db.md5

@@ -0,0 +1,3 @@
+source_md5="9d3f4010fc8b0426f6a4b78d76eb75ac"
+dest_md5="10bdce4fdd1c6b355944226a21b3c175"
+

.import/HoverButton.wav-b4f06b94508ef6329b16866b11deca55.md5

@@ -0,0 +1,3 @@
+source_md5="6d2b131152ff4c12a5d330d6f862f330"
+dest_md5="cbb7597b1e76bec657145883a9d348e8"
+

.import/Menu.ogg-5d0b70bc270d7b88fd20e45ac7483499.md5

@@ -0,0 +1,3 @@
+source_md5="41306e1aeb775a019be7a979d99cb36c"
+dest_md5="490bbac48759819e5b977936c915c394"
+

.import/MusicVolume1.png-8b307e41993910b033bd2a665cbfc5ff.md5

@@ -0,0 +1,3 @@
+source_md5="36e1ccfd1be6c7f3acf363b9f2cdaf2b"
+dest_md5="95f486f524910134bfeabff3df93ac3d"
+

.import/MusicVolume2.png-7a884ade53c6bbc52021437f6bb8418d.md5

@@ -0,0 +1,3 @@
+source_md5="cd0bb70b1c99a3c930e11575fa954cc9"
+dest_md5="8ba5ddd580e0556e0e90494574b9f5f4"
+

.import/MusicVolume3.png-4556065c35916caee8e7661fb814e73d.md5

@@ -0,0 +1,3 @@
+source_md5="d5c3144ea1848645e460d57954fc4b11"
+dest_md5="88816d991c330488f96b2384eccf464b"
+

.import/SFXVolume1.png-71ddb0fc50fa3d9f89b3d5cd3b7a772a.md5

@@ -0,0 +1,3 @@
+source_md5="c896c4d44bd2790ae022f4c498bfb595"
+dest_md5="a75345f02f906b9ecce6235b7e44067e"
+

.import/SFXVolume2.png-1afa9c2c2442c49d99f4471960a9feae.md5

@@ -0,0 +1,3 @@
+source_md5="654397e6d0c66448a69549a94ee2d6f5"
+dest_md5="065b586c869b1710ad10365f43b704ef"
+

.import/SelectButton.wav-22daca460391460ee3cf8c29d8fc288e.md5

@@ -0,0 +1,3 @@
+source_md5="b2c45fbff0017002f0d8346d5f881c62"
+dest_md5="55e766ae00bf8fd0ce7991075b5020b8"
+

.import/greenExplodes.wav-d82703c3b81826bab057136adb820c60.md5

@@ -0,0 +1,3 @@
+source_md5="72493e6db18982e92e710c752ba0a923"
+dest_md5="110364a04533b3146bc1555964aac31d"
+

.import/hoverButton.wav-7e9081d0e1c0d25ca7f506c66f81f62c.md5

@@ -0,0 +1,3 @@
+source_md5="da83a19fae3800a8c0fe51d400d504f9"
+dest_md5="4a7fe121b19adab3b098e0ee4e20b750"
+

Ball/AudioStreamPlayer.gd

@@ -0,0 +1,5 @@
+extends AudioStreamPlayer
+
+
+func _on_AudioStreamPlayer_finished():
+	playing = false

Ball/Ball.gd

@@ -81,6 +81,7 @@ func spawn_trajectory_dots():
 		can_spawn_trajectory_dot = true
 		trajectoryTimer.start()
 func reset_ball():
+	GameStats.multiplier = 1
 	# delete the ball when the level is won, so it doesn't respawn
 	if GameStats.level_won:
 		queue_free()

Ball/Ball.tscn

@@ -1,9 +1,10 @@
-[gd_scene load_steps=6 format=2]
+[gd_scene load_steps=7 format=2]
 
 [ext_resource path="res://Ball/sprite.png" type="Texture" id=1]
 [ext_resource path="res://Ball/Ball.gd" type="Script" id=2]
 [ext_resource path="res://Ball/Ball.tres" type="PhysicsMaterial" id=3]
 [ext_resource path="res://Ball/BallCollision.tscn" type="PackedScene" id=4]
+[ext_resource path="res://SFX/Scratch/BallReset.wav" type="AudioStream" id=5]
 
 [sub_resource type="Animation" id=1]
 resource_name = "reset"
@@ -33,6 +34,20 @@ tracks/1/keys = {
 "points": PoolRealArray( -10, -0.25, 0, 0.25, 0, 0, -0.25, 0, 0.25, 0 ),
 "times": PoolRealArray( 0, 1.5 )
 }
+tracks/2/type = "audio"
+tracks/2/path = NodePath("AudioStreamPlayer")
+tracks/2/interp = 1
+tracks/2/loop_wrap = true
+tracks/2/imported = false
+tracks/2/enabled = true
+tracks/2/keys = {
+"clips": [ {
+"end_offset": 0.0,
+"start_offset": 0.0,
+"stream": ExtResource( 5 )
+} ],
+"times": PoolRealArray( 0 )
+}
 
 [node name="Ball" type="RigidBody2D"]
 collision_layer = 4
@@ -61,4 +76,7 @@ wait_time = 0.1
 [node name="AnimationPlayer" type="AnimationPlayer" parent="."]
 anims/reset = SubResource( 1 )
 
+[node name="AudioStreamPlayer" type="AudioStreamPlayer" parent="."]
+stream = ExtResource( 5 )
+
 [connection signal="timeout" from="TrajectoryTimer" to="." method="_on_TrajectoryTimer_timeout"]

Effects/FadeIn.tscn

@@ -1,10 +1,13 @@
-[gd_scene load_steps=5 format=2]
+[gd_scene load_steps=7 format=2]
 
 [ext_resource path="res://Effects/transitionPattern.png" type="Texture" id=1]
 [ext_resource path="res://Effects/Transition.gd" type="Script" id=2]
+[ext_resource path="res://SFX/Scratch/Fadeout.ogg" type="AudioStream" id=3]
+[ext_resource path="res://SFX/Scratch/Fadein.ogg" type="AudioStream" id=4]
 
 [sub_resource type="Animation" id=1]
 resource_name = "FadeIn"
+length = 0.7
 step = 0.05
 tracks/0/type = "bezier"
 tracks/0/path = NodePath("TransitionSprite:position:x")
@@ -14,7 +17,7 @@ tracks/0/imported = false
 tracks/0/enabled = true
 tracks/0/keys = {
 "points": PoolRealArray( 0, -0.25, 0, 0.25, 0, 384, -0.25, 0, 0.25, 0 ),
-"times": PoolRealArray( 0, 1 )
+"times": PoolRealArray( 0, 0.7 )
 }
 tracks/1/type = "method"
 tracks/1/path = NodePath(".")
@@ -23,7 +26,7 @@ tracks/1/loop_wrap = true
 tracks/1/imported = false
 tracks/1/enabled = true
 tracks/1/keys = {
-"times": PoolRealArray( 1 ),
+"times": PoolRealArray( 0.7 ),
 "transitions": PoolRealArray( 1 ),
 "values": [ {
 "args": [  ],
@@ -33,7 +36,7 @@ tracks/1/keys = {
 
 [sub_resource type="Animation" id=2]
 resource_name = "FadeOut"
-length = 0.75
+length = 1.3
 loop = true
 step = 0.05
 tracks/0/type = "value"
@@ -43,10 +46,10 @@ tracks/0/loop_wrap = true
 tracks/0/imported = false
 tracks/0/enabled = true
 tracks/0/keys = {
-"times": PoolRealArray( 0, 0.75 ),
-"transitions": PoolRealArray( 1, 1 ),
+"times": PoolRealArray( 0, 0.4, 1.25 ),
+"transitions": PoolRealArray( 1, 1, 1 ),
 "update": 0,
-"values": [ Vector2( 384, 0 ), Vector2( 0, 0 ) ]
+"values": [ Vector2( 384, 0 ), Vector2( 0, 0 ), Vector2( 0, 0 ) ]
 }
 tracks/1/type = "method"
 tracks/1/path = NodePath(".")
@@ -55,13 +58,27 @@ tracks/1/loop_wrap = true
 tracks/1/imported = false
 tracks/1/enabled = true
 tracks/1/keys = {
-"times": PoolRealArray( 0.75 ),
+"times": PoolRealArray( 1.25 ),
 "transitions": PoolRealArray( 1 ),
 "values": [ {
 "args": [  ],
 "method": "finish_animation"
 } ]
 }
+tracks/2/type = "audio"
+tracks/2/path = NodePath("AnimationPlayer/FadeoutSound")
+tracks/2/interp = 1
+tracks/2/loop_wrap = true
+tracks/2/imported = false
+tracks/2/enabled = true
+tracks/2/keys = {
+"clips": [ {
+"end_offset": 0.153926,
+"start_offset": 0.0,
+"stream": ExtResource( 3 )
+} ],
+"times": PoolRealArray( 0 )
+}
 
 [node name="Transition" type="CanvasLayer"]
 layer = 128
@@ -76,6 +93,12 @@ region_enabled = true
 region_rect = Rect2( 0, 0, 768, 216 )
 
 [node name="AnimationPlayer" type="AnimationPlayer" parent="."]
-playback_process_mode = 0
 anims/FadeIn = SubResource( 1 )
 anims/FadeOut = SubResource( 2 )
+
+[node name="FadeInSound" type="AudioStreamPlayer" parent="."]
+pause_mode = 1
+stream = ExtResource( 4 )
+bus = "SFX"
+
+[connection signal="finished" from="FadeInSound" to="." method="_on_FadeInSound_finished"]

Effects/FadeOut.tscn

@@ -1,10 +1,13 @@
-[gd_scene load_steps=3 format=2]
+[gd_scene load_steps=4 format=2]
 
 [ext_resource path="res://Effects/FadeIn.tscn" type="PackedScene" id=1]
 [ext_resource path="res://Effects/FadeOut.gd" type="Script" id=2]
+[ext_resource path="res://SFX/Scratch/Fadeout.ogg" type="AudioStream" id=3]
 
 [node name="FadeOut" instance=ExtResource( 1 )]
 script = ExtResource( 2 )
 
-[node name="TransitionSprite" parent="." index="0"]
-position = Vector2( 0, 0 )
+[node name="FadeoutSound" type="AudioStreamPlayer" parent="AnimationPlayer" index="0"]
+pause_mode = 1
+stream = ExtResource( 3 )
+bus = "SFX"

Effects/Transition.gd

@@ -5,6 +5,7 @@ onready var animation = $AnimationPlayer
 func _ready():
 	$TransitionSprite.visible = true
 	animation.play("FadeIn")
+	$FadeInSound.play(0)
 
 func finish_animation():
 	queue_free()

Flipper/Flipper.gd

@@ -4,3 +4,5 @@ func _physics_process(delta):
 	if Input.is_action_pressed("shoot"):
 		rotation = lerp(rotation, -90, 0.9)
 	else: rotation = 0
+func bouncy():
+	pass

Flipper/Flipper.tscn

@@ -4,10 +4,12 @@
 [ext_resource path="res://Flipper/Flipper.gd" type="Script" id=2]
 
 [node name="Flipper" type="KinematicBody2D"]
-position = Vector2( 309, 143 )
 motion/sync_to_physics = true
 script = ExtResource( 2 )
 
 [node name="Sprite" type="Sprite" parent="."]
 position = Vector2( -11, 0 )
 texture = ExtResource( 1 )
+
+[node name="CollisionPolygon2D" type="CollisionPolygon2D" parent="."]
+polygon = PoolVector2Array( 3, -5, -2, -5, -3, -4, -10, -4, -17, -4, -18, -3, -20, -3, -21, -2, -22, -2, -23, -1, -24, -1, -25, 0, -26, 0, -27, 1, -27, 2, -26, 3, -25, 3, -24, 4, -20, 4, -19, 5, 2, 5, 3, 4, 4, 3, 4, 2, 5, 1, 5, -2, 4, -3, 4, -4 )

Menu/Buttons/AudioSliders/MusicVolume1.png.import

@@ -0,0 +1,34 @@
+[remap]
+
+importer="texture"
+type="StreamTexture"
+path="res://.import/MusicVolume1.png-8b307e41993910b033bd2a665cbfc5ff.stex"
+metadata={
+"vram_texture": false
+}
+
+[deps]
+
+source_file="res://Menu/Buttons/AudioSliders/MusicVolume1.png"
+dest_files=[ "res://.import/MusicVolume1.png-8b307e41993910b033bd2a665cbfc5ff.stex" ]
+
+[params]
+
+compress/mode=0
+compress/lossy_quality=0.7
+compress/hdr_mode=0
+compress/bptc_ldr=0
+compress/normal_map=0
+flags/repeat=0
+flags/filter=false
+flags/mipmaps=false
+flags/anisotropic=false
+flags/srgb=2
+process/fix_alpha_border=true
+process/premult_alpha=false
+process/HDR_as_SRGB=false
+process/invert_color=false
+stream=false
+size_limit=0
+detect_3d=false
+svg/scale=1.0

Menu/Buttons/AudioSliders/MusicVolume2.png.import

@@ -0,0 +1,34 @@
+[remap]
+
+importer="texture"
+type="StreamTexture"
+path="res://.import/MusicVolume2.png-7a884ade53c6bbc52021437f6bb8418d.stex"
+metadata={
+"vram_texture": false
+}
+
+[deps]
+
+source_file="res://Menu/Buttons/AudioSliders/MusicVolume2.png"
+dest_files=[ "res://.import/MusicVolume2.png-7a884ade53c6bbc52021437f6bb8418d.stex" ]
+
+[params]
+
+compress/mode=0
+compress/lossy_quality=0.7
+compress/hdr_mode=0
+compress/bptc_ldr=0
+compress/normal_map=0
+flags/repeat=0
+flags/filter=false
+flags/mipmaps=false
+flags/anisotropic=false
+flags/srgb=2
+process/fix_alpha_border=true
+process/premult_alpha=false
+process/HDR_as_SRGB=false
+process/invert_color=false
+stream=false
+size_limit=0
+detect_3d=false
+svg/scale=1.0

Menu/Buttons/AudioSliders/MusicVolume3.png.import

@@ -0,0 +1,34 @@
+[remap]
+
+importer="texture"
+type="StreamTexture"
+path="res://.import/MusicVolume3.png-4556065c35916caee8e7661fb814e73d.stex"
+metadata={
+"vram_texture": false
+}
+
+[deps]
+
+source_file="res://Menu/Buttons/AudioSliders/MusicVolume3.png"
+dest_files=[ "res://.import/MusicVolume3.png-4556065c35916caee8e7661fb814e73d.stex" ]
+
+[params]
+
+compress/mode=0
+compress/lossy_quality=0.7
+compress/hdr_mode=0
+compress/bptc_ldr=0
+compress/normal_map=0
+flags/repeat=0
+flags/filter=false
+flags/mipmaps=false
+flags/anisotropic=false
+flags/srgb=2
+process/fix_alpha_border=true
+process/premult_alpha=false
+process/HDR_as_SRGB=false
+process/invert_color=false
+stream=false
+size_limit=0
+detect_3d=false
+svg/scale=1.0

Menu/Buttons/AudioSliders/SFXVolume1.png.import

@@ -0,0 +1,34 @@
+[remap]
+
+importer="texture"
+type="StreamTexture"
+path="res://.import/SFXVolume1.png-71ddb0fc50fa3d9f89b3d5cd3b7a772a.stex"
+metadata={
+"vram_texture": false
+}
+
+[deps]
+
+source_file="res://Menu/Buttons/AudioSliders/SFXVolume1.png"
+dest_files=[ "res://.import/SFXVolume1.png-71ddb0fc50fa3d9f89b3d5cd3b7a772a.stex" ]
+
+[params]
+
+compress/mode=0
+compress/lossy_quality=0.7
+compress/hdr_mode=0
+compress/bptc_ldr=0
+compress/normal_map=0
+flags/repeat=0
+flags/filter=false
+flags/mipmaps=false
+flags/anisotropic=false
+flags/srgb=2
+process/fix_alpha_border=true
+process/premult_alpha=false
+process/HDR_as_SRGB=false
+process/invert_color=false
+stream=false
+size_limit=0
+detect_3d=false
+svg/scale=1.0

Menu/Buttons/AudioSliders/SFXVolume2.png.import

@@ -0,0 +1,34 @@
+[remap]
+
+importer="texture"
+type="StreamTexture"
+path="res://.import/SFXVolume2.png-1afa9c2c2442c49d99f4471960a9feae.stex"
+metadata={
+"vram_texture": false
+}
+
+[deps]
+
+source_file="res://Menu/Buttons/AudioSliders/SFXVolume2.png"
+dest_files=[ "res://.import/SFXVolume2.png-1afa9c2c2442c49d99f4471960a9feae.stex" ]
+
+[params]
+
+compress/mode=0
+compress/lossy_quality=0.7
+compress/hdr_mode=0
+compress/bptc_ldr=0
+compress/normal_map=0
+flags/repeat=0
+flags/filter=false
+flags/mipmaps=false
+flags/anisotropic=false
+flags/srgb=2
+process/fix_alpha_border=true
+process/premult_alpha=false
+process/HDR_as_SRGB=false
+process/invert_color=false
+stream=false
+size_limit=0
+detect_3d=false
+svg/scale=1.0

Menu/Buttons/AudioSliders/VolumeSlider.gd

@@ -0,0 +1,9 @@
+extends HSlider
+
+export var bus_channel = "Master"
+
+func _ready():
+	value = db2linear(AudioServer.get_bus_volume_db(AudioServer.get_bus_index(bus_channel)))
+
+func _on_MusicVolumeSlider_value_changed(value):
+	AudioServer.set_bus_volume_db(AudioServer.get_bus_index(bus_channel),  linear2db(value))

Menu/Buttons/AudioSliders/VolumeSlider.tscn

@@ -0,0 +1,19 @@
+[gd_scene load_steps=3 format=2]
+
+[ext_resource path="res://Menu/Buttons/AudioSliders/VolumeSlider.gd" type="Script" id=1]
+[ext_resource path="res://Menu/Theme.tres" type="Theme" id=2]
+
+[node name="VolumeSlider" type="HSlider"]
+margin_right = 500.0
+margin_bottom = 32.0
+grow_vertical = 2
+rect_min_size = Vector2( 100, 32 )
+theme = ExtResource( 2 )
+max_value = 1.0
+step = 0.025
+script = ExtResource( 1 )
+__meta__ = {
+"_edit_use_anchors_": false
+}
+
+[connection signal="value_changed" from="." to="." method="_on_MusicVolumeSlider_value_changed"]

Menu/Buttons/ButtonSFX.gd

@@ -0,0 +1,8 @@
+extends Node
+
+func on_hover():
+	$Hover.play(0)
+
+func on_select():
+	$Select.play(0)
+

Menu/Buttons/ButtonSFX.tscn

@@ -0,0 +1,15 @@
+[gd_scene load_steps=4 format=2]
+
+[ext_resource path="res://SFX/Scratch/HoverButton.wav" type="AudioStream" id=1]
+[ext_resource path="res://SFX/Scratch/SelectButton.wav" type="AudioStream" id=2]
+[ext_resource path="res://Menu/Buttons/ButtonSFX.gd" type="Script" id=3]
+
+[node name="ButtonSFX" type="Node"]
+script = ExtResource( 3 )
+
+[node name="Hover" type="AudioStreamPlayer" parent="."]
+stream = ExtResource( 1 )
+bus = "SFX"
+
+[node name="Select" type="AudioStreamPlayer" parent="."]
+stream = ExtResource( 2 )

Menu/Buttons/Fullscreen/FullscreenButton.tscn

@@ -1,9 +1,10 @@
-[gd_scene load_steps=5 format=2]
+[gd_scene load_steps=6 format=2]
 
 [ext_resource path="res://Menu/Buttons/Fullscreen/fullscreen1.png" type="Texture" id=1]
 [ext_resource path="res://Menu/Buttons/Fullscreen/fullscreen3.png" type="Texture" id=2]
 [ext_resource path="res://Menu/Buttons/Fullscreen/fullscreen2.png" type="Texture" id=3]
 [ext_resource path="res://Menu/Buttons/Fullscreen/FullscreenButton.gd" type="Script" id=4]
+[ext_resource path="res://Menu/Buttons/ButtonSFX.tscn" type="PackedScene" id=5]
 
 [node name="FullscreenButton" type="TextureButton"]
 anchor_right = 1.0
@@ -17,4 +18,9 @@ __meta__ = {
 "_edit_use_anchors_": false
 }
 
+[node name="ButtonSFX" parent="." instance=ExtResource( 5 )]
+
+[connection signal="focus_entered" from="." to="ButtonSFX" method="on_hover"]
+[connection signal="mouse_entered" from="." to="ButtonSFX" method="on_hover"]
+[connection signal="pressed" from="." to="ButtonSFX" method="on_select"]
 [connection signal="toggled" from="." to="." method="_on_FullscreenButton_toggled"]

Menu/Buttons/LevelSelectButton.gd

@@ -1,6 +1,11 @@
 extends Button
 
 export var scene = "res://Menu/MainMenu.tscn"
+export var unlock_points_required = 0
+
+func _ready():
+	if unlock_points_required > GameStats.unlock_points:
+		disabled = true
 
 func _on_SceneSelectButton_pressed():
 	GameStats.set_current_scene(scene)

Menu/Buttons/LevelSelectIconButton.gd

@@ -9,3 +9,4 @@ func _on_LevelSelectIconButton_pressed():
 	var fadeout = Fadeout.instance()
 	fadeout.scene_to_load = scene
 	main.add_child(fadeout)
+	get_tree().paused = false

Menu/Buttons/LevelSelectIconButton.tscn

@@ -1,6 +1,7 @@
-[gd_scene load_steps=2 format=2]
+[gd_scene load_steps=3 format=2]
 
 [ext_resource path="res://Menu/Buttons/LevelSelectIconButton.gd" type="Script" id=1]
+[ext_resource path="res://Menu/Buttons/ButtonSFX.tscn" type="PackedScene" id=2]
 
 [node name="LevelSelectIconButton" type="TextureButton"]
 margin_right = 40.0
@@ -10,4 +11,9 @@ __meta__ = {
 "_edit_use_anchors_": false
 }
 
+[node name="ButtonSFX" parent="." instance=ExtResource( 2 )]
+
+[connection signal="focus_entered" from="." to="ButtonSFX" method="on_hover"]
+[connection signal="mouse_entered" from="." to="ButtonSFX" method="on_hover"]
+[connection signal="pressed" from="." to="ButtonSFX" method="on_select"]
 [connection signal="pressed" from="." to="." method="_on_LevelSelectIconButton_pressed"]

Menu/Buttons/PlayButton.gd

@@ -3,3 +3,5 @@ extends TextureButton
 func _on_PlayButton_pressed():
 	GameStats.restart_level()
 	disabled = true
+	get_tree().paused = false
+	get_parent().visible = false

Menu/Buttons/PlayButton.tscn

@@ -1,9 +1,10 @@
-[gd_scene load_steps=5 format=2]
+[gd_scene load_steps=6 format=2]
 
 [ext_resource path="res://Menu/Icons/Play/Play3.png" type="Texture" id=1]
 [ext_resource path="res://Menu/Icons/Play/Play2.png" type="Texture" id=2]
 [ext_resource path="res://Menu/Icons/Play/Play1.png" type="Texture" id=3]
 [ext_resource path="res://Menu/Buttons/PlayButton.gd" type="Script" id=4]
+[ext_resource path="res://Menu/Buttons/ButtonSFX.tscn" type="PackedScene" id=5]
 
 [node name="PlayButton" type="TextureButton"]
 margin_right = 40.0
@@ -16,4 +17,9 @@ __meta__ = {
 "_edit_use_anchors_": false
 }
 
+[node name="ButtonSFX" parent="." instance=ExtResource( 5 )]
+
+[connection signal="focus_entered" from="." to="ButtonSFX" method="on_hover"]
+[connection signal="mouse_entered" from="." to="ButtonSFX" method="on_hover"]
 [connection signal="pressed" from="." to="." method="_on_PlayButton_pressed"]
+[connection signal="pressed" from="." to="ButtonSFX" method="on_select"]

Menu/Buttons/RestartButton.gd

@@ -5,3 +5,4 @@ extends TextureButton
 func _on_RestartButton_pressed():
 	GameStats.restart_level()
 	disabled = true
+	

Menu/Buttons/RestartButton.tscn

@@ -1,9 +1,10 @@
-[gd_scene load_steps=5 format=2]
+[gd_scene load_steps=6 format=2]
 
 [ext_resource path="res://Menu/Icons/Replay/replayIcon3.png" type="Texture" id=1]
 [ext_resource path="res://Menu/Icons/Replay/replayIcon2.png" type="Texture" id=2]
 [ext_resource path="res://Menu/Icons/Replay/replayIcon1.png" type="Texture" id=3]
 [ext_resource path="res://Menu/Buttons/RestartButton.gd" type="Script" id=4]
+[ext_resource path="res://Menu/Buttons/ButtonSFX.tscn" type="PackedScene" id=5]
 
 [node name="RestartButton" type="TextureButton"]
 margin_right = 32.0
@@ -16,4 +17,9 @@ __meta__ = {
 "_edit_use_anchors_": false
 }
 
+[node name="ButtonSFX" parent="." instance=ExtResource( 5 )]
+
+[connection signal="focus_entered" from="." to="ButtonSFX" method="on_hover"]
+[connection signal="mouse_entered" from="." to="ButtonSFX" method="on_hover"]
+[connection signal="pressed" from="." to="ButtonSFX" method="on_select"]
 [connection signal="pressed" from="." to="." method="_on_RestartButton_pressed"]

Menu/Buttons/SceneSelectButton.tscn

@@ -1,7 +1,8 @@
-[gd_scene load_steps=3 format=2]
+[gd_scene load_steps=4 format=2]
 
 [ext_resource path="res://Menu/Theme.tres" type="Theme" id=1]
 [ext_resource path="res://Menu/Buttons/LevelSelectButton.gd" type="Script" id=2]
+[ext_resource path="res://Menu/Buttons/ButtonSFX.tscn" type="PackedScene" id=3]
 
 [node name="SceneSelectButton" type="Button"]
 anchor_right = 1.0
@@ -15,4 +16,9 @@ __meta__ = {
 "_edit_use_anchors_": false
 }
 
+[node name="ButtonSFX" parent="." instance=ExtResource( 3 )]
+
+[connection signal="focus_entered" from="." to="ButtonSFX" method="on_hover"]
+[connection signal="mouse_entered" from="." to="ButtonSFX" method="on_hover"]
+[connection signal="pressed" from="." to="ButtonSFX" method="on_select"]
 [connection signal="pressed" from="." to="." method="_on_SceneSelectButton_pressed"]

Menu/MainMenu.tscn

@@ -1,4 +1,4 @@
-[gd_scene load_steps=9 format=2]
+[gd_scene load_steps=14 format=2]
 
 [ext_resource path="res://Menu/Theme.tres" type="Theme" id=1]
 [ext_resource path="res://Menu/Buttons/SceneSelectButton.tscn" type="PackedScene" id=2]
@@ -8,6 +8,11 @@
 [ext_resource path="res://icon.png" type="Texture" id=6]
 [ext_resource path="res://Menu/LevelInfo.tscn" type="PackedScene" id=7]
 [ext_resource path="res://Pegs/Pink/Pink.png" type="Texture" id=8]
+[ext_resource path="res://Menu/Buttons/AudioSliders/VolumeSlider.tscn" type="PackedScene" id=9]
+[ext_resource path="res://Menu/Buttons/AudioSliders/MusicVolume1.png" type="Texture" id=10]
+[ext_resource path="res://Menu/Buttons/AudioSliders/MusicVolume2.png" type="Texture" id=11]
+[ext_resource path="res://Menu/Buttons/AudioSliders/SFXVolume1.png" type="Texture" id=12]
+[ext_resource path="res://Menu/Buttons/AudioSliders/SFXVolume2.png" type="Texture" id=13]
 
 [node name="CanvasLayer" type="CanvasLayer"]
 
@@ -55,13 +60,27 @@ __meta__ = {
 margin_top = 133.0
 margin_right = 368.0
 margin_bottom = 165.0
-alignment = 2
+alignment = 1
+
+[node name="SFX Volume" parent="Control/TabContainer/Main Menu/VBoxContainer/HBoxContainer" instance=ExtResource( 9 )]
+margin_left = 64.0
+margin_right = 164.0
+custom_icons/grabber_highlight = ExtResource( 13 )
+custom_icons/grabber = ExtResource( 12 )
+bus_channel = "SFX"
+
+[node name="Music Volume" parent="Control/TabContainer/Main Menu/VBoxContainer/HBoxContainer" instance=ExtResource( 9 )]
+margin_left = 168.0
+margin_right = 268.0
+custom_icons/grabber_highlight = ExtResource( 11 )
+custom_icons/grabber = ExtResource( 10 )
+bus_channel = "Music"
 
 [node name="FullscreenButton" parent="Control/TabContainer/Main Menu/VBoxContainer/HBoxContainer" instance=ExtResource( 5 )]
 anchor_right = 0.0
 anchor_bottom = 0.0
-margin_left = 336.0
-margin_right = 368.0
+margin_left = 272.0
+margin_right = 304.0
 margin_bottom = 32.0
 
 [node name="Levels" type="Tabs" parent="Control/TabContainer"]
@@ -84,9 +103,12 @@ __meta__ = {
 }
 
 [node name="LevelInfo" parent="Control/TabContainer/Levels/HBoxContainer" instance=ExtResource( 7 )]
+margin_left = 157.0
+margin_right = 172.0
+alignment = 1
 
 [node name="LevelList" type="ScrollContainer" parent="Control/TabContainer/Levels/HBoxContainer"]
-margin_left = 154.0
+margin_left = 176.0
 margin_right = 368.0
 margin_bottom = 165.0
 theme = ExtResource( 1 )
@@ -102,72 +124,74 @@ margin_bottom = 335.0
 [node name="LevelSelectButton" parent="Control/TabContainer/Levels/HBoxContainer/LevelList/LevelListHBox" instance=ExtResource( 2 )]
 anchor_right = 0.0
 anchor_bottom = 0.0
-margin_right = 190.0
-margin_bottom = 40.0
+margin_right = 168.0
+margin_bottom = 25.0
 icon = ExtResource( 8 )
 scene = "res://Stages/EmptyStage.tscn"
 
 [node name="LevelSelectButton3" parent="Control/TabContainer/Levels/HBoxContainer/LevelList/LevelListHBox" instance=ExtResource( 2 )]
 anchor_right = 0.0
 anchor_bottom = 0.0
-margin_top = 88.0
-margin_right = 190.0
-margin_bottom = 128.0
+margin_top = 29.0
+margin_right = 168.0
+margin_bottom = 69.0
 icon = ExtResource( 6 )
 scene = "res://Stages/EmptyStage.tscn"
+unlock_points_required = 10
 
 [node name="LevelSelectButton4" parent="Control/TabContainer/Levels/HBoxContainer/LevelList/LevelListHBox" instance=ExtResource( 2 )]
 anchor_right = 0.0
 anchor_bottom = 0.0
-margin_top = 132.0
-margin_right = 190.0
-margin_bottom = 172.0
+margin_top = 73.0
+margin_right = 168.0
+margin_bottom = 113.0
 text = "> piss"
 icon = ExtResource( 6 )
 scene = "res://Stages/EmptyStage.tscn"
+unlock_points_required = 20
 
 [node name="LevelSelectButton5" parent="Control/TabContainer/Levels/HBoxContainer/LevelList/LevelListHBox" instance=ExtResource( 2 )]
 anchor_right = 0.0
 anchor_bottom = 0.0
-margin_top = 176.0
-margin_right = 190.0
-margin_bottom = 216.0
+margin_top = 117.0
+margin_right = 168.0
+margin_bottom = 157.0
 icon = ExtResource( 6 )
 scene = "res://Stages/EmptyStage.tscn"
 
 [node name="LevelSelectButton6" parent="Control/TabContainer/Levels/HBoxContainer/LevelList/LevelListHBox" instance=ExtResource( 2 )]
 anchor_right = 0.0
 anchor_bottom = 0.0
-margin_top = 220.0
-margin_right = 190.0
-margin_bottom = 260.0
+margin_top = 161.0
+margin_right = 168.0
+margin_bottom = 201.0
 icon = ExtResource( 6 )
 scene = "res://Stages/EmptyStage.tscn"
 
 [node name="LevelSelectButton7" parent="Control/TabContainer/Levels/HBoxContainer/LevelList/LevelListHBox" instance=ExtResource( 2 )]
 anchor_right = 0.0
 anchor_bottom = 0.0
-margin_top = 264.0
-margin_right = 190.0
-margin_bottom = 304.0
+margin_top = 205.0
+margin_right = 168.0
+margin_bottom = 245.0
 icon = ExtResource( 6 )
 scene = "res://Stages/EmptyStage.tscn"
 
 [node name="LevelSelectButton8" parent="Control/TabContainer/Levels/HBoxContainer/LevelList/LevelListHBox" instance=ExtResource( 2 )]
 anchor_right = 0.0
 anchor_bottom = 0.0
-margin_top = 308.0
-margin_right = 190.0
-margin_bottom = 348.0
+margin_top = 249.0
+margin_right = 168.0
+margin_bottom = 289.0
 icon = ExtResource( 6 )
 scene = "res://Stages/EmptyStage.tscn"
 
 [node name="LevelSelectButton9" parent="Control/TabContainer/Levels/HBoxContainer/LevelList/LevelListHBox" instance=ExtResource( 2 )]
 anchor_right = 0.0
 anchor_bottom = 0.0
-margin_top = 352.0
-margin_right = 190.0
-margin_bottom = 392.0
+margin_top = 293.0
+margin_right = 168.0
+margin_bottom = 333.0
 icon = ExtResource( 6 )
 scene = "res://Stages/EmptyStage.tscn"
 

Menu/Pause.gd

@@ -0,0 +1,9 @@
+extends CenterContainer
+
+func _process(delta):
+	if Input.is_action_just_pressed("pause"):
+		_on_pause_button_pressed()
+
+func _on_pause_button_pressed():
+	get_tree().paused = !get_tree().paused
+	visible = !visible

Menu/Pause.tscn

@@ -0,0 +1,95 @@
+[gd_scene load_steps=17 format=2]
+
+[ext_resource path="res://Menu/Buttons/RestartButton.tscn" type="PackedScene" id=1]
+[ext_resource path="res://Menu/Icons/Play/Play2.png" type="Texture" id=2]
+[ext_resource path="res://Menu/Icons/Home/homeIcon1.png" type="Texture" id=3]
+[ext_resource path="res://Menu/Icons/Home/homeIcon2.png" type="Texture" id=4]
+[ext_resource path="res://Menu/Icons/Home/homeIcon3.png" type="Texture" id=5]
+[ext_resource path="res://Menu/Buttons/LevelSelectIconButton.tscn" type="PackedScene" id=6]
+[ext_resource path="res://Menu/Pause.gd" type="Script" id=7]
+[ext_resource path="res://Menu/Icons/Play/Play1.png" type="Texture" id=8]
+[ext_resource path="res://Menu/Icons/Play/Play3.png" type="Texture" id=9]
+[ext_resource path="res://Menu/Buttons/AudioSliders/SFXVolume2.png" type="Texture" id=10]
+[ext_resource path="res://Menu/Buttons/AudioSliders/SFXVolume1.png" type="Texture" id=11]
+[ext_resource path="res://Menu/Buttons/AudioSliders/VolumeSlider.tscn" type="PackedScene" id=12]
+[ext_resource path="res://Menu/Buttons/AudioSliders/MusicVolume1.png" type="Texture" id=13]
+[ext_resource path="res://Menu/Buttons/AudioSliders/MusicVolume2.png" type="Texture" id=14]
+[ext_resource path="res://Menu/Theme.tres" type="Theme" id=15]
+[ext_resource path="res://Menu/Buttons/Fullscreen/FullscreenButton.tscn" type="PackedScene" id=16]
+
+[node name="Pause" type="CanvasLayer"]
+pause_mode = 2
+
+[node name="Pause" type="CenterContainer" parent="."]
+visible = false
+anchor_right = 1.0
+anchor_bottom = 1.0
+theme = ExtResource( 15 )
+script = ExtResource( 7 )
+__meta__ = {
+"_edit_use_anchors_": false
+}
+
+[node name="PanelContainer" type="PanelContainer" parent="Pause"]
+margin_left = 190.0
+margin_top = 106.0
+margin_right = 194.0
+margin_bottom = 110.0
+theme = ExtResource( 15 )
+
+[node name="HBoxContainer" type="VBoxContainer" parent="Pause/PanelContainer"]
+margin_left = 2.0
+margin_top = 2.0
+margin_right = 142.0
+margin_bottom = 106.0
+
+[node name="VBoxContainer" type="HBoxContainer" parent="Pause/PanelContainer/HBoxContainer"]
+margin_right = 140.0
+margin_bottom = 32.0
+
+[node name="FullscreenButton" parent="Pause/PanelContainer/HBoxContainer/VBoxContainer" instance=ExtResource( 16 )]
+anchor_right = 0.0
+anchor_bottom = 0.0
+margin_right = 32.0
+margin_bottom = 32.0
+
+[node name="LevelSelectIconButton" parent="Pause/PanelContainer/HBoxContainer/VBoxContainer" instance=ExtResource( 6 )]
+margin_left = 36.0
+margin_right = 68.0
+margin_bottom = 32.0
+texture_normal = ExtResource( 3 )
+texture_pressed = ExtResource( 5 )
+texture_hover = ExtResource( 4 )
+
+[node name="RestartButton" parent="Pause/PanelContainer/HBoxContainer/VBoxContainer" instance=ExtResource( 1 )]
+margin_left = 72.0
+margin_right = 104.0
+margin_bottom = 32.0
+
+[node name="Resume" type="TextureButton" parent="Pause/PanelContainer/HBoxContainer/VBoxContainer"]
+margin_left = 108.0
+margin_right = 140.0
+margin_bottom = 32.0
+texture_normal = ExtResource( 8 )
+texture_pressed = ExtResource( 9 )
+texture_hover = ExtResource( 2 )
+
+[node name="SFX Volume" parent="Pause/PanelContainer/HBoxContainer" instance=ExtResource( 12 )]
+margin_top = 36.0
+margin_right = 140.0
+margin_bottom = 68.0
+custom_icons/grabber_highlight = ExtResource( 10 )
+custom_icons/grabber = ExtResource( 11 )
+bus_channel = "SFX"
+
+[node name="Music Volume" parent="Pause/PanelContainer/HBoxContainer" instance=ExtResource( 12 )]
+margin_top = 72.0
+margin_right = 140.0
+margin_bottom = 104.0
+custom_icons/grabber_highlight = ExtResource( 14 )
+custom_icons/grabber = ExtResource( 13 )
+bus_channel = "Music"
+
+[connection signal="pressed" from="Pause/PanelContainer/HBoxContainer/VBoxContainer/LevelSelectIconButton" to="Pause" method="_on_pause_button_pressed"]
+[connection signal="pressed" from="Pause/PanelContainer/HBoxContainer/VBoxContainer/RestartButton" to="Pause" method="_on_pause_button_pressed"]
+[connection signal="pressed" from="Pause/PanelContainer/HBoxContainer/VBoxContainer/Resume" to="Pause" method="_on_pause_button_pressed"]

Menu/Theme.tres

@@ -1,4 +1,4 @@
-[gd_resource type="Theme" load_steps=22 format=2]
+[gd_resource type="Theme" load_steps=26 format=2]
 
 [ext_resource path="res://Font/Yoster-island/Yoster16.tres" type="DynamicFont" id=1]
 [ext_resource path="res://Font/Yoster-island/Yoster.ttf" type="DynamicFontData" id=2]
@@ -60,12 +60,40 @@ border_width_right = 2
 border_width_bottom = 2
 border_color = Color( 0.454902, 0.337255, 0.607843, 1 )
 
-[sub_resource type="DynamicFont" id=7]
+[sub_resource type="StyleBoxFlat" id=7]
+bg_color = Color( 0.847059, 0.74902, 0.847059, 1 )
+border_width_left = 2
+border_width_top = 2
+border_width_right = 2
+border_width_bottom = 2
+border_color = Color( 0.454902, 0.337255, 0.607843, 1 )
+anti_aliasing = false
+
+[sub_resource type="StyleBoxFlat" id=8]
+bg_color = Color( 0.588235, 0.984314, 0.780392, 1 )
+border_width_left = 2
+border_width_top = 2
+border_width_right = 2
+border_width_bottom = 2
+border_color = Color( 0.454902, 0.337255, 0.607843, 1 )
+anti_aliasing = false
+
+[sub_resource type="StyleBoxFlat" id=9]
+bg_color = Color( 0.847059, 0.74902, 0.847059, 1 )
+border_width_left = 2
+border_width_top = 2
+border_width_right = 2
+border_width_bottom = 2
+border_color = Color( 0.454902, 0.337255, 0.607843, 1 )
+expand_margin_top = 14.0
+expand_margin_bottom = 14.0
+
+[sub_resource type="DynamicFont" id=10]
 size = 18
 outline_color = Color( 0.847059, 0.74902, 0.847059, 1 )
 font_data = ExtResource( 2 )
 
-[sub_resource type="StyleBoxFlat" id=8]
+[sub_resource type="StyleBoxFlat" id=11]
 bg_color = Color( 0.847059, 0.74902, 0.847059, 1 )
 border_width_left = 1
 border_width_top = 1
@@ -73,14 +101,31 @@ border_width_right = 1
 border_width_bottom = 1
 border_color = Color( 0.454902, 0.337255, 0.607843, 1 )
 
-[sub_resource type="StyleBoxFlat" id=9]
+[sub_resource type="StyleBoxFlat" id=23]
+content_margin_left = 2.0
+content_margin_right = 2.0
+content_margin_top = 2.0
+content_margin_bottom = 2.0
+bg_color = Color( 0.847059, 0.74902, 0.847059, 1 )
+border_width_left = 2
+border_width_top = 2
+border_width_right = 2
+border_width_bottom = 2
+border_color = Color( 0.454902, 0.337255, 0.607843, 1 )
+corner_detail = 1
+expand_margin_left = 2.0
+expand_margin_right = 2.0
+expand_margin_top = 2.0
+expand_margin_bottom = 2.0
+
+[sub_resource type="StyleBoxFlat" id=12]
 content_margin_left = 2.0
 content_margin_right = 2.0
 content_margin_top = 2.0
 content_margin_bottom = 2.0
 bg_color = Color( 0.847059, 0.74902, 0.847059, 1 )
 
-[sub_resource type="StyleBoxFlat" id=10]
+[sub_resource type="StyleBoxFlat" id=13]
 content_margin_left = 4.0
 content_margin_right = 4.0
 content_margin_top = 4.0
@@ -93,7 +138,7 @@ border_width_bottom = 2
 border_color = Color( 0.454902, 0.337255, 0.607843, 1 )
 anti_aliasing = false
 
-[sub_resource type="StyleBoxFlat" id=11]
+[sub_resource type="StyleBoxFlat" id=14]
 content_margin_left = 4.0
 content_margin_right = 4.0
 content_margin_top = 4.0
@@ -105,7 +150,7 @@ border_width_right = 1
 border_width_bottom = 1
 border_color = Color( 0.454902, 0.337255, 0.607843, 1 )
 
-[sub_resource type="StyleBoxFlat" id=12]
+[sub_resource type="StyleBoxFlat" id=15]
 content_margin_left = 4.0
 content_margin_right = 4.0
 content_margin_top = 4.0
@@ -118,15 +163,15 @@ border_width_bottom = 1
 border_color = Color( 0.454902, 0.337255, 0.607843, 1 )
 anti_aliasing = false
 
-[sub_resource type="StyleBoxFlat" id=13]
+[sub_resource type="StyleBoxFlat" id=16]
 bg_color = Color( 0.454902, 0.337255, 0.607843, 1 )
 
-[sub_resource type="StyleBoxFlat" id=14]
+[sub_resource type="StyleBoxFlat" id=17]
 
-[sub_resource type="StyleBoxFlat" id=15]
+[sub_resource type="StyleBoxFlat" id=18]
 bg_color = Color( 0.847059, 0.74902, 0.847059, 1 )
 
-[sub_resource type="StyleBoxFlat" id=16]
+[sub_resource type="StyleBoxFlat" id=19]
 bg_color = Color( 0.847059, 0.74902, 0.847059, 1 )
 border_width_left = 2
 border_width_top = 2
@@ -134,7 +179,7 @@ border_width_right = 2
 border_width_bottom = 2
 border_color = Color( 0.454902, 0.337255, 0.607843, 1 )
 
-[sub_resource type="StyleBoxFlat" id=17]
+[sub_resource type="StyleBoxFlat" id=20]
 bg_color = Color( 1, 0.701961, 0.796078, 1 )
 border_width_left = 2
 border_width_top = 2
@@ -142,7 +187,7 @@ border_width_right = 2
 border_width_bottom = 2
 border_color = Color( 0.454902, 0.337255, 0.607843, 1 )
 
-[sub_resource type="StyleBoxFlat" id=18]
+[sub_resource type="StyleBoxFlat" id=21]
 bg_color = Color( 0.588235, 0.984314, 0.780392, 1 )
 border_width_left = 2
 border_width_top = 2
@@ -150,7 +195,7 @@ border_width_right = 2
 border_width_bottom = 2
 border_color = Color( 0.454902, 0.337255, 0.607843, 1 )
 
-[sub_resource type="StyleBoxFlat" id=19]
+[sub_resource type="StyleBoxFlat" id=22]
 content_margin_right = 16.0
 bg_color = Color( 0.847059, 0.74902, 0.847059, 1 )
 border_width_left = 4
@@ -300,9 +345,9 @@ HSlider/icons/grabber = null
 HSlider/icons/grabber_disabled = null
 HSlider/icons/grabber_highlight = null
 HSlider/icons/tick = null
-HSlider/styles/grabber_area = null
-HSlider/styles/grabber_area_highlight = null
-HSlider/styles/slider = null
+HSlider/styles/grabber_area = SubResource( 7 )
+HSlider/styles/grabber_area_highlight = SubResource( 8 )
+HSlider/styles/slider = SubResource( 9 )
 HSplitContainer/constants/autohide = 1
 HSplitContainer/constants/separation = 12
 HSplitContainer/icons/grabber = null
@@ -329,7 +374,7 @@ Label/constants/line_spacing = 3
 Label/constants/shadow_as_outline = 0
 Label/constants/shadow_offset_x = 1
 Label/constants/shadow_offset_y = 1
-Label/fonts/font = SubResource( 7 )
+Label/fonts/font = SubResource( 10 )
 Label/styles/normal = null
 LineEdit/colors/clear_button_color = Color( 0, 0, 0, 1 )
 LineEdit/colors/clear_button_color_pressed = Color( 0, 0, 0, 1 )
@@ -378,8 +423,8 @@ OptionButton/styles/focus = null
 OptionButton/styles/hover = null
 OptionButton/styles/normal = null
 OptionButton/styles/pressed = null
-Panel/styles/panel = SubResource( 8 )
-PanelContainer/styles/panel = null
+Panel/styles/panel = SubResource( 11 )
+PanelContainer/styles/panel = SubResource( 23 )
 PopupDialog/styles/panel = null
 PopupMenu/colors/font_color = Color( 0, 0, 0, 1 )
 PopupMenu/colors/font_color_accel = Color( 0, 0, 0, 1 )
@@ -423,7 +468,7 @@ RichTextLabel/fonts/mono_font = null
 RichTextLabel/fonts/normal_font = null
 RichTextLabel/styles/focus = null
 RichTextLabel/styles/normal = null
-ScrollContainer/styles/bg = SubResource( 9 )
+ScrollContainer/styles/bg = SubResource( 12 )
 SpinBox/icons/updown = null
 TabContainer/colors/font_color_bg = Color( 0, 0, 0, 1 )
 TabContainer/colors/font_color_disabled = Color( 0, 0, 0, 1 )
@@ -440,10 +485,10 @@ TabContainer/icons/increment = null
 TabContainer/icons/increment_highlight = null
 TabContainer/icons/menu = null
 TabContainer/icons/menu_highlight = null
-TabContainer/styles/panel = SubResource( 10 )
-TabContainer/styles/tab_bg = SubResource( 11 )
+TabContainer/styles/panel = SubResource( 13 )
+TabContainer/styles/tab_bg = SubResource( 14 )
 TabContainer/styles/tab_disabled = null
-TabContainer/styles/tab_fg = SubResource( 12 )
+TabContainer/styles/tab_fg = SubResource( 15 )
 Tabs/colors/font_color_bg = Color( 0.454902, 0.337255, 0.607843, 1 )
 Tabs/colors/font_color_disabled = Color( 0.454902, 0.337255, 0.607843, 1 )
 Tabs/colors/font_color_fg = Color( 0.454902, 0.337255, 0.607843, 1 )
@@ -457,10 +502,10 @@ Tabs/icons/decrement = null
 Tabs/icons/decrement_highlight = null
 Tabs/icons/increment = null
 Tabs/icons/increment_highlight = null
-Tabs/styles/button = SubResource( 13 )
+Tabs/styles/button = SubResource( 16 )
 Tabs/styles/button_pressed = null
-Tabs/styles/panel = SubResource( 14 )
-Tabs/styles/tab_bg = SubResource( 15 )
+Tabs/styles/panel = SubResource( 17 )
+Tabs/styles/tab_bg = SubResource( 18 )
 Tabs/styles/tab_disabled = null
 Tabs/styles/tab_fg = null
 TextEdit/colors/background_color = Color( 0, 0, 0, 1 )
@@ -560,10 +605,10 @@ VScrollBar/icons/decrement = null
 VScrollBar/icons/decrement_highlight = null
 VScrollBar/icons/increment = null
 VScrollBar/icons/increment_highlight = null
-VScrollBar/styles/grabber = SubResource( 16 )
-VScrollBar/styles/grabber_highlight = SubResource( 17 )
-VScrollBar/styles/grabber_pressed = SubResource( 18 )
-VScrollBar/styles/scroll = SubResource( 19 )
+VScrollBar/styles/grabber = SubResource( 19 )
+VScrollBar/styles/grabber_highlight = SubResource( 20 )
+VScrollBar/styles/grabber_pressed = SubResource( 21 )
+VScrollBar/styles/scroll = SubResource( 22 )
 VScrollBar/styles/scroll_focus = null
 VSeparator/constants/separation = 4
 VSeparator/styles/separator = null

Music/Menu.ogg.import

@@ -0,0 +1,15 @@
+[remap]
+
+importer="ogg_vorbis"
+type="AudioStreamOGGVorbis"
+path="res://.import/Menu.ogg-5d0b70bc270d7b88fd20e45ac7483499.oggstr"
+
+[deps]
+
+source_file="res://Music/Menu.ogg"
+dest_files=[ "res://.import/Menu.ogg-5d0b70bc270d7b88fd20e45ac7483499.oggstr" ]
+
+[params]
+
+loop=true
+loop_offset=0

Music/Music.gd

@@ -0,0 +1,5 @@
+extends AudioStreamPlayer
+
+func _process(delta):
+	var speed = clamp(Engine.time_scale, 0.99, 1.1)
+	pitch_scale = lerp(pitch_scale, speed, 0.01)

Music/Music.tscn

@@ -0,0 +1,10 @@
+[gd_scene load_steps=3 format=2]
+
+[ext_resource path="res://Music/Menu.ogg" type="AudioStream" id=1]
+[ext_resource path="res://Music/Music.gd" type="Script" id=2]
+
+[node name="Jukebox" type="AudioStreamPlayer"]
+stream = ExtResource( 1 )
+autoplay = true
+bus = "Music"
+script = ExtResource( 2 )

Pegs/Green/GreenBar.tscn

@@ -1,8 +1,9 @@
-[gd_scene load_steps=7 format=2]
+[gd_scene load_steps=8 format=2]
 
 [ext_resource path="res://Pegs/Green/bar.png" type="Texture" id=1]
 [ext_resource path="res://Pegs/Green/GreenBar.gd" type="Script" id=2]
 [ext_resource path="res://Pegs/Green/GraceTimer.tscn" type="PackedScene" id=3]
+[ext_resource path="res://Pegs/Green/HitSFX.tscn" type="PackedScene" id=4]
 
 [sub_resource type="RectangleShape2D" id=1]
 extents = Vector2( 16, 3 )
@@ -41,6 +42,8 @@ shape = SubResource( 2 )
 
 [node name="GraceTimer" parent="." instance=ExtResource( 3 )]
 
+[node name="HitSFX" parent="." instance=ExtResource( 4 )]
+
 [node name="AnimationPlayer" type="AnimationPlayer" parent="."]
 anims/spawn = SubResource( 3 )
 

Pegs/Green/GreenPeg.tscn

@@ -1,10 +1,11 @@
-[gd_scene load_steps=8 format=2]
+[gd_scene load_steps=9 format=2]
 
 [ext_resource path="res://Pegs/Green/green.png" type="Texture" id=1]
 [ext_resource path="res://Pegs/Green/GreenPeg.gd" type="Script" id=2]
 [ext_resource path="res://Pegs/Green/GraceTimer.tscn" type="PackedScene" id=3]
 [ext_resource path="res://Pegs/DefaultPegCollisionShape.tscn" type="PackedScene" id=4]
 [ext_resource path="res://Pegs/Green/GreenPegAnimationPlayer.gd" type="Script" id=5]
+[ext_resource path="res://Pegs/Green/HitSFX.tscn" type="PackedScene" id=6]
 
 [sub_resource type="PhysicsMaterial" id=1]
 
@@ -38,6 +39,8 @@ texture = ExtResource( 1 )
 anims/GetBigger = SubResource( 2 )
 script = ExtResource( 5 )
 
+[node name="HitSFX" parent="." instance=ExtResource( 6 )]
+
 [node name="GraceTimer" parent="." instance=ExtResource( 3 )]
 
 [connection signal="timeout" from="GraceTimer" to="." method="_on_GraceTimer_timeout"]

Pegs/Green/HitParticles.tscn

@@ -1,7 +1,9 @@
-[gd_scene load_steps=4 format=2]
+[gd_scene load_steps=6 format=2]
 
 [ext_resource path="res://Pegs/HitParticles.gd" type="Script" id=1]
 [ext_resource path="res://Effects/greenParticle.png" type="Texture" id=2]
+[ext_resource path="res://SFX/greenExplodes.wav" type="AudioStream" id=3]
+[ext_resource path="res://Pegs/Green/HitSFX.gd" type="Script" id=4]
 
 [sub_resource type="ParticlesMaterial" id=1]
 emission_shape = 1
@@ -30,3 +32,9 @@ local_coords = false
 process_material = SubResource( 1 )
 texture = ExtResource( 2 )
 script = ExtResource( 1 )
+
+[node name="HitSFX" type="AudioStreamPlayer2D" parent="."]
+stream = ExtResource( 3 )
+autoplay = true
+bus = "SFX"
+script = ExtResource( 4 )

Pegs/Green/HitSFX.gd

@@ -0,0 +1,4 @@
+extends AudioStreamPlayer2D
+
+func _ready():
+	pitch_scale = rand_range(0.75, 2)

Pegs/Green/HitSFX.tscn

@@ -0,0 +1,11 @@
+[gd_scene load_steps=3 format=2]
+
+[ext_resource path="res://Pegs/Green/HitSFX.gd" type="Script" id=1]
+[ext_resource path="res://SFX/greenExplodes.wav" type="AudioStream" id=2]
+
+[node name="HitSFX" type="AudioStreamPlayer2D"]
+stream = ExtResource( 2 )
+volume_db = 8.0
+autoplay = true
+bus = "SFX"
+script = ExtResource( 1 )

Pegs/Pink/PinkPeg.gd

@@ -18,6 +18,7 @@ func make_green():
 	
 	#finally delete the old peg
 	GameStats.pinks_left -= 1
+	GameStats.add_to_multiplier()
 	win_level()
 	Engine.time_scale = 1
 	queue_free()

Pegs/Pink/PinkPeg.tscn

@@ -4,10 +4,10 @@
 [ext_resource path="res://Pegs/DefaultPegCollisionShape.tscn" type="PackedScene" id=2]
 [ext_resource path="res://Pegs/Pink/Pink.png" type="Texture" id=3]
 
-[sub_resource type="CircleShape2D" id=2]
+[sub_resource type="CircleShape2D" id=1]
 radius = 10.2018
 
-[sub_resource type="CircleShape2D" id=1]
+[sub_resource type="CircleShape2D" id=2]
 radius = 33.0151
 
 [node name="PinkPeg" type="StaticBody2D"]
@@ -18,7 +18,7 @@ collision_layer = 0
 collision_mask = 4
 
 [node name="CollisionShape2D" type="CollisionShape2D" parent="RegularCollision"]
-shape = SubResource( 2 )
+shape = SubResource( 1 )
 
 [node name="SlowmoTimer" type="Timer" parent="."]
 wait_time = 0.075
@@ -34,7 +34,7 @@ collision_layer = 0
 collision_mask = 4
 
 [node name="CollisionShape2D" type="CollisionShape2D" parent="LastPegCollision"]
-shape = SubResource( 1 )
+shape = SubResource( 2 )
 
 [connection signal="body_entered" from="RegularCollision" to="." method="_on_Area2D_body_entered"]
 [connection signal="body_exited" from="RegularCollision" to="." method="_on_Area2D_body_exited"]

Pegs/Purple/PurpleBar.gd

@@ -9,6 +9,7 @@ func make_green():
 	green_bar.global_rotation = global_rotation
 	
 	main.add_child(green_bar)
+	GameStats.add_to_multiplier()
 	queue_free()
 
 func bouncy():