From f35134b7b148d3da47fda42e63da75913d1a7deb Mon Sep 17 00:00:00 2001 From: Logan Date: Fri, 24 Jul 2020 00:17:24 -0500 Subject: [PATCH] Auto stash before merge of "master" and "origin/master" --- Cutscenes/Intro.gd | 5 ++ Cutscenes/NewIntro.tscn | 78 +++++++++++++++++++++++++-- art/Pillar.png | Bin 0 -> 175 bytes levels/Campaign/Level 1/Level 1.tscn | 36 +++++++------ levels/Campaign/Level 2/Level_2.tscn | 29 +++++----- levels/Campaign/Level 3/Level_3.tscn | 65 +++++++++++----------- levels/Campaign/Level0.tscn | 5 +- objects/Door.gd | 2 + 8 files changed, 147 insertions(+), 73 deletions(-) create mode 100644 art/Pillar.png diff --git a/Cutscenes/Intro.gd b/Cutscenes/Intro.gd index d042801..4c97a49 100644 --- a/Cutscenes/Intro.gd +++ b/Cutscenes/Intro.gd @@ -4,3 +4,8 @@ signal finished func finished(): emit_signal("finished") + +func _process(delta): + if Input.is_action_just_pressed("open"): + $AnimationPlayer.play("reset") + emit_signal("finished") diff --git a/Cutscenes/NewIntro.tscn b/Cutscenes/NewIntro.tscn index daacd27..5fd80e3 100644 --- a/Cutscenes/NewIntro.tscn +++ b/Cutscenes/NewIntro.tscn @@ -1,4 +1,4 @@ -[gd_scene load_steps=10 format=2] +[gd_scene load_steps=12 format=2] [ext_resource path="res://art/Black.png" type="Texture" id=1] [ext_resource path="res://Music and Fonts(Misc.)/m5x7.tres" type="DynamicFontData" id=2] @@ -28,7 +28,62 @@ shader = SubResource( 3 ) size = 35 font_data = ExtResource( 2 ) -[sub_resource type="Animation" id=6] +[sub_resource type="DynamicFont" id=6] +font_data = ExtResource( 2 ) + +[sub_resource type="Animation" id=7] +resource_name = "reset" +length = 0.1 +tracks/0/type = "value" +tracks/0/path = NodePath("Black:self_modulate") +tracks/0/interp = 1 +tracks/0/loop_wrap = true +tracks/0/imported = false +tracks/0/enabled = true +tracks/0/keys = { +"times": PoolRealArray( 0 ), +"transitions": PoolRealArray( 1 ), +"update": 0, +"values": [ Color( 1, 1, 1, 0 ) ] +} +tracks/1/type = "value" +tracks/1/path = NodePath("Label:visible_characters") +tracks/1/interp = 1 +tracks/1/loop_wrap = true +tracks/1/imported = false +tracks/1/enabled = true +tracks/1/keys = { +"times": PoolRealArray( 0 ), +"transitions": PoolRealArray( 1 ), +"update": 1, +"values": [ 0 ] +} +tracks/2/type = "value" +tracks/2/path = NodePath("Label2:visible_characters") +tracks/2/interp = 1 +tracks/2/loop_wrap = true +tracks/2/imported = false +tracks/2/enabled = true +tracks/2/keys = { +"times": PoolRealArray( 0 ), +"transitions": PoolRealArray( 1 ), +"update": 1, +"values": [ 0 ] +} +tracks/3/type = "value" +tracks/3/path = NodePath("Label3:visible_characters") +tracks/3/interp = 1 +tracks/3/loop_wrap = true +tracks/3/imported = false +tracks/3/enabled = true +tracks/3/keys = { +"times": PoolRealArray( 0 ), +"transitions": PoolRealArray( 1 ), +"update": 1, +"values": [ 0 ] +} + +[sub_resource type="Animation" id=8] length = 10.0 tracks/0/type = "value" tracks/0/path = NodePath("Label:visible_characters") @@ -129,9 +184,9 @@ __meta__ = { [node name="Label2" type="Label" parent="."] material = SubResource( 4 ) -margin_top = 118.0 +margin_top = 112.0 margin_right = 320.0 -margin_bottom = 161.0 +margin_bottom = 146.0 custom_fonts/font = SubResource( 5 ) custom_colors/font_color = Color( 1, 0, 0, 1 ) text = "The Crypt" @@ -142,6 +197,19 @@ __meta__ = { "_edit_use_anchors_": false } +[node name="Label3" type="Label" parent="."] +margin_top = 152.0 +margin_right = 320.0 +margin_bottom = 173.0 +custom_fonts/font = SubResource( 6 ) +text = "Press F to skip" +align = 1 +valign = 1 +__meta__ = { +"_edit_use_anchors_": false +} + [node name="AnimationPlayer" type="AnimationPlayer" parent="."] autoplay = "scroll" -anims/scroll = SubResource( 6 ) +anims/reset = SubResource( 7 ) +anims/scroll = SubResource( 8 ) diff --git a/art/Pillar.png b/art/Pillar.png new file mode 100644 index 0000000000000000000000000000000000000000..fb7a879fe477816f4c3c60aaea924cdbb953314b GIT binary patch literal 175 zcmeAS@N?(olHy`uVBq!ia0vp^0zhoQ!3HEH;(vt$DaPU;cPEB*=VV?2Ihmd=jv*eM z$tej52?pCr{+xGUv#74IR~ELEn#ic!^H6k>%Ove>YiAxmap1rKhmG71*m9zc`vW5b zXEy=?