From d2c09a33ff8372326b40bf7d36dc2095546f0d78 Mon Sep 17 00:00:00 2001 From: Marco Date: Fri, 11 Apr 2025 09:47:26 +0200 Subject: [PATCH] Level 3 lightbridge fix --- Resources/Debug/DebugLevels.tres | 28 ++++++++++++++-------------- Resources/Enemies/Thermathron.tres | 5 +++-- Resources/Enemies/Turret360.tres | 5 +++-- Resources/Maps/Briefing_1.tres | 7 ++++--- Resources/Maps/Tutorial.tres | 7 ++++--- Scenes/Maps/Level3.tscn | 6 +++--- 6 files changed, 31 insertions(+), 27 deletions(-) diff --git a/Resources/Debug/DebugLevels.tres b/Resources/Debug/DebugLevels.tres index 7fee4e91..702ee4ab 100644 --- a/Resources/Debug/DebugLevels.tres +++ b/Resources/Debug/DebugLevels.tres @@ -19,8 +19,8 @@ _name = "Intro" [sub_resource type="Resource" id="Resource_cfhv5"] script = ExtResource("1_ov731") EggIndex = 0 -StartingEquipment = [] -RemoveEquipment = [] +StartingEquipment = Array[ExtResource("2_bkci5")]([]) +RemoveEquipment = Array[ExtResource("2_bkci5")]([]) [sub_resource type="Resource" id="Resource_0k62o"] script = ExtResource("2_tnajf") @@ -32,8 +32,8 @@ StartData = SubResource("Resource_cfhv5") [sub_resource type="Resource" id="Resource_tpb7s"] script = ExtResource("1_ov731") EggIndex = 0 -StartingEquipment = [] -RemoveEquipment = [] +StartingEquipment = Array[ExtResource("2_bkci5")]([]) +RemoveEquipment = Array[ExtResource("2_bkci5")]([]) [sub_resource type="Resource" id="Resource_edoov"] script = ExtResource("2_tnajf") @@ -45,8 +45,8 @@ StartData = SubResource("Resource_tpb7s") [sub_resource type="Resource" id="Resource_1sw5g"] script = ExtResource("1_ov731") EggIndex = 255 -StartingEquipment = [] -RemoveEquipment = [] +StartingEquipment = Array[ExtResource("2_bkci5")]([]) +RemoveEquipment = Array[ExtResource("2_bkci5")]([]) [sub_resource type="Resource" id="Resource_47bot"] script = ExtResource("2_tnajf") @@ -59,7 +59,7 @@ StartData = SubResource("Resource_1sw5g") script = ExtResource("1_ov731") EggIndex = 2 StartingEquipment = Array[ExtResource("2_bkci5")]([ExtResource("3_fydgr"), ExtResource("4_38yta"), ExtResource("5_em757"), ExtResource("6_sdmg8")]) -RemoveEquipment = [] +RemoveEquipment = Array[ExtResource("2_bkci5")]([]) [sub_resource type="Resource" id="Resource_mgdm6"] script = ExtResource("2_tnajf") @@ -77,8 +77,8 @@ _name = "Rebel Base" [sub_resource type="Resource" id="Resource_maxpt"] script = ExtResource("1_ov731") EggIndex = 0 -StartingEquipment = [] -RemoveEquipment = [] +StartingEquipment = Array[ExtResource("2_bkci5")]([]) +RemoveEquipment = Array[ExtResource("2_bkci5")]([]) [sub_resource type="Resource" id="Resource_pein5"] script = ExtResource("2_tnajf") @@ -115,7 +115,7 @@ _name = "Default Scene" script = ExtResource("1_ov731") EggIndex = 0 StartingEquipment = Array[ExtResource("2_bkci5")]([ExtResource("7_b3oo5")]) -RemoveEquipment = [] +RemoveEquipment = Array[ExtResource("2_bkci5")]([]) [sub_resource type="Resource" id="Resource_6ijnv"] script = ExtResource("2_tnajf") @@ -134,8 +134,8 @@ metadata/_custom_type_script = "uid://dnthdjrx78u6m" [sub_resource type="Resource" id="Resource_7sue8"] script = ExtResource("1_ov731") EggIndex = 255 -StartingEquipment = [] -RemoveEquipment = [] +StartingEquipment = Array[ExtResource("2_bkci5")]([]) +RemoveEquipment = Array[ExtResource("2_bkci5")]([]) metadata/_custom_type_script = "uid://mja0rk7n2kln" [sub_resource type="Resource" id="Resource_ognca"] @@ -149,8 +149,8 @@ metadata/_custom_type_script = "uid://dnthdjrx78u6m" [sub_resource type="Resource" id="Resource_olpjo"] script = ExtResource("1_ov731") EggIndex = 0 -StartingEquipment = [] -RemoveEquipment = [] +StartingEquipment = Array[ExtResource("2_bkci5")]([]) +RemoveEquipment = Array[ExtResource("2_bkci5")]([]) metadata/_custom_type_script = "uid://mja0rk7n2kln" [sub_resource type="Resource" id="Resource_nbnej"] diff --git a/Resources/Enemies/Thermathron.tres b/Resources/Enemies/Thermathron.tres index 097dc58c..e1780426 100644 --- a/Resources/Enemies/Thermathron.tres +++ b/Resources/Enemies/Thermathron.tres @@ -1,5 +1,6 @@ -[gd_resource type="Resource" script_class="EnemyResource" load_steps=3 format=3 uid="uid://cfdvg162u65sr"] +[gd_resource type="Resource" script_class="EnemyResource" load_steps=4 format=3 uid="uid://cfdvg162u65sr"] +[ext_resource type="Script" uid="uid://cq65aed620ijo" path="res://Scripts/Resources/Loot/LootDrop.cs" id="1_f3huq"] [ext_resource type="Resource" uid="uid://cdfmedtgp2rcn" path="res://Resources/Weapons/EnemyWeapon.tres" id="7_filx8"] [ext_resource type="Script" uid="uid://cd5o0ceb50jki" path="res://Scripts/Resources/EnemyResource.cs" id="8_x8scf"] @@ -11,7 +12,7 @@ PrefabPath = &"res://Scenes/Actors/Thermathron.tscn" MaxHealth = 16.0 MovementSpeed = 38.0 Weapon = ExtResource("7_filx8") -LootDrops = [] +LootDrops = Array[ExtResource("1_f3huq")]([]) MotivationReward = 4.0 PlayerDetectionRange = 90.0 ViewRange = 120.0 diff --git a/Resources/Enemies/Turret360.tres b/Resources/Enemies/Turret360.tres index a6c238b1..09c59052 100644 --- a/Resources/Enemies/Turret360.tres +++ b/Resources/Enemies/Turret360.tres @@ -1,5 +1,6 @@ -[gd_resource type="Resource" script_class="EnemyResource" load_steps=3 format=3 uid="uid://ysd6wl2gmdhn"] +[gd_resource type="Resource" script_class="EnemyResource" load_steps=4 format=3 uid="uid://ysd6wl2gmdhn"] +[ext_resource type="Script" uid="uid://cq65aed620ijo" path="res://Scripts/Resources/Loot/LootDrop.cs" id="1_sma76"] [ext_resource type="Resource" uid="uid://dyaxm3st70sh6" path="res://Resources/Weapons/Enemy/TurretWeapon.tres" id="1_yap8t"] [ext_resource type="Script" uid="uid://cd5o0ceb50jki" path="res://Scripts/Resources/EnemyResource.cs" id="2_sma76"] @@ -11,7 +12,7 @@ PrefabPath = &"res://Scenes/Actors/Turret360.tscn" MaxHealth = 20.0 MovementSpeed = 0.0 Weapon = ExtResource("1_yap8t") -LootDrops = [] +LootDrops = Array[ExtResource("1_sma76")]([]) MotivationReward = 4.0 PlayerDetectionRange = 90.0 ViewRange = 120.0 diff --git a/Resources/Maps/Briefing_1.tres b/Resources/Maps/Briefing_1.tres index fe5d79c1..f2909d1a 100644 --- a/Resources/Maps/Briefing_1.tres +++ b/Resources/Maps/Briefing_1.tres @@ -1,13 +1,14 @@ -[gd_resource type="Resource" script_class="MapResource" load_steps=4 format=3 uid="uid://dsvcyd0f5br85"] +[gd_resource type="Resource" script_class="MapResource" load_steps=5 format=3 uid="uid://dsvcyd0f5br85"] +[ext_resource type="Script" uid="uid://epnwjptvks3t" path="res://Scripts/Resources/LootItem.cs" id="1_7e3mb"] [ext_resource type="Script" uid="uid://quy4d4tgvqfy" path="res://Scripts/Resources/MapResource.cs" id="1_x864d"] [ext_resource type="Script" uid="uid://mja0rk7n2kln" path="res://Scripts/Resources/MapStartDataResource.cs" id="2_bbif0"] [sub_resource type="Resource" id="Resource_7e7pr"] script = ExtResource("2_bbif0") EggIndex = 0 -StartingEquipment = [] -RemoveEquipment = [] +StartingEquipment = Array[ExtResource("1_7e3mb")]([]) +RemoveEquipment = Array[ExtResource("1_7e3mb")]([]) metadata/_custom_type_script = "uid://mja0rk7n2kln" [resource] diff --git a/Resources/Maps/Tutorial.tres b/Resources/Maps/Tutorial.tres index 0d3a4d03..c3497b3f 100644 --- a/Resources/Maps/Tutorial.tres +++ b/Resources/Maps/Tutorial.tres @@ -1,13 +1,14 @@ -[gd_resource type="Resource" script_class="MapResource" load_steps=4 format=3 uid="uid://b4u3cs6ietmow"] +[gd_resource type="Resource" script_class="MapResource" load_steps=5 format=3 uid="uid://b4u3cs6ietmow"] [ext_resource type="Script" uid="uid://mja0rk7n2kln" path="res://Scripts/Resources/MapStartDataResource.cs" id="1_3bwtp"] [ext_resource type="Script" uid="uid://quy4d4tgvqfy" path="res://Scripts/Resources/MapResource.cs" id="1_5stb7"] +[ext_resource type="Script" uid="uid://epnwjptvks3t" path="res://Scripts/Resources/LootItem.cs" id="1_dpitu"] [sub_resource type="Resource" id="Resource_dpitu"] script = ExtResource("1_3bwtp") EggIndex = 0 -StartingEquipment = [] -RemoveEquipment = [] +StartingEquipment = Array[ExtResource("1_dpitu")]([]) +RemoveEquipment = Array[ExtResource("1_dpitu")]([]) metadata/_custom_type_script = "uid://mja0rk7n2kln" [resource] diff --git a/Scenes/Maps/Level3.tscn b/Scenes/Maps/Level3.tscn index e1762ad3..9f72a268 100644 --- a/Scenes/Maps/Level3.tscn +++ b/Scenes/Maps/Level3.tscn @@ -406,11 +406,11 @@ position = Vector2(-88, 426) [node name="KeycardReaderGreen" parent="Tilemaps/Actors" node_paths=PackedStringArray("Target") instance=ExtResource("44_udf20")] position = Vector2(1058, 866) -Target = NodePath("../AcidBridge") +Target = NodePath("../AcidBridge/LightBridge") [node name="KeycardReaderGreen2" parent="Tilemaps/Actors" node_paths=PackedStringArray("Target") instance=ExtResource("44_udf20")] -position = Vector2(1154, 861) -Target = NodePath("../AcidBridge") +position = Vector2(1154, 866) +Target = NodePath("../AcidBridge/LightBridge") [node name="VerticalDoor" parent="Tilemaps/Actors" instance=ExtResource("45_wy0ue")] position = Vector2(700, 1096)