diff --git a/src/items/InventoryItem.tscn b/src/items/InventoryItem.tscn new file mode 100644 index 00000000..98a256aa --- /dev/null +++ b/src/items/InventoryItem.tscn @@ -0,0 +1,24 @@ +[gd_scene load_steps=2 format=3 uid="uid://dme37m7q60um4"] + +[sub_resource type="BoxShape3D" id="BoxShape3D_84bq1"] +size = Vector3(0.778381, 0.929947, 0.731567) + +[node name="InventoryItem" type="Node3D"] + +[node name="Pickup" type="Area3D" parent="."] +unique_name_in_owner = true +collision_layer = 0 +collision_mask = 4 + +[node name="Sprite" type="Sprite3D" parent="Pickup"] +unique_name_in_owner = true +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, -0.0322805, 0) +pixel_size = 0.0003 +billboard = 2 +double_sided = false +alpha_cut = 1 +texture_filter = 0 + +[node name="CollisionShape3D" type="CollisionShape3D" parent="Pickup"] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0.0600509, 0.26725, 0.180481) +shape = SubResource("BoxShape3D_84bq1") diff --git a/src/items/InventoryItemInfo.cs b/src/items/InventoryItemInfo.cs index 94c43edf..519818c7 100644 --- a/src/items/InventoryItemInfo.cs +++ b/src/items/InventoryItemInfo.cs @@ -12,4 +12,7 @@ public partial class InventoryItemInfo : Resource [Export] public Texture2D Texture { get; set; } + + [Export(PropertyHint.Range, "0, 1, 0.01")] + public float SpawnRate { get; set; } = 0.5f; } \ No newline at end of file diff --git a/src/items/ItemDatabase.cs b/src/items/ItemDatabase.cs index ffe750e3..2ad0e0be 100644 --- a/src/items/ItemDatabase.cs +++ b/src/items/ItemDatabase.cs @@ -1,5 +1,4 @@ using Godot; -using Godot.Collections; using System.Collections.Generic; namespace GameJamDungeon @@ -21,11 +20,9 @@ namespace GameJamDungeon [Export] public PackedScene ConsumableItemScene { get; set; } - public List<(IInventoryItem Item, float SpawnRate)> Database { get; private set; } - - public void SpawnItems() + public IInventoryItem[] Initialize() { - Database = new List<(IInventoryItem, float SpawnRates)>(); + var database = new List(); var armorResources = DirAccess.GetFilesAt("res://src/items/armor/resources/"); var weaponResources = DirAccess.GetFilesAt("res://src/items/weapons/resources/"); var accessoryResources = DirAccess.GetFilesAt("res://src/items/accessory/resources/"); @@ -37,7 +34,7 @@ namespace GameJamDungeon var armorInfo = GD.Load($"res://src/items/armor/resources/{armor}"); var armorScene = ArmorScene.Instantiate(); armorScene.ArmorInfo = armorInfo; - Database.Add(new(armorScene, 0.01f)); + database.Add(armorScene); } foreach (var weapon in weaponResources) @@ -45,7 +42,7 @@ namespace GameJamDungeon var weaponInfo = GD.Load($"res://src/items/weapons/resources/{weapon}"); var weaponScene = WeaponScene.Instantiate(); weaponScene.WeaponInfo = weaponInfo; - Database.Add(new(weaponScene, 0.01f)); + database.Add(weaponScene); } foreach (var accessory in accessoryResources) @@ -53,7 +50,7 @@ namespace GameJamDungeon var accessoryInfo = GD.Load($"res://src/items/accessory/resources/{accessory}"); var accessoryScene = AccessoryScene.Instantiate(); accessoryScene.AccessoryInfo = accessoryInfo; - Database.Add(new(accessoryScene, 0.01f)); + database.Add(accessoryScene); } foreach (var throwable in throwableResources) @@ -61,7 +58,7 @@ namespace GameJamDungeon var throwableItemInfo = GD.Load($"res://src/items/throwable/resources/{throwable}"); var throwableItemScene = ThrowableItemScene.Instantiate(); throwableItemScene.ThrowableItemInfo = throwableItemInfo; - Database.Add(new(throwableItemScene, 0.01f)); + database.Add(throwableItemScene); } foreach (var consumable in consumableResources) @@ -69,8 +66,10 @@ namespace GameJamDungeon var consumableItemInfo = GD.Load($"res://src/items/consumable/resources/{consumable}"); var consumableItemScene = ConsumableItemScene.Instantiate(); consumableItemScene.ConsumableItemInfo = consumableItemInfo; - Database.Add(new(consumableItemScene, 0.9f)); + database.Add(consumableItemScene); } + + return database.ToArray(); } } } diff --git a/src/items/throwable/resources/GeomanticDice.tres b/src/items/throwable/resources/GeomanticDice.tres index b5a1344e..aad4390c 100644 --- a/src/items/throwable/resources/GeomanticDice.tres +++ b/src/items/throwable/resources/GeomanticDice.tres @@ -9,3 +9,4 @@ ThrowableItemTags = [] Name = "Geomantic Dice" Description = "Inflicts Affinity damage when thrown." Texture = ExtResource("1_jhits") +SpawnRate = 0.5 diff --git a/src/items/weapons/Weapon.tscn b/src/items/weapons/Weapon.tscn index 313bb9a3..5c8f64cf 100644 --- a/src/items/weapons/Weapon.tscn +++ b/src/items/weapons/Weapon.tscn @@ -15,6 +15,7 @@ collision_mask = 4 [node name="Sprite" type="Sprite3D" parent="Pickup"] unique_name_in_owner = true +pixel_size = 0.0003 billboard = 2 double_sided = false alpha_cut = 1 diff --git a/src/items/weapons/resources/Jiblett.tres b/src/items/weapons/resources/Jiblett.tres index a1141475..a3874469 100644 --- a/src/items/weapons/resources/Jiblett.tres +++ b/src/items/weapons/resources/Jiblett.tres @@ -1,6 +1,6 @@ [gd_resource type="Resource" script_class="WeaponInfo" load_steps=3 format=3 uid="uid://c1bg0o7nmu2xw"] -[ext_resource type="Texture2D" uid="uid://wd6jh5q51e4k" path="res://src/items/weapons/models/sword.png" id="1_4hugd"] +[ext_resource type="Texture2D" uid="uid://cil3xe3jq82r6" path="res://src/items/weapons/textures/JIBLETT.PNG" id="1_ifm43"] [ext_resource type="Script" path="res://src/items/weapons/WeaponInfo.cs" id="1_re512"] [resource] @@ -13,7 +13,7 @@ AeolicDamageBonus = 0.0 BaseHydricDamageBonus = 0.0 IgneousDamageBonus = 0.0 FerrumDamageBonus = 0.0 -WeaponTags = Array[int]([]) +WeaponTags = [] Name = "Jiblett" Description = "" -Texture = ExtResource("1_4hugd") +Texture = ExtResource("1_ifm43") diff --git a/src/items/weapons/resources/Kubel.tres b/src/items/weapons/resources/Kubel.tres index d43edcf9..6c221fc5 100644 --- a/src/items/weapons/resources/Kubel.tres +++ b/src/items/weapons/resources/Kubel.tres @@ -1,7 +1,7 @@ [gd_resource type="Resource" script_class="WeaponInfo" load_steps=3 format=3 uid="uid://db075qhmlmrcu"] -[ext_resource type="Texture2D" uid="uid://wd6jh5q51e4k" path="res://src/items/weapons/models/sword.png" id="1_35u6c"] [ext_resource type="Script" path="res://src/items/weapons/WeaponInfo.cs" id="1_kbje7"] +[ext_resource type="Texture2D" uid="uid://bkntmni5jxfpk" path="res://src/items/weapons/textures/KUBEL.PNG" id="1_kwtbu"] [resource] script = ExtResource("1_kbje7") @@ -13,7 +13,7 @@ AeolicDamageBonus = 0.0 BaseHydricDamageBonus = 0.0 IgneousDamageBonus = 0.0 FerrumDamageBonus = 0.0 -WeaponTags = Array[int]([]) +WeaponTags = [] Name = "Kubel" Description = "" -Texture = ExtResource("1_35u6c") +Texture = ExtResource("1_kwtbu") diff --git a/src/items/weapons/resources/LoveJudgement.tres b/src/items/weapons/resources/LoveJudgement.tres index 8cb93827..b536ac34 100644 --- a/src/items/weapons/resources/LoveJudgement.tres +++ b/src/items/weapons/resources/LoveJudgement.tres @@ -1,6 +1,6 @@ [gd_resource type="Resource" script_class="WeaponInfo" load_steps=3 format=3 uid="uid://cfr100khjkloh"] -[ext_resource type="Texture2D" uid="uid://wd6jh5q51e4k" path="res://src/items/weapons/models/sword.png" id="1_rcmir"] +[ext_resource type="Texture2D" uid="uid://blq3nnyostunl" path="res://src/items/weapons/textures/LOVE JUDGEMENT.PNG" id="1_ivlxj"] [ext_resource type="Script" path="res://src/items/weapons/WeaponInfo.cs" id="1_vroib"] [resource] @@ -13,7 +13,7 @@ AeolicDamageBonus = 25.0 BaseHydricDamageBonus = 0.0 IgneousDamageBonus = 0.0 FerrumDamageBonus = 0.0 -WeaponTags = Array[int]([]) +WeaponTags = [] Name = "Love Judgement" Description = "A mace only wieldable by the strong of heart." -Texture = ExtResource("1_rcmir") +Texture = ExtResource("1_ivlxj") diff --git a/src/items/weapons/resources/Palm of Heaven.tres b/src/items/weapons/resources/Palm of Heaven.tres index 06515576..a7edd20f 100644 --- a/src/items/weapons/resources/Palm of Heaven.tres +++ b/src/items/weapons/resources/Palm of Heaven.tres @@ -1,6 +1,6 @@ [gd_resource type="Resource" script_class="WeaponInfo" load_steps=3 format=3 uid="uid://ckj1m4iv4m02r"] -[ext_resource type="Texture2D" uid="uid://wd6jh5q51e4k" path="res://src/items/weapons/models/sword.png" id="1_ccrtk"] +[ext_resource type="Texture2D" uid="uid://740syoj0w14p" path="res://src/items/weapons/textures/PALM OF HEAVEN.PNG" id="1_hi6xm"] [ext_resource type="Script" path="res://src/items/weapons/WeaponInfo.cs" id="1_pwwg7"] [resource] @@ -13,7 +13,7 @@ AeolicDamageBonus = 0.0 BaseHydricDamageBonus = 0.0 IgneousDamageBonus = 0.0 FerrumDamageBonus = 0.0 -WeaponTags = Array[int]([3]) +WeaponTags = [3] Name = "Palm of Heaven" Description = "Very Powerful. Breaks upon leaving the floor." -Texture = ExtResource("1_ccrtk") +Texture = ExtResource("1_hi6xm") diff --git a/src/items/weapons/resources/Rondo.tres b/src/items/weapons/resources/Rondo.tres index 91e36f73..1ffb8f09 100644 --- a/src/items/weapons/resources/Rondo.tres +++ b/src/items/weapons/resources/Rondo.tres @@ -1,6 +1,6 @@ [gd_resource type="Resource" script_class="WeaponInfo" load_steps=3 format=3 uid="uid://gebgo2x6nr3t"] -[ext_resource type="Texture2D" uid="uid://wd6jh5q51e4k" path="res://src/items/weapons/models/sword.png" id="1_3aw6j"] +[ext_resource type="Texture2D" uid="uid://b8c7kd436tg4" path="res://src/items/weapons/textures/RONDO.PNG" id="1_cvwbh"] [ext_resource type="Script" path="res://src/items/weapons/WeaponInfo.cs" id="1_xfb0x"] [resource] @@ -13,7 +13,7 @@ AeolicDamageBonus = 0.0 BaseHydricDamageBonus = 0.0 IgneousDamageBonus = 0.0 FerrumDamageBonus = 0.0 -WeaponTags = Array[int]([1]) +WeaponTags = [1] Name = "Rondo" Description = "An eastern blade outside of time and reproach." -Texture = ExtResource("1_3aw6j") +Texture = ExtResource("1_cvwbh") diff --git a/src/items/weapons/resources/SealingRod.tres b/src/items/weapons/resources/SealingRod.tres index f76493a4..ffb5e46b 100644 --- a/src/items/weapons/resources/SealingRod.tres +++ b/src/items/weapons/resources/SealingRod.tres @@ -1,7 +1,7 @@ [gd_resource type="Resource" script_class="WeaponInfo" load_steps=3 format=3 uid="uid://b7xr0l4a8g1gk"] -[ext_resource type="Texture2D" uid="uid://wd6jh5q51e4k" path="res://src/items/weapons/models/sword.png" id="1_8htja"] [ext_resource type="Script" path="res://src/items/weapons/WeaponInfo.cs" id="1_40b5j"] +[ext_resource type="Texture2D" uid="uid://b1qbho30vnuxf" path="res://src/items/weapons/textures/sealing rod.PNG" id="1_wiylj"] [resource] script = ExtResource("1_40b5j") @@ -13,9 +13,9 @@ AeolicDamageBonus = 0.0 BaseHydricDamageBonus = 0.0 IgneousDamageBonus = 0.0 FerrumDamageBonus = 0.0 -WeaponTags = Array[int]([]) -Texture = ExtResource("1_8htja") +WeaponTags = [] Name = "Sealing Rod" Description = "A wand fitted with charms said to cleanse and purify that which belongs to other worlds. It's unaligned nature has the power to balance all that it comes into contact with, should the wielder have the will." +Texture = ExtResource("1_wiylj") diff --git a/src/items/weapons/resources/Sword Sword Odette.tres b/src/items/weapons/resources/Sword Sword Odette.tres index f40178ef..834e1954 100644 --- a/src/items/weapons/resources/Sword Sword Odette.tres +++ b/src/items/weapons/resources/Sword Sword Odette.tres @@ -1,7 +1,7 @@ [gd_resource type="Resource" script_class="WeaponInfo" load_steps=3 format=3 uid="uid://bpdbuf0k0exb5"] [ext_resource type="Script" path="res://src/items/weapons/WeaponInfo.cs" id="1_cik6n"] -[ext_resource type="Texture2D" uid="uid://wd6jh5q51e4k" path="res://src/items/weapons/models/sword.png" id="1_qxt4y"] +[ext_resource type="Texture2D" uid="uid://cvtcsi2sagfwm" path="res://src/items/weapons/textures/SWAN SWORD.PNG" id="1_qc4eu"] [resource] script = ExtResource("1_cik6n") @@ -13,9 +13,9 @@ AeolicDamageBonus = 0.0 BaseHydricDamageBonus = 0.0 IgneousDamageBonus = 0.0 FerrumDamageBonus = 0.0 -WeaponTags = Array[int]([1]) +WeaponTags = [1] Name = "Swan Sword Odette" Description = "Ignores Affinity. The blade of a thousand faced heroine." -Texture = ExtResource("1_qxt4y") +Texture = ExtResource("1_qc4eu") diff --git a/src/items/weapons/textures/JIBLETT.PNG b/src/items/weapons/textures/JIBLETT.PNG new file mode 100644 index 00000000..1ad55f4e Binary files /dev/null and b/src/items/weapons/textures/JIBLETT.PNG differ diff --git a/src/items/weapons/textures/JIBLETT.PNG.import b/src/items/weapons/textures/JIBLETT.PNG.import new file mode 100644 index 00000000..8235c6d0 --- /dev/null +++ b/src/items/weapons/textures/JIBLETT.PNG.import @@ -0,0 +1,35 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://cil3xe3jq82r6" +path.s3tc="res://.godot/imported/JIBLETT.PNG-2cf0cf727a9a9bc2a9193ad4ac6c7dc4.s3tc.ctex" +metadata={ +"imported_formats": ["s3tc_bptc"], +"vram_texture": true +} + +[deps] + +source_file="res://src/items/weapons/textures/JIBLETT.PNG" +dest_files=["res://.godot/imported/JIBLETT.PNG-2cf0cf727a9a9bc2a9193ad4ac6c7dc4.s3tc.ctex"] + +[params] + +compress/mode=2 +compress/high_quality=false +compress/lossy_quality=0.7 +compress/hdr_compression=1 +compress/normal_map=0 +compress/channel_pack=0 +mipmaps/generate=true +mipmaps/limit=-1 +roughness/mode=0 +roughness/src_normal="" +process/fix_alpha_border=true +process/premult_alpha=false +process/normal_map_invert_y=false +process/hdr_as_srgb=false +process/hdr_clamp_exposure=false +process/size_limit=0 +detect_3d/compress_to=0 diff --git a/src/items/weapons/textures/KUBEL.PNG b/src/items/weapons/textures/KUBEL.PNG new file mode 100644 index 00000000..262eead2 Binary files /dev/null and b/src/items/weapons/textures/KUBEL.PNG differ diff --git a/src/items/weapons/textures/KUBEL.PNG.import b/src/items/weapons/textures/KUBEL.PNG.import new file mode 100644 index 00000000..e4dd3bd3 --- /dev/null +++ b/src/items/weapons/textures/KUBEL.PNG.import @@ -0,0 +1,35 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://bkntmni5jxfpk" +path.s3tc="res://.godot/imported/KUBEL.PNG-bd6eff6ed8307de491529365dab55876.s3tc.ctex" +metadata={ +"imported_formats": ["s3tc_bptc"], +"vram_texture": true +} + +[deps] + +source_file="res://src/items/weapons/textures/KUBEL.PNG" +dest_files=["res://.godot/imported/KUBEL.PNG-bd6eff6ed8307de491529365dab55876.s3tc.ctex"] + +[params] + +compress/mode=2 +compress/high_quality=false +compress/lossy_quality=0.7 +compress/hdr_compression=1 +compress/normal_map=0 +compress/channel_pack=0 +mipmaps/generate=true +mipmaps/limit=-1 +roughness/mode=0 +roughness/src_normal="" +process/fix_alpha_border=true +process/premult_alpha=false +process/normal_map_invert_y=false +process/hdr_as_srgb=false +process/hdr_clamp_exposure=false +process/size_limit=0 +detect_3d/compress_to=0 diff --git a/src/items/weapons/textures/LOVE JUDGEMENT.PNG b/src/items/weapons/textures/LOVE JUDGEMENT.PNG new file mode 100644 index 00000000..ed31bc3d Binary files /dev/null and b/src/items/weapons/textures/LOVE JUDGEMENT.PNG differ diff --git a/src/items/weapons/textures/LOVE JUDGEMENT.PNG.import b/src/items/weapons/textures/LOVE JUDGEMENT.PNG.import new file mode 100644 index 00000000..81af1383 --- /dev/null +++ b/src/items/weapons/textures/LOVE JUDGEMENT.PNG.import @@ -0,0 +1,35 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://blq3nnyostunl" +path.s3tc="res://.godot/imported/LOVE JUDGEMENT.PNG-46f90645e3286ed3dab4dfdeae491b95.s3tc.ctex" +metadata={ +"imported_formats": ["s3tc_bptc"], +"vram_texture": true +} + +[deps] + +source_file="res://src/items/weapons/textures/LOVE JUDGEMENT.PNG" +dest_files=["res://.godot/imported/LOVE JUDGEMENT.PNG-46f90645e3286ed3dab4dfdeae491b95.s3tc.ctex"] + +[params] + +compress/mode=2 +compress/high_quality=false +compress/lossy_quality=0.7 +compress/hdr_compression=1 +compress/normal_map=0 +compress/channel_pack=0 +mipmaps/generate=true +mipmaps/limit=-1 +roughness/mode=0 +roughness/src_normal="" +process/fix_alpha_border=true +process/premult_alpha=false +process/normal_map_invert_y=false +process/hdr_as_srgb=false +process/hdr_clamp_exposure=false +process/size_limit=0 +detect_3d/compress_to=0 diff --git a/src/items/weapons/textures/PALM OF HEAVEN.PNG b/src/items/weapons/textures/PALM OF HEAVEN.PNG new file mode 100644 index 00000000..8311a16e Binary files /dev/null and b/src/items/weapons/textures/PALM OF HEAVEN.PNG differ diff --git a/src/items/weapons/textures/PALM OF HEAVEN.PNG.import b/src/items/weapons/textures/PALM OF HEAVEN.PNG.import new file mode 100644 index 00000000..33c30328 --- /dev/null +++ b/src/items/weapons/textures/PALM OF HEAVEN.PNG.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://740syoj0w14p" +path="res://.godot/imported/PALM OF HEAVEN.PNG-35554a412a9c4bc09647efa86e6b581e.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://src/items/weapons/textures/PALM OF HEAVEN.PNG" +dest_files=["res://.godot/imported/PALM OF HEAVEN.PNG-35554a412a9c4bc09647efa86e6b581e.ctex"] + +[params] + +compress/mode=0 +compress/high_quality=false +compress/lossy_quality=0.7 +compress/hdr_compression=1 +compress/normal_map=0 +compress/channel_pack=0 +mipmaps/generate=false +mipmaps/limit=-1 +roughness/mode=0 +roughness/src_normal="" +process/fix_alpha_border=true +process/premult_alpha=false +process/normal_map_invert_y=false +process/hdr_as_srgb=false +process/hdr_clamp_exposure=false +process/size_limit=0 +detect_3d/compress_to=1 diff --git a/src/items/weapons/textures/RONDO.PNG b/src/items/weapons/textures/RONDO.PNG new file mode 100644 index 00000000..ab445869 Binary files /dev/null and b/src/items/weapons/textures/RONDO.PNG differ diff --git a/src/items/weapons/textures/RONDO.PNG.import b/src/items/weapons/textures/RONDO.PNG.import new file mode 100644 index 00000000..bf8cf314 --- /dev/null +++ b/src/items/weapons/textures/RONDO.PNG.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://b8c7kd436tg4" +path="res://.godot/imported/RONDO.PNG-77b50e9afaf9eb46f5672e079a5f50bf.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://src/items/weapons/textures/RONDO.PNG" +dest_files=["res://.godot/imported/RONDO.PNG-77b50e9afaf9eb46f5672e079a5f50bf.ctex"] + +[params] + +compress/mode=0 +compress/high_quality=false +compress/lossy_quality=0.7 +compress/hdr_compression=1 +compress/normal_map=0 +compress/channel_pack=0 +mipmaps/generate=false +mipmaps/limit=-1 +roughness/mode=0 +roughness/src_normal="" +process/fix_alpha_border=true +process/premult_alpha=false +process/normal_map_invert_y=false +process/hdr_as_srgb=false +process/hdr_clamp_exposure=false +process/size_limit=0 +detect_3d/compress_to=1 diff --git a/src/items/weapons/textures/SWAN SWORD.PNG b/src/items/weapons/textures/SWAN SWORD.PNG new file mode 100644 index 00000000..9a927a17 Binary files /dev/null and b/src/items/weapons/textures/SWAN SWORD.PNG differ diff --git a/src/items/weapons/textures/SWAN SWORD.PNG.import b/src/items/weapons/textures/SWAN SWORD.PNG.import new file mode 100644 index 00000000..5c3ec492 --- /dev/null +++ b/src/items/weapons/textures/SWAN SWORD.PNG.import @@ -0,0 +1,35 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://cvtcsi2sagfwm" +path.s3tc="res://.godot/imported/SWAN SWORD.PNG-7ff808d531b475ccc5be81a5523655a0.s3tc.ctex" +metadata={ +"imported_formats": ["s3tc_bptc"], +"vram_texture": true +} + +[deps] + +source_file="res://src/items/weapons/textures/SWAN SWORD.PNG" +dest_files=["res://.godot/imported/SWAN SWORD.PNG-7ff808d531b475ccc5be81a5523655a0.s3tc.ctex"] + +[params] + +compress/mode=2 +compress/high_quality=false +compress/lossy_quality=0.7 +compress/hdr_compression=1 +compress/normal_map=0 +compress/channel_pack=0 +mipmaps/generate=true +mipmaps/limit=-1 +roughness/mode=0 +roughness/src_normal="" +process/fix_alpha_border=true +process/premult_alpha=false +process/normal_map_invert_y=false +process/hdr_as_srgb=false +process/hdr_clamp_exposure=false +process/size_limit=0 +detect_3d/compress_to=0 diff --git a/src/items/weapons/textures/katar.PNG b/src/items/weapons/textures/katar.PNG new file mode 100644 index 00000000..b8afea03 Binary files /dev/null and b/src/items/weapons/textures/katar.PNG differ diff --git a/src/items/weapons/textures/katar.PNG.import b/src/items/weapons/textures/katar.PNG.import new file mode 100644 index 00000000..ff9b4e57 --- /dev/null +++ b/src/items/weapons/textures/katar.PNG.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://dsi0myqu80aq3" +path="res://.godot/imported/katar.PNG-64792536265ff7c6213050533f028b81.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://src/items/weapons/textures/katar.PNG" +dest_files=["res://.godot/imported/katar.PNG-64792536265ff7c6213050533f028b81.ctex"] + +[params] + +compress/mode=0 +compress/high_quality=false +compress/lossy_quality=0.7 +compress/hdr_compression=1 +compress/normal_map=0 +compress/channel_pack=0 +mipmaps/generate=false +mipmaps/limit=-1 +roughness/mode=0 +roughness/src_normal="" +process/fix_alpha_border=true +process/premult_alpha=false +process/normal_map_invert_y=false +process/hdr_as_srgb=false +process/hdr_clamp_exposure=false +process/size_limit=0 +detect_3d/compress_to=1 diff --git a/src/items/weapons/textures/sealing rod.PNG b/src/items/weapons/textures/sealing rod.PNG new file mode 100644 index 00000000..f52909d8 Binary files /dev/null and b/src/items/weapons/textures/sealing rod.PNG differ diff --git a/src/items/weapons/textures/sealing rod.PNG.import b/src/items/weapons/textures/sealing rod.PNG.import new file mode 100644 index 00000000..9ddde998 --- /dev/null +++ b/src/items/weapons/textures/sealing rod.PNG.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://b1qbho30vnuxf" +path="res://.godot/imported/sealing rod.PNG-4b6f479656dc98395fbaa74abf404389.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://src/items/weapons/textures/sealing rod.PNG" +dest_files=["res://.godot/imported/sealing rod.PNG-4b6f479656dc98395fbaa74abf404389.ctex"] + +[params] + +compress/mode=0 +compress/high_quality=false +compress/lossy_quality=0.7 +compress/hdr_compression=1 +compress/normal_map=0 +compress/channel_pack=0 +mipmaps/generate=false +mipmaps/limit=-1 +roughness/mode=0 +roughness/src_normal="" +process/fix_alpha_border=true +process/premult_alpha=false +process/normal_map_invert_y=false +process/hdr_as_srgb=false +process/hdr_clamp_exposure=false +process/size_limit=0 +detect_3d/compress_to=1 diff --git a/src/items/weapons/textures/spaded staff.PNG b/src/items/weapons/textures/spaded staff.PNG new file mode 100644 index 00000000..9c724846 Binary files /dev/null and b/src/items/weapons/textures/spaded staff.PNG differ diff --git a/src/items/weapons/textures/spaded staff.PNG.import b/src/items/weapons/textures/spaded staff.PNG.import new file mode 100644 index 00000000..df87940d --- /dev/null +++ b/src/items/weapons/textures/spaded staff.PNG.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://cixq2naufiuhv" +path="res://.godot/imported/spaded staff.PNG-e9590cdbd372c4b4a4fc0c7b2b987b18.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://src/items/weapons/textures/spaded staff.PNG" +dest_files=["res://.godot/imported/spaded staff.PNG-e9590cdbd372c4b4a4fc0c7b2b987b18.ctex"] + +[params] + +compress/mode=0 +compress/high_quality=false +compress/lossy_quality=0.7 +compress/hdr_compression=1 +compress/normal_map=0 +compress/channel_pack=0 +mipmaps/generate=false +mipmaps/limit=-1 +roughness/mode=0 +roughness/src_normal="" +process/fix_alpha_border=true +process/premult_alpha=false +process/normal_map_invert_y=false +process/hdr_as_srgb=false +process/hdr_clamp_exposure=false +process/size_limit=0 +detect_3d/compress_to=1 diff --git a/src/items/weapons/textures/talwar.PNG b/src/items/weapons/textures/talwar.PNG new file mode 100644 index 00000000..efc6cf11 Binary files /dev/null and b/src/items/weapons/textures/talwar.PNG differ diff --git a/src/items/weapons/textures/talwar.PNG.import b/src/items/weapons/textures/talwar.PNG.import new file mode 100644 index 00000000..cddf526a --- /dev/null +++ b/src/items/weapons/textures/talwar.PNG.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://d02gqi3icdp8l" +path="res://.godot/imported/talwar.PNG-d35174e542d7a4b1cd4c9dcab5b38d49.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://src/items/weapons/textures/talwar.PNG" +dest_files=["res://.godot/imported/talwar.PNG-d35174e542d7a4b1cd4c9dcab5b38d49.ctex"] + +[params] + +compress/mode=0 +compress/high_quality=false +compress/lossy_quality=0.7 +compress/hdr_compression=1 +compress/normal_map=0 +compress/channel_pack=0 +mipmaps/generate=false +mipmaps/limit=-1 +roughness/mode=0 +roughness/src_normal="" +process/fix_alpha_border=true +process/premult_alpha=false +process/normal_map_invert_y=false +process/hdr_as_srgb=false +process/hdr_clamp_exposure=false +process/size_limit=0 +detect_3d/compress_to=1 diff --git a/src/map/dungeon/rooms/DungeonRoom.cs b/src/map/dungeon/rooms/DungeonRoom.cs index 3aaad78c..f43ba6f4 100644 --- a/src/map/dungeon/rooms/DungeonRoom.cs +++ b/src/map/dungeon/rooms/DungeonRoom.cs @@ -39,7 +39,6 @@ public partial class DungeonRoom : Node3D, IDungeonRoom, IProvide x.SpawnRate).ToArray(); - var database = ItemDatabase.Database.Select(x => x.Item).ToArray(); + var weights = database.Select(x => x.Info.SpawnRate).ToArray(); var selectedItem = database[rng.RandWeighted(weights)]; var duplicated = selectedItem.Duplicate((int)DuplicateFlags.UseInstantiation) as Node3D; duplicated.Position = spawnPoint.Position; diff --git a/src/sfx/SE_BTL_BKN_10.ogg b/src/sfx/SE_BTL_BKN_10.ogg deleted file mode 100644 index ab90b4f2..00000000 Binary files a/src/sfx/SE_BTL_BKN_10.ogg and /dev/null differ diff --git a/src/sfx/SE_BTL_BKN_10.ogg.import b/src/sfx/SE_BTL_BKN_10.ogg.import deleted file mode 100644 index 77c526c6..00000000 --- a/src/sfx/SE_BTL_BKN_10.ogg.import +++ /dev/null @@ -1,19 +0,0 @@ -[remap] - -importer="oggvorbisstr" -type="AudioStreamOggVorbis" -uid="uid://cnsw6x70aawoc" -path="res://.godot/imported/SE_BTL_BKN_10.ogg-f6ec6e0e609e9f325bcd12539236b4be.oggvorbisstr" - -[deps] - -source_file="res://src/sfx/SE_BTL_BKN_10.ogg" -dest_files=["res://.godot/imported/SE_BTL_BKN_10.ogg-f6ec6e0e609e9f325bcd12539236b4be.oggvorbisstr"] - -[params] - -loop=false -loop_offset=0 -bpm=0 -beat_count=0 -bar_beats=4 diff --git a/src/sfx/SE_BTL_BKN_21.ogg b/src/sfx/SE_BTL_BKN_21.ogg deleted file mode 100644 index d131d9d8..00000000 Binary files a/src/sfx/SE_BTL_BKN_21.ogg and /dev/null differ diff --git a/src/sfx/SE_BTL_BKN_21.ogg.import b/src/sfx/SE_BTL_BKN_21.ogg.import deleted file mode 100644 index 369f6965..00000000 --- a/src/sfx/SE_BTL_BKN_21.ogg.import +++ /dev/null @@ -1,19 +0,0 @@ -[remap] - -importer="oggvorbisstr" -type="AudioStreamOggVorbis" -uid="uid://d5tquxahydiy" -path="res://.godot/imported/SE_BTL_BKN_21.ogg-18929f982e62102e29a8439d9e3e6246.oggvorbisstr" - -[deps] - -source_file="res://src/sfx/SE_BTL_BKN_21.ogg" -dest_files=["res://.godot/imported/SE_BTL_BKN_21.ogg-18929f982e62102e29a8439d9e3e6246.oggvorbisstr"] - -[params] - -loop=false -loop_offset=0 -bpm=0 -beat_count=0 -bar_beats=4 diff --git a/src/sfx/swish-7.wav b/src/sfx/swish-7.wav deleted file mode 100644 index 0f7ff745..00000000 Binary files a/src/sfx/swish-7.wav and /dev/null differ diff --git a/src/sfx/swish-7.wav.import b/src/sfx/swish-7.wav.import deleted file mode 100644 index d03a768f..00000000 --- a/src/sfx/swish-7.wav.import +++ /dev/null @@ -1,24 +0,0 @@ -[remap] - -importer="wav" -type="AudioStreamWAV" -uid="uid://d2pubs2jbnkn5" -path="res://.godot/imported/swish-7.wav-68bc23f9c7120de3e54b25a21082a686.sample" - -[deps] - -source_file="res://src/sfx/swish-7.wav" -dest_files=["res://.godot/imported/swish-7.wav-68bc23f9c7120de3e54b25a21082a686.sample"] - -[params] - -force/8_bit=false -force/mono=false -force/max_rate=false -force/max_rate_hz=44100 -edit/trim=false -edit/normalize=false -edit/loop_mode=0 -edit/loop_begin=0 -edit/loop_end=-1 -compress/mode=0 diff --git a/src/sound/music/droney.mp3 b/src/sound/music/droney.mp3 new file mode 100644 index 00000000..0be325e3 Binary files /dev/null and b/src/sound/music/droney.mp3 differ diff --git a/src/sound/music/droney.mp3.import b/src/sound/music/droney.mp3.import new file mode 100644 index 00000000..b38e6f48 --- /dev/null +++ b/src/sound/music/droney.mp3.import @@ -0,0 +1,19 @@ +[remap] + +importer="mp3" +type="AudioStreamMP3" +uid="uid://dfu0fksb6slhx" +path="res://.godot/imported/droney.mp3-7dd594403d939d2237ca85424564e2e7.mp3str" + +[deps] + +source_file="res://src/sound/music/droney.mp3" +dest_files=["res://.godot/imported/droney.mp3-7dd594403d939d2237ca85424564e2e7.mp3str"] + +[params] + +loop=false +loop_offset=0 +bpm=0 +beat_count=0 +bar_beats=4