diff --git a/Scene/FastTrail.tscn b/Scene/FastTrail.tscn index 55a07be..e705ba6 100644 --- a/Scene/FastTrail.tscn +++ b/Scene/FastTrail.tscn @@ -1,9 +1,9 @@ -[gd_scene load_steps=5 format=2] +[gd_scene load_steps=6 format=2] [ext_resource path="res://Assets/PAINT1.png" type="Texture" id=1] [ext_resource path="res://Scripts/FastTrail.gd" type="Script" id=2] [ext_resource path="res://Assets/BigPlaceholder.png" type="Texture" id=3] -[ext_resource path="res://Sounds/PaintJamSpeedUp.wav" type="AudioStream" id=3] +[ext_resource path="res://Sounds/PaintJamSpeedUp.wav" type="AudioStream" id=4] [sub_resource type="RectangleShape2D" id=1] extents = Vector2( 88.8117, 26.2111 ) @@ -15,7 +15,7 @@ script = ExtResource( 2 ) [node name="Sprite" type="Sprite" parent="."] modulate = Color( 0.901961, 0, 0, 1 ) light_mask = 64 -z_index = 10 +z_index = 8 texture = ExtResource( 1 ) offset = Vector2( 88, 0 ) @@ -32,5 +32,6 @@ scale = Vector2( 1, 1.2 ) texture = ExtResource( 3 ) mode = 3 range_item_cull_mask = 64 + [node name="AudioPlayer" type="AudioStreamPlayer" parent="."] -stream = ExtResource( 3 ) +stream = ExtResource( 4 ) diff --git a/Scene/SlowTrail.tscn b/Scene/SlowTrail.tscn index 22bbf7c..adf313b 100644 --- a/Scene/SlowTrail.tscn +++ b/Scene/SlowTrail.tscn @@ -1,9 +1,9 @@ -[gd_scene load_steps=5 format=2] +[gd_scene load_steps=6 format=2] [ext_resource path="res://Assets/PAINT1.png" type="Texture" id=1] [ext_resource path="res://Scripts/SlowTrail.gd" type="Script" id=2] [ext_resource path="res://Assets/BigPlaceholder.png" type="Texture" id=3] -[ext_resource path="res://Sounds/PaintJamSlowDown.wav" type="AudioStream" id=3] +[ext_resource path="res://Sounds/PaintJamSlowDown.wav" type="AudioStream" id=4] [sub_resource type="RectangleShape2D" id=1] extents = Vector2( 88.8117, 26.2111 ) @@ -14,7 +14,7 @@ script = ExtResource( 2 ) [node name="Sprite" type="Sprite" parent="."] modulate = Color( 0.0392157, 0.0313726, 0.917647, 1 ) light_mask = 512 -z_index = 10 +z_index = 8 texture = ExtResource( 1 ) offset = Vector2( 88, 0 ) @@ -31,5 +31,6 @@ scale = Vector2( 1, 1.2 ) texture = ExtResource( 3 ) mode = 3 range_item_cull_mask = 512 + [node name="AudioPlayer" type="AudioStreamPlayer" parent="."] -stream = ExtResource( 3 ) +stream = ExtResource( 4 ) diff --git a/Scripts/Player.gd b/Scripts/Player.gd index 062c34a..a6af1f2 100644 --- a/Scripts/Player.gd +++ b/Scripts/Player.gd @@ -21,9 +21,6 @@ export var rota_speed = 100 export var slow_cooldown = 5 export var fast_cooldown = 5 -var slow_trail = load("res://Scene/SlowPaint.tscn") -var fast_trail = load("res://Scene/FastPaint.tscn") - var slow_cooldown_elapsed = 5 var fast_cooldown_elapsed = 5