Rewrite and simplify Inventory Menu, various fixes for item effects

Zennysoft.Game.Ma/src/items/Inventory.cs

@@ -19,6 +19,7 @@ public partial class Inventory : Node, IInventory
   private const int _maxInventorySize = 20;
 
   public event Action<string> BroadcastMessage;
+  public event Action InventoryChanged;
 
   public Inventory()
   {
@@ -32,10 +33,7 @@ public partial class Inventory : Node, IInventory
   {
     var isAdded = TryAdd(item);
     if (isAdded)
-    {
       BroadcastMessage?.Invoke($"{item.ItemName} picked up.");
-      item.QueueFree();
-    }
     else
       BroadcastMessage?.Invoke($"Could not pick up {item.ItemName}.");
 
@@ -48,6 +46,7 @@ public partial class Inventory : Node, IInventory
       return false;
 
     Items.Add(inventoryItem);
+    InventoryChanged?.Invoke();
     return true;
   }
 
@@ -57,11 +56,15 @@ public partial class Inventory : Node, IInventory
       return false;
 
     Items.Insert(index, inventoryItem);
+    InventoryChanged?.Invoke();
     return true;
   }
 
-  public void Remove(InventoryItem inventoryItem) => Items.Remove(inventoryItem);
-
+  public void Remove(InventoryItem inventoryItem)
+  {
+    Items.Remove(inventoryItem);
+    InventoryChanged?.Invoke();
+  }
 
   public void Sort(EquipableItem currentWeapon, EquipableItem currentArmor, EquipableItem currentAccessory)
   {

Zennysoft.Game.Ma/src/items/InventoryItemStats.cs

@@ -9,9 +9,11 @@ namespace Zennysoft.Game.Ma;
 public abstract partial class InventoryItemStats : Resource
 {
   [Export]
+  [Save("equipment_name")]
   public string Name { get; set; }
 
   [Export(PropertyHint.MultilineText)]
+  [Save("equipment_description")]
   public string Description { get; set; }
 
   [Export(PropertyHint.Range, "0, 1, 0.01")]
@@ -30,33 +32,43 @@ public abstract partial class InventoryItemStats : Resource
   public double BonusLuck { get; set; } = 0.05;
 
   [Export]
+  [Save("equipment_bonus_hp")]
+  public int BonusHP { get; set; } = 0;
+
+  [Export]
+  [Save("equipment_bonus_vt")]
+  public int BonusVT { get; set; } = 0;
+
+  [Export]
+  [Save("equipment_aeolic_resist")]
   public int AeolicResistance { get; set; } = 0;
 
   [Export]
+  [Save("equipment_telluric_resist")]
   public int TelluricResistance { get; set; } = 0;
 
   [Export]
+  [Save("equipment_hydric_resist")]
   public int HydricResistance { get; set; } = 0;
 
   [Export]
+  [Save("equipment_igneous_resist")]
   public int IgneousResistance { get; set; } = 0;
 
   [Export]
+  [Save("equipment_ferrum_resist")]
   public int FerrumResistance { get; set; } = 0;
 
   [Export(PropertyHint.Range, "0, 25, 0.1")]
+  [Save("equipment_throw_speed")]
   public float ThrowSpeed { get; set; } = 12.0f;
 
   [Export(PropertyHint.Range, "0, 999, 1")]
-  public int IncreaseMaxHPAmount { get; set; }
-
-  [Export(PropertyHint.Range, "0, 999, 1")]
-  public int IncreaseMaxVTAmount { get; set; }
-
-  [Export(PropertyHint.Range, "0, 999, 1")]
+  [Save("equipment_throw_damage")]
   public int ThrowDamage { get; set; } = 5;
 
   [Export]
+  [Save("equipment_item_tag")]
   public ItemTag ItemTag { get; set; } = ItemTag.None;
 
   [Export]

Zennysoft.Game.Ma/src/items/ItemDatabase.cs

@@ -62,7 +62,6 @@ public class ItemDatabase
       weaponScene.Stats = weaponInfo;
       if (!database.Contains(weaponScene))
         database.Add(weaponScene);
-      database.Add(weaponScene);
     }
 
     foreach (var accessory in accessoryResources)
@@ -72,7 +71,6 @@ public class ItemDatabase
       accessoryScene.Stats = accessoryInfo;
       if (!database.Contains(accessoryScene))
         database.Add(accessoryScene);
-      database.Add(accessoryScene);
     }
 
     foreach (var throwable in throwableResources)
@@ -82,7 +80,6 @@ public class ItemDatabase
       throwableItemScene.Stats = throwableItemInfo;
       if (!database.Contains(throwableItemScene))
         database.Add(throwableItemScene);
-      database.Add(throwableItemScene);
     }
 
     foreach (var consumable in consumableResources)
@@ -92,7 +89,6 @@ public class ItemDatabase
       consumableItemScene.Stats = consumableItemInfo;
       if (!database.Contains(consumableItemScene))
         database.Add(consumableItemScene);
-      database.Add(consumableItemScene);
     }
 
     foreach (var effectItem in effectResources)
@@ -102,7 +98,6 @@ public class ItemDatabase
       effectItemScene.Stats = effectItemInfo;
       if (!database.Contains(effectItemScene))
         database.Add(effectItemScene);
-      database.Add(effectItemScene);
     }
 
     Items = [.. database];

Zennysoft.Game.Ma/src/items/accessory/Accessory.cs

