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 4/Level_4.tscn b/levels/Campaign/Level 4/Level_4.tscn index b06fd46..a7d6545 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 ) @@ -48,6 +50,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 }