diff --git a/Scenes/Levels/level_1.tscn b/Scenes/Levels/level_1.tscn index 17023d5..b35780a 100644 --- a/Scenes/Levels/level_1.tscn +++ b/Scenes/Levels/level_1.tscn @@ -1,13 +1,15 @@ [gd_scene load_steps=6 format=3 uid="uid://uoyiei4wyig3"] [ext_resource type="PackedScene" uid="uid://b8s2seg2lf7wo" path="res://Scenes/Tilemaps/tileset_1.tscn" id="1_4n82n"] -[ext_resource type="PackedScene" path="res://Scenes/Props/candle_1.tscn" id="2_5hdq4"] -[ext_resource type="PackedScene" path="res://Scenes/Props/candle_2.tscn" id="2_o33c4"] +[ext_resource type="PackedScene" uid="uid://cl7w6ndvons1a" path="res://Scenes/Props/candle_1.tscn" id="2_5hdq4"] +[ext_resource type="PackedScene" uid="uid://by2xmwcng01uy" path="res://Scenes/Props/candle_2.tscn" id="2_o33c4"] [ext_resource type="PackedScene" uid="uid://b5lnjonlf4i1b" path="res://Scenes/enemy.tscn" id="4_g0oey"] [ext_resource type="PackedScene" uid="uid://0onqgygm832d" path="res://Scenes/Player/player.tscn" id="5_ik47y"] [node name="Level1" type="Node2D"] +[node name="Player" parent="." instance=ExtResource("5_ik47y")] + [node name="TileSet1" parent="." instance=ExtResource("1_4n82n")] [node name="Decor" type="Node2D" parent="."] @@ -38,5 +40,3 @@ position = Vector2(528, 320) [node name="Enemy" parent="." instance=ExtResource("4_g0oey")] position = Vector2(481.898, 270.98) - -[node name="Player" parent="." instance=ExtResource("5_ik47y")] diff --git a/Scenes/Player/UI/player_ui.tscn b/Scenes/Player/UI/player_ui.tscn new file mode 100644 index 0000000..5ab9704 --- /dev/null +++ b/Scenes/Player/UI/player_ui.tscn @@ -0,0 +1,34 @@ +[gd_scene format=3 uid="uid://dmvukn3rl6gbx"] + +[node name="PlayerUI" type="CanvasLayer"] + +[node name="UIRoot" type="Control" parent="."] +layout_mode = 3 +anchor_top = 0.874 +anchor_right = 1.0 +anchor_bottom = 1.0 +offset_left = 9.0 +offset_top = 9.0 +offset_right = -9.0 +offset_bottom = -13.0 +grow_horizontal = 2 +grow_vertical = 0 + +[node name="ControlPanel" type="HBoxContainer" parent="UIRoot"] +layout_mode = 1 +anchors_preset = 15 +anchor_right = 1.0 +anchor_bottom = 1.0 +grow_horizontal = 2 +grow_vertical = 2 +theme_override_constants/separation = 2 +alignment = 1 + +[node name="StatPanel" type="Control" parent="UIRoot/ControlPanel"] +layout_mode = 2 +size_flags_horizontal = 3 + +[node name="ButtonPanel" type="HBoxContainer" parent="UIRoot/ControlPanel"] +layout_mode = 2 +size_flags_horizontal = 3 +theme_override_constants/separation = 4 diff --git a/Scenes/Player/UI/spawnable_button.tscn b/Scenes/Player/UI/spawnable_button.tscn new file mode 100644 index 0000000..b07aa88 --- /dev/null +++ b/Scenes/Player/UI/spawnable_button.tscn @@ -0,0 +1,21 @@ +[gd_scene load_steps=2 format=3 uid="uid://f7n8gd1wlv4v"] + +[sub_resource type="AnimatedTexture" id="AnimatedTexture_iksd1"] + +[node name="SpawnableButton" type="Button"] +anchors_preset = 15 +anchor_right = 1.0 +anchor_bottom = 1.0 +grow_horizontal = 2 +grow_vertical = 2 + +[node name="Animation" type="TextureRect" parent="."] +layout_mode = 1 +anchors_preset = 15 +anchor_right = 1.0 +anchor_bottom = 1.0 +grow_horizontal = 2 +grow_vertical = 2 +texture = SubResource("AnimatedTexture_iksd1") + +[node name="AnimatedSprite2D" type="AnimatedSprite2D" parent="Animation"] diff --git a/Scenes/Player/player.tscn b/Scenes/Player/player.tscn index cc0e9f0..981b4db 100644 --- a/Scenes/Player/player.tscn +++ b/Scenes/Player/player.tscn @@ -1,8 +1,12 @@ -[gd_scene load_steps=3 format=3 uid="uid://0onqgygm832d"] +[gd_scene load_steps=4 format=3 uid="uid://0onqgygm832d"] [ext_resource type="Script" path="res://Scenes/Player/player.gd" id="1_63swt"] [ext_resource type="PackedScene" uid="uid://brnx3xyyd0e71" path="res://Scenes/Spawnables/bat_spawnable.tscn" id="2_fd41r"] +[ext_resource type="PackedScene" uid="uid://dmvukn3rl6gbx" path="res://Scenes/Player/UI/player_ui.tscn" id="3_nbue7"] [node name="Player" type="Node2D"] script = ExtResource("1_63swt") batTemplatePath = ExtResource("2_fd41r") + +[node name="PlayerUI" parent="." instance=ExtResource("3_nbue7")] +metadata/_edit_use_anchors_ = true diff --git a/Scenes/Props/candle_1.tscn b/Scenes/Props/candle_1.tscn index 8da7c2a..acae912 100644 --- a/Scenes/Props/candle_1.tscn +++ b/Scenes/Props/candle_1.tscn @@ -1,4 +1,4 @@ -[gd_scene load_steps=9 format=3 uid="uid://dgtscjxcqoxls"] +[gd_scene load_steps=9 format=3 uid="uid://cl7w6ndvons1a"] [ext_resource type="Texture2D" uid="uid://dvtntmnfw83ms" path="res://Assets/RF_Catacombs_v1.0/candleA_02.png" id="1_2uqmc"] [ext_resource type="Texture2D" uid="uid://biomqy201h4yk" path="res://Assets/RF_Catacombs_v1.0/candleA_03.png" id="2_dgnwu"] @@ -55,5 +55,8 @@ visibility_rect = Rect2(0, 0, 0, 0) [node name="PointLight2D" type="PointLight2D" parent="."] color = Color(1, 0.698039, 0.2, 1) +shadow_enabled = true +shadow_filter = 2 +shadow_filter_smooth = 20.5 texture = SubResource("GradientTexture2D_mton1") texture_scale = 1.5 diff --git a/Scenes/Props/candle_2.tscn b/Scenes/Props/candle_2.tscn index 9cace68..f8c254c 100644 --- a/Scenes/Props/candle_2.tscn +++ b/Scenes/Props/candle_2.tscn @@ -1,4 +1,4 @@ -[gd_scene load_steps=9 format=3 uid="uid://cf7al5uln33rn"] +[gd_scene load_steps=9 format=3 uid="uid://by2xmwcng01uy"] [ext_resource type="Texture2D" uid="uid://phrnbrk3bl0g" path="res://Assets/RF_Catacombs_v1.0/candleB_01.png" id="1_r5efy"] [ext_resource type="Texture2D" uid="uid://dbyoqh34wf5ix" path="res://Assets/RF_Catacombs_v1.0/candleB_02.png" id="2_lpcc8"] @@ -60,5 +60,8 @@ visibility_rect = Rect2(0, 0, 0, 0) [node name="PointLight2D" type="PointLight2D" parent="."] color = Color(1, 0.698039, 0.2, 1) +shadow_enabled = true +shadow_filter = 2 +shadow_filter_smooth = 20.5 texture = SubResource("GradientTexture2D_mton1") texture_scale = 2.5 diff --git a/Scenes/Spawnables/template_spawnable.tscn b/Scenes/Spawnables/template_spawnable.tscn index dbf6447..a54ba91 100644 --- a/Scenes/Spawnables/template_spawnable.tscn +++ b/Scenes/Spawnables/template_spawnable.tscn @@ -1,4 +1,4 @@ -[gd_scene load_steps=38 format=3 uid="uid://kkfxguj0lr5a"] +[gd_scene load_steps=39 format=3 uid="uid://kkfxguj0lr5a"] [ext_resource type="Script" path="res://Scenes/Spawnables/template_spawnable.gd" id="1_rkej7"] [ext_resource type="Texture2D" uid="uid://f60ndepwmpj2" path="res://Assets/Bat/noBKG_BatAttack_strip.png" id="2_7ayi7"] @@ -231,6 +231,9 @@ height = 24.0 [sub_resource type="CapsuleShape2D" id="CapsuleShape2D_o2kl1"] radius = 8.0 +[sub_resource type="OccluderPolygon2D" id="OccluderPolygon2D_qtt12"] +polygon = PackedVector2Array(-4, -6, 3, -6, 7, -2, 5, 5, -1, 6, -6, 4, -7, -2) + [node name="TemplateSpawnable" type="CharacterBody2D"] collision_layer = 6 collision_mask = 6 @@ -283,4 +286,7 @@ debug_color = Color(0.639216, 0, 0.156863, 0.419608) [node name="Node2D" type="Node2D" parent="."] +[node name="LightOccluder2D" type="LightOccluder2D" parent="."] +occluder = SubResource("OccluderPolygon2D_qtt12") + [connection signal="body_entered" from="DamageArea" to="." method="_on_damage_area_body_entered"]