@@ -28,6 +28,14 @@ public partial class Accessory : EquipableItem
 
   public override float ThrowSpeed => Stats.ThrowSpeed;
 
+  public override int BonusAttack => Stats.BonusAttack;
+
+  public override int BonusDefense => Stats.BonusDefense;
+
+  public override int BonusHP => Stats.BonusHP;
+
+  public override int BonusVT => Stats.BonusVT;
+
   public override ElementalResistanceSet ElementalResistance => new ElementalResistanceSet(Stats.AeolicResistance, Stats.HydricResistance, Stats.IgneousResistance, Stats.FerrumResistance, Stats.TelluricResistance);
 
   [Save("accessory_tag")]

Zennysoft.Game.Ma/src/items/accessory/resources/MaskAvarice.tres

@@ -5,18 +5,21 @@
 
 [resource]
 script = ExtResource("1_xqaot")
-ATKUp = 0
-DEFUp = 0
-LuckUp = 0.1
-MaxHPUp = 0
-MaxVTUp = 0
 AccessoryTag = 0
 Name = "Mask of the Goddess of Avarice"
 Description = "Raises Luck"
-Texture = ExtResource("1_q42cv")
 SpawnRate = 0.1
+BonusAttack = 0
+BonusDefense = 0
+BonusLuck = 0.3
+AeolicResistance = 0
+TelluricResistance = 0
+HydricResistance = 0
+IgneousResistance = 0
+FerrumResistance = 0
 ThrowSpeed = 12.0
-HealHPAmount = 0
-HealVTAmount = 0
+IncreaseMaxHPAmount = 0
+IncreaseMaxVTAmount = 0
 ThrowDamage = 5
 ItemTag = 0
+Texture = ExtResource("1_q42cv")

Zennysoft.Game.Ma/src/items/accessory/resources/MaskDestruction.tres

@@ -1,17 +1,25 @@
 [gd_resource type="Resource" script_class="AccessoryStats" load_steps=3 format=3 uid="uid://d4bcem2nup7ef"]
 
 [ext_resource type="Texture2D" uid="uid://db7i7iy5gagae" path="res://src/items/accessory/textures/MASK 02.PNG" id="1_0p1ot"]
-[ext_resource type="Script" path="res://src/items/accessory/AccessoryStats.cs" id="1_vef66"]
+[ext_resource type="Script" uid="uid://b8arlmivk68b" path="res://src/items/accessory/AccessoryStats.cs" id="1_vef66"]
 
 [resource]
 script = ExtResource("1_vef66")
-ATKUp = 3
-DEFUp = 0
-LUCKUp = 0.0
-MaxHPUp = 0
-MaxVTUp = 0
-AccessoryTags = [0]
+AccessoryTag = 0
 Name = "Mask of the Goddess of Destruction"
 Description = "Raises ATK."
-Texture = ExtResource("1_0p1ot")
 SpawnRate = 0.1
+BonusAttack = 3
+BonusDefense = 0
+BonusLuck = 0.05
+AeolicResistance = 0
+TelluricResistance = 0
+HydricResistance = 0
+IgneousResistance = 0
+FerrumResistance = 0
+ThrowSpeed = 12.0
+IncreaseMaxHPAmount = 0
+IncreaseMaxVTAmount = 0
+ThrowDamage = 5
+ItemTag = 0
+Texture = ExtResource("1_0p1ot")

Zennysoft.Game.Ma/src/items/accessory/resources/MaskGuilt.tres

@@ -1,17 +1,25 @@
 [gd_resource type="Resource" script_class="AccessoryStats" load_steps=3 format=3 uid="uid://bejy3lpudgawg"]
 
 [ext_resource type="Texture2D" uid="uid://db7i7iy5gagae" path="res://src/items/accessory/textures/MASK 02.PNG" id="1_0k42r"]
-[ext_resource type="Script" path="res://src/items/accessory/AccessoryStats.cs" id="1_cgxkh"]
+[ext_resource type="Script" uid="uid://b8arlmivk68b" path="res://src/items/accessory/AccessoryStats.cs" id="1_cgxkh"]
 
 [resource]
 script = ExtResource("1_cgxkh")
-ATKUp = 1
-DEFUp = 1
-LUCKUp = 0.0
-MaxHPUp = 30
-MaxVTUp = 30
-AccessoryTags = []
+AccessoryTag = 0
 Name = "Mask of the Goddess of Guilt"
 Description = "Raises MAX HP, MAX VT, ATK, DEF"
-Texture = ExtResource("1_0k42r")
 SpawnRate = 0.1
+BonusAttack = 2
+BonusDefense = 2
+BonusLuck = 0.05
+BonusHP = 25
+BonusVT = 25
+AeolicResistance = 0
+TelluricResistance = 0
+HydricResistance = 0
+IgneousResistance = 0
+FerrumResistance = 0
+ThrowSpeed = 12.0
+ThrowDamage = 5
+ItemTag = 0
+Texture = ExtResource("1_0k42r")

Zennysoft.Game.Ma/src/items/accessory/resources/MaskObstinance.tres

@@ -1,17 +1,25 @@
 [gd_resource type="Resource" script_class="AccessoryStats" load_steps=3 format=3 uid="uid://ddwyaxxqvk52h"]
 
 [ext_resource type="Texture2D" uid="uid://db7i7iy5gagae" path="res://src/items/accessory/textures/MASK 02.PNG" id="1_1uw37"]
