From 200bbdfe64c867ad9b715da2d083b1b7ceff3982 Mon Sep 17 00:00:00 2001
From: adrienmalin <41926238+adrienmalin@users.noreply.github.com>
Date: Sat, 5 Jan 2019 17:40:15 +0100
Subject: [PATCH] clean audio buses, tweak flash text

---
 Main.tscn               | 20 +++++++--------
 MidiPlayer.gd           |  2 +-
 Stats.tscn              | 56 ++++++++++++++++++-----------------------
 default_bus_layout.tres | 39 +---------------------------
 4 files changed, 36 insertions(+), 81 deletions(-)

diff --git a/Main.tscn b/Main.tscn
index f121a30..5584f2b 100644
--- a/Main.tscn
+++ b/Main.tscn
@@ -172,7 +172,7 @@ subdivide_depth = 0
 
 [sub_resource type="DynamicFont" id=6]
 
-size = 20
+size = 30
 use_mipmaps = true
 use_filter = false
 font_data = ExtResource( 8 )
@@ -191,10 +191,10 @@ tracks/0/loop_wrap = true
 tracks/0/imported = false
 tracks/0/enabled = true
 tracks/0/keys = {
-"times": PoolRealArray( 0, 0.1, 0.8, 1 ),
+"times": PoolRealArray( 0, 0.1, 0.9, 1 ),
 "transitions": PoolRealArray( 1, 0, 1, 1 ),
 "update": 0,
-"values": [ 20, 20, 20, 50 ]
+"values": [ 30, 30, 30, 50 ]
 }
 tracks/1/type = "value"
 tracks/1/path = NodePath("Label:custom_colors/font_color")
