Movement tweaks, fade tweaks, stopped ledge jumping, and lighting tweaks

This commit is contained in:
2020-05-31 01:16:14 -04:00
parent 3a6df205d2
commit e1ea4f96cd
21 changed files with 202 additions and 44 deletions

View File

@ -1,23 +1,24 @@
[gd_scene load_steps=10 format=2]
[gd_scene load_steps=11 format=2]
[ext_resource path="res://Assets/Themes/default.tres" type="Theme" id=1]
[ext_resource path="res://Scripts/Systems/GameGui.gd" type="Script" id=2]
[ext_resource path="res://Assets/Proprietary/hf-scifi-complete/improbable-v1/Improbable.ttf" type="DynamicFontData" id=3]
[ext_resource path="res://Assets/Proprietary/hf-scifi-complete/zapper-v1.1/Zapper.otf" type="DynamicFontData" id=4]
[ext_resource path="res://Assets/Proprietary/hf-scifi-complete/marksman-v1/Marksman.ttf" type="DynamicFontData" id=5]
[ext_resource path="res://Scripts/Entities/Fader.gd" type="Script" id=6]
[sub_resource type="DynamicFont" id=1]
size = 18
font_data = ExtResource( 4 )
[sub_resource type="StyleBoxFlat" id=4]
[sub_resource type="StyleBoxFlat" id=2]
bg_color = Color( 0.2, 0.376471, 0.368627, 0.694118 )
[sub_resource type="DynamicFont" id=2]
[sub_resource type="DynamicFont" id=3]
size = 48
font_data = ExtResource( 3 )
[sub_resource type="DynamicFont" id=3]
[sub_resource type="DynamicFont" id=4]
size = 32
outline_size = 2
outline_color = Color( 0, 0, 0, 0.45098 )
@ -83,7 +84,7 @@ margin_left = 37.0
margin_top = -9.0
margin_right = 987.0
margin_bottom = 22.0
custom_styles/panel = SubResource( 4 )
custom_styles/panel = SubResource( 2 )
__meta__ = {
"_edit_use_anchors_": false
}
@ -121,7 +122,7 @@ margin_left = 12.0
margin_top = -59.0
margin_right = 1257.0
margin_bottom = -8.0
custom_fonts/font = SubResource( 2 )
custom_fonts/font = SubResource( 3 )
text = "Entering: Depths"
valign = 2
__meta__ = {
@ -137,9 +138,21 @@ margin_left = -386.0
margin_top = -110.5
margin_right = 386.0
margin_bottom = 110.5
custom_fonts/font = SubResource( 3 )
custom_fonts/font = SubResource( 4 )
text = "Press WASD to move"
align = 1
__meta__ = {
"_edit_use_anchors_": false
}
[node name="Fader" type="ColorRect" parent="."]
visible = false
anchor_right = 1.0
anchor_bottom = 1.0
mouse_filter = 2
color = Color( 0, 0, 0, 1 )
script = ExtResource( 6 )
__meta__ = {
"_edit_use_anchors_": false
}
start_with_fade_in = false

View File

@ -1,28 +1,27 @@
[gd_scene load_steps=12 format=2]
[gd_scene load_steps=13 format=2]
[ext_resource path="res://Assets/Sfx/intro/processed.wav" type="AudioStream" id=1]
[ext_resource path="res://Scripts/Component/StorySpeaker.gd" type="Script" id=2]
[ext_resource path="res://Scripts/Entities/NPCs/Aura.gd" type="Script" id=3]
[ext_resource path="res://Assets/Art/Characters/aura.png" type="Texture" id=4]
[ext_resource path="res://Scripts/Entities/Fader.gd" type="Script" id=5]
[sub_resource type="AtlasTexture" id=1]
atlas = ExtResource( 4 )
region = Rect2( 23, 0, 5, 16 )
[sub_resource type="StreamTexture" id=3]
[sub_resource type="StreamTexture" id=2]
load_path = "res://.import/aura.png-d56c2c3c604fb12791bf7613004ed5a9.stex"
[sub_resource type="AtlasTexture" id=4]
atlas = SubResource( 3 )
[sub_resource type="AtlasTexture" id=3]
atlas = SubResource( 2 )
region = Rect2( 19, 0, 3, 16 )
[sub_resource type="AtlasTexture" id=5]
atlas = SubResource( 3 )
[sub_resource type="AtlasTexture" id=4]
atlas = SubResource( 2 )
region = Rect2( 29, 0, 3, 16 )
[sub_resource type="RectangleShape2D" id=2]
[sub_resource type="RectangleShape2D" id=5]
extents = Vector2( 62.9439, 20.084 )
[sub_resource type="Animation" id=6]
@ -160,16 +159,16 @@ texture = SubResource( 1 )
[node name="RightArm" type="Sprite" parent="Torso"]
position = Vector2( -3, 0 )
z_index = -1
texture = SubResource( 4 )
texture = SubResource( 3 )
[node name="LeftArm" type="Sprite" parent="Torso"]
position = Vector2( 3, 0 )
z_index = -1
texture = SubResource( 5 )
texture = SubResource( 4 )
[node name="CollisionShape2D" type="CollisionShape2D" parent="."]
visible = false
shape = SubResource( 2 )
shape = SubResource( 5 )
[node name="Speaker" type="Node" parent="."]
script = ExtResource( 2 )
@ -190,6 +189,18 @@ __meta__ = {
"_edit_use_anchors_": false
}
[node name="Fader" type="ColorRect" parent="CanvasLayer"]
visible = false
anchor_right = 1.0
anchor_bottom = 1.0
mouse_filter = 2
color = Color( 0, 0, 0, 1 )
script = ExtResource( 5 )
__meta__ = {
"_edit_use_anchors_": false
}
start_with_fade_in = false
[node name="AnimationPlayer" type="AnimationPlayer" parent="."]
anims/Idle = SubResource( 6 )
anims/Shoot = SubResource( 7 )

View File

@ -1717,7 +1717,7 @@ tracks/39/keys = {
"times": PoolRealArray( 0, 0.5, 0.9 )
}
[sub_resource type="RectangleShape2D" id=23]
[sub_resource type="RectangleShape2D" id=6]
extents = Vector2( 3.06702, 6.9149 )
[sub_resource type="AtlasTexture" id=7]
@ -1817,7 +1817,7 @@ zoom = Vector2( 0.187, 0.187 )
[node name="CollisionShape2D" type="CollisionShape2D" parent="."]
position = Vector2( -0.0595379, 2.35723 )
shape = SubResource( 23 )
shape = SubResource( 6 )
[node name="Light2D" type="Light2D" parent="."]
texture = ExtResource( 3 )