Add DARK_MACHINE_GUN and DISAGIATOR items with associated resources and pickups

3D/Maps/Factory5.map

@@ -1609,3 +1609,15 @@
 "origin" "-700 -12 24"
 "angles" "0 -180 0"
 }
+// entity 71
+{
+"classname" "marker_spawn_item"
+"origin" "-36 -116 22"
+"resource_path" "res://Resources/Items/DARK_MACHINE_GUN_Item.tres"
+}
+// entity 72
+{
+"classname" "marker_spawn_item"
+"origin" "-44 -132 22"
+"resource_path" "res://Resources/Items/IceShotgun.tres"
+}

Resources/Items/DARK_MACHINE_GUN_Item.tres

@@ -0,0 +1,21 @@
+[gd_resource type="Resource" script_class="LootItem" format=3 uid="uid://cecyd50cwsc8q"]
+
+[ext_resource type="Texture2D" uid="uid://dllry0ed1enrg" path="res://Sprites/Items/Darkness_Gun.png" id="1_njiua"]
+[ext_resource type="Resource" uid="uid://c2oywnnxc63ju" path="res://Resources/Weapons/DARK_MACHINE_GUN.tres" id="2_oxtpp"]
+[ext_resource type="Script" uid="uid://epnwjptvks3t" path="res://Scripts/Resources/LootItem.cs" id="3_1kdit"]
+
+[resource]
+script = ExtResource("3_1kdit")
+ItemName = &"Dark Machine Gun"
+ShortName = &"RM-05"
+ItemDescription = &"A weapon shooting dark shells"
+ItemKey = &"DARK_MACHINE_GUN"
+Item = 9
+WeaponData3D = ExtResource("2_oxtpp")
+Amount = 1
+Max = 1
+UiType = 14
+Selectable = true
+InventorySprite = ExtResource("1_njiua")
+DropScenePath = &""
+DropScenePath3D = &"res://Scenes/Items/GenericItem3D.tscn"

Resources/Items/DISAGIATOR_Item.tres

@@ -0,0 +1,18 @@
+[gd_resource type="Resource" script_class="LootItem" format=3 uid="uid://daypqxy0pyepn"]
+
+[ext_resource type="Resource" path="res://Resources/Weapons/DISAGIATOR.tres" id="1_ud0bn"]
+[ext_resource type="Script" uid="uid://epnwjptvks3t" path="res://Scripts/Resources/LootItem.cs" id="2_3rlf8"]
+
+[resource]
+script = ExtResource("2_3rlf8")
+ItemName = &"Disagiator"
+ShortName = &"DS-TR"
+ItemDescription = &"Weapon that causes Disagi"
+ItemKey = &"DISAGIATOR"
+Item = 13
+WeaponData3D = ExtResource("1_ud0bn")
+Amount = 1
+Max = 1
+Selectable = true
+DropScenePath = &""
+DropScenePath3D = &"res://Scenes/Items/GenericItem3D.tscn"

Resources/Items/Heart_Extend_Pickup.tres

@@ -1,4 +1,4 @@
-[gd_resource type="Resource" script_class="LootItem" load_steps=5 format=3 uid="uid://ciybnocjfpshh"]
+[gd_resource type="Resource" script_class="LootItem" format=3 uid="uid://ciybnocjfpshh"]
 
 [ext_resource type="Texture2D" uid="uid://c8fr1ea20odaw" path="res://Sprites/Items/Heart_Extend.png" id="1_00obu"]
 [ext_resource type="Script" uid="uid://6cupx85nnda4" path="res://Scripts/Resources/ItemEffects/ResourceIncreaseEffectResource.cs" id="2_uaof8"]

Resources/Items/IceShotgun.tres

@@ -1,4 +1,4 @@
-[gd_resource type="Resource" script_class="LootItem" load_steps=5 format=3 uid="uid://dau0s8ob7qnpc"]
+[gd_resource type="Resource" script_class="LootItem" format=3 uid="uid://dau0s8ob7qnpc"]
 
 [ext_resource type="Resource" uid="uid://cyntngidhcbkc" path="res://Resources/Weapons/Ice_Shotgun_Weapon.tres" id="2_3le6e"]
 [ext_resource type="Texture2D" uid="uid://b46usr10jhmev" path="res://Sprites/Items/Ice_Shotgun.png" id="2_4ibag"]
