From 1b57512bc16a8a6764692b7c836e2f7efd50db98 Mon Sep 17 00:00:00 2001 From: Diego Date: Fri, 24 Jul 2020 02:14:12 -0500 Subject: [PATCH] Credits done --- levels/Campaign/Credits.tscn | 85 -------------- levels/Campaign/Credits/Credits.tscn | 141 +++++++++++++++++++++++ levels/Campaign/Credits/TextureButton.gd | 20 ++++ levels/Campaign/Credits/Timer.gd | 8 ++ levels/Campaign/Level 2/Level_2.tscn | 1 - levels/Campaign/Level 4/Level_4.tscn | 5 + meta/Music.gd | 4 +- meta/Music.tscn | 2 + npc/Wizard.tscn | 5 +- 9 files changed, 183 insertions(+), 88 deletions(-) delete mode 100644 levels/Campaign/Credits.tscn create mode 100644 levels/Campaign/Credits/Credits.tscn create mode 100644 levels/Campaign/Credits/TextureButton.gd create mode 100644 levels/Campaign/Credits/Timer.gd diff --git a/levels/Campaign/Credits.tscn b/levels/Campaign/Credits.tscn deleted file mode 100644 index 61f69ac..0000000 --- a/levels/Campaign/Credits.tscn +++ /dev/null @@ -1,85 +0,0 @@ -[gd_scene load_steps=6 format=2] - -[ext_resource path="res://Music and Fonts(Misc.)/m5x7.ttf" type="DynamicFontData" id=1] -[ext_resource path="res://art/Black.png" type="Texture" id=2] -[ext_resource path="res://Music and Fonts(Misc.)/Credit Music.ogg" type="AudioStream" id=3] - -[sub_resource type="DynamicFont" id=1] -font_data = ExtResource( 1 ) - -[sub_resource type="Animation" id=2] -resource_name = "Text Scroll" -length = 45.0 -tracks/0/type = "value" -tracks/0/path = NodePath("CanvasLayer/Label:rect_position") -tracks/0/interp = 1 -tracks/0/loop_wrap = true -tracks/0/imported = false -tracks/0/enabled = true -tracks/0/keys = { -"times": PoolRealArray( 0, 44.7, 44.8 ), -"transitions": PoolRealArray( 1, 1, 1 ), -"update": 0, -"values": [ Vector2( 30, 177 ), Vector2( 30, -553 ), Vector2( 30, -572 ) ] -} - -[node name="Credits" type="Node"] - -[node name="CanvasLayer" type="CanvasLayer" parent="."] - -[node name="Sprite" type="Sprite" parent="CanvasLayer"] -texture = ExtResource( 2 ) -centered = false - -[node name="Label" type="Label" parent="CanvasLayer"] -margin_left = 30.0 -margin_top = -572.0 -margin_right = 293.0 -margin_bottom = 17.0 -custom_fonts/font = SubResource( 1 ) -text = "We can't thank you enough for playing our game. This is our first Game Jam/Coding experience, and had loads of fun. So sincerely, thank you. - - - From Diego Lugo [dogtots] - and Logan Gatlin [Tyranus] - - - -Sprite Creator: Logan Gatlin [Tyranus] - -Coders: Diego Lugo [dogtots], - Logan Gatlin [Tyranus] - - -Sources: -Player and Enemy Sprites - Robert [0x72] (https://0x72.itch.io/dungeontileset-ii) - -Inventory Sprites - Robert [0x72] -(https://0x72.itch.io/dungeonui) - -Music - Alexmax -(https://opengameart.org/content/pixelated-music) - -Ambience - JaggedStone -(https://opengameart.org/content/loopable-dungeon-ambience) - -Sound Effects - (https://www.freesfx.co.uk/sfx/lever) - -Sound Effects - Sfxr -(https://www.drpetter.se/project_sfxr.html) - -" -align = 1 -autowrap = true -__meta__ = { -"_edit_use_anchors_": false -} - -[node name="AnimationPlayer" type="AnimationPlayer" parent="."] -autoplay = "Text Scroll" -"anims/Text Scroll" = SubResource( 2 ) - -[node name="AudioStreamPlayer" type="AudioStreamPlayer" parent="."] -stream = ExtResource( 3 ) -volume_db = -14.312 -autoplay = true diff --git a/levels/Campaign/Credits/Credits.tscn b/levels/Campaign/Credits/Credits.tscn new file mode 100644 index 0000000..f965994 --- /dev/null +++ b/levels/Campaign/Credits/Credits.tscn @@ -0,0 +1,141 @@ +[gd_scene load_steps=9 format=2] + +[ext_resource path="res://Music and Fonts(Misc.)/Credit Music.ogg" type="AudioStream" id=2] +[ext_resource path="res://art/Black.png" type="Texture" id=3] +[ext_resource path="res://Music and Fonts(Misc.)/m5x7.ttf" type="DynamicFontData" id=4] +[ext_resource path="res://art/Quit Death 1.png" type="Texture" id=5] +[ext_resource path="res://art/Quit DEath 2.png" type="Texture" id=6] +[ext_resource path="res://levels/Campaign/Credits/TextureButton.gd" type="Script" id=7] + +[sub_resource type="DynamicFont" id=1] +font_data = ExtResource( 4 ) + +[sub_resource type="Animation" id=2] +resource_name = "Text Scroll" +length = 60.0 +tracks/0/type = "value" +tracks/0/path = NodePath("CanvasLayer/Label:rect_position") +tracks/0/interp = 1 +tracks/0/loop_wrap = true +tracks/0/imported = false +tracks/0/enabled = true +tracks/0/keys = { +"times": PoolRealArray( 0.1, 59.8, 65.4 ), +"transitions": PoolRealArray( 1, 1, 1 ), +"update": 0, +"values": [ Vector2( 30, 177 ), Vector2( 30, -615.567 ), Vector2( 30, -553 ) ] +} +tracks/1/type = "value" +tracks/1/path = NodePath("CanvasLayer/TextureButton:rect_position") +tracks/1/interp = 1 +tracks/1/loop_wrap = true +tracks/1/imported = false +tracks/1/enabled = true +tracks/1/keys = { +"times": PoolRealArray( 0, 59.8 ), +"transitions": PoolRealArray( 1, 1 ), +"update": 0, +"values": [ Vector2( 110, 830 ), Vector2( 110, 60 ) ] +} +tracks/2/type = "value" +tracks/2/path = NodePath("CanvasLayer/TextureButton:visible") +tracks/2/interp = 1 +tracks/2/loop_wrap = true +tracks/2/imported = false +tracks/2/enabled = true +tracks/2/keys = { +"times": PoolRealArray( 0, 3 ), +"transitions": PoolRealArray( 1, 1 ), +"update": 1, +"values": [ false, true ] +} +tracks/3/type = "value" +tracks/3/path = NodePath("CanvasLayer/Label:visible") +tracks/3/interp = 1 +tracks/3/loop_wrap = true +tracks/3/imported = false +tracks/3/enabled = true +tracks/3/keys = { +"times": PoolRealArray( 0, 0.1 ), +"transitions": PoolRealArray( 1, 1 ), +"update": 1, +"values": [ false, true ] +} + +[node name="Credits" type="Node"] + +[node name="CanvasLayer" type="CanvasLayer" parent="."] + +[node name="Sprite" type="Sprite" parent="CanvasLayer"] +texture = ExtResource( 3 ) +centered = false + +[node name="Label" type="Label" parent="CanvasLayer"] +margin_left = 30.0 +margin_top = 156.868 +margin_right = 293.0 +margin_bottom = 793.868 +custom_fonts/font = SubResource( 1 ) +text = "We can't thank you enough for playing our game. This is our first Game Jam/Coding experience, and had loads of fun. So sincerely, thank you. + + + From Diego Lugo [dogtots] + and Logan Gatlin [Tyranus] + + + +Sprite Creator: Logan Gatlin [Tyranus] + +Coders: Diego Lugo [dogtots], + Logan Gatlin [Tyranus] + + +Sources: +Player and Enemy Sprites - Robert [0x72] (https://0x72.itch.io/dungeontileset-ii) + +Inventory Sprites - Robert [0x72] +(https://0x72.itch.io/dungeonui) + +Music - Alexmax +(https://opengameart.org/content/pixelated-music) + +End Credit Music - Joe Hawley +(https://www.youtube.com/watch?v=WOtTTkVuCwA) + +Ambience - JaggedStone +(https://opengameart.org/content/loopable-dungeon-ambience) + +Sound Effects - (https://www.freesfx.co.uk/sfx/lever) + +Sound Effects - Sfxr +(https://www.drpetter.se/project_sfxr.html) + +" +align = 1 +autowrap = true +__meta__ = { +"_edit_use_anchors_": false +} + +[node name="TextureButton" type="TextureButton" parent="CanvasLayer"] +visible = false +margin_left = 110.0 +margin_top = 809.186 +margin_right = 210.0 +margin_bottom = 859.186 +texture_normal = ExtResource( 5 ) +texture_hover = ExtResource( 6 ) +script = ExtResource( 7 ) +__meta__ = { +"_edit_use_anchors_": false +} + +[node name="AnimationPlayer" type="AnimationPlayer" parent="."] +autoplay = "Text Scroll" +"anims/Text Scroll" = SubResource( 2 ) + +[node name="AudioStreamPlayer" type="AudioStreamPlayer" parent="."] +stream = ExtResource( 2 ) +volume_db = -14.312 +autoplay = true +[connection signal="pressed" from="CanvasLayer/TextureButton" to="CanvasLayer/TextureButton" method="_on_TextureButton_pressed"] diff --git a/levels/Campaign/Credits/TextureButton.gd b/levels/Campaign/Credits/TextureButton.gd new file mode 100644 index 0000000..6676b14 --- /dev/null +++ b/levels/Campaign/Credits/TextureButton.gd @@ -0,0 +1,20 @@ +extends TextureButton + + +# Declare member variables here. Examples: +# var a = 2 +# var b = "text" + + +# Called when the node enters the scene tree for the first time. +func _ready(): + pass # Replace with function body. + + +# Called every frame. 'delta' is the elapsed time since the previous frame. +#func _process(delta): +# pass + + +func _on_TextureButton_pressed(): + get_tree().quit() diff --git a/levels/Campaign/Credits/Timer.gd b/levels/Campaign/Credits/Timer.gd new file mode 100644 index 0000000..8275592 --- /dev/null +++ b/levels/Campaign/Credits/Timer.gd @@ -0,0 +1,8 @@ +extends Timer + +onready var DamageCD = $DamageCD + +func _on_Timer_timeout(): + if DamageCD.is_stopped(): + Player.current_scene = "res://levels/Campaign/End/End.tscn" + get_tree().change_scene("res://levels/Campaign/End/End.tscn") diff --git a/levels/Campaign/Level 2/Level_2.tscn b/levels/Campaign/Level 2/Level_2.tscn index 03c8fd3..9de1ab0 100644 --- a/levels/Campaign/Level 2/Level_2.tscn +++ b/levels/Campaign/Level 2/Level_2.tscn @@ -8,7 +8,6 @@ [ext_resource path="res://Player/Player.tscn" type="PackedScene" id=6] [ext_resource path="res://ai/Scenes/Skeleton Enemy.tscn" type="PackedScene" id=7] - [sub_resource type="RectangleShape2D" id=1] extents = Vector2( 1810, 13 ) diff --git a/levels/Campaign/Level 4/Level_4.tscn b/levels/Campaign/Level 4/Level_4.tscn index c2df2ab..b1972f0 100644 --- a/levels/Campaign/Level 4/Level_4.tscn +++ b/levels/Campaign/Level 4/Level_4.tscn @@ -18,6 +18,8 @@ extents = Vector2( 1535, 10 ) [node name="Door" parent="." instance=ExtResource( 10 )] position = Vector2( 1590, 145 ) +next_scene = "res://levels/Campaign/Credits/Credits.tscn" +text = "Credits. Thank you. " [node name="door" type="Sprite" parent="."] position = Vector2( 16.0554, 160.966 ) @@ -29,6 +31,8 @@ hframes = 2 ]] tile_set = ExtResource( 1 ) cell_size = Vector2( 16, 16 ) +collision_layer = 2 +collision_mask = 0 format = 1 tile_data = PoolIntArray( -65538, 0, 8, -65537, 0, 10, -131072, 0, 10, -131071, 0, 10, -131070, 0, 10, -131069, 0, 10, -131068, 0, 10, -131067, 0, 10, -131066, 0, 10, -131065, 0, 10, -131064, 0, 10, -131063, 0, 10, -131062, 0, 10, -131061, 0, 10, -131060, 0, 10, -131059, 0, 10, -131058, 0, 10, -131057, 0, 10, -131056, 0, 10, -131055, 0, 10, -131054, 0, 10, -131053, 0, 10, -131052, 0, 10, -131051, 0, 10, -131050, 0, 10, -131049, 0, 10, -131048, 0, 10, -131047, 0, 10, -131046, 0, 10, -131045, 0, 10, -131044, 0, 10, -131043, 0, 10, -131042, 0, 10, -131041, 0, 10, -131040, 0, 10, -131039, 0, 10, -131038, 0, 10, -131037, 0, 10, -131036, 0, 10, -131035, 0, 10, -131034, 0, 10, -131033, 0, 10, -131032, 0, 10, -131031, 0, 10, -131030, 0, 10, -131029, 0, 10, -131028, 0, 10, -131027, 0, 10, -131026, 0, 10, -131025, 0, 10, -131024, 0, 10, -131023, 0, 10, -131022, 0, 10, -131021, 0, 10, -131020, 0, 10, -131019, 0, 10, -131018, 0, 10, -131017, 0, 10, -131016, 0, 10, -131015, 0, 10, -131014, 0, 10, -131013, 0, 10, -131012, 0, 10, -131011, 0, 10, -131010, 0, 10, -131009, 0, 10, -131008, 0, 10, -131007, 0, 10, -131006, 0, 10, -131005, 0, 10, -131004, 0, 10, -131003, 0, 10, -131002, 0, 10, -131001, 0, 10, -131000, 0, 10, -130999, 0, 10, -130998, 0, 10, -130997, 0, 10, -130996, 0, 10, -130995, 0, 10, -130994, 0, 10, -130993, 0, 10, -130992, 0, 10, -130991, 0, 10, -130990, 0, 10, -130989, 0, 10, -130988, 0, 10, -130987, 0, 10, -130986, 0, 10, -130985, 0, 10, -130984, 0, 10, -130983, 0, 10, -130982, 0, 10, -130981, 0, 10, -130980, 0, 10, -130979, 0, 10, -130978, 0, 10, -130977, 0, 10, -130976, 0, 10, -130975, 0, 10, -130974, 0, 10, -130973, 0, 10, -130972, 0, 10, -130971, 0, 10, -130970, 0, 10, -130969, 0, 11, -2, 0, 65544, -1, 0, 131078, -65536, 0, 196617, -65535, 0, 196617, -65534, 0, 196617, -65533, 0, 196617, -65532, 0, 196617, -65531, 0, 196617, -65530, 0, 196617, -65529, 0, 196617, -65528, 0, 196617, -65527, 0, 196617, -65526, 0, 196617, -65525, 0, 196617, -65524, 0, 196617, -65523, 0, 196617, -65522, 0, 196617, -65521, 0, 196617, -65520, 0, 196617, -65519, 0, 196617, -65518, 0, 196617, -65517, 0, 196617, -65516, 0, 196617, -65515, 0, 196617, -65514, 0, 196617, -65513, 0, 196617, -65512, 0, 196617, -65511, 0, 196617, -65510, 0, 196617, -65509, 0, 196617, -65508, 0, 196617, -65507, 0, 196617, -65506, 0, 196617, -65505, 0, 196617, -65504, 0, 196617, -65503, 0, 196617, -65502, 0, 196617, -65501, 0, 196617, -65500, 0, 196617, -65499, 0, 196617, -65498, 0, 196617, -65497, 0, 196617, -65496, 0, 196617, -65495, 0, 196617, -65494, 0, 196617, -65493, 0, 196617, -65492, 0, 196617, -65491, 0, 196617, -65490, 0, 196617, -65489, 0, 196617, -65488, 0, 196617, -65487, 0, 196617, -65486, 0, 196617, -65485, 0, 196617, -65484, 0, 196617, -65483, 0, 196617, -65482, 0, 196617, -65481, 0, 131077, -65480, 0, 131078, -65479, 0, 196617, -65478, 0, 196617, -65477, 0, 196617, -65476, 0, 196617, -65475, 0, 196617, -65474, 0, 196617, -65473, 0, 196617, -65472, 0, 196617, -65471, 0, 196617, -65470, 0, 196617, -65469, 0, 196617, -65468, 0, 196617, -65467, 0, 196617, -65466, 0, 196617, -65465, 0, 196617, -65464, 0, 196617, -65463, 0, 196617, -65462, 0, 131077, -65461, 0, 131078, -65460, 0, 196617, -65459, 0, 196617, -65458, 0, 196617, -65457, 0, 196617, -65456, 0, 196617, -65455, 0, 196617, -65454, 0, 196617, -65453, 0, 196617, -65452, 0, 196617, -65451, 0, 196617, -65450, 0, 196617, -65449, 0, 196617, -65448, 0, 196617, -65447, 0, 196617, -65446, 0, 196617, -65445, 0, 196617, -65444, 0, 196617, -65443, 0, 196617, -65442, 0, 196617, -65441, 0, 196617, -65440, 0, 196617, -65439, 0, 196617, -65438, 0, 196617, -65437, 0, 196617, -65436, 0, 196617, -65435, 0, 196617, -65434, 0, 131077, -65433, 0, 131083, 65534, 0, 65544, 65535, 0, 131083, 55, 0, 65544, 56, 0, 131083, 74, 0, 65544, 75, 0, 131083, 102, 0, 65544, 103, 0, 131083, 131070, 0, 65544, 131071, 0, 131083, 65591, 0, 65544, 65592, 0, 131083, 65610, 0, 65544, 65611, 0, 131083, 65638, 0, 65544, 65639, 0, 131083, 196606, 0, 65544, 196607, 0, 131083, 131127, 0, 65544, 131128, 0, 131083, 131146, 0, 65544, 131147, 0, 131083, 131174, 0, 65544, 131175, 0, 131083, 262142, 0, 65544, 262143, 0, 131083, 196663, 0, 65544, 196664, 0, 131083, 196682, 0, 65544, 196683, 0, 131083, 196710, 0, 65544, 196711, 0, 131083, 327678, 0, 65544, 327679, 0, 131083, 262199, 0, 65544, 262200, 0, 131083, 262218, 0, 65544, 262219, 0, 131083, 262246, 0, 65544, 262247, 0, 131083, 393214, 0, 65544, 393215, 0, 131083, 327735, 0, 65544, 327736, 0, 131083, 327754, 0, 65544, 327755, 0, 131083, 327782, 0, 65544, 327783, 0, 131083, 458750, 0, 65544, 458751, 0, 131083, 393271, 0, 65544, 393272, 0, 131083, 393290, 0, 65544, 393291, 0, 131083, 393318, 0, 65544, 393319, 0, 131083, 524286, 0, 65544, 524287, 0, 131083, 458807, 0, 65544, 458808, 0, 131083, 458826, 0, 65544, 458827, 0, 131083, 458854, 0, 65544, 458855, 0, 131083, 589822, 0, 65544, 589823, 0, 131083, 524343, 0, 196616, 524344, 0, 196619, 524362, 0, 196616, 524363, 0, 196619, 524390, 0, 65544, 524391, 0, 131083, 655358, 0, 65544, 655359, 0, 131083, 589852, 0, 8, 589853, 0, 10, 589854, 0, 10, 589855, 0, 10, 589856, 0, 10, 589857, 0, 10, 589858, 0, 10, 589859, 0, 10, 589860, 0, 11, 589926, 0, 65544, 589927, 0, 131083, 720894, 0, 65544, 720895, 0, 131083, 655382, 0, 0, 655386, 0, 0, 655388, 0, 65544, 655389, 0, 131081, 655390, 0, 131081, 655391, 0, 131081, 655392, 0, 131081, 655393, 0, 131081, 655394, 0, 131081, 655395, 0, 131081, 655396, 0, 65542, 655397, 0, 11, 655462, 0, 65544, 655463, 0, 131083, 786430, 0, 65544, 786431, 0, 65542, 720896, 0, 10, 720897, 0, 10, 720898, 0, 10, 720899, 0, 10, 720900, 0, 10, 720901, 0, 10, 720902, 0, 10, 720903, 0, 10, 720904, 0, 10, 720905, 0, 10, 720906, 0, 10, 720907, 0, 10, 720908, 0, 10, 720909, 0, 10, 720910, 0, 10, 720911, 0, 10, 720912, 0, 10, 720913, 0, 10, 720914, 0, 10, 720915, 0, 10, 720916, 0, 11, 720918, 0, 65536, 720920, 0, 0, 720922, 0, 65536, 720924, 0, 65544, 720925, 0, 131081, 720926, 0, 131081, 720927, 0, 131081, 720928, 0, 131081, 720929, 0, 131081, 720930, 0, 131081, 720931, 0, 131081, 720932, 0, 131081, 720933, 0, 65542, 720934, 0, 10, 720935, 0, 10, 720936, 0, 10, 720937, 0, 10, 720938, 0, 10, 720939, 0, 10, 720940, 0, 10, 720941, 0, 10, 720942, 0, 10, 720943, 0, 10, 720944, 0, 10, 720945, 0, 10, 720946, 0, 10, 720947, 0, 10, 720948, 0, 10, 720949, 0, 10, 720950, 0, 10, 720951, 0, 10, 720952, 0, 10, 720953, 0, 10, 720954, 0, 10, 720955, 0, 10, 720956, 0, 10, 720957, 0, 10, 720958, 0, 10, 720959, 0, 10, 720960, 0, 10, 720961, 0, 10, 720962, 0, 10, 720963, 0, 10, 720964, 0, 10, 720965, 0, 10, 720966, 0, 10, 720967, 0, 10, 720968, 0, 10, 720969, 0, 10, 720970, 0, 10, 720971, 0, 10, 720972, 0, 10, 720973, 0, 10, 720974, 0, 10, 720975, 0, 10, 720976, 0, 11, 720982, 0, 8, 720983, 0, 10, 720984, 0, 10, 720985, 0, 10, 720986, 0, 10, 720987, 0, 10, 720988, 0, 10, 720989, 0, 10, 720990, 0, 10, 720991, 0, 10, 720992, 0, 10, 720993, 0, 10, 720994, 0, 10, 720995, 0, 10, 720996, 0, 10, 720997, 0, 10, 720998, 0, 65541, 720999, 0, 131083, 851966, 0, 196616, 851967, 0, 196617, 786432, 0, 196617, 786433, 0, 196617, 786434, 0, 196617, 786435, 0, 196617, 786436, 0, 196617, 786437, 0, 196617, 786438, 0, 196617, 786439, 0, 196617, 786440, 0, 196617, 786441, 0, 196617, 786442, 0, 196617, 786443, 0, 196617, 786444, 0, 196617, 786445, 0, 196617, 786446, 0, 196617, 786447, 0, 196617, 786448, 0, 196617, 786449, 0, 196617, 786450, 0, 196617, 786451, 0, 196617, 786452, 0, 196619, 786454, 0, 131072, 786456, 0, 131072, 786458, 0, 131072, 786460, 0, 196616, 786461, 0, 196617, 786462, 0, 196617, 786463, 0, 196617, 786464, 0, 196617, 786465, 0, 196617, 786466, 0, 196617, 786467, 0, 196617, 786468, 0, 196617, 786469, 0, 196617, 786470, 0, 196617, 786471, 0, 196617, 786472, 0, 196617, 786473, 0, 196617, 786474, 0, 196617, 786475, 0, 196617, 786476, 0, 196617, 786477, 0, 196617, 786478, 0, 196617, 786479, 0, 196617, 786480, 0, 196617, 786481, 0, 196617, 786482, 0, 196617, 786483, 0, 196617, 786484, 0, 196617, 786485, 0, 196617, 786486, 0, 196617, 786487, 0, 196617, 786488, 0, 196617, 786489, 0, 196617, 786490, 0, 196617, 786491, 0, 196617, 786492, 0, 196617, 786493, 0, 196617, 786494, 0, 196617, 786495, 0, 196617, 786496, 0, 196617, 786497, 0, 196617, 786498, 0, 196617, 786499, 0, 196617, 786500, 0, 196617, 786501, 0, 196617, 786502, 0, 196617, 786503, 0, 196617, 786504, 0, 196617, 786505, 0, 196617, 786506, 0, 196617, 786507, 0, 196617, 786508, 0, 196617, 786509, 0, 196617, 786510, 0, 196617, 786511, 0, 196617, 786512, 0, 196619, 786518, 0, 196616, 786519, 0, 196617, 786520, 0, 196617, 786521, 0, 196617, 786522, 0, 196617, 786523, 0, 196617, 786524, 0, 196617, 786525, 0, 196617, 786526, 0, 196617, 786527, 0, 196617, 786528, 0, 196617, 786529, 0, 196617, 786530, 0, 196617, 786531, 0, 196617, 786532, 0, 196617, 786533, 0, 196617, 786534, 0, 196617, 786535, 0, 196619 ) @@ -44,6 +48,7 @@ script = ExtResource( 5 ) [node name="Lever" parent="." instance=ExtResource( 4 )] position = Vector2( 844, 169 ) +lock = false [node name="Enemies" type="Node" parent="."] diff --git a/meta/Music.gd b/meta/Music.gd index 0ac9ef6..901bf46 100644 --- a/meta/Music.gd +++ b/meta/Music.gd @@ -2,9 +2,11 @@ extends Node onready var MainMusic: AudioStreamPlayer = $MainMusic onready var Ambience: AudioStreamPlayer = $Ambience +onready var CreditMusic: AudioStreamPlayer = $CreditMusic func _process(delta): - if Player.current_scene == "res://levels/Campaign/Credits.tscn": + if Player.current_scene == "res://levels/Campaign/Credits/Credits.tscn": + CreditMusic.playing = true MainMusic.playing = false Ambience.playing = false else: diff --git a/meta/Music.tscn b/meta/Music.tscn index 558c916..8fb19ab 100644 --- a/meta/Music.tscn +++ b/meta/Music.tscn @@ -14,3 +14,5 @@ volume_db = -4.0 [node name="Ambience" type="AudioStreamPlayer" parent="."] stream = ExtResource( 2 ) volume_db = -8.0 + +[node name="CreditMusic" type="AudioStreamPlayer" parent="."] diff --git a/npc/Wizard.tscn b/npc/Wizard.tscn index b79b5d6..3ce7020 100644 --- a/npc/Wizard.tscn +++ b/npc/Wizard.tscn @@ -64,6 +64,7 @@ tracks/2/keys = { [sub_resource type="Animation" id=3] length = 1.5 +step = 0.06 tracks/0/type = "value" tracks/0/path = NodePath("Label:percent_visible") tracks/0/interp = 1 @@ -94,10 +95,12 @@ collision_mask = 2 script = ExtResource( 2 ) [node name="Sprite" type="Sprite" parent="."] +modulate = Color( 1, 1, 1, 0.73047 ) position = Vector2( 0, -12 ) texture = ExtResource( 1 ) vframes = 3 hframes = 4 +frame = 3 [node name="AnimationPlayer" type="AnimationPlayer" parent="."] autoplay = "Idle" @@ -120,7 +123,7 @@ custom_fonts/font = SubResource( 6 ) align = 1 valign = 1 autowrap = true -percent_visible = 0.103 +percent_visible = 0.13888 __meta__ = { "_edit_use_anchors_": false }