-[ext_resource type="Script" path="res://src/items/accessory/AccessoryStats.cs" id="1_kuyyj"]
+[ext_resource type="Script" uid="uid://b8arlmivk68b" path="res://src/items/accessory/AccessoryStats.cs" id="1_kuyyj"]
 
 [resource]
 script = ExtResource("1_kuyyj")
-ATKUp = 0
-DEFUp = 3
-LUCKUp = 0.0
-MaxHPUp = 0
-MaxVTUp = 0
-AccessoryTags = []
+AccessoryTag = 0
 Name = "Mask of the Goddess of Obstinance"
 Description = "Raises DEF."
-Texture = ExtResource("1_1uw37")
 SpawnRate = 0.1
+BonusAttack = 0
+BonusDefense = 3
+BonusLuck = 0.05
+AeolicResistance = 0
+TelluricResistance = 0
+HydricResistance = 0
+IgneousResistance = 0
+FerrumResistance = 0
+ThrowSpeed = 12.0
+IncreaseMaxHPAmount = 0
+IncreaseMaxVTAmount = 0
+ThrowDamage = 5
+ItemTag = 0
+Texture = ExtResource("1_1uw37")

Zennysoft.Game.Ma/src/items/accessory/resources/MaskSuffering.tres

@@ -1,17 +1,25 @@
 [gd_resource type="Resource" script_class="AccessoryStats" load_steps=3 format=3 uid="uid://d02kuxaus43mk"]
 
-[ext_resource type="Script" path="res://src/items/accessory/AccessoryStats.cs" id="1_3iw2y"]
+[ext_resource type="Script" uid="uid://b8arlmivk68b" path="res://src/items/accessory/AccessoryStats.cs" id="1_3iw2y"]
 [ext_resource type="Texture2D" uid="uid://db7i7iy5gagae" path="res://src/items/accessory/textures/MASK 02.PNG" id="1_vc77e"]
 
 [resource]
 script = ExtResource("1_3iw2y")
-ATKUp = 0
-DEFUp = 0
-LUCKUp = 0.0
-MaxHPUp = 0
-MaxVTUp = 50
-AccessoryTags = []
+AccessoryTag = 0
 Name = "Mask of the Goddess of Suffering"
 Description = "Raises MAX VT"
-Texture = ExtResource("1_vc77e")
 SpawnRate = 0.1
+BonusAttack = 0
+BonusDefense = 0
+BonusLuck = 0.05
+BonusHP = 0
+BonusVT = 50
+AeolicResistance = 0
+TelluricResistance = 0
+HydricResistance = 0
+IgneousResistance = 0
+FerrumResistance = 0
+ThrowSpeed = 12.0
+ThrowDamage = 5
+ItemTag = 0
+Texture = ExtResource("1_vc77e")

Zennysoft.Game.Ma/src/items/accessory/resources/MaskZeal.tres

@@ -1,17 +1,25 @@
 [gd_resource type="Resource" script_class="AccessoryStats" load_steps=3 format=3 uid="uid://b0bxwp55mcyyp"]
 
-[ext_resource type="Script" path="res://src/items/accessory/AccessoryStats.cs" id="1_0u4rq"]
+[ext_resource type="Script" uid="uid://b8arlmivk68b" path="res://src/items/accessory/AccessoryStats.cs" id="1_0u4rq"]
 [ext_resource type="Texture2D" uid="uid://db7i7iy5gagae" path="res://src/items/accessory/textures/MASK 02.PNG" id="1_ggv41"]
 
 [resource]
 script = ExtResource("1_0u4rq")
-ATKUp = 0
-DEFUp = 0
-LUCKUp = 0.0
-MaxHPUp = 50
-MaxVTUp = 0
-AccessoryTags = []
+AccessoryTag = 0
 Name = "Mask of the Goddess of Zeal"
 Description = "Raises MAX HP"
-Texture = ExtResource("1_ggv41")
 SpawnRate = 0.1
+BonusAttack = 0
+BonusDefense = 0
+BonusLuck = 0.05
+BonusHP = 50
+BonusVT = 0
+AeolicResistance = 0
+TelluricResistance = 0
+HydricResistance = 0
+IgneousResistance = 0
+FerrumResistance = 0
+ThrowSpeed = 12.0
+ThrowDamage = 5
+ItemTag = 0
+Texture = ExtResource("1_ggv41")

Zennysoft.Game.Ma/src/items/armor/resources/Acceptance.tres

@@ -5,9 +5,6 @@
 
 [resource]
 script = ExtResource("1_si4wu")
-Name = "Acceptance"
-Description = "+9 DEF"
-Defense = 9
 _telluricResistance = 0.0
 _aeolicResistance = 0.0
 _hydricResistance = 0.0
@@ -16,9 +13,17 @@ _ferrumResistance = 0.0
 Name = "Acceptance"
 Description = "+9 DEF"
 SpawnRate = 0.01
+BonusAttack = 0
+BonusDefense = 9
+BonusLuck = 0.05
+AeolicResistance = 0
+TelluricResistance = 0
+HydricResistance = 0
+IgneousResistance = 0
+FerrumResistance = 0
 ThrowSpeed = 12.0
-HealHPAmount = 0
-HealVTAmount = 0
+IncreaseMaxHPAmount = 0
+IncreaseMaxVTAmount = 0
 ThrowDamage = 5
 ItemTag = 0
 Texture = ExtResource("1_p85jd")