@@ -203,7 +203,7 @@ tracks/1/loop_wrap = true
 tracks/1/imported = false
 tracks/1/enabled = true
 tracks/1/keys = {
-"times": PoolRealArray( 0, 0.1, 0.8, 1 ),
+"times": PoolRealArray( 0, 0.1, 0.9, 1 ),
 "transitions": PoolRealArray( 1, 1, 1, 1 ),
 "update": 0,
 "values": [ Color( 0.445404, 0.710476, 0.820313, 0 ), Color( 0.445404, 0.710476, 0.820313, 0.533765 ), Color( 0.445404, 0.710476, 0.820313, 0.533765 ), Color( 0.445404, 0.710476, 0.820313, 0 ) ]
@@ -215,7 +215,7 @@ tracks/2/loop_wrap = true
 tracks/2/imported = false
 tracks/2/enabled = true
 tracks/2/keys = {
-"times": PoolRealArray( 0, 0.1, 0.8, 1 ),
+"times": PoolRealArray( 0, 0.1, 0.9, 1 ),
 "transitions": PoolRealArray( 1, 1, 1, 1 ),
 "update": 0,
 "values": [ Vector2( 0, 110 ), Vector2( 0, -50 ), Vector2( 0, -60 ), Vector2( 0, -100 ) ]
@@ -427,9 +427,9 @@ anchor_left = 0.0
 anchor_top = 0.0
 anchor_right = 0.0
 anchor_bottom = 0.0
-margin_top = -50.0
+margin_top = 190.0
 margin_right = 500.0
-margin_bottom = 450.0
+margin_bottom = 690.0
 rect_pivot_offset = Vector2( 0, 0 )
 rect_clip_content = false
 mouse_filter = 2
@@ -437,13 +437,13 @@ mouse_default_cursor_shape = 0
 size_flags_horizontal = 1
 size_flags_vertical = 4
 custom_fonts/font = SubResource( 6 )
-custom_colors/font_color = Color( 0.445404, 0.710476, 0.820313, 0.533765 )
+custom_colors/font_color = Color( 0.445404, 0.710476, 0.820313, 0 )
 align = 1
 valign = 1
 percent_visible = 1.0
 lines_skipped = 0
 max_lines_visible = -1
-_sections_unfolded = [ "Rect", "custom_colors", "custom_fonts" ]
+_sections_unfolded = [ "custom_colors", "custom_fonts" ]
 
 [node name="AnimationPlayer" type="AnimationPlayer" parent="FlashText" index="1"]
 
@@ -513,7 +513,7 @@ _sections_unfolded = [ "Margin", "custom_colors", "custom_fonts" ]
 
 [connection signal="animation_finished" from="FlashText/AnimationPlayer" to="FlashText" method="_on_AnimationPlayer_animation_finished"]
 
-[connection signal="flash_text" from="Stats" to="FlashText" method="_on_Stats_flash_text"]
+[connection signal="flash_text" from="Stats" to="FlashText" method="print"]
 
 [connection signal="level_up" from="Stats" to="." method="_on_Stats_level_up"]
 
diff --git a/MidiPlayer.gd b/MidiPlayer.gd
index 43f0954..19a7bac 100644
--- a/MidiPlayer.gd
+++ b/MidiPlayer.gd
@@ -3,7 +3,7 @@ extends "midi/MidiPlayer.gd"
 const Tetromino = preload("res://Tetrominos/Tetromino.gd")
 
 const LINE_CLEAR_CHANNELS = [2, 6]
-const MOVE_CHANNELS = [8]
+const MOVE_CHANNELS = []
 
 var muted_events = []
 
diff --git a/Stats.tscn b/Stats.tscn
index 690d707..971e7d5 100644
--- a/Stats.tscn
+++ b/Stats.tscn
@@ -1,16 +1,8 @@
-[gd_scene load_steps=5 format=2]
+[gd_scene load_steps=4 format=2]
 
 [ext_resource path="res://Stats.gd" type="Script" id=1]
 [ext_resource path="res://fonts/Gamer.ttf" type="DynamicFontData" id=2]
 
-[sub_resource type="DynamicFont" id=1]
-
-size = 22
-use_mipmaps = false
-use_filter = false
-font_data = ExtResource( 2 )
-_sections_unfolded = [ "Font", "Settings" ]
-
 [sub_resource type="DynamicFont" id=2]
 
 size = 20
@@ -53,7 +45,7 @@ anchor_right = 0.0
 anchor_bottom = 0.0
 margin_left = 16.0
 margin_right = 94.0
-margin_bottom = 172.0
+margin_bottom = 170.0
 rect_pivot_offset = Vector2( 0, 0 )
 rect_clip_content = false
 mouse_filter = 1
@@ -71,14 +63,14 @@ anchor_top = 0.0
 anchor_right = 0.0
 anchor_bottom = 0.0
 margin_right = 78.0
-margin_bottom = 18.0
+margin_bottom = 17.0
 rect_pivot_offset = Vector2( 0, 0 )
 rect_clip_content = false
 mouse_filter = 2
 mouse_default_cursor_shape = 0
 size_flags_horizontal = 1
 size_flags_vertical = 4
-custom_fonts/font = SubResource( 1 )
+custom_fonts/font = SubResource( 2 )
 custom_colors/font_color = Color( 0.756214, 0.921978, 0.990234, 1 )
 text = "Score:"
 percent_visible = 1.0
@@ -92,16 +84,16 @@ anchor_left = 0.0
 anchor_top = 0.0
 anchor_right = 0.0
 anchor_bottom = 0.0
-margin_top = 18.0
+margin_top = 17.0
 margin_right = 78.0
-margin_bottom = 36.0
+margin_bottom = 34.0
 rect_pivot_offset = Vector2( 0, 0 )
 rect_clip_content = false
 mouse_filter = 2
 mouse_default_cursor_shape = 0
 size_flags_horizontal = 1
 size_flags_vertical = 4
-custom_fonts/font = SubResource( 1 )
+custom_fonts/font = SubResource( 2 )
 custom_colors/font_color = Color( 0.756214, 0.921978, 0.990234, 1 )
 text = "0"
 align = 2
@@ -116,9 +108,9 @@ anchor_left = 0.0
 anchor_top = 0.0
 anchor_right = 0.0
 anchor_bottom = 0.0
-margin_top = 36.0
+margin_top = 34.0
 margin_right = 78.0
-margin_bottom = 53.0
+margin_bottom = 51.0
 rect_pivot_offset = Vector2( 0, 0 )
 rect_clip_content = false
 mouse_filter = 2
@@ -131,7 +123,7 @@ text = "High score:"
 percent_visible = 1.0
 lines_skipped = 0
 max_lines_visible = -1
-_sections_unfolded = [ "Anchor", "custom_fonts" ]
+_sections_unfolded = [ "Anchor", "custom_fonts", "custom_styles" ]
 
 [node name="HighScore" type="Label" parent="VBC" index="3"]
 
@@ -139,9 +131,9 @@ anchor_left = 0.0
 anchor_top = 0.0
 anchor_right = 0.0
 anchor_bottom = 0.0
-margin_top = 53.0
+margin_top = 51.0
 margin_right = 78.0
-margin_bottom = 70.0
+margin_bottom = 68.0
 rect_pivot_offset = Vector2( 0, 0 )
 rect_clip_content = false
 mouse_filter = 2
@@ -163,9 +155,9 @@ anchor_left = 0.0
 anchor_top = 0.0
 anchor_right = 0.0
 anchor_bottom = 0.0
-margin_top = 70.0
+margin_top = 68.0
 margin_right = 78.0
-margin_bottom = 87.0
+margin_bottom = 85.0
 rect_pivot_offset = Vector2( 0, 0 )
 rect_clip_content = false
 mouse_filter = 2
@@ -185,9 +177,9 @@ anchor_left = 0.0
 anchor_top = 0.0
 anchor_right = 0.0
 anchor_bottom = 0.0
-margin_top = 87.0
+margin_top = 85.0
 margin_right = 78.0
-margin_bottom = 104.0
+margin_bottom = 102.0
 rect_pivot_offset = Vector2( 0, 0 )
 rect_clip_content = false
 mouse_filter = 2
@@ -208,9 +200,9 @@ anchor_left = 0.0
 anchor_top = 0.0
 anchor_right = 0.0
 anchor_bottom = 0.0
-margin_top = 104.0
+margin_top = 102.0
 margin_right = 78.0
-margin_bottom = 121.0
+margin_bottom = 119.0
 rect_pivot_offset = Vector2( 0, 0 )
 rect_clip_content = false
 mouse_filter = 2
@@ -230,9 +222,9 @@ anchor_left = 0.0
 anchor_top = 0.0
 anchor_right = 0.0
 anchor_bottom = 0.0
-margin_top = 121.0
+margin_top = 119.0
 margin_right = 78.0
-margin_bottom = 138.0
+margin_bottom = 136.0
 rect_pivot_offset = Vector2( 0, 0 )
 rect_clip_content = false
 mouse_filter = 2
@@ -253,9 +245,9 @@ anchor_left = 0.0
 anchor_top = 0.0
 anchor_right = 0.0
 anchor_bottom = 0.0
-margin_top = 138.0
+margin_top = 136.0
 margin_right = 78.0
-margin_bottom = 155.0
+margin_bottom = 153.0
 rect_pivot_offset = Vector2( 0, 0 )
 rect_clip_content = false
 mouse_filter = 2
@@ -275,9 +267,9 @@ anchor_left = 0.0
 anchor_top = 0.0
 anchor_right = 0.0
 anchor_bottom = 0.0
-margin_top = 155.0
+margin_top = 153.0
 margin_right = 78.0
-margin_bottom = 172.0
+margin_bottom = 170.0
 rect_pivot_offset = Vector2( 0, 0 )
 rect_clip_content = false
 mouse_filter = 2
diff --git a/default_bus_layout.tres b/default_bus_layout.tres
index 8edf417..7f8817a 100644
--- a/default_bus_layout.tres
+++ b/default_bus_layout.tres
@@ -1,21 +1,4 @@
-[gd_resource type="AudioBusLayout" load_steps=2 format=2]
-
-[sub_resource type="AudioEffectDelay" id=1]
-
-resource_name = "Delay"
-dry = 1.0
-tap1/active = true
-tap1/delay_ms = 250.0
-tap1/level_db = -6.0
-tap1/pan = 0.2
-tap2/active = true
-tap2/delay_ms = 500.0
-tap2/level_db = -12.0
-tap2/pan = -0.4
-feedback/active = false
-feedback/delay_ms = 340.0
-feedback/level_db = -6.0
-feedback/lowpass = 16000.0
+[gd_resource type="AudioBusLayout" format=2]
 
 [resource]
 
@@ -25,24 +8,4 @@ bus/0/mute = false
 bus/0/bypass_fx = false
 bus/0/volume_db = 0.0
 bus/0/send = ""
-bus/1/name = "Music"
-bus/1/solo = false
-bus/1/mute = false
-bus/1/bypass_fx = false
-bus/1/volume_db = -16.8
-bus/1/send = "Master"
-bus/2/name = "LineClear"
-bus/2/solo = false
-bus/2/mute = false
-bus/2/bypass_fx = false
-bus/2/volume_db = 5.5
-bus/2/send = "Master"
-bus/2/effect/0/effect = SubResource( 1 )
-bus/2/effect/0/enabled = true
-bus/3/name = "SFX"
-bus/3/solo = false
-bus/3/mute = false
-bus/3/bypass_fx = false
-bus/3/volume_db = -11.3
-bus/3/send = "Master"