@@ -12,17 +12,12 @@ ShortName = &"IC-25"
 ItemDescription = &"Shoots ice pellets in a wide spread"
 ItemKey = &"ICE_SHOTGUN"
 Item = 9
-Tier = 0
-Price = 0
 WeaponData = ExtResource("2_3le6e")
 WeaponData3D = ExtResource("3_k86gl")
 Amount = 1
 Max = 1
-PickupIfMaxed = false
-ConsumeOnUse = false
 UiType = 14
 Selectable = true
-AutoPickup = false
 InventorySprite = ExtResource("2_4ibag")
 DropScenePath = &"res://Scenes/Items/GenericItem.tscn"
 DropScenePath3D = &"uid://cnot7sft7lpf3"

Resources/Items/Shield_Extend_Pickup.tres

@@ -1,4 +1,4 @@
-[gd_resource type="Resource" script_class="LootItem" load_steps=5 format=3 uid="uid://bdpbekqhuuq4l"]
+[gd_resource type="Resource" script_class="LootItem" format=3 uid="uid://bdpbekqhuuq4l"]
 
 [ext_resource type="Texture2D" uid="uid://b2vmpi57d7vwy" path="res://Sprites/Items/Shield_Extend.png" id="1_e61f8"]
 [ext_resource type="Script" uid="uid://6cupx85nnda4" path="res://Scripts/Resources/ItemEffects/ResourceIncreaseEffectResource.cs" id="2_da583"]

Resources/Items/Spider_Bomb_Pickup.tres

@@ -1,4 +1,4 @@
-[gd_resource type="Resource" script_class="LootItem" load_steps=9 format=3 uid="uid://dhbltvgsa3g88"]
+[gd_resource type="Resource" script_class="LootItem" format=3 uid="uid://dhbltvgsa3g88"]
 
 [ext_resource type="Texture2D" uid="uid://r2h77ktff10m" path="res://Sprites/Bullets/Snowball.png" id="1_gpot4"]
 [ext_resource type="Script" uid="uid://epnwjptvks3t" path="res://Scripts/Resources/LootItem.cs" id="1_lus3u"]

Resources/ItemsDatabase.tres

@@ -1,4 +1,4 @@
-[gd_resource type="Resource" script_class="ItemsDatabase" load_steps=35 format=3 uid="uid://cdi84udi6gldt"]
+[gd_resource type="Resource" script_class="ItemsDatabase" format=3 uid="uid://cdi84udi6gldt"]
 
 [ext_resource type="Resource" uid="uid://ct1fa2huvy34n" path="res://Resources/Items/Ammo1.tres" id="1_1s15f"]
 [ext_resource type="Script" uid="uid://c23prvgfitlpd" path="res://Scripts/Resources/ItemsDatabase.cs" id="1_al8ea"]
@@ -34,8 +34,9 @@
 [ext_resource type="Resource" uid="uid://oa8s6xydriib" path="res://Resources/Items/Generic_Keycard.tres" id="31_i5d5q"]
 [ext_resource type="Resource" uid="uid://cajqlnyvlmybe" path="res://Resources/Items/IcicleRepeater_Improved.tres" id="32_42kyh"]
 [ext_resource type="Resource" uid="uid://dwwbyyy3fo4bt" path="res://Resources/Items/IcicleRepeater_Advanced.tres" id="33_q4lxx"]
+[ext_resource type="Resource" uid="uid://cecyd50cwsc8q" path="res://Resources/Items/DARK_MACHINE_GUN_Item.tres" id="34_5stko"]
 
 [resource]
 script = ExtResource("1_al8ea")