Zennysoft.Game.Ma/src/items/armor/resources/AtonersAdornments.tres

@@ -5,18 +5,25 @@
 
 [resource]
 script = ExtResource("1_6r2bl")
-Defense = 1
-TelluricResistance = 0.0
-AeolicResistance = 0.0
-HydricResistance = 0.0
-IgneousResistance = 0.0
-FerrumResistance = 0.0
+_telluricResistance = 0.0
+_aeolicResistance = 0.0
+_hydricResistance = 0.0
+_igneousResistance = 0.0
+_ferrumResistance = 0.0
 Name = "Atoner's Adornments"
 Description = "+1 DEF"
-Texture = ExtResource("1_588l8")
 SpawnRate = 0.25
+BonusAttack = 0
+BonusDefense = 1
+BonusLuck = 0.05
+AeolicResistance = 0
+TelluricResistance = 0
+HydricResistance = 0
+IgneousResistance = 0
+FerrumResistance = 0
 ThrowSpeed = 12.0
-HealHPAmount = 0
-HealVTAmount = 0
+IncreaseMaxHPAmount = 0
+IncreaseMaxVTAmount = 0
 ThrowDamage = 5
 ItemTag = 0
+Texture = ExtResource("1_588l8")

Zennysoft.Game.Ma/src/items/armor/resources/CeremonialVestments.tres

@@ -1,17 +1,29 @@
 [gd_resource type="Resource" script_class="ArmorStats" load_steps=3 format=3 uid="uid://dnu241lh47oqd"]
 
-[ext_resource type="Script" path="res://src/items/armor/ArmorStats.cs" id="1_0qtvf"]
+[ext_resource type="Script" uid="uid://dqtp6ewvttoyu" path="res://src/items/armor/ArmorStats.cs" id="1_0qtvf"]
 [ext_resource type="Texture2D" uid="uid://vvhbibkslh57" path="res://src/items/armor/textures/CEREMONIAL.PNG" id="1_s4gpg"]
 
 [resource]
 script = ExtResource("1_0qtvf")
-Defense = 2
-TelluricResistance = 0.0
-AeolicResistance = 0.0
-HydricResistance = 0.0
-IgneousResistance = 0.0
-FerrumResistance = 0.0
+_telluricResistance = 0.0
+_aeolicResistance = 0.0
+_hydricResistance = 0.0
+_igneousResistance = 0.0
+_ferrumResistance = 0.0
 Name = "Ceremonial Vestments"
 Description = "+2 DEF"
-Texture = ExtResource("1_s4gpg")
 SpawnRate = 0.2
+BonusAttack = 0
+BonusDefense = 2
+BonusLuck = 0.05
+AeolicResistance = 0
+TelluricResistance = 0
+HydricResistance = 0
+IgneousResistance = 0
+FerrumResistance = 0
+ThrowSpeed = 12.0
+IncreaseMaxHPAmount = 0
+IncreaseMaxVTAmount = 0
+ThrowDamage = 5
+ItemTag = 0
+Texture = ExtResource("1_s4gpg")

Zennysoft.Game.Ma/src/items/armor/resources/DevicLayer.tres

@@ -1,17 +1,29 @@
 [gd_resource type="Resource" script_class="ArmorStats" load_steps=3 format=3 uid="uid://4s7wjsb7eb6e"]
 
 [ext_resource type="Texture2D" uid="uid://381ddynsa3gc" path="res://src/items/armor/textures/DEVIC.PNG" id="1_5ik54"]
-[ext_resource type="Script" path="res://src/items/armor/ArmorStats.cs" id="1_w3lql"]
+[ext_resource type="Script" uid="uid://dqtp6ewvttoyu" path="res://src/items/armor/ArmorStats.cs" id="1_w3lql"]
 
 [resource]
 script = ExtResource("1_w3lql")
-Defense = 7
-TelluricResistance = 0.0
-AeolicResistance = 0.0
-HydricResistance = 0.0
-IgneousResistance = 0.0
-FerrumResistance = 0.0
+_telluricResistance = 0.0
+_aeolicResistance = 0.0
+_hydricResistance = 0.0
+_igneousResistance = 0.0
+_ferrumResistance = 0.0
 Name = "Devic Layers"
 Description = "+7 DEF"
-Texture = ExtResource("1_5ik54")
 SpawnRate = 0.05
+BonusAttack = 0
+BonusDefense = 7
+BonusLuck = 0.05
+AeolicResistance = 0
+TelluricResistance = 0
+HydricResistance = 0
+IgneousResistance = 0
+FerrumResistance = 0
+ThrowSpeed = 12.0
+IncreaseMaxHPAmount = 0
+IncreaseMaxVTAmount = 0
+ThrowDamage = 5
+ItemTag = 0
+Texture = ExtResource("1_5ik54")

Zennysoft.Game.Ma/src/items/armor/resources/GoddessRobe.tres

@@ -1,17 +1,29 @@
 [gd_resource type="Resource" script_class="ArmorStats" load_steps=3 format=3 uid="uid://dc0qjer88chme"]
 
-[ext_resource type="Script" path="res://src/items/armor/ArmorStats.cs" id="1_3mc7x"]
+[ext_resource type="Script" uid="uid://dqtp6ewvttoyu" path="res://src/items/armor/ArmorStats.cs" id="1_3mc7x"]
 [ext_resource type="Texture2D" uid="uid://c57kuugsc2lti" path="res://src/items/armor/textures/GODDESS.PNG" id="1_5vleh"]
 
 [resource]
 script = ExtResource("1_3mc7x")
