diff --git a/Resources/Items/Nuclear_Ammo_Pickup.tres b/Resources/Items/Nuclear_Ammo_Pickup.tres index 6304949b..f5915cdc 100644 --- a/Resources/Items/Nuclear_Ammo_Pickup.tres +++ b/Resources/Items/Nuclear_Ammo_Pickup.tres @@ -1,15 +1,16 @@ [gd_resource type="Resource" script_class="LootItem" load_steps=3 format=3 uid="uid://cfod8kephnio6"] -[ext_resource type="Texture2D" uid="uid://b61po207ggn63" path="res://Sprites/Items/Yin_Ammo.png" id="1_6ly0q"] +[ext_resource type="Texture2D" uid="uid://bxwcjp25xba1j" path="res://Sprites/Items/Nuclear_Ammo.png" id="1_nas3h"] [ext_resource type="Script" uid="uid://epnwjptvks3t" path="res://Scripts/Resources/LootItem.cs" id="2_x45it"] [resource] script = ExtResource("2_x45it") ItemName = &"Nuclear Ammo" -ShortName = null +ShortName = &"" ItemDescription = &"Ammo for Nuclear weapons" ItemKey = &"NUCLEAR_AMMO" Item = 3 +Price = 0 Amount = 5 Max = 50 PickupIfMaxed = false @@ -17,5 +18,5 @@ ConsumeOnUse = true UiType = 2 Selectable = false AutoPickup = true -InventorySprite = ExtResource("1_6ly0q") -DropScenePath = &"res://Scenes/Items/Nuclear_Gun_Pickup.tscn" +InventorySprite = ExtResource("1_nas3h") +DropScenePath = &"uid://c1va8s6p050kx" diff --git a/Resources/Items/Yin_Yang_Ammo.tres b/Resources/Items/Yin_Yang_Ammo.tres index fcca8e16..67e7a568 100644 --- a/Resources/Items/Yin_Yang_Ammo.tres +++ b/Resources/Items/Yin_Yang_Ammo.tres @@ -6,10 +6,11 @@ [resource] script = ExtResource("3_ajs4l") ItemName = &"Yin-Yang Ammo" -ShortName = null +ShortName = &"" ItemDescription = &"Ammo for Ying-Yang based weapons" ItemKey = &"YINYANG_AMMO" Item = 3 +Price = 0 Amount = 5 Max = 50 PickupIfMaxed = false @@ -18,4 +19,4 @@ UiType = 2 Selectable = false AutoPickup = true InventorySprite = ExtResource("1_jt7l8") -DropScenePath = &"res://Scenes/Items/Yin_Yang_Ammo.tscn" +DropScenePath = &"uid://sjxkj5jdndxb" diff --git a/Resources/RogueliteMaps/Factory_Theme.tres b/Resources/RogueliteMaps/Factory_Theme.tres index 77e6060e..c66d0d8f 100644 --- a/Resources/RogueliteMaps/Factory_Theme.tres +++ b/Resources/RogueliteMaps/Factory_Theme.tres @@ -1,10 +1,9 @@ -[gd_resource type="Resource" script_class="RogueliteMapTheme" load_steps=65 format=3 uid="uid://cw6868vuvuynh"] +[gd_resource type="Resource" script_class="RogueliteMapTheme" load_steps=64 format=3 uid="uid://cw6868vuvuynh"] [ext_resource type="Script" uid="uid://bwtif3if3ea0u" path="res://Scripts/Resources/RogueliteMapTheme.cs" id="1_2rtdw"] [ext_resource type="Resource" uid="uid://cltxhkrqp055v" path="res://Resources/Items/Money_Pickup.tres" id="1_ae3bb"] [ext_resource type="PackedScene" uid="uid://djf0y08ix66fn" path="res://Scenes/Interactable/Chest.tscn" id="1_modrh"] [ext_resource type="PackedScene" uid="uid://db5dwj6nqo8fn" path="res://Scenes/Interactable/control_pad_gray_keycard.tscn" id="1_w43eq"] -[ext_resource type="Resource" uid="uid://oa8s6xydriib" path="res://Resources/Items/Generic_Keycard.tres" id="2_p3lfl"] [ext_resource type="PackedScene" uid="uid://l84on3kv2s52" path="res://Scenes/Door_Horizontal.tscn" id="2_y7x1u"] [ext_resource type="Resource" uid="uid://dodwpect0ldjf" path="res://Resources/Items/Heart_Pickup.tres" id="3_tsgja"] [ext_resource type="PackedScene" uid="uid://mtn26qwp4yqy" path="res://Scenes/Items/Gray_Keycard.tscn" id="4_qjf5s"] @@ -59,7 +58,7 @@ [sub_resource type="Resource" id="Resource_nnvxo"] script = ExtResource("11_eegnh") -Items = Array[Object]([ExtResource("1_ae3bb"), ExtResource("2_p3lfl"), ExtResource("3_tsgja"), ExtResource("4_qo6vk"), ExtResource("5_ga54h"), ExtResource("6_cxv74"), ExtResource("7_f7mru"), ExtResource("8_3kwn2"), ExtResource("9_to7mi"), ExtResource("10_w335g")]) +Items = Array[Object]([ExtResource("1_ae3bb"), ExtResource("3_tsgja"), ExtResource("4_qo6vk"), ExtResource("5_ga54h"), ExtResource("6_cxv74"), ExtResource("7_f7mru"), ExtResource("8_3kwn2"), ExtResource("9_to7mi"), ExtResource("10_w335g"), ExtResource("42_qo6vk"), ExtResource("41_tsgja")]) metadata/_custom_type_script = "uid://rgx0g5iqksnn" [sub_resource type="Resource" id="Resource_tsgja"] @@ -133,7 +132,7 @@ metadata/_custom_type_script = "uid://b1mvbcwsip0mv" [sub_resource type="Resource" id="Resource_11cll"] script = ExtResource("11_eegnh") -Items = Array[Object]([ExtResource("9_to7mi"), ExtResource("3_tsgja"), ExtResource("10_w335g"), ExtResource("6_cxv74"), ExtResource("9_to7mi"), ExtResource("5_ga54h"), ExtResource("41_tsgja"), ExtResource("42_qo6vk"), ExtResource("7_f7mru"), ExtResource("4_qo6vk"), ExtResource("2_p3lfl"), ExtResource("8_3kwn2")]) +Items = Array[Object]([ExtResource("9_to7mi"), ExtResource("3_tsgja"), ExtResource("10_w335g"), ExtResource("6_cxv74"), ExtResource("9_to7mi"), ExtResource("5_ga54h"), ExtResource("41_tsgja"), ExtResource("42_qo6vk"), ExtResource("7_f7mru"), ExtResource("4_qo6vk"), ExtResource("8_3kwn2")]) metadata/_custom_type_script = "uid://rgx0g5iqksnn" [sub_resource type="Resource" id="Resource_eegnh"] diff --git a/Scenes/Items/Nuclear_Ammo.tscn b/Scenes/Items/Nuclear_Ammo.tscn new file mode 100644 index 00000000..3eef8b02 --- /dev/null +++ b/Scenes/Items/Nuclear_Ammo.tscn @@ -0,0 +1,37 @@ +[gd_scene load_steps=8 format=3 uid="uid://c1va8s6p050kx"] + +[ext_resource type="Script" uid="uid://b3h7b30kerf60" path="res://Scripts/Interactables/ItemPickup.cs" id="1_iee4x"] +[ext_resource type="Script" uid="uid://epnwjptvks3t" path="res://Scripts/Resources/LootItem.cs" id="2_wy3cq"] +[ext_resource type="Resource" uid="uid://cfod8kephnio6" path="res://Resources/Items/Nuclear_Ammo_Pickup.tres" id="3_uan86"] +[ext_resource type="Texture2D" uid="uid://bxwcjp25xba1j" path="res://Sprites/Items/Nuclear_Ammo.png" id="4_b086f"] + +[sub_resource type="CircleShape2D" id="CircleShape2D_6vv2s"] + +[sub_resource type="AtlasTexture" id="AtlasTexture_am0yf"] +atlas = ExtResource("4_b086f") +region = Rect2(0, 0, 16, 16) + +[sub_resource type="SpriteFrames" id="SpriteFrames_q2nuw"] +animations = [{ +"frames": [{ +"duration": 1.0, +"texture": SubResource("AtlasTexture_am0yf") +}], +"loop": true, +"name": &"default", +"speed": 5.0 +}] + +[node name="NuclearAmmo" type="Area2D" groups=["Interactable"]] +collision_layer = 4 +collision_mask = 2 +script = ExtResource("1_iee4x") +LootTable = Array[ExtResource("2_wy3cq")]([ExtResource("3_uan86")]) + +[node name="CollisionShape2D" type="CollisionShape2D" parent="."] +shape = SubResource("CircleShape2D_6vv2s") + +[node name="AnimatedSprite2D" type="AnimatedSprite2D" parent="."] +sprite_frames = SubResource("SpriteFrames_q2nuw") + +[connection signal="area_entered" from="." to="." method="_on_area_entered"]