-LootItems = Array[ExtResource("1_nodmt")]([ExtResource("1_1s15f"), ExtResource("2_nsx5p"), ExtResource("3_oark3"), ExtResource("4_yj5fs"), ExtResource("5_wigtd"), ExtResource("6_ador3"), ExtResource("7_xxd6q"), ExtResource("8_33up1"), ExtResource("9_a23i7"), ExtResource("10_0hw56"), ExtResource("11_nodmt"), ExtResource("12_5stko"), ExtResource("13_5x77y"), ExtResource("14_p1hpt"), ExtResource("15_b6dqw"), ExtResource("16_a5xwj"), ExtResource("17_44qof"), ExtResource("18_i5d5q"), ExtResource("19_42kyh"), ExtResource("20_q4lxx"), ExtResource("21_detwd"), ExtResource("22_w8yo3"), ExtResource("23_nq6hj"), ExtResource("25_5stko"), ExtResource("26_5x77y"), ExtResource("27_p1hpt"), ExtResource("28_b6dqw"), ExtResource("29_a5xwj"), ExtResource("30_44qof"), ExtResource("31_i5d5q"), ExtResource("32_42kyh"), ExtResource("33_q4lxx")])
+LootItems = Array[ExtResource("1_nodmt")]([ExtResource("1_1s15f"), ExtResource("2_nsx5p"), ExtResource("3_oark3"), ExtResource("4_yj5fs"), ExtResource("5_wigtd"), ExtResource("6_ador3"), ExtResource("7_xxd6q"), ExtResource("8_33up1"), ExtResource("9_a23i7"), ExtResource("10_0hw56"), ExtResource("11_nodmt"), ExtResource("12_5stko"), ExtResource("13_5x77y"), ExtResource("14_p1hpt"), ExtResource("15_b6dqw"), ExtResource("16_a5xwj"), ExtResource("17_44qof"), ExtResource("18_i5d5q"), ExtResource("19_42kyh"), ExtResource("20_q4lxx"), ExtResource("21_detwd"), ExtResource("22_w8yo3"), ExtResource("23_nq6hj"), ExtResource("25_5stko"), ExtResource("26_5x77y"), ExtResource("27_p1hpt"), ExtResource("28_b6dqw"), ExtResource("29_a5xwj"), ExtResource("30_44qof"), ExtResource("31_i5d5q"), ExtResource("32_42kyh"), ExtResource("33_q4lxx"), ExtResource("34_5stko")])
 metadata/_custom_type_script = "uid://c23prvgfitlpd"

Resources/Weapons/DARK_MACHINE_GUN.tres

@@ -0,0 +1,16 @@
+[gd_resource type="Resource" script_class="WeaponResource" format=3 uid="uid://c2oywnnxc63ju"]
+
+[ext_resource type="Resource" uid="uid://c2ptnbivq3ioj" path="res://Resources/Bullets/3D/icicle_repeater_bullets_3D.tres" id="1_i203b"]
+[ext_resource type="Script" uid="uid://b6fmrnipv88bk" path="res://Scripts/Resources/WeaponResource.cs" id="2_c6ngb"]
+
+[resource]
+script = ExtResource("2_c6ngb")
+Name = &"Dark Machine Gun"
+BulletData = ExtResource("1_i203b")
+Priority = 10
+RateOfFire = 0.2
+BulletCapacity = 50
+InfiniteAmmo = false
+ItemKey = &"DARK_MACHINE_GUN"
+AmmoKey = &""
+RechargeAmount = 5

Resources/Weapons/EnemyShotgun_3D.tres

@@ -1,4 +1,4 @@
-[gd_resource type="Resource" script_class="WeaponResource" load_steps=3 format=3 uid="uid://dtrmtjd7j03k8"]
+[gd_resource type="Resource" script_class="WeaponResource" format=3 uid="uid://dtrmtjd7j03k8"]
 
 [ext_resource type="Resource" uid="uid://qrqsywgiij7i" path="res://Resources/Bullets/3D/simple_enemy_bullet_small_3D.tres" id="1_l2h7p"]
 [ext_resource type="Script" uid="uid://b6fmrnipv88bk" path="res://Scripts/Resources/WeaponResource.cs" id="2_0kc7l"]
@@ -7,16 +7,10 @@
 script = ExtResource("2_0kc7l")
 Name = &"Enemy Shotgun"
 BulletData = ExtResource("1_l2h7p")
-Priority = 0
-AmmoPerShot = 1
 RateOfFire = 1.2
 BulletCapacity = 4
 ReloadTime = 2.0
-AutoReload = true
-InfiniteAmmo = true
 ItemKey = &""
 AmmoKey = &""
 BulletsPerShot = 5
 SpreadAngle = 30.0
-RandomSpread = 0.0
-_rotationOffset = 0.0

Resources/Weapons/EnemyWeapon_Big_3D.tres

@@ -1,4 +1,4 @@
-[gd_resource type="Resource" script_class="WeaponResource" load_steps=3 format=3 uid="uid://c6ywv08e6is5o"]
+[gd_resource type="Resource" script_class="WeaponResource" format=3 uid="uid://c6ywv08e6is5o"]
 
 [ext_resource type="Resource" uid="uid://wbdspte0ch33" path="res://Resources/Bullets/3D/simple_enemy_bullet_3D.tres" id="1_itg3a"]
 [ext_resource type="Script" uid="uid://b6fmrnipv88bk" path="res://Scripts/Resources/WeaponResource.cs" id="2_6m4qy"]

