Hotfixes (#13)

* Fixed #11

Also fixed behavior where the character would move without the walking animations being played when playing flute, holding a movement key, then releasing the play flute key

* Past commit actually Fixes #12  this one fixes #11

* Added #11 Fix to end of the part where bug happens

actors/player/bard/bard.gd

@@ -28,6 +28,7 @@ func resume():
 	#movement and interaction behaviors
 	$Animator.play("rest")
 	$Flute.stop()
+	set_current_state(IDLE)
 
 func miss():
 	#Plays a failing animation on both the player and the object he is
@@ -66,7 +67,7 @@ func _input(event):
 		if e.as_text() == event.as_text():
 			p = (InputMap.get_action_list("interact").find(e))
 
-	if event.is_action_pressed("interact") and current_state != JUMP:
+	if event.is_action_pressed("interact") and is_on_floor():
 		can_move = false
 		$Animator.play("flute")
 		interact(p)

levels/level_01/level_01.tscn

@@ -25,7 +25,7 @@ custom_solver_bias = 0.0
 normal = Vector2( 0, -1 )
 d = 0.0
 
-[node name="Level_01" index="0" instance=ExtResource( 1 )]
+[node name="Level_01" instance=ExtResource( 1 )]
 
 [node name="Tilemap" parent="." index="0"]
 

screens/credit_screen/credit_screen.tscn

@@ -8,7 +8,7 @@
 [ext_resource path="res://screens/GaroaHackerClubeBold.otf" type="DynamicFontData" id=6]
 [ext_resource path="res://screens/credit_screen/credits_texture.tres" type="Texture" id=7]
 
-[sub_resource type="DynamicFont" id=3]
+[sub_resource type="DynamicFont" id=1]
 
 size = 32
 use_mipmaps = true
@@ -27,11 +27,6 @@ next_scene = "res://screens/main_screen/main_screen.tscn"
 
 layer = 2
 
-[node name="ColorRect" parent="Transition" index="0"]
-
-margin_left = -1280.0
-margin_right = -256.0
-
 [node name="Background" type="TextureRect" parent="." index="2"]
 
 anchor_left = 0.0
@@ -349,7 +344,7 @@ mouse_filter = 2
 mouse_default_cursor_shape = 0
 size_flags_horizontal = 1
 size_flags_vertical = 4
-custom_fonts/font = SubResource( 3 )
+custom_fonts/font = SubResource( 1 )
 text = "audio"
 align = 1
 valign = 1
@@ -489,7 +484,7 @@ mouse_filter = 2
 mouse_default_cursor_shape = 0
 size_flags_horizontal = 1
 size_flags_vertical = 4
-custom_fonts/font = SubResource( 3 )
+custom_fonts/font = SubResource( 1 )
 text = "design"
 align = 1
 valign = 1
@@ -748,7 +743,7 @@ mouse_filter = 2
 mouse_default_cursor_shape = 0
 size_flags_horizontal = 1
 size_flags_vertical = 4
-custom_fonts/font = SubResource( 3 )
+custom_fonts/font = SubResource( 1 )
 text = "engineering"
 align = 1
 valign = 1
@@ -830,7 +825,7 @@ mouse_filter = 2
 mouse_default_cursor_shape = 0
 size_flags_horizontal = 1
 size_flags_vertical = 4
-custom_fonts/font = SubResource( 3 )
+custom_fonts/font = SubResource( 1 )
 text = "graphics"
 align = 1
 valign = 1
@@ -1148,7 +1143,7 @@ mouse_filter = 2
 mouse_default_cursor_shape = 0
 size_flags_horizontal = 1
 size_flags_vertical = 4
-custom_fonts/font = SubResource( 3 )
+custom_fonts/font = SubResource( 1 )
 text = "special thanks to"
 align = 1
 valign = 1

screens/splash_screen/splash_screen.tscn

@@ -9,7 +9,7 @@
 [ext_resource path="res://screens/splash_screen/twitter.png" type="Texture" id=7]
 [ext_resource path="res://screens/splash_screen/itch.png" type="Texture" id=8]
 
-[node name="SplashScreen" index="0" instance=ExtResource( 1 )]
+[node name="SplashScreen" instance=ExtResource( 1 )]
 
 next_scene = "res://screens/main_screen/main_screen.tscn"
 

screens/tutorial_screen/tutorial_screen.tscn

@@ -393,8 +393,8 @@ tracks/10/loop_wrap = true
 tracks/10/imported = false
 tracks/10/enabled = true
 tracks/10/keys = {
-"times": PoolRealArray( 4, 6, 8 ),
-"transitions": PoolRealArray( 1, 1, 1 ),
+"times": PoolRealArray( 4, 6, 8, 9 ),
+"transitions": PoolRealArray( 1, 1, 1, 1 ),
 "values": [ {
 "args": [  ],
 "method": "stop"
@@ -404,6 +404,9 @@ tracks/10/keys = {
 }, {
 "args": [  ],
 "method": "stop"
+}, {
+"args": [  ],
+"method": "stop"
 } ]
 }
 
@@ -456,13 +459,25 @@ tracks/3/loop_wrap = true
 tracks/3/imported = false
 tracks/3/enabled = true
 tracks/3/keys = {
-"times": PoolRealArray( 1.9 ),
+"times": PoolRealArray( 2 ),
 "transitions": PoolRealArray( 1 ),
 "values": [ {
 "args": [ true ],
 "method": "set_process_input"
 } ]
 }
+tracks/4/type = "value"
+tracks/4/path = NodePath("Flute/SFX:playing")
+tracks/4/interp = 1
+tracks/4/loop_wrap = true
+tracks/4/imported = false
+tracks/4/enabled = true
+tracks/4/keys = {
+"times": PoolRealArray( 0 ),
+"transitions": PoolRealArray( 1 ),
+"update": 1,
+"values": [ false ]
+}
 
 [sub_resource type="Animation" id=7]
 
@@ -948,7 +963,7 @@ use_filter = true
 font_data = ExtResource( 18 )
 _sections_unfolded = [ "Extra Spacing", "Font", "Settings" ]
 
-[node name="Tutorial" instance=ExtResource( 1 )]
+[node name="Tutorial" index="0" instance=ExtResource( 1 )]
 
 script = ExtResource( 2 )
 next_scene = "res://levels/level_01/level_01.tscn"
@@ -1190,7 +1205,7 @@ _sections_unfolded = [ "Visibility" ]
 [node name="Helper_2" parent="." index="5" instance=ExtResource( 11 )]
 
 editor/display_folded = true
-position = Vector2( 899, 715.2 )
+position = Vector2( 831, 645.6 )
 rotation = -2.20035
 scale = Vector2( 1.5, 1.5 )
 z_index = 1
@@ -1304,7 +1319,7 @@ mouse_filter = 2
 mouse_default_cursor_shape = 0
 size_flags_horizontal = 1
 size_flags_vertical = 4
-text = "heyo, this fox over there is rowan. he is now on his journey to become a bard."
+text = "it gets more trembly going to its bottom, and more bassy going to its top"
 align = 1
 valign = 1
 autowrap = true