From de4d73708773b032b26ca474b0380b6a83e97a1d Mon Sep 17 00:00:00 2001 From: Logan Date: Thu, 23 Jul 2020 15:25:33 -0500 Subject: [PATCH] Minor tweaks --- Cutscenes/Intro.tscn | 93 ++++++++++++++++++++++++++++++++++++++ levels/other/Node2D.tscn | 2 - magic/Beams/PhantomBeam.gd | 4 +- ui/PlayerStats.tscn | 4 +- 4 files changed, 97 insertions(+), 6 deletions(-) create mode 100644 Cutscenes/Intro.tscn diff --git a/Cutscenes/Intro.tscn b/Cutscenes/Intro.tscn new file mode 100644 index 0000000..b69b126 --- /dev/null +++ b/Cutscenes/Intro.tscn @@ -0,0 +1,93 @@ +[gd_scene load_steps=8 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] + +[sub_resource type="DynamicFont" id=1] +size = 20 +extra_spacing_char = 1 +extra_spacing_space = 1 +font_data = ExtResource( 2 ) + +[sub_resource type="Shader" id=3] +code = "shader_type canvas_item; + +void vertex(){ + VERTEX.x += (sin(TIME * 2.0) * sin(TIME * VERTEX.y)) / 5.0; + VERTEX.y += cos(TIME * 2.0) * cos(TIME * VERTEX.x); +}" +custom_defines = "" + +[sub_resource type="ShaderMaterial" id=4] +shader = SubResource( 3 ) + +[sub_resource type="DynamicFont" id=2] +size = 35 +font_data = ExtResource( 2 ) + +[sub_resource type="Animation" id=5] +resource_name = "scroll" +length = 15.0 +tracks/0/type = "value" +tracks/0/path = NodePath("Label:visible_characters") +tracks/0/interp = 1 +tracks/0/loop_wrap = true +tracks/0/imported = false +tracks/0/enabled = true +tracks/0/keys = { +"times": PoolRealArray( 0, 3, 3.5, 5.5 ), +"transitions": PoolRealArray( 1, 1, 1, 1 ), +"update": 0, +"values": [ 0, 49, 49, 99 ] +} +tracks/1/type = "value" +tracks/1/path = NodePath("Label2:visible_characters") +tracks/1/interp = 1 +tracks/1/loop_wrap = true +tracks/1/imported = false +tracks/1/enabled = true +tracks/1/keys = { +"times": PoolRealArray( 6, 7 ), +"transitions": PoolRealArray( 1, 1 ), +"update": 0, +"values": [ 0, 8 ] +} + +[node name="CanvasLayer" type="CanvasLayer"] + +[node name="Black" type="Sprite" parent="."] +position = Vector2( 160, 90 ) +texture = ExtResource( 1 ) + +[node name="Label" type="Label" parent="."] +margin_left = 50.0 +margin_right = 270.0 +margin_bottom = 114.0 +custom_fonts/font = SubResource( 1 ) +text = "You are an apprentice Wizard, training in the art of Magic. One day, your teacher summons you to a place known only as..." +align = 1 +valign = 1 +autowrap = true +percent_visible = 0.0 +__meta__ = { +"_edit_use_anchors_": false +} + +[node name="Label2" type="Label" parent="."] +material = SubResource( 4 ) +margin_top = 118.0 +margin_right = 320.0 +margin_bottom = 161.0 +custom_fonts/font = SubResource( 2 ) +custom_colors/font_color = Color( 1, 0, 0, 1 ) +text = "The Crypt" +align = 1 +valign = 1 +percent_visible = 0.0 +__meta__ = { +"_edit_use_anchors_": false +} + +[node name="AnimationPlayer" type="AnimationPlayer" parent="."] +autoplay = "scroll" +anims/scroll = SubResource( 5 ) diff --git a/levels/other/Node2D.tscn b/levels/other/Node2D.tscn index 426d879..1db3ca4 100644 --- a/levels/other/Node2D.tscn +++ b/levels/other/Node2D.tscn @@ -3,8 +3,6 @@ [ext_resource path="res://meta/DungeonTilemap.tscn" type="PackedScene" id=1] [ext_resource path="res://Player/Player.tscn" type="PackedScene" id=2] - - [node name="World" type="Node2D"] position = Vector2( 6.67419, 7.34163 ) diff --git a/magic/Beams/PhantomBeam.gd b/magic/Beams/PhantomBeam.gd index fe0c6e8..bf42f60 100644 --- a/magic/Beams/PhantomBeam.gd +++ b/magic/Beams/PhantomBeam.gd @@ -1,8 +1,8 @@ extends Beam func _ready(): - energy_cost = 3 - damage = 1 + energy_cost = 2 + damage = 2 func activate(): $Beam.visible = true diff --git a/ui/PlayerStats.tscn b/ui/PlayerStats.tscn index 31f1832..0881076 100644 --- a/ui/PlayerStats.tscn +++ b/ui/PlayerStats.tscn @@ -39,8 +39,8 @@ margin_left = 4.0 margin_top = -5.0 margin_right = -64.0 margin_bottom = -16.0 -max_value = 10.0 -value = 10.0 +max_value = 12.0 +value = 12.0 texture_progress = ExtResource( 4 ) __meta__ = { "_edit_use_anchors_": false