From 3fc4606f355b4e339aa480caffa6d72bc0c0d816 Mon Sep 17 00:00:00 2001 From: David Belisle <79233327+DavidBelisle@users.noreply.github.com> Date: Tue, 10 Oct 2023 22:28:27 -0400 Subject: [PATCH] collision --- Scenes/Levels/level_1.tscn | 4 +- Scenes/Props/candle_1.tscn | 2 +- Scenes/Props/candle_2.tscn | 2 +- Scenes/Spawnables/bat_spawnable.tscn | 4 +- Scenes/Tilemaps/tileset_1.tscn | 60 ++++++++++++++++++++++++++++ 5 files changed, 66 insertions(+), 6 deletions(-) diff --git a/Scenes/Levels/level_1.tscn b/Scenes/Levels/level_1.tscn index f9e1256..2f87dcd 100644 --- a/Scenes/Levels/level_1.tscn +++ b/Scenes/Levels/level_1.tscn @@ -2,8 +2,8 @@ [ext_resource type="Script" path="res://Scripts/level.gd" id="1_0nmok"] [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://dgtscjxcqoxls" path="res://Scenes/Props/candle_1.tscn" id="2_5hdq4"] +[ext_resource type="PackedScene" uid="uid://cf7al5uln33rn" 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"] diff --git a/Scenes/Props/candle_1.tscn b/Scenes/Props/candle_1.tscn index acae912..4c9e262 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://cl7w6ndvons1a"] +[gd_scene load_steps=9 format=3 uid="uid://dgtscjxcqoxls"] [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"] diff --git a/Scenes/Props/candle_2.tscn b/Scenes/Props/candle_2.tscn index f8c254c..eb7cb9d 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://by2xmwcng01uy"] +[gd_scene load_steps=9 format=3 uid="uid://cf7al5uln33rn"] [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"] diff --git a/Scenes/Spawnables/bat_spawnable.tscn b/Scenes/Spawnables/bat_spawnable.tscn index 07b7d72..d9ba3b3 100644 --- a/Scenes/Spawnables/bat_spawnable.tscn +++ b/Scenes/Spawnables/bat_spawnable.tscn @@ -10,8 +10,8 @@ speed = 4000.0 damage = 1 priority = 1 -[node name="AnimatedSprite2D" parent="." index="0"] +[node name="AnimatedSprite2D" parent="." index="1"] frame_progress = 0.482614 -[node name="AI" parent="." index="4"] +[node name="AI" parent="." index="5"] script = ExtResource("2_x3ldf") diff --git a/Scenes/Tilemaps/tileset_1.tscn b/Scenes/Tilemaps/tileset_1.tscn index b849aa5..f1ab3ae 100644 --- a/Scenes/Tilemaps/tileset_1.tscn +++ b/Scenes/Tilemaps/tileset_1.tscn @@ -780,39 +780,51 @@ texture = ExtResource("1_q3uqo") 4:12/0 = 0 4:12/0/physics_layer_0/linear_velocity = Vector2(0, 0) 4:12/0/physics_layer_0/angular_velocity = 0.0 +4:12/0/physics_layer_0/polygon_0/points = PackedVector2Array(-8, -8, 8, -8, 8, 8, -8, 8) 5:12/0 = 0 5:12/0/physics_layer_0/linear_velocity = Vector2(0, 0) 5:12/0/physics_layer_0/angular_velocity = 0.0 +5:12/0/physics_layer_0/polygon_0/points = PackedVector2Array(-8, -8, 8, -8, 8, 8, -8, 8) 6:12/0 = 0 6:12/0/physics_layer_0/linear_velocity = Vector2(0, 0) 6:12/0/physics_layer_0/angular_velocity = 0.0 +6:12/0/physics_layer_0/polygon_0/points = PackedVector2Array(-8, -8, 8, -8, 8, 8, -8, 8) 7:12/0 = 0 7:12/0/physics_layer_0/linear_velocity = Vector2(0, 0) 7:12/0/physics_layer_0/angular_velocity = 0.0 +7:12/0/physics_layer_0/polygon_0/points = PackedVector2Array(-8, -8, 8, -8, 8, 8, -8, 8) 8:12/0 = 0 8:12/0/physics_layer_0/linear_velocity = Vector2(0, 0) 8:12/0/physics_layer_0/angular_velocity = 0.0 +8:12/0/physics_layer_0/polygon_0/points = PackedVector2Array(-8, -8, 8, -8, 8, 8, -8, 8) 9:12/0 = 0 9:12/0/physics_layer_0/linear_velocity = Vector2(0, 0) 9:12/0/physics_layer_0/angular_velocity = 0.0 +9:12/0/physics_layer_0/polygon_0/points = PackedVector2Array(-8, -8, 8, -8, 8, 8, -8, 8) 10:12/0 = 0 10:12/0/physics_layer_0/linear_velocity = Vector2(0, 0) 10:12/0/physics_layer_0/angular_velocity = 0.0 +10:12/0/physics_layer_0/polygon_0/points = PackedVector2Array(-8, -8, 8, -8, 8, 8, -8, 8) 11:12/0 = 0 11:12/0/physics_layer_0/linear_velocity = Vector2(0, 0) 11:12/0/physics_layer_0/angular_velocity = 0.0 +11:12/0/physics_layer_0/polygon_0/points = PackedVector2Array(-8, -8, 8, -8, 8, 8, -8, 8) 12:12/0 = 0 12:12/0/physics_layer_0/linear_velocity = Vector2(0, 0) 12:12/0/physics_layer_0/angular_velocity = 0.0 +12:12/0/physics_layer_0/polygon_0/points = PackedVector2Array(-8, -8, 8, -8, 8, 8, -8, 8) 13:12/0 = 0 13:12/0/physics_layer_0/linear_velocity = Vector2(0, 0) 13:12/0/physics_layer_0/angular_velocity = 0.0 +13:12/0/physics_layer_0/polygon_0/points = PackedVector2Array(-8, -8, 8, -8, 8, 8, -8, 8) 14:12/0 = 0 14:12/0/physics_layer_0/linear_velocity = Vector2(0, 0) 14:12/0/physics_layer_0/angular_velocity = 0.0 +14:12/0/physics_layer_0/polygon_0/points = PackedVector2Array(-8, -8, 8, -8, 8, 8, -8, 8) 15:12/0 = 0 15:12/0/physics_layer_0/linear_velocity = Vector2(0, 0) 15:12/0/physics_layer_0/angular_velocity = 0.0 +15:12/0/physics_layer_0/polygon_0/points = PackedVector2Array(-8, -8, 8, -8, 8, 8, -8, 8) 16:12/0 = 0 16:12/0/physics_layer_0/linear_velocity = Vector2(0, 0) 16:12/0/physics_layer_0/angular_velocity = 0.0 @@ -828,39 +840,51 @@ texture = ExtResource("1_q3uqo") 4:13/0 = 0 4:13/0/physics_layer_0/linear_velocity = Vector2(0, 0) 4:13/0/physics_layer_0/angular_velocity = 0.0 +4:13/0/physics_layer_0/polygon_0/points = PackedVector2Array(-8, -8, 8, -8, 8, 8, -8, 8) 5:13/0 = 0 5:13/0/physics_layer_0/linear_velocity = Vector2(0, 0) 5:13/0/physics_layer_0/angular_velocity = 0.0 +5:13/0/physics_layer_0/polygon_0/points = PackedVector2Array(-8, -8, 8, -8, 8, 8, -8, 8) 6:13/0 = 0 6:13/0/physics_layer_0/linear_velocity = Vector2(0, 0) 6:13/0/physics_layer_0/angular_velocity = 0.0 +6:13/0/physics_layer_0/polygon_0/points = PackedVector2Array(-8, -8, 8, -8, 8, 8, -8, 8) 7:13/0 = 0 7:13/0/physics_layer_0/linear_velocity = Vector2(0, 0) 7:13/0/physics_layer_0/angular_velocity = 0.0 +7:13/0/physics_layer_0/polygon_0/points = PackedVector2Array(-8, -8, 8, -8, 8, 8, -8, 8) 8:13/0 = 0 8:13/0/physics_layer_0/linear_velocity = Vector2(0, 0) 8:13/0/physics_layer_0/angular_velocity = 0.0 +8:13/0/physics_layer_0/polygon_0/points = PackedVector2Array(-8, -8, 8, -8, 8, 8, -8, 8) 9:13/0 = 0 9:13/0/physics_layer_0/linear_velocity = Vector2(0, 0) 9:13/0/physics_layer_0/angular_velocity = 0.0 +9:13/0/physics_layer_0/polygon_0/points = PackedVector2Array(-8, -8, 8, -8, 8, 8, -8, 8) 10:13/0 = 0 10:13/0/physics_layer_0/linear_velocity = Vector2(0, 0) 10:13/0/physics_layer_0/angular_velocity = 0.0 +10:13/0/physics_layer_0/polygon_0/points = PackedVector2Array(-8, -8, 8, -8, 8, 8, -8, 8) 11:13/0 = 0 11:13/0/physics_layer_0/linear_velocity = Vector2(0, 0) 11:13/0/physics_layer_0/angular_velocity = 0.0 +11:13/0/physics_layer_0/polygon_0/points = PackedVector2Array(-8, -8, 8, -8, 8, 8, -8, 8) 12:13/0 = 0 12:13/0/physics_layer_0/linear_velocity = Vector2(0, 0) 12:13/0/physics_layer_0/angular_velocity = 0.0 +12:13/0/physics_layer_0/polygon_0/points = PackedVector2Array(-8, -8, 8, -8, 8, 8, -8, 8) 13:13/0 = 0 13:13/0/physics_layer_0/linear_velocity = Vector2(0, 0) 13:13/0/physics_layer_0/angular_velocity = 0.0 +13:13/0/physics_layer_0/polygon_0/points = PackedVector2Array(-8, -8, 8, -8, 8, 8, -8, 8) 14:13/0 = 0 14:13/0/physics_layer_0/linear_velocity = Vector2(0, 0) 14:13/0/physics_layer_0/angular_velocity = 0.0 +14:13/0/physics_layer_0/polygon_0/points = PackedVector2Array(-8, -8, 8, -8, 8, 8, -8, 8) 15:13/0 = 0 15:13/0/physics_layer_0/linear_velocity = Vector2(0, 0) 15:13/0/physics_layer_0/angular_velocity = 0.0 +15:13/0/physics_layer_0/polygon_0/points = PackedVector2Array(-8, -8, 8, -8, 8, 8, -8, 8) 16:13/0 = 0 16:13/0/physics_layer_0/linear_velocity = Vector2(0, 0) 16:13/0/physics_layer_0/angular_velocity = 0.0 @@ -903,39 +927,51 @@ texture = ExtResource("1_q3uqo") 4:14/0 = 0 4:14/0/physics_layer_0/linear_velocity = Vector2(0, 0) 4:14/0/physics_layer_0/angular_velocity = 0.0 +4:14/0/physics_layer_0/polygon_0/points = PackedVector2Array(-8, -8, 8, -8, 8, 8, -8, 8) 5:14/0 = 0 5:14/0/physics_layer_0/linear_velocity = Vector2(0, 0) 5:14/0/physics_layer_0/angular_velocity = 0.0 +5:14/0/physics_layer_0/polygon_0/points = PackedVector2Array(-8, -8, 8, -8, 8, 8, -8, 8) 6:14/0 = 0 6:14/0/physics_layer_0/linear_velocity = Vector2(0, 0) 6:14/0/physics_layer_0/angular_velocity = 0.0 +6:14/0/physics_layer_0/polygon_0/points = PackedVector2Array(-8, -8, 8, -8, 8, 8, -8, 8) 7:14/0 = 0 7:14/0/physics_layer_0/linear_velocity = Vector2(0, 0) 7:14/0/physics_layer_0/angular_velocity = 0.0 +7:14/0/physics_layer_0/polygon_0/points = PackedVector2Array(-8, -8, 8, -8, 8, 8, -8, 8) 8:14/0 = 0 8:14/0/physics_layer_0/linear_velocity = Vector2(0, 0) 8:14/0/physics_layer_0/angular_velocity = 0.0 +8:14/0/physics_layer_0/polygon_0/points = PackedVector2Array(-8, -8, 8, -8, 8, 8, -8, 8) 9:14/0 = 0 9:14/0/physics_layer_0/linear_velocity = Vector2(0, 0) 9:14/0/physics_layer_0/angular_velocity = 0.0 +9:14/0/physics_layer_0/polygon_0/points = PackedVector2Array(-8, -8, 8, -8, 8, 8, -8, 8) 10:14/0 = 0 10:14/0/physics_layer_0/linear_velocity = Vector2(0, 0) 10:14/0/physics_layer_0/angular_velocity = 0.0 +10:14/0/physics_layer_0/polygon_0/points = PackedVector2Array(-8, -8, 8, -8, 8, 8, -8, 8) 11:14/0 = 0 11:14/0/physics_layer_0/linear_velocity = Vector2(0, 0) 11:14/0/physics_layer_0/angular_velocity = 0.0 +11:14/0/physics_layer_0/polygon_0/points = PackedVector2Array(-8, -8, 8, -8, 8, 8, -8, 8) 12:14/0 = 0 12:14/0/physics_layer_0/linear_velocity = Vector2(0, 0) 12:14/0/physics_layer_0/angular_velocity = 0.0 +12:14/0/physics_layer_0/polygon_0/points = PackedVector2Array(-8, -8, 8, -8, 8, 8, -8, 8) 13:14/0 = 0 13:14/0/physics_layer_0/linear_velocity = Vector2(0, 0) 13:14/0/physics_layer_0/angular_velocity = 0.0 +13:14/0/physics_layer_0/polygon_0/points = PackedVector2Array(-8, -8, 8, -8, 8, 8, -8, 8) 14:14/0 = 0 14:14/0/physics_layer_0/linear_velocity = Vector2(0, 0) 14:14/0/physics_layer_0/angular_velocity = 0.0 +14:14/0/physics_layer_0/polygon_0/points = PackedVector2Array(-8, -8, 8, -8, 8, 8, -8, 8) 15:14/0 = 0 15:14/0/physics_layer_0/linear_velocity = Vector2(0, 0) 15:14/0/physics_layer_0/angular_velocity = 0.0 +15:14/0/physics_layer_0/polygon_0/points = PackedVector2Array(-8, -8, 8, -8, 8, 8, -8, 8) 16:14/0 = 0 16:14/0/physics_layer_0/linear_velocity = Vector2(0, 0) 16:14/0/physics_layer_0/angular_velocity = 0.0 @@ -978,39 +1014,51 @@ texture = ExtResource("1_q3uqo") 4:15/0 = 0 4:15/0/physics_layer_0/linear_velocity = Vector2(0, 0) 4:15/0/physics_layer_0/angular_velocity = 0.0 +4:15/0/physics_layer_0/polygon_0/points = PackedVector2Array(-8, -8, 8, -8, 8, 8, -8, 8) 5:15/0 = 0 5:15/0/physics_layer_0/linear_velocity = Vector2(0, 0) 5:15/0/physics_layer_0/angular_velocity = 0.0 +5:15/0/physics_layer_0/polygon_0/points = PackedVector2Array(-8, -8, 8, -8, 8, 8, -8, 8) 6:15/0 = 0 6:15/0/physics_layer_0/linear_velocity = Vector2(0, 0) 6:15/0/physics_layer_0/angular_velocity = 0.0 +6:15/0/physics_layer_0/polygon_0/points = PackedVector2Array(-8, -8, 8, -8, 8, 8, -8, 8) 7:15/0 = 0 7:15/0/physics_layer_0/linear_velocity = Vector2(0, 0) 7:15/0/physics_layer_0/angular_velocity = 0.0 +7:15/0/physics_layer_0/polygon_0/points = PackedVector2Array(-8, -8, 8, -8, 8, 8, -8, 8) 8:15/0 = 0 8:15/0/physics_layer_0/linear_velocity = Vector2(0, 0) 8:15/0/physics_layer_0/angular_velocity = 0.0 +8:15/0/physics_layer_0/polygon_0/points = PackedVector2Array(-8, -8, 8, -8, 8, 8, -8, 8) 9:15/0 = 0 9:15/0/physics_layer_0/linear_velocity = Vector2(0, 0) 9:15/0/physics_layer_0/angular_velocity = 0.0 +9:15/0/physics_layer_0/polygon_0/points = PackedVector2Array(-8, -8, 8, -8, 8, 8, -8, 8) 10:15/0 = 0 10:15/0/physics_layer_0/linear_velocity = Vector2(0, 0) 10:15/0/physics_layer_0/angular_velocity = 0.0 +10:15/0/physics_layer_0/polygon_0/points = PackedVector2Array(-8, -8, 8, -8, 8, 8, -8, 8) 11:15/0 = 0 11:15/0/physics_layer_0/linear_velocity = Vector2(0, 0) 11:15/0/physics_layer_0/angular_velocity = 0.0 +11:15/0/physics_layer_0/polygon_0/points = PackedVector2Array(-8, -8, 8, -8, 8, 8, -8, 8) 12:15/0 = 0 12:15/0/physics_layer_0/linear_velocity = Vector2(0, 0) 12:15/0/physics_layer_0/angular_velocity = 0.0 +12:15/0/physics_layer_0/polygon_0/points = PackedVector2Array(-8, -8, 8, -8, 8, 8, -8, 8) 13:15/0 = 0 13:15/0/physics_layer_0/linear_velocity = Vector2(0, 0) 13:15/0/physics_layer_0/angular_velocity = 0.0 +13:15/0/physics_layer_0/polygon_0/points = PackedVector2Array(-8, -8, 8, -8, 8, 8, -8, 8) 14:15/0 = 0 14:15/0/physics_layer_0/linear_velocity = Vector2(0, 0) 14:15/0/physics_layer_0/angular_velocity = 0.0 +14:15/0/physics_layer_0/polygon_0/points = PackedVector2Array(-8, -8, 8, -8, 8, 8, -8, 8) 15:15/0 = 0 15:15/0/physics_layer_0/linear_velocity = Vector2(0, 0) 15:15/0/physics_layer_0/angular_velocity = 0.0 +15:15/0/physics_layer_0/polygon_0/points = PackedVector2Array(-8, -8, 8, -8, 8, 8, -8, 8) 16:15/0 = 0 16:15/0/physics_layer_0/linear_velocity = Vector2(0, 0) 16:15/0/physics_layer_0/angular_velocity = 0.0 @@ -1053,39 +1101,51 @@ texture = ExtResource("1_q3uqo") 4:16/0 = 0 4:16/0/physics_layer_0/linear_velocity = Vector2(0, 0) 4:16/0/physics_layer_0/angular_velocity = 0.0 +4:16/0/physics_layer_0/polygon_0/points = PackedVector2Array(-8, -8, 8, -8, 8, 8, -8, 8) 5:16/0 = 0 5:16/0/physics_layer_0/linear_velocity = Vector2(0, 0) 5:16/0/physics_layer_0/angular_velocity = 0.0 +5:16/0/physics_layer_0/polygon_0/points = PackedVector2Array(-8, -8, 8, -8, 8, 8, -8, 8) 6:16/0 = 0 6:16/0/physics_layer_0/linear_velocity = Vector2(0, 0) 6:16/0/physics_layer_0/angular_velocity = 0.0 +6:16/0/physics_layer_0/polygon_0/points = PackedVector2Array(-8, -8, 8, -8, 8, 8, -8, 8) 7:16/0 = 0 7:16/0/physics_layer_0/linear_velocity = Vector2(0, 0) 7:16/0/physics_layer_0/angular_velocity = 0.0 +7:16/0/physics_layer_0/polygon_0/points = PackedVector2Array(-8, -8, 8, -8, 8, 8, -8, 8) 8:16/0 = 0 8:16/0/physics_layer_0/linear_velocity = Vector2(0, 0) 8:16/0/physics_layer_0/angular_velocity = 0.0 +8:16/0/physics_layer_0/polygon_0/points = PackedVector2Array(-8, -8, 8, -8, 8, 8, -8, 8) 9:16/0 = 0 9:16/0/physics_layer_0/linear_velocity = Vector2(0, 0) 9:16/0/physics_layer_0/angular_velocity = 0.0 +9:16/0/physics_layer_0/polygon_0/points = PackedVector2Array(-8, -8, 8, -8, 8, 8, -8, 8) 10:16/0 = 0 10:16/0/physics_layer_0/linear_velocity = Vector2(0, 0) 10:16/0/physics_layer_0/angular_velocity = 0.0 +10:16/0/physics_layer_0/polygon_0/points = PackedVector2Array(-8, -8, 8, -8, 8, 8, -8, 8) 11:16/0 = 0 11:16/0/physics_layer_0/linear_velocity = Vector2(0, 0) 11:16/0/physics_layer_0/angular_velocity = 0.0 +11:16/0/physics_layer_0/polygon_0/points = PackedVector2Array(-8, -8, 8, -8, 8, 8, -8, 8) 12:16/0 = 0 12:16/0/physics_layer_0/linear_velocity = Vector2(0, 0) 12:16/0/physics_layer_0/angular_velocity = 0.0 +12:16/0/physics_layer_0/polygon_0/points = PackedVector2Array(-8, -8, 8, -8, 8, 8, -8, 8) 13:16/0 = 0 13:16/0/physics_layer_0/linear_velocity = Vector2(0, 0) 13:16/0/physics_layer_0/angular_velocity = 0.0 +13:16/0/physics_layer_0/polygon_0/points = PackedVector2Array(-8, -8, 8, -8, 8, 8, -8, 8) 14:16/0 = 0 14:16/0/physics_layer_0/linear_velocity = Vector2(0, 0) 14:16/0/physics_layer_0/angular_velocity = 0.0 +14:16/0/physics_layer_0/polygon_0/points = PackedVector2Array(-8, -8, 8, -8, 8, 8, -8, 8) 15:16/0 = 0 15:16/0/physics_layer_0/linear_velocity = Vector2(0, 0) 15:16/0/physics_layer_0/angular_velocity = 0.0 +15:16/0/physics_layer_0/polygon_0/points = PackedVector2Array(-8, -8, 8, -8, 8, 8, -8, 8) 16:16/0 = 0 16:16/0/physics_layer_0/linear_velocity = Vector2(0, 0) 16:16/0/physics_layer_0/angular_velocity = 0.0