Resources/Weapons/Ice_Shotgun_Weapon.tres

@@ -1,4 +1,4 @@
-[gd_resource type="Resource" script_class="WeaponResource" load_steps=5 format=3 uid="uid://cyntngidhcbkc"]
+[gd_resource type="Resource" script_class="WeaponResource" format=3 uid="uid://cyntngidhcbkc"]
 
 [ext_resource type="Resource" uid="uid://eu6n6c5175y8" path="res://Resources/Bullets/simple_ice_bullet.tres" id="1_m44wx"]
 [ext_resource type="AudioStream" uid="uid://jsv3yjluv1au" path="res://SFX/Weapons/Reload_01.wav" id="2_0vfwr"]
@@ -10,17 +10,14 @@ script = ExtResource("2_utbbo")
 Name = &"Ice Shotgun"
 BulletData = ExtResource("1_m44wx")
 Priority = 30
-AmmoPerShot = 1
 RateOfFire = 0.5
 BulletCapacity = 4
 ReloadTime = 0.8
-AutoReload = true
 InfiniteAmmo = false
 ItemKey = &"ICE_SHOTGUN"
 AmmoKey = &"ICE_AMMO"
 BulletsPerShot = 3
 SpreadAngle = 8.0
 RandomSpread = 15.0
-_rotationOffset = 0.0
 ReloadSound = ExtResource("2_0vfwr")
 ShootSound = ExtResource("3_tvv5a")

Resources/Weapons/IcicleGun_3D.tres

@@ -1,4 +1,4 @@
-[gd_resource type="Resource" script_class="WeaponResource" load_steps=5 format=3 uid="uid://bohkmf6g1fi2o"]
+[gd_resource type="Resource" script_class="WeaponResource" format=3 uid="uid://bohkmf6g1fi2o"]
 
 [ext_resource type="Resource" uid="uid://csmq6hngkx41e" path="res://Resources/Bullets/3D/icicle_gun_bullets_3D.tres" id="1_d2kl0"]
 [ext_resource type="AudioStream" uid="uid://jsv3yjluv1au" path="res://SFX/Weapons/Reload_01.wav" id="2_sdmjb"]

Resources/bus_layout.tres

@@ -1,4 +1,4 @@
-[gd_resource type="AudioBusLayout" load_steps=2 format=3 uid="uid://clblu7fse2pjy"]
+[gd_resource type="AudioBusLayout" format=3 uid="uid://clblu7fse2pjy"]
 
 [sub_resource type="AudioEffectHardLimiter" id="AudioEffectHardLimiter_0f13h"]
 resource_name = "HardLimiter"

Sprites/Items/Darkness_Gun.png.import

@@ -3,32 +3,39 @@
 importer="texture"
 type="CompressedTexture2D"
 uid="uid://dllry0ed1enrg"
-path="res://.godot/imported/Darkness_Gun.png-ab3a22cf4a7cee780b569914b927e341.ctex"
+path.s3tc="res://.godot/imported/Darkness_Gun.png-ab3a22cf4a7cee780b569914b927e341.s3tc.ctex"
 metadata={
-"vram_texture": false
+"imported_formats": ["s3tc_bptc"],
+"vram_texture": true
 }
 
 [deps]
 
 source_file="res://Sprites/Items/Darkness_Gun.png"
-dest_files=["res://.godot/imported/Darkness_Gun.png-ab3a22cf4a7cee780b569914b927e341.ctex"]
+dest_files=["res://.godot/imported/Darkness_Gun.png-ab3a22cf4a7cee780b569914b927e341.s3tc.ctex"]
 
 [params]
 
-compress/mode=0
+compress/mode=2
 compress/high_quality=false
 compress/lossy_quality=0.7
+compress/uastc_level=0
+compress/rdo_quality_loss=0.0
 compress/hdr_compression=1
 compress/normal_map=0
 compress/channel_pack=0
-mipmaps/generate=false
+mipmaps/generate=true
 mipmaps/limit=-1
 roughness/mode=0
 roughness/src_normal=""
+process/channel_remap/red=0
+process/channel_remap/green=1
+process/channel_remap/blue=2
+process/channel_remap/alpha=3
 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
+detect_3d/compress_to=0