-Defense = 8
-TelluricResistance = 0.0
-AeolicResistance = 0.0
-HydricResistance = 0.0
-IgneousResistance = 0.0
-FerrumResistance = 0.0
+_telluricResistance = 0.0
+_aeolicResistance = 0.0
+_hydricResistance = 0.0
+_igneousResistance = 0.0
+_ferrumResistance = 0.0
 Name = "Goddess' Robe"
 Description = "+8 DEF"
-Texture = ExtResource("1_5vleh")
 SpawnRate = 0.03
+BonusAttack = 0
+BonusDefense = 8
+BonusLuck = 0.05
+AeolicResistance = 0
+TelluricResistance = 0
+HydricResistance = 0
+IgneousResistance = 0
+FerrumResistance = 0
+ThrowSpeed = 12.0
+IncreaseMaxHPAmount = 0
+IncreaseMaxVTAmount = 0
+ThrowDamage = 5
+ItemTag = 0
+Texture = ExtResource("1_5vleh")

Zennysoft.Game.Ma/src/items/armor/resources/IronCage.tres

@@ -1,17 +1,29 @@
 [gd_resource type="Resource" script_class="ArmorStats" load_steps=3 format=3 uid="uid://ceqnyutl7y7t4"]
 
-[ext_resource type="Script" path="res://src/items/armor/ArmorStats.cs" id="1_iqj2w"]
+[ext_resource type="Script" uid="uid://dqtp6ewvttoyu" path="res://src/items/armor/ArmorStats.cs" id="1_iqj2w"]
 [ext_resource type="Texture2D" uid="uid://cj5m8qkpqrcx4" path="res://src/items/armor/textures/IRON.PNG" id="1_jyoar"]
 
 [resource]
 script = ExtResource("1_iqj2w")
-Defense = 4
-TelluricResistance = 0.0
-AeolicResistance = 0.0
-HydricResistance = 0.0
-IgneousResistance = 0.0
-FerrumResistance = 0.0
+_telluricResistance = 0.0
+_aeolicResistance = 0.0
+_hydricResistance = 0.0
+_igneousResistance = 0.0
+_ferrumResistance = 0.0
 Name = "Iron Cage"
 Description = "+4 DEF"
-Texture = ExtResource("1_jyoar")
 SpawnRate = 0.15
+BonusAttack = 0
+BonusDefense = 4
+BonusLuck = 0.05
+AeolicResistance = 0
+TelluricResistance = 0
+HydricResistance = 0
+IgneousResistance = 0
+FerrumResistance = 0
+ThrowSpeed = 12.0
+IncreaseMaxHPAmount = 0
+IncreaseMaxVTAmount = 0
+ThrowDamage = 5
+ItemTag = 0
+Texture = ExtResource("1_jyoar")

Zennysoft.Game.Ma/src/items/armor/resources/LogisticiansGarb.tres

@@ -1,17 +1,29 @@
 [gd_resource type="Resource" script_class="ArmorStats" load_steps=3 format=3 uid="uid://chhxktntl4k8r"]
 
-[ext_resource type="Script" path="res://src/items/armor/ArmorStats.cs" id="1_frqfh"]
+[ext_resource type="Script" uid="uid://dqtp6ewvttoyu" path="res://src/items/armor/ArmorStats.cs" id="1_frqfh"]
 [ext_resource type="Texture2D" uid="uid://2qvbtq2obsac" path="res://src/items/armor/textures/LOGISTIAN.PNG" id="1_kh3n2"]
 
 [resource]
 script = ExtResource("1_frqfh")
-Defense = 5
-TelluricResistance = 0.0
-AeolicResistance = 0.0
-HydricResistance = 0.0
-IgneousResistance = 0.0
-FerrumResistance = 0.0
+_telluricResistance = 0.0
+_aeolicResistance = 0.0
+_hydricResistance = 0.0
+_igneousResistance = 0.0
+_ferrumResistance = 0.0
 Name = "Logistician's Garb"
 Description = "+5 DEF"
-Texture = ExtResource("1_kh3n2")
 SpawnRate = 0.08
+BonusAttack = 0
+BonusDefense = 5
+BonusLuck = 0.05
+AeolicResistance = 0
+TelluricResistance = 0
+HydricResistance = 0
+IgneousResistance = 0
+FerrumResistance = 0
+ThrowSpeed = 12.0
+IncreaseMaxHPAmount = 0
+IncreaseMaxVTAmount = 0
+ThrowDamage = 5
+ItemTag = 0
+Texture = ExtResource("1_kh3n2")

Zennysoft.Game.Ma/src/items/armor/resources/Stoic.tres

@@ -1,17 +1,29 @@
 [gd_resource type="Resource" script_class="ArmorStats" load_steps=3 format=3 uid="uid://d3l8aa87tevgt"]
 
-[ext_resource type="Script" path="res://src/items/armor/ArmorStats.cs" id="1_dh6tr"]
+[ext_resource type="Script" uid="uid://dqtp6ewvttoyu" path="res://src/items/armor/ArmorStats.cs" id="1_dh6tr"]
 [ext_resource type="Texture2D" uid="uid://ddtscpfj6nf6i" path="res://src/items/armor/textures/STOIC.PNG" id="1_xpphu"]
 
 [resource]
 script = ExtResource("1_dh6tr")
