diff --git a/Resources/Debug/DebugLevels.tres b/Resources/Debug/DebugLevels.tres index c5224ec4..83bc6d0d 100644 --- a/Resources/Debug/DebugLevels.tres +++ b/Resources/Debug/DebugLevels.tres @@ -21,8 +21,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") @@ -34,8 +34,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") @@ -47,8 +47,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") @@ -61,7 +61,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") @@ -79,8 +79,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") @@ -117,7 +117,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") @@ -136,8 +136,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"] @@ -151,8 +151,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/Base_Fairy.tres b/Resources/Enemies/Base_Fairy.tres index c5ac574f..e042509a 100644 --- a/Resources/Enemies/Base_Fairy.tres +++ b/Resources/Enemies/Base_Fairy.tres @@ -49,7 +49,7 @@ script = ExtResource("8_241b0") EnemyName = &"Fairy" EnemyKey = &"FAIRY_BASE" PrefabPath = &"uid://clieeuln36a7a" -MaxHealth = 8.0 +MaxHealth = 4.0 MovementSpeed = 30.0 Weapon = ExtResource("7_xkg5o") LootDrops = Array[ExtResource("2_sxbtw")]([SubResource("Resource_c8nix"), SubResource("Resource_gs2l3"), SubResource("Resource_sqnvg"), SubResource("Resource_5tyar"), SubResource("Resource_48xq6")]) diff --git a/Resources/Items/Ammo1.tres b/Resources/Items/Ammo1.tres index aabfb87a..dfa9b684 100644 --- a/Resources/Items/Ammo1.tres +++ b/Resources/Items/Ammo1.tres @@ -13,6 +13,7 @@ ShortName = &"" ItemDescription = &"Ammo for Ice-Based Weapons" ItemKey = &"ICE_AMMO" Item = 3 +Tier = 0 Price = 0 Amount = 10 Max = 250 diff --git a/Resources/Items/IceShotgun_Sawed_T0.tres b/Resources/Items/IceShotgun_Sawed_T0.tres index d4c7a15b..1b0630bb 100644 --- a/Resources/Items/IceShotgun_Sawed_T0.tres +++ b/Resources/Items/IceShotgun_Sawed_T0.tres @@ -6,7 +6,7 @@ [resource] script = ExtResource("3_n0omu") -ItemName = &"Sawed Ice Shotgun" +ItemName = &"Sawed-Off Ice Shotgun" ShortName = &"IC-25" ItemDescription = &"Shoots ice pellets in a wide spread" ItemKey = &"ICE_SHOTGUN_SAWED" diff --git a/Resources/Items/IceShotgun_Sawed_T1.tres b/Resources/Items/IceShotgun_Sawed_T1.tres index 386bb6cf..37fe6fd6 100644 --- a/Resources/Items/IceShotgun_Sawed_T1.tres +++ b/Resources/Items/IceShotgun_Sawed_T1.tres @@ -6,7 +6,7 @@ [resource] script = ExtResource("3_eu2qy") -ItemName = &"Improved Sawed Ice Shotgun" +ItemName = &"Improved Sawed-Off Ice Shotgun" ShortName = &"IC-27-S" ItemDescription = &"Shoots ice pellets in a wide spread" ItemKey = &"ICE_SHOTGUN_SAWED_T1" diff --git a/Resources/Items/IceShotgun_Sawed_T2.tres b/Resources/Items/IceShotgun_Sawed_T2.tres index dc5a92e1..f9177b09 100644 --- a/Resources/Items/IceShotgun_Sawed_T2.tres +++ b/Resources/Items/IceShotgun_Sawed_T2.tres @@ -6,7 +6,7 @@ [resource] script = ExtResource("3_4syqt") -ItemName = &"Advanced Sawed Ice Shotgun" +ItemName = &"Advanced Sawed-Off Ice Shotgun" ShortName = &"IC-27-S" ItemDescription = &"Shoots ice pellets in a wide spread" ItemKey = &"ICE_SHOTGUN_SAWED_T2" diff --git a/Resources/Items/IcicleRepeater_Improved.tres b/Resources/Items/IcicleRepeater_Improved.tres index a583f773..85391d33 100644 --- a/Resources/Items/IcicleRepeater_Improved.tres +++ b/Resources/Items/IcicleRepeater_Improved.tres @@ -9,7 +9,7 @@ script = ExtResource("3_1c8ng") ItemName = &"Improved Icicle Repeater" ShortName = &"IC-18" ItemDescription = &"Shoots ice pellets at a high rate" -ItemKey = &"ICICLE_REPEATER" +ItemKey = &"ICICLE_REPEATER_T1" Item = 9 Tier = 1 Price = 0 diff --git a/Resources/Weapons/Cheat_Gun.tres b/Resources/Weapons/Cheat_Gun.tres index 2bd77c3e..97b43e8c 100644 --- a/Resources/Weapons/Cheat_Gun.tres +++ b/Resources/Weapons/Cheat_Gun.tres @@ -7,14 +7,15 @@ script = ExtResource("1_d3tbp") Name = &"Cheat Gun" BulletData = ExtResource("1_7fekn") +Priority = 100 RateOfFire = 0.4 BulletCapacity = 200 ReloadTime = 0.1 AutoReload = true InfiniteAmmo = true +ItemKey = &"CHEAT_GUN" +AmmoKey = &"" BulletsPerShot = 1 SpreadAngle = 0.0 RandomSpread = 0.0 -ItemKey = &"CHEAT_GUN" -AmmoKey = null _rotationOffset = 0.0 diff --git a/Resources/Weapons/Enemy/TurretWeapon.tres b/Resources/Weapons/Enemy/TurretWeapon.tres index f1509f55..17bbd96f 100644 --- a/Resources/Weapons/Enemy/TurretWeapon.tres +++ b/Resources/Weapons/Enemy/TurretWeapon.tres @@ -33,6 +33,7 @@ metadata/_custom_type_script = "uid://dslyrfcej3g2n" script = ExtResource("4_17dut") Name = &"" BulletData = SubResource("Resource_5eesc") +Priority = 0 RateOfFire = 0.4 BulletCapacity = 20 ReloadTime = 2.0 diff --git a/Resources/Weapons/EnemyShotgun.tres b/Resources/Weapons/EnemyShotgun.tres index 001b7ebb..a0dbad61 100644 --- a/Resources/Weapons/EnemyShotgun.tres +++ b/Resources/Weapons/EnemyShotgun.tres @@ -7,6 +7,7 @@ script = ExtResource("2_gblpw") Name = &"Enemy Shotgun" BulletData = ExtResource("1_gd1fn") +Priority = 0 RateOfFire = 1.2 BulletCapacity = 4 ReloadTime = 2.0 diff --git a/Resources/Weapons/EnemyWeapon_Big.tres b/Resources/Weapons/EnemyWeapon_Big.tres index ae1e0e82..61ca655f 100644 --- a/Resources/Weapons/EnemyWeapon_Big.tres +++ b/Resources/Weapons/EnemyWeapon_Big.tres @@ -5,8 +5,9 @@ [resource] script = ExtResource("2_w71lp") -Name = &"" +Name = &"Enemy weapon with big bullets" BulletData = ExtResource("1_gww1w") +Priority = 0 RateOfFire = 0.6 BulletCapacity = 4 ReloadTime = 1.0 diff --git a/Resources/Weapons/Ice_Shotgun_Sawed_T0.tres b/Resources/Weapons/Ice_Shotgun_Sawed_T0.tres index bd94687f..b25d3fe1 100644 --- a/Resources/Weapons/Ice_Shotgun_Sawed_T0.tres +++ b/Resources/Weapons/Ice_Shotgun_Sawed_T0.tres @@ -5,9 +5,9 @@ [resource] script = ExtResource("2_d1u0r") -Name = &"Sawed Ice Shotgun" +Name = &"Sawed-Off Ice Shotgun" BulletData = ExtResource("1_g5stw") -Priority = 0 +Priority = 10 RateOfFire = 0.5 BulletCapacity = 4 ReloadTime = 0.8 diff --git a/Resources/Weapons/Ice_Shotgun_Sawed_T1.tres b/Resources/Weapons/Ice_Shotgun_Sawed_T1.tres index 5e62debe..ca8f78f2 100644 --- a/Resources/Weapons/Ice_Shotgun_Sawed_T1.tres +++ b/Resources/Weapons/Ice_Shotgun_Sawed_T1.tres @@ -5,9 +5,9 @@ [resource] script = ExtResource("2_q6qa7") -Name = &"Ice Shotgun" +Name = &"Improved Sawed-Off Ice Shotgun" BulletData = ExtResource("1_1fs3a") -Priority = 0 +Priority = 20 RateOfFire = 0.4 BulletCapacity = 4 ReloadTime = 0.8 diff --git a/Resources/Weapons/Ice_Shotgun_Sawed_T2.tres b/Resources/Weapons/Ice_Shotgun_Sawed_T2.tres index 8d34c9c9..c137f6a3 100644 --- a/Resources/Weapons/Ice_Shotgun_Sawed_T2.tres +++ b/Resources/Weapons/Ice_Shotgun_Sawed_T2.tres @@ -5,9 +5,9 @@ [resource] script = ExtResource("2_uksy0") -Name = &"Ice Shotgun" +Name = &"Advanced Sawed-Off Ice Shotgun" BulletData = ExtResource("1_yvljr") -Priority = 0 +Priority = 30 RateOfFire = 0.2 BulletCapacity = 6 ReloadTime = 0.7 diff --git a/Resources/Weapons/Ice_Shotgun_T1.tres b/Resources/Weapons/Ice_Shotgun_T1.tres index 10365bf1..fe98981f 100644 --- a/Resources/Weapons/Ice_Shotgun_T1.tres +++ b/Resources/Weapons/Ice_Shotgun_T1.tres @@ -7,7 +7,7 @@ script = ExtResource("2_6gv3a") Name = &"Ice Shotgun" BulletData = ExtResource("1_fi2vm") -Priority = 0 +Priority = 10 RateOfFire = 0.4 BulletCapacity = 4 ReloadTime = 0.8 diff --git a/Resources/Weapons/Ice_Shotgun_T2.tres b/Resources/Weapons/Ice_Shotgun_T2.tres index bb26a387..37891308 100644 --- a/Resources/Weapons/Ice_Shotgun_T2.tres +++ b/Resources/Weapons/Ice_Shotgun_T2.tres @@ -7,7 +7,7 @@ script = ExtResource("2_2n571") Name = &"Ice Shotgun" BulletData = ExtResource("1_ej60i") -Priority = 0 +Priority = 20 RateOfFire = 0.2 BulletCapacity = 6 ReloadTime = 0.7 diff --git a/Resources/Weapons/Ice_Shotgun_Weapon.tres b/Resources/Weapons/Ice_Shotgun_Weapon.tres index 255a5888..cb5c5f0a 100644 --- a/Resources/Weapons/Ice_Shotgun_Weapon.tres +++ b/Resources/Weapons/Ice_Shotgun_Weapon.tres @@ -7,7 +7,7 @@ script = ExtResource("2_utbbo") Name = &"Ice Shotgun" BulletData = ExtResource("1_m44wx") -Priority = 0 +Priority = 30 RateOfFire = 0.5 BulletCapacity = 4 ReloadTime = 0.8 diff --git a/Resources/Weapons/IcicleGun.tres b/Resources/Weapons/IcicleGun.tres index e8b3c226..8e8e6e24 100644 --- a/Resources/Weapons/IcicleGun.tres +++ b/Resources/Weapons/IcicleGun.tres @@ -9,7 +9,7 @@ script = ExtResource("2_m8dps") Name = &"Icicle Gun" BulletData = ExtResource("1_85ef1") -Priority = 0 +Priority = 1 RateOfFire = 0.3 BulletCapacity = 5 ReloadTime = 0.6 diff --git a/Resources/Weapons/IcicleRepeater.tres b/Resources/Weapons/IcicleRepeater.tres index 241bd52b..65647fd1 100644 --- a/Resources/Weapons/IcicleRepeater.tres +++ b/Resources/Weapons/IcicleRepeater.tres @@ -7,14 +7,15 @@ [resource] script = ExtResource("2_f4135") -Name = &"Icicle Repeater" +Name = &"Improved Icicle Repeater" BulletData = ExtResource("1_lg8jo") +Priority = 20 RateOfFire = 0.1 BulletCapacity = 8 ReloadTime = 0.5 AutoReload = true InfiniteAmmo = false -ItemKey = &"ICICLE_REPEATER" +ItemKey = &"ICICLE_REPEATER_T1" AmmoKey = &"ICE_AMMO" BulletsPerShot = 1 SpreadAngle = 0.0 diff --git a/Resources/Weapons/IcicleRepeater_T2.tres b/Resources/Weapons/IcicleRepeater_T2.tres index d86ad44f..77e546a2 100644 --- a/Resources/Weapons/IcicleRepeater_T2.tres +++ b/Resources/Weapons/IcicleRepeater_T2.tres @@ -7,8 +7,9 @@ [resource] script = ExtResource("4_a5x7h") -Name = &"Icicle Repeater" +Name = &"Advanced Icicle Repeater" BulletData = ExtResource("1_2nbel") +Priority = 30 RateOfFire = 0.1 BulletCapacity = 8 ReloadTime = 0.5 diff --git a/Resources/Weapons/IcicleRepeater_t0.tres b/Resources/Weapons/IcicleRepeater_t0.tres index 345b090e..7dd05404 100644 --- a/Resources/Weapons/IcicleRepeater_t0.tres +++ b/Resources/Weapons/IcicleRepeater_t0.tres @@ -7,8 +7,9 @@ [resource] script = ExtResource("4_ai75q") -Name = &"Bad Icicle Repeater" +Name = &"Icicle Repeater" BulletData = ExtResource("1_2567x") +Priority = 10 RateOfFire = 0.2 BulletCapacity = 6 ReloadTime = 0.5 diff --git a/Resources/Weapons/NuclearGun.tres b/Resources/Weapons/NuclearGun.tres index fe74f3b8..59c6bee7 100644 --- a/Resources/Weapons/NuclearGun.tres +++ b/Resources/Weapons/NuclearGun.tres @@ -7,6 +7,7 @@ script = ExtResource("2_vm6dw") Name = &"Nuclear Gun (MP-42)" BulletData = ExtResource("1_x7js4") +Priority = 20 RateOfFire = 0.6 BulletCapacity = 5 ReloadTime = 0.5 diff --git a/Resources/Weapons/Yin_Yang_Gun.tres b/Resources/Weapons/Yin_Yang_Gun.tres index 0d6b4a3b..1b353a29 100644 --- a/Resources/Weapons/Yin_Yang_Gun.tres +++ b/Resources/Weapons/Yin_Yang_Gun.tres @@ -7,14 +7,15 @@ script = ExtResource("2_dbal7") Name = &"Yin-Yang Gun" BulletData = ExtResource("1_otehl") +Priority = 20 RateOfFire = 0.8 BulletCapacity = 3 ReloadTime = 0.4 AutoReload = true InfiniteAmmo = false +ItemKey = &"YINYANG_GUN" +AmmoKey = &"YINYANG_AMMO" BulletsPerShot = 1 SpreadAngle = 0.0 RandomSpread = 0.0 -ItemKey = &"YINYANG_GUN" -AmmoKey = &"YINYANG_AMMO" _rotationOffset = 0.0 diff --git a/Scenes/Maps/Roguelike.tscn b/Scenes/Maps/Roguelike.tscn index 4ea36328..df72358a 100644 --- a/Scenes/Maps/Roguelike.tscn +++ b/Scenes/Maps/Roguelike.tscn @@ -27,6 +27,7 @@ process_mode = 1 y_sort_enabled = true script = ExtResource("4_jtlua") MapThemes = Array[Object]([ExtResource("25_7gtqx")]) +ManualSeed = "8303399526188049494" [node name="CameraController" type="Camera2D" parent="."] process_mode = 1 diff --git a/Scenes/Maps/RogueliteMaps/Beginner1.tscn b/Scenes/Maps/RogueliteMaps/Beginner1.tscn index 678ae0de..5618fc4f 100644 --- a/Scenes/Maps/RogueliteMaps/Beginner1.tscn +++ b/Scenes/Maps/RogueliteMaps/Beginner1.tscn @@ -1,4 +1,4 @@ -[gd_scene load_steps=18 format=4 uid="uid://24wh7h2dbljf"] +[gd_scene load_steps=28 format=4 uid="uid://24wh7h2dbljf"] [ext_resource type="Script" uid="uid://b2j00riayxkit" path="res://Scripts/Controllers/RogueliteRoom.cs" id="1_vhsym"] [ext_resource type="Resource" uid="uid://dn3ai56rrxfnk" path="res://Resources/RogueliteMaps/Beginner1.tres" id="2_vhsym"] @@ -9,11 +9,21 @@ [ext_resource type="PackedScene" uid="uid://djf0y08ix66fn" path="res://Scenes/Interactable/Chest.tscn" id="7_kublc"] [ext_resource type="Script" uid="uid://epnwjptvks3t" path="res://Scripts/Resources/LootItem.cs" id="8_dbn5e"] [ext_resource type="Resource" uid="uid://cltxhkrqp055v" path="res://Resources/Items/Money_Pickup.tres" id="9_5yebg"] -[ext_resource type="Script" uid="uid://8umfjejbkcsm" path="res://Scripts/Actors/RogueliteEnemySpawner.cs" id="10_c0yr1"] -[ext_resource type="Resource" uid="uid://cocl3qontm3be" path="res://Resources/Enemies/Base_Fairy.tres" id="11_5rt6n"] +[ext_resource type="Resource" uid="uid://cajqlnyvlmybe" path="res://Resources/Items/IcicleRepeater_Improved.tres" id="10_6gtn1"] +[ext_resource type="Resource" uid="uid://dwwbyyy3fo4bt" path="res://Resources/Items/IcicleRepeater_Advanced.tres" id="11_0a3am"] [ext_resource type="Script" uid="uid://g6oraxgd87ij" path="res://Scripts/Actors/TeleporterMarker.cs" id="12_f3e1d"] +[ext_resource type="Resource" uid="uid://dv0cdlx8d6evm" path="res://Resources/Items/IceShotgun_Sawed_T0.tres" id="12_t3lr8"] [ext_resource type="Texture2D" uid="uid://d3e762pxublbt" path="res://Sprites/teleporter.png" id="13_c0yr1"] +[ext_resource type="Resource" uid="uid://btk4kojtepwv" path="res://Resources/Items/IceShotgun_Sawed_T1.tres" id="13_ii24s"] +[ext_resource type="Resource" uid="uid://c57od7cpn5kwf" path="res://Resources/Items/IceShotgun_Sawed_T2.tres" id="14_15ruc"] [ext_resource type="LabelSettings" uid="uid://buk3e7bbwmnv1" path="res://Resources/Styles/Hud_Text_Style.tres" id="14_c0yr1"] +[ext_resource type="Resource" uid="uid://dau0s8ob7qnpc" path="res://Resources/Items/IceShotgun.tres" id="15_5uxd1"] +[ext_resource type="Resource" uid="uid://bgcgeg187vg1h" path="res://Resources/Items/IcicleRepeater.tres" id="16_iyfx3"] +[ext_resource type="Resource" uid="uid://brsukcuyoq364" path="res://Resources/Items/NuclearGunPickup.tres" id="17_45mmk"] +[ext_resource type="Resource" uid="uid://ccmuffmnevrt4" path="res://Resources/Items/Yin_Yang_Gun_Pickup.tres" id="18_ipsj4"] +[ext_resource type="Resource" uid="uid://diqm2ju0xakkt" path="res://Resources/Items/Yin_Yang_Ammo.tres" id="19_ii24s"] +[ext_resource type="Resource" uid="uid://cfod8kephnio6" path="res://Resources/Items/Nuclear_Ammo_Pickup.tres" id="20_15ruc"] +[ext_resource type="Resource" uid="uid://ct1fa2huvy34n" path="res://Resources/Items/Ammo1.tres" id="21_5uxd1"] [sub_resource type="RectangleShape2D" id="RectangleShape2D_u3c1h"] size = Vector2(272, 85) @@ -63,7 +73,7 @@ position = Vector2(248, 56) [node name="Chest" parent="Actors" instance=ExtResource("7_kublc")] position = Vector2(216, 55) -LootTable = Array[ExtResource("8_dbn5e")]([ExtResource("9_5yebg"), ExtResource("9_5yebg"), ExtResource("9_5yebg"), ExtResource("9_5yebg"), ExtResource("9_5yebg"), ExtResource("9_5yebg")]) +LootTable = Array[ExtResource("8_dbn5e")]([ExtResource("9_5yebg"), ExtResource("9_5yebg"), ExtResource("9_5yebg"), ExtResource("9_5yebg"), ExtResource("9_5yebg"), ExtResource("9_5yebg"), ExtResource("10_6gtn1"), ExtResource("11_0a3am"), ExtResource("12_t3lr8"), ExtResource("13_ii24s"), ExtResource("14_15ruc"), ExtResource("15_5uxd1"), ExtResource("16_iyfx3"), ExtResource("17_45mmk"), ExtResource("18_ipsj4"), ExtResource("19_ii24s"), ExtResource("19_ii24s"), ExtResource("19_ii24s"), ExtResource("20_15ruc"), ExtResource("20_15ruc"), ExtResource("20_15ruc"), ExtResource("21_5uxd1"), ExtResource("21_5uxd1"), ExtResource("21_5uxd1")]) [node name="Label" type="Label" parent="Actors"] offset_left = 153.0 @@ -76,11 +86,6 @@ label_settings = ExtResource("14_c0yr1") [node name="EnemySpawners" type="Node2D" parent="."] -[node name="RogueliteEnemySpawner3" type="Marker2D" parent="EnemySpawners"] -position = Vector2(293, 58) -script = ExtResource("10_c0yr1") -Enemy = ExtResource("11_5rt6n") - [node name="PlayerEnterDetector" type="Area2D" parent="."] visible = false collision_layer = 0 diff --git a/Scripts/UI/ItemsMenu.cs b/Scripts/UI/ItemsMenu.cs index 28e01eb9..47126ac2 100644 --- a/Scripts/UI/ItemsMenu.cs +++ b/Scripts/UI/ItemsMenu.cs @@ -1,5 +1,6 @@ using Godot; using System; +using System.Linq; using Cirno.Scripts; using Cirno.Scripts.UI; using Godot.Collections; @@ -22,7 +23,8 @@ public partial class ItemsMenu : ItemList public void Fill() { - foreach (var item in InventoryManager.Instance.Items) + var sortedItems = InventoryManager.Instance.Items.OrderBy(x => x.Item.ItemKey.ToString()).ToList(); + foreach (var item in sortedItems) { if (item.Count <= 0) continue; if (!ItemsFilter.Contains(item.Item.Item)) continue; diff --git a/addons/resources_spreadsheet_view/saved_state.json b/addons/resources_spreadsheet_view/saved_state.json index e1a2ed62..e50bc5d8 100644 --- a/addons/resources_spreadsheet_view/saved_state.json +++ b/addons/resources_spreadsheet_view/saved_state.json @@ -43,13 +43,25 @@ "resource_name": { "visibility": 0.0 } + }, + "res://Resources/Weapons/Enemy/": { + "metadata/_custom_type_script": { + "visibility": 0 + }, + "resource_local_to_scene": { + "visibility": 0 + }, + "resource_name": { + "visibility": 0 + } } }, "recent_paths": [ "res://Resources/", "res://Resources/Items/", "res://Resources/Weapons/", - "res://Resources/Bullets/" + "res://Resources/Bullets/", + "res://Resources/Weapons/Enemy/" ], "table_functions": { "filter": [