-Defense = 6
-TelluricResistance = 0.0
-AeolicResistance = 0.0
-HydricResistance = 0.0
-IgneousResistance = 0.0
-FerrumResistance = 0.0
+_telluricResistance = 0.0
+_aeolicResistance = 0.0
+_hydricResistance = 0.0
+_igneousResistance = 0.0
+_ferrumResistance = 0.0
 Name = "Stoic"
 Description = "+6 DEF"
-Texture = ExtResource("1_xpphu")
 SpawnRate = 0.05
+BonusAttack = 0
+BonusDefense = 6
+BonusLuck = 0.05
+AeolicResistance = 0
+TelluricResistance = 0
+HydricResistance = 0
+IgneousResistance = 0
+FerrumResistance = 0
+ThrowSpeed = 12.0
+IncreaseMaxHPAmount = 0
+IncreaseMaxVTAmount = 0
+ThrowDamage = 5
+ItemTag = 0
+Texture = ExtResource("1_xpphu")

Zennysoft.Game.Ma/src/items/armor/resources/WoodenArmament.tres

@@ -1,17 +1,29 @@
 [gd_resource type="Resource" script_class="ArmorStats" load_steps=3 format=3 uid="uid://dq4c6an78qa4q"]
 
-[ext_resource type="Script" path="res://src/items/armor/ArmorStats.cs" id="1_bkpin"]
+[ext_resource type="Script" uid="uid://dqtp6ewvttoyu" path="res://src/items/armor/ArmorStats.cs" id="1_bkpin"]
 [ext_resource type="Texture2D" uid="uid://dghvd33w32q63" path="res://src/items/armor/textures/WOODEN.PNG" id="1_vs6ua"]
 
 [resource]
 script = ExtResource("1_bkpin")
-Defense = 3
-TelluricResistance = 0.0
-AeolicResistance = 0.0
-HydricResistance = 0.0
-IgneousResistance = 0.0
-FerrumResistance = 0.0
+_telluricResistance = 0.0
+_aeolicResistance = 0.0
+_hydricResistance = 0.0
+_igneousResistance = 0.0
+_ferrumResistance = 0.0
 Name = "Wooden Armament"
 Description = "+3 DEF"
-Texture = ExtResource("1_vs6ua")
 SpawnRate = 0.3
+BonusAttack = 0
+BonusDefense = 3
+BonusLuck = 0.05
+AeolicResistance = 0
+TelluricResistance = 0
+HydricResistance = 0
+IgneousResistance = 0
+FerrumResistance = 0
+ThrowSpeed = 12.0
+IncreaseMaxHPAmount = 0
+IncreaseMaxVTAmount = 0
+ThrowDamage = 5
+ItemTag = 0
+Texture = ExtResource("1_vs6ua")

Zennysoft.Game.Ma/src/items/consumable/resources/AmritShard.tres

@@ -1,16 +1,29 @@
 [gd_resource type="Resource" script_class="ConsumableItemStats" load_steps=3 format=3 uid="uid://d0cxrf0nldona"]
 
 [ext_resource type="Texture2D" uid="uid://ttmu3vttq8yo" path="res://src/items/consumable/textures/amrit shard.PNG" id="1_f1n30"]
-[ext_resource type="Script" path="res://src/items/consumable/ConsumableItemStats.cs" id="2_riwik"]
+[ext_resource type="Script" uid="uid://cymeea1n4f04i" path="res://src/items/consumable/ConsumableItemStats.cs" id="2_riwik"]
 
 [resource]
 script = ExtResource("2_riwik")
 HealHPAmount = 60
-RaiseHPAmount = 16
 HealVTAmount = 0
-RaiseVTAmount = 0
+PermanentRaiseHPAmount = 16
+PermanentRaiseVTAmount = 0
 Name = "Amrit Shard"
 Description = "A droplet of the heavenly elixir, frozen in time.
 Restores 60 HP. If HP full, raises MAX HP by 16."
-Texture = ExtResource("1_f1n30")
 SpawnRate = 0.05
+BonusAttack = 0
+BonusDefense = 0
+BonusLuck = 0.05
+BonusHP = 0
+BonusVT = 0
+AeolicResistance = 0
+TelluricResistance = 0
+HydricResistance = 0
+IgneousResistance = 0
+FerrumResistance = 0
+ThrowSpeed = 12.0
+ThrowDamage = 5
+ItemTag = 0
+Texture = ExtResource("1_f1n30")

Zennysoft.Game.Ma/src/items/consumable/resources/PastSelfRemnant.tres

@@ -1,15 +1,28 @@
 [gd_resource type="Resource" script_class="ConsumableItemStats" load_steps=3 format=3 uid="uid://dns281deffo6q"]
 
 [ext_resource type="Texture2D" uid="uid://bg47n2tmintm0" path="res://src/items/consumable/textures/past self remnant.PNG" id="1_rc8t1"]
-[ext_resource type="Script" path="res://src/items/consumable/ConsumableItemStats.cs" id="2_e61q8"]
+[ext_resource type="Script" uid="uid://cymeea1n4f04i" path="res://src/items/consumable/ConsumableItemStats.cs" id="2_e61q8"]
 
 [resource]
 script = ExtResource("2_e61q8")
-HealHPAmount = 1000
-RaiseHPAmount = 25
+HealHPAmount = 999
 HealVTAmount = 0
-RaiseVTAmount = 0
+PermanentRaiseHPAmount = 25
+PermanentRaiseVTAmount = 0
 Name = "Past Self's Fragment"
 Description = "Restores all HP. If HP full, raises MAX HP by 25."
-Texture = ExtResource("1_rc8t1")
 SpawnRate = 0.05
+BonusAttack = 0
+BonusDefense = 0
+BonusLuck = 0.05
+BonusHP = 0
+BonusVT = 0
+AeolicResistance = 0
+TelluricResistance = 0
+HydricResistance = 0
+IgneousResistance = 0
+FerrumResistance = 0
+ThrowSpeed = 12.0
+ThrowDamage = 5
+ItemTag = 0
+Texture = ExtResource("1_rc8t1")

Zennysoft.Game.Ma/src/items/consumable/resources/PastSelfSpirit.tres

@@ -1,15 +1,28 @@
 [gd_resource type="Resource" script_class="ConsumableItemStats" load_steps=3 format=3 uid="uid://bnec53frgyue8"]
 
 [ext_resource type="Texture2D" uid="uid://cj0x1u7rknrvy" path="res://src/items/consumable/textures/past self spirit.PNG" id="1_jx43p"]
-[ext_resource type="Script" path="res://src/items/consumable/ConsumableItemStats.cs" id="2_wmtl1"]
+[ext_resource type="Script" uid="uid://cymeea1n4f04i" path="res://src/items/consumable/ConsumableItemStats.cs" id="2_wmtl1"]
 
 [resource]
 script = ExtResource("2_wmtl1")
 HealHPAmount = 0
-RaiseHPAmount = 0
 HealVTAmount = 1000
-RaiseVTAmount = 20
+PermanentRaiseHPAmount = 0
+PermanentRaiseVTAmount = 20
 Name = "Past Self's Spirit"
 Description = "Restores all VT. If VT full, raises MAX VT by 20."
-Texture = ExtResource("1_jx43p")
 SpawnRate = 0.05
+BonusAttack = 0
+BonusDefense = 0
+BonusLuck = 0.05
+BonusHP = 0
+BonusVT = 0
+AeolicResistance = 0
+TelluricResistance = 0
+HydricResistance = 0
+IgneousResistance = 0
+FerrumResistance = 0
+ThrowSpeed = 12.0
+ThrowDamage = 5
+ItemTag = 0
+Texture = ExtResource("1_jx43p")

Zennysoft.Game.Ma/src/items/consumable/resources/SteloFragment.tres

@@ -1,16 +1,29 @@
 [gd_resource type="Resource" script_class="ConsumableItemStats" load_steps=3 format=3 uid="uid://75fpkwfp0t0k"]
 
-[ext_resource type="Script" path="res://src/items/consumable/ConsumableItemStats.cs" id="1_f8ogj"]
+[ext_resource type="Script" uid="uid://cymeea1n4f04i" path="res://src/items/consumable/ConsumableItemStats.cs" id="1_f8ogj"]
 [ext_resource type="Texture2D" uid="uid://dbl5v5i1s3m2u" path="res://src/items/consumable/textures/stelo fragment.PNG" id="1_ic5xm"]
 
 [resource]
 script = ExtResource("1_f8ogj")
 HealHPAmount = 0
-RaiseHPAmount = 0
 HealVTAmount = 30
-RaiseVTAmount = 10
+PermanentRaiseHPAmount = 0
+PermanentRaiseVTAmount = 10
 Name = "Stelo Fragment"
 Description = "A small gathered piece of the former heavens.
 Restores 30 VT. If VT full, raises MAX VT by 10."
-Texture = ExtResource("1_ic5xm")
 SpawnRate = 0.5
+BonusAttack = 0
+BonusDefense = 0
+BonusLuck = 0.05
+BonusHP = 0
+BonusVT = 0
+AeolicResistance = 0
+TelluricResistance = 0
+HydricResistance = 0
+IgneousResistance = 0
+FerrumResistance = 0
+ThrowSpeed = 12.0
+ThrowDamage = 5
+ItemTag = 0
+Texture = ExtResource("1_ic5xm")

Zennysoft.Game.Ma/src/items/consumable/resources/SunaFragment.tres

@@ -1,16 +1,29 @@
 [gd_resource type="Resource" script_class="ConsumableItemStats" load_steps=3 format=3 uid="uid://ypw2yg10430p"]
 
 [ext_resource type="Texture2D" uid="uid://bqyjjdgub6iem" path="res://src/items/consumable/textures/suna fragment.PNG" id="1_ldd10"]
-[ext_resource type="Script" path="res://src/items/consumable/ConsumableItemStats.cs" id="2_41hue"]
+[ext_resource type="Script" uid="uid://cymeea1n4f04i" path="res://src/items/consumable/ConsumableItemStats.cs" id="2_41hue"]
 
 [resource]
 script = ExtResource("2_41hue")
 HealHPAmount = 0
-RaiseHPAmount = 0
 HealVTAmount = 60
-RaiseVTAmount = 20
+PermanentRaiseHPAmount = 0
+PermanentRaiseVTAmount = 20
 Name = "Suna Fragment"
 Description = "A large gathered piece of the former heavens.
 Restores 60 VT. If VT full, raises MAX VT by 20."
-Texture = ExtResource("1_ldd10")
 SpawnRate = 0.1
+BonusAttack = 0
+BonusDefense = 0
+BonusLuck = 0.05
+BonusHP = 0
+BonusVT = 0
+AeolicResistance = 0
+TelluricResistance = 0
+HydricResistance = 0
+IgneousResistance = 0
+FerrumResistance = 0
+ThrowSpeed = 12.0
+ThrowDamage = 5
+ItemTag = 0
+Texture = ExtResource("1_ldd10")

Zennysoft.Game.Ma/src/items/consumable/resources/YdunicShard.tres

@@ -1,16 +1,29 @@
 [gd_resource type="Resource" script_class="ConsumableItemStats" load_steps=3 format=3 uid="uid://lu0ddu3538p6"]
 
 [ext_resource type="Texture2D" uid="uid://dw06kkltgk3sv" path="res://src/items/consumable/textures/ydunic fragment.PNG" id="1_4llax"]
-[ext_resource type="Script" path="res://src/items/consumable/ConsumableItemStats.cs" id="2_q4pyq"]
+[ext_resource type="Script" uid="uid://cymeea1n4f04i" path="res://src/items/consumable/ConsumableItemStats.cs" id="2_q4pyq"]
 
 [resource]
 script = ExtResource("2_q4pyq")
 HealHPAmount = 30
-RaiseHPAmount = 8
-HealVTAmount = 0
-RaiseVTAmount = 0
+HealVTAmount = 8
+PermanentRaiseHPAmount = 0
+PermanentRaiseVTAmount = 0
 Name = "Ydunic Shard"
 Description = "A fragment of the divine fruit, frozen in time.
 Restores 30 HP. If HP full, raises MAX HP by 8."
-Texture = ExtResource("1_4llax")
 SpawnRate = 0.1
+BonusAttack = 0
+BonusDefense = 0
+BonusLuck = 0.05
+BonusHP = 0
+BonusVT = 0
+AeolicResistance = 0
+TelluricResistance = 0
+HydricResistance = 0
+IgneousResistance = 0
+FerrumResistance = 0
+ThrowSpeed = 12.0
+ThrowDamage = 5
+ItemTag = 0
+Texture = ExtResource("1_4llax")

Zennysoft.Game.Ma/src/items/throwable/resources/GeomanticDice.tres

@@ -5,9 +5,8 @@
 
 [resource]
 script = ExtResource("1_ewck5")
-Name = "Geomantic Dice"
-Description = "Inflicts base damage when thrown.
-Use item to change Affinity."
+HealHPAmount = 10
+HealVTAmount = 5
 ThrowableItemTag = 3
 ElementType = 0
 UsableItemTag = 0
@@ -17,9 +16,17 @@ Name = "Geomantic Dice"
 Description = "Inflicts base damage when thrown.
 Use item to change Affinity."
 SpawnRate = 1.0
+BonusAttack = 0
+BonusDefense = 0
+BonusLuck = 0.05
+BonusHP = 0
+BonusVT = 0
+AeolicResistance = 0
+TelluricResistance = 0
+HydricResistance = 0
+IgneousResistance = 0
+FerrumResistance = 0
 ThrowSpeed = 20.0
-HealHPAmount = 0
-HealVTAmount = 0
 ThrowDamage = 20
 ItemTag = 0
 Texture = ExtResource("1_jhits")

Zennysoft.Game.Ma/src/items/throwable/resources/Gospel of Dimension.tres

@@ -5,9 +5,9 @@
 
 [resource]
 script = ExtResource("2_m680r")
-Name = "Gospel of Dimension"
-Description = "Teleports target to a random location."
-ThrowableItemTag = 0
+HealHPAmount = 0
+HealVTAmount = 0
+ThrowableItemTag = 4
 ElementType = 0
 UsableItemTag = 0
 MinimumCount = 1
@@ -15,9 +15,17 @@ MaximumCount = 8
 Name = "Gospel of Dimension"
 Description = "Teleports target to a random location."
 SpawnRate = 0.1
+BonusAttack = 0
+BonusDefense = 0
+BonusLuck = 0.05
+AeolicResistance = 0
+TelluricResistance = 0
+HydricResistance = 0
+IgneousResistance = 0
+FerrumResistance = 0
 ThrowSpeed = 20.0
-HealHPAmount = 0
-HealVTAmount = 0
+IncreaseMaxHPAmount = 0
+IncreaseMaxVTAmount = 0
 ThrowDamage = 20
 ItemTag = 0
 Texture = ExtResource("1_xt2mp")

Zennysoft.Game.Ma/src/items/throwable/resources/SpellSignKnowledge.tres

@@ -5,17 +5,27 @@
 
 [resource]
 script = ExtResource("1_s3pq7")
-Name = "Spell Sign: Knowledge"
-Description = "Doubles experience points earned. Effect is temporary."
+HealHPAmount = 8
+HealVTAmount = 3
 ThrowableItemTag = 1
 ElementType = 0
 UsableItemTag = 0
+MinimumCount = 1
+MaximumCount = 8
 Name = "Spell Sign: Knowledge"
 Description = "Doubles experience points earned. Effect is temporary."
 SpawnRate = 0.1
+BonusAttack = 0
+BonusDefense = 0
+BonusLuck = 0.05
+BonusHP = 0
+BonusVT = 0
+AeolicResistance = 0
+TelluricResistance = 0
+HydricResistance = 0
+IgneousResistance = 0
+FerrumResistance = 0
 ThrowSpeed = 12.0
-HealHPAmount = 0
-HealVTAmount = 0
 ThrowDamage = 5
 ItemTag = 0
 Texture = ExtResource("1_3605p")