Additional refactoring and fixing of equipment data

Add attack data to enemy attacks (might need to rework a little bit for primary/secondary attacks)

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

@@ -124,7 +124,7 @@ public class EffectService
     var currentEnemies = currentRoom.EnemiesInRoom;
     foreach (var enemy in currentEnemies)
     {
-      var damageDealt = DamageCalculator.CalculateDamage(new Damage(20, elementType, false, false, false), 10, new ElementalResistanceSet(0, 0, 0, 0, 0));
+      var damageDealt = DamageCalculator.CalculateDamage(new AttackData(20, elementType), 10, ElementalResistanceSet.None);
       enemy.HealthComponent.Damage(damageDealt);
     }
   }

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

@@ -5,7 +5,6 @@ using Godot;
 using System.Collections.Generic;
 using System.Linq;
 using Zennysoft.Game.Abstractions;
-using Zennysoft.Game.Implementation;
 using Zennysoft.Ma.Adapter;
 
 namespace Zennysoft.Game.Ma;
@@ -47,11 +46,11 @@ public partial class Inventory : Node, IInventory
   public void Remove(InventoryItem inventoryItem) => Items.Remove(inventoryItem);
 
 
-  public void Sort()
+  public void Sort(EquipableItem currentWeapon, EquipableItem currentArmor, EquipableItem currentAccessory)
   {
-    var equippedWeapon = Items.OfType<Weapon>().Where(x => x.IsEquipped);
-    var equippedArmor = Items.OfType<Armor>().Where(x => x.IsEquipped);
-    var equippedAccessory = Items.OfType<Accessory>().Where(x => x.IsEquipped);
+    var equippedWeapon = Items.OfType<Weapon>().Where(x => x == currentWeapon);
+    var equippedArmor = Items.OfType<Armor>().Where(x => x == currentArmor);
+    var equippedAccessory = Items.OfType<Accessory>().Where(x => x == currentAccessory);
     var equippedItems = new List<InventoryItem>();
     equippedItems.AddRange(equippedWeapon);
     equippedItems.AddRange(equippedArmor);
@@ -80,10 +79,10 @@ public partial class Inventory : Node, IInventory
   {
     public int Compare(Weapon x, Weapon y)
     {
-      if (x.Damage == y.Damage)
+      if (x.BonusAttack == y.BonusAttack)
         return x.ItemName.CompareTo(y.ItemName);
 
-      return x.Damage < y.Damage ? 1 : -1;
+      return x.BonusAttack < y.BonusAttack ? 1 : -1;
     }
   }
 
@@ -91,10 +90,10 @@ public partial class Inventory : Node, IInventory
   {
     public int Compare(Armor x, Armor y)
     {
-      if (x.Defense == y.Defense)
+      if (x.BonusDefense == y.BonusDefense)
         return x.ItemName.CompareTo(y.ItemName);
 
-      return x.Defense < y.Defense ? 1 : -1;
+      return x.BonusDefense < y.BonusDefense ? 1 : -1;
     }
   }
 

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

@@ -10,22 +10,34 @@ namespace Zennysoft.Game.Ma;
 public abstract partial class InventoryItemStats : Resource
 {
   [Export]
-  public abstract string Name { get; set; }
+  public string Name { get; set; }
 
   [Export(PropertyHint.MultilineText)]
-  public abstract string Description { get; set; }
+  public string Description { get; set; }
 
   [Export(PropertyHint.Range, "0, 1, 0.01")]
   public float SpawnRate { get; set; } = 0.5f;
 
+  [Export]
+  [Save("weapon_damage")]
+  public int BonusAttack { get; set; } = 0;
+
+  [Export]
+  [Save("armor_defense")]
+  public int Defense { get; set; } = 0;
+
+  [Export]
+  [Save("weapon_luck")]
+  public double Luck { get; set; } = 0.05;
+
   [Export(PropertyHint.Range, "0, 25, 0.1")]
   public float ThrowSpeed { get; set; } = 12.0f;
 
   [Export(PropertyHint.Range, "0, 999, 1")]
-  public int HealHPAmount { get; set; }
+  public int IncreaseMaxHPAmount { get; set; }
 
   [Export(PropertyHint.Range, "0, 999, 1")]
-  public int HealVTAmount { get; set; }
+  public int IncreaseMaxVTAmount { get; set; }
 
   [Export(PropertyHint.Range, "0, 999, 1")]
   public int ThrowDamage { get; set; } = 5;

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

@@ -27,16 +27,6 @@ public partial class Accessory : EquipableItem
 
   public override float ThrowSpeed => Stats.ThrowSpeed;
 
-  public int MaxHPUp => Stats.MaxHPUp;
-
-  public int MaxVTUp => Stats.MaxVTUp;
-
-  public double LuckUp => Stats.LuckUp;
-
-  public int ATKUp => Stats.ATKUp;
-
-  public int DEFUp => Stats.DEFUp;
-
   public AccessoryTag AccessoryTag => Stats.AccessoryTag;
 
   public override ItemTag ItemTag => Stats.ItemTag;

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

@@ -1,7 +1,6 @@
 using Chickensoft.Introspection;
 using Chickensoft.Serialization;
 using Godot;
-using Zennysoft.Game.Implementation;
 using Zennysoft.Ma.Adapter;
 
 namespace Zennysoft.Game.Ma;
@@ -10,34 +9,6 @@ namespace Zennysoft.Game.Ma;
 [Meta, Id("accessory_stat_type")]
 public partial class AccessoryStats : InventoryItemStats
 {
-  [Export]
-  [Save("accessory_name")]
-  public override string Name { get; set; } = default!;
-
-  [Export(PropertyHint.MultilineText)]
-  [Save("accessory_description")]
-  public override string Description { get; set; } = default!;
-
-  [Export]
-  [Save("accessory_atk_up")]
-  public int ATKUp { get; set; } = 0;
-
-  [Export]
-  [Save("accessory_def_up")]
-  public int DEFUp { get; set; } = 0;
-
-  [Export]
-  [Save("accessory_luck_up")]
-  public double LuckUp { get; set; } = 0;
-
-  [Export]
-  [Save("accessory_max_hp_up")]
-  public int MaxHPUp { get; set; } = 0;
-
-  [Export]
-  [Save("accessory_max_vt_up")]
-  public int MaxVTUp { get; set; } = 0;
-
   [Export]
   [Save("accessory_tag")]
   public AccessoryTag AccessoryTag { get; set; } = AccessoryTag.None;

Zennysoft.Game.Ma/src/items/armor/Armor.cs

@@ -28,9 +28,8 @@ public partial class Armor : EquipableItem
 
   public override float ThrowSpeed => Stats.ThrowSpeed;
 
-  public int Defense => Stats.Defense + _bonusDefense;
+  public override int BonusDefense => Stats.Defense + _bonusDefense;
 
-  [Save("armor_bonus_defense")]
   private int _bonusDefense { get; set; } = 0;
 
   public void IncreaseArmorDefense(int bonus) => _bonusDefense += bonus;

Zennysoft.Game.Ma/src/items/armor/ArmorStats.cs

@@ -9,18 +9,6 @@ namespace Zennysoft.Game.Ma;
 [Meta, Id("armor_stats")]
 public partial class ArmorStats : InventoryItemStats
 {
-  [Export]
-  [Save("armor_name")]
-  public override string Name { get; set; } = default!;
-
-  [Export(PropertyHint.MultilineText)]
-  [Save("armor_description")]
-  public override string Description { get; set; } = default!;
-
-  [Export]
-  [Save("armor_defense")]
-  public int Defense { get; set; } = 0;
-
   [Export]
   [Save("armor_telluric_resistance")]
   private double _telluricResistance { get; set; } = 0;

Zennysoft.Game.Ma/src/items/consumable/ConsumableItem.cs

@@ -32,9 +32,9 @@ public partial class ConsumableItem : InventoryItem
 
   public int HealVTAmount => Stats.HealVTAmount;
 
-  public int RaiseHPAmount => Stats.RaiseHPAmount;
+  public int RaiseHPAmount => Stats.PermanentRaiseHPAmount;
 
-  public int RaiseVTAmount => Stats.RaiseVTAmount;
+  public int RaiseVTAmount => Stats.PermanentRaiseVTAmount;
 
   public override ItemTag ItemTag => Stats.ItemTag;
 

Zennysoft.Game.Ma/src/items/consumable/ConsumableItemStats.cs

@@ -8,19 +8,17 @@ namespace Zennysoft.Game.Ma;
 [Meta, Id("consumable_item_stats")]
 public partial class ConsumableItemStats : InventoryItemStats
 {
-  [Export]
-  [Save("consumable_item_name")]
-  public override string Name { get; set; } = default!;
+  [Export(PropertyHint.Range, "0, 999, 1")]
+  public int HealHPAmount { get; set; }
 
-  [Export(PropertyHint.MultilineText)]
-  [Save("consumable_item_description")]
-  public override string Description { get; set; } = default!;
+  [Export(PropertyHint.Range, "0, 999, 1")]
+  public int HealVTAmount { get; set; }
 
   [Export]
   [Save("consumable_item_raise_hp")]
-  public int RaiseHPAmount { get; set; } = 0;
+  public int PermanentRaiseHPAmount { get; set; } = 0;
 
   [Export]
   [Save("consumable_item_raise_vt")]
-  public int RaiseVTAmount { get; set; } = 0;
+  public int PermanentRaiseVTAmount { get; set; } = 0;
 }

Zennysoft.Game.Ma/src/items/dropped/DroppedItem.cs

@@ -38,8 +38,8 @@ public partial class DroppedItem : RigidBody3D, IDroppedItem
     AddCollisionExceptionWith((Node)Player);
     Pickup.Monitorable = false;
     Pickup.Monitoring = false;
-    GlobalPosition = Player.CurrentPosition + Vector3.Up;
-    ApplyCentralImpulse(-Player.CurrentBasis.Z.Normalized() * 5.0f);
+    GlobalPosition = Player.GlobalPosition + Vector3.Up;
+    ApplyCentralImpulse(-Player.GlobalBasis.Z.Normalized() * 5.0f);
     await ToSignal(GetTree().CreateTimer(1), "timeout");
     RemoveCollisionExceptionWith((Node)Player);
     Pickup.Monitorable = true;

Zennysoft.Game.Ma/src/items/effect/EffectItemStats.cs

@@ -10,14 +10,6 @@ namespace Zennysoft.Game.Ma;
 [Meta, Id("effect_item_stats")]
 public partial class EffectItemStats : InventoryItemStats
 {
-  [Export]
-  [Save("effect_item_name")]
-  public override string Name { get; set; } = default!;
-
-  [Export(PropertyHint.MultilineText)]
-  [Save("effect_item_description")]
-  public override string Description { get; set; } = default!;
-
   [Export]
   [Save("effect_item_tag")]
   public UsableItemTag UsableItemTag { get; set; } = UsableItemTag.None;

Zennysoft.Game.Ma/src/items/throwable/ThrowableItem.cs

@@ -3,7 +3,6 @@ using Chickensoft.Introspection;
 using Chickensoft.Serialization;
 using Godot;
 using Zennysoft.Game.Abstractions;
-using Zennysoft.Game.Implementation;
 using Zennysoft.Ma.Adapter;
 
 namespace Zennysoft.Game.Ma;

Zennysoft.Game.Ma/src/items/throwable/ThrowableItemStats.cs

@@ -1,7 +1,6 @@
 using Chickensoft.Introspection;
 using Chickensoft.Serialization;
 using Godot;
-using Zennysoft.Game.Implementation;
 using Zennysoft.Ma.Adapter;
 
 namespace Zennysoft.Game.Ma;
@@ -10,13 +9,11 @@ namespace Zennysoft.Game.Ma;
 [Meta, Id("throwable_item_stats")]
 public partial class ThrowableItemStats : InventoryItemStats
 {
-  [Export]
-  [Save("throwable_item_name")]
-  public override string Name { get; set; } = default!;
+  [Export(PropertyHint.Range, "0, 999, 1")]
+  public int HealHPAmount { get; set; }
 
-  [Export(PropertyHint.MultilineText)]
-  [Save("throwable_item_description")]
-  public override string Description { get; set; } = default!;
+  [Export(PropertyHint.Range, "0, 999, 1")]
+  public int HealVTAmount { get; set; }
 
   [Export]
   [Save("throwable_item_tag")]

Zennysoft.Game.Ma/src/items/thrown/ThrownItem.cs

@@ -1,7 +1,6 @@
 using Chickensoft.AutoInject;
 using Chickensoft.Introspection;
 using Godot;
-using Zennysoft.Game.Implementation;
 using Zennysoft.Ma.Adapter;
 using Zennysoft.Ma.Adapter.Entity;
 
@@ -28,7 +27,7 @@ public partial class ThrownItem : RigidBody3D
   {
     BodyEntered += ThrownItem_BodyEntered;
     Collision.AreaEntered += Collision_AreaEntered;
-    GlobalPosition = Player.CurrentPosition;
+    GlobalPosition = Player.GlobalPosition;
     Sprite.Texture = ItemThatIsThrown.GetTexture();
     AddCollisionExceptionWith((Node)Player);
     Collision.SetCollisionLayerValue(3, false);
@@ -60,7 +59,7 @@ public partial class ThrownItem : RigidBody3D
   public void Throw(EffectService effectService)
   {
     _effectService = effectService;
-    ApplyCentralImpulse(-Player.CurrentBasis.Z.Normalized() * ItemThatIsThrown.ThrowSpeed);
+    ApplyCentralImpulse(-Player.GlobalBasis.Z.Normalized() * ItemThatIsThrown.ThrowSpeed);
   }
 
   public void RescueItem()
@@ -116,14 +115,14 @@ public partial class ThrownItem : RigidBody3D
           _effectService.TeleportToRandomRoom(enemy);
           break;
         default:
-          var damageDealt = DamageCalculator.CalculateDamage(new Damage(throwableItem.ThrowDamage, throwableItem.ElementType, false, false, false), 10, new ElementalResistanceSet(0, 0, 0, 0, 0));
+          var damageDealt = DamageCalculator.CalculateDamage(new AttackData(throwableItem.ThrowDamage, throwableItem.ElementType), 10, ElementalResistanceSet.None);
           enemy.HealthComponent.Damage(damageDealt);
           break;
       }
     }
     else
     {
-      var damageDealt = DamageCalculator.CalculateDamage(new Damage(ItemThatIsThrown.ThrowDamage, ElementType.None, false, false, false), 10, new ElementalResistanceSet(0, 0, 0, 0, 0));
+      var damageDealt = DamageCalculator.CalculateDamage(new AttackData(ItemThatIsThrown.ThrowDamage, ElementType.None), 10, ElementalResistanceSet.None);
       enemy.HealthComponent.Damage(damageDealt);
     }
   }

Zennysoft.Game.Ma/src/items/weapons/Weapon.cs

@@ -38,14 +38,11 @@ public partial class Weapon : EquipableItem
 
   public ElementType WeaponElement => Stats.WeaponElement;
 
-  public double ElementalDamageBonus => Stats.ElementalDamageBonus;
+  public void IncreaseWeaponAttack(int bonus) => _extraDamage += bonus;
 
-  public int Damage => Stats.Damage + _bonusDamage;
+  public override int BonusAttack { get => Stats.BonusAttack + _extraDamage; }
 
-  public void IncreaseWeaponAttack(int bonus) => _bonusDamage += bonus;
-
-  [Save("weapon_bonus_damage")]
-  private int _bonusDamage { get; set; } = 0;
+  private int _extraDamage = 0;
 
   [Export]
   [Save("weapon_stats")]

Zennysoft.Game.Ma/src/items/weapons/WeaponStats.cs

@@ -1,7 +1,6 @@
 using Chickensoft.Introspection;
 using Chickensoft.Serialization;
 using Godot;
-using Zennysoft.Game.Implementation;
 using Zennysoft.Ma.Adapter;
 
 namespace Zennysoft.Game.Ma;
@@ -10,22 +9,6 @@ namespace Zennysoft.Game.Ma;
 [Meta, Id("weapon_stat_type")]
 public partial class WeaponStats : InventoryItemStats
 {
-  [Export]
-  [Save("weapon_name")]
-  public override string Name { get; set; } = default!;
-
-  [Export(PropertyHint.MultilineText)]
-  [Save("weapon_description")]
-  public override string Description { get; set; } = default!;
-
-  [Export]
-  [Save("weapon_damage")]
-  public int Damage { get; set; } = 0;
-
-  [Export]
-  [Save("weapon_luck")]
-  public double Luck { get; set; } = 0.05;
-
   [Export]
   [Save("weapon_atk_speed")]
   public double AttackSpeed { get; set; } = 1;
@@ -34,10 +17,6 @@ public partial class WeaponStats : InventoryItemStats
   [Save("weapon_element")]
   public ElementType WeaponElement { get; set; } = ElementType.None;
 
-  [Export]
-  [Save("weapon_elemental_damage_bonus")]
-  public double ElementalDamageBonus { get; set; } = 1.0;
-
   [Export]
   [Save("weapon_tag")]
   public WeaponTag WeaponTag { get; set; } = WeaponTag.None;

Zennysoft.Game.Ma/src/items/weapons/resources/Atonement.tres

@@ -1,9 +1,12 @@
-[gd_resource type="Resource" load_steps=2 format=3 uid="uid://ww4vha51i82v"]
+[gd_resource type="Resource" script_class="WeaponStats" load_steps=2 format=3 uid="uid://ww4vha51i82v"]
 
 [ext_resource type="Script" uid="uid://cc7byqeolw5y4" path="res://src/items/weapons/WeaponStats.cs" id="1_d2lw0"]
 
 [resource]
 script = ExtResource("1_d2lw0")
+AttackSpeed = 0.15
+WeaponElement = 0
+WeaponTag = 0
 Name = "Atonement"
 Description = "\"Should I betray my mother, my father, my brother, my sister, my love, let me be pierced by a thousand knives.
 Should I betray the self, let me be struck by 10,000 lightning bolts.
@@ -15,16 +18,13 @@ The Goddess of Destruction materialized it's sorrow into this form.
 A powerful weapon that has the ability to obliterate anything of the earth.
 
 There is significance in your using it."
-Damage = 1000
-Luck = 0.05
-AttackSpeed = 0.15
-WeaponElement = 0
-ElementalDamageBonus = 1.0
-WeaponTag = 0
 SpawnRate = 0.0
+BonusAttack = 1000
+Defense = 0
+Luck = 0.05
 ThrowSpeed = 12.0
-HealHPAmount = 0
-HealVTAmount = 0
+IncreaseMaxHPAmount = 0
+IncreaseMaxVTAmount = 0
 ThrowDamage = 5
 ItemTag = 0
 metadata/_custom_type_script = "uid://cc7byqeolw5y4"

Zennysoft.Game.Ma/src/items/weapons/resources/Jiblett.tres

@@ -1,21 +1,23 @@
 [gd_resource type="Resource" script_class="WeaponStats" load_steps=3 format=3 uid="uid://c1bg0o7nmu2xw"]
 
 [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/WeaponStats.cs" id="1_re512"]
+[ext_resource type="Script" uid="uid://cc7byqeolw5y4" path="res://src/items/weapons/WeaponStats.cs" id="1_re512"]
 
 [resource]
 script = ExtResource("1_re512")
-Damage = 3
-Luck = 0.05
 AttackSpeed = 1.0
-TelluricDamageBonus = 0.0
-AeolicDamageBonus = 0.0
-BaseHydricDamageBonus = 0.0
-IgneousDamageBonus = 0.0
-FerrumDamageBonus = 0.0
-WeaponTags = []
+WeaponElement = 0
+WeaponTag = 0
 Name = "Jiblett"
 Description = "+3 ATK
 A halberd for the tasteful."
-Texture = ExtResource("1_ifm43")
 SpawnRate = 0.1
+BonusAttack = 3
+Defense = 0
+Luck = 0.05
+ThrowSpeed = 12.0
+IncreaseMaxHPAmount = 0
+IncreaseMaxVTAmount = 0
+ThrowDamage = 5
+ItemTag = 0
+Texture = ExtResource("1_ifm43")

Zennysoft.Game.Ma/src/items/weapons/resources/Katara.tres

@@ -1,20 +1,22 @@
 [gd_resource type="Resource" script_class="WeaponStats" load_steps=3 format=3 uid="uid://c8bvtfcq772sv"]
 
 [ext_resource type="Texture2D" uid="uid://dsi0myqu80aq3" path="res://src/items/weapons/textures/katar.PNG" id="1_3waom"]
-[ext_resource type="Script" path="res://src/items/weapons/WeaponStats.cs" id="2_3gdyl"]
+[ext_resource type="Script" uid="uid://cc7byqeolw5y4" path="res://src/items/weapons/WeaponStats.cs" id="2_3gdyl"]
 
 [resource]
 script = ExtResource("2_3gdyl")
-Damage = 1
-Luck = 0.05
 AttackSpeed = 1.25
-TelluricDamageBonus = 0.0
-AeolicDamageBonus = 0.0
-BaseHydricDamageBonus = 0.0
-IgneousDamageBonus = 0.0
-FerrumDamageBonus = 0.0
-WeaponTags = []
+WeaponElement = 0
+WeaponTag = 0
 Name = "Katara"
 Description = "+1 ATK, Fast"
-Texture = ExtResource("1_3waom")
 SpawnRate = 0.3
+BonusAttack = 1
+Defense = 0
+Luck = 0.05
+ThrowSpeed = 12.0
+IncreaseMaxHPAmount = 0
+IncreaseMaxVTAmount = 0
+ThrowDamage = 5
+ItemTag = 0
+Texture = ExtResource("1_3waom")

Zennysoft.Game.Ma/src/items/weapons/resources/Kubel.tres

@@ -1,22 +1,24 @@
 [gd_resource type="Resource" script_class="WeaponStats" load_steps=3 format=3 uid="uid://db075qhmlmrcu"]
 
-[ext_resource type="Script" path="res://src/items/weapons/WeaponStats.cs" id="1_kbje7"]
+[ext_resource type="Script" uid="uid://cc7byqeolw5y4" path="res://src/items/weapons/WeaponStats.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")
-Damage = 9
-Luck = 0.05
 AttackSpeed = 1.0
-TelluricDamageBonus = 0.0
-AeolicDamageBonus = 0.0
-BaseHydricDamageBonus = 0.0
-IgneousDamageBonus = 0.0
-FerrumDamageBonus = 0.0
-WeaponTags = [0]
+WeaponElement = 0
+WeaponTag = 0
 Name = "Kubel"
 Description = "+9 ATK
 A very powerful spear. 
 For every hit, you lose 5 HP."
-Texture = ExtResource("1_kwtbu")
 SpawnRate = 0.01
+BonusAttack = 9
+Defense = 0
+Luck = 0.05
+ThrowSpeed = 12.0
+IncreaseMaxHPAmount = 0
+IncreaseMaxVTAmount = 0
+ThrowDamage = 5
+ItemTag = 0
+Texture = ExtResource("1_kwtbu")

Zennysoft.Game.Ma/src/items/weapons/resources/LoveJudgement.tres

@@ -1,21 +1,23 @@
 [gd_resource type="Resource" script_class="WeaponStats" load_steps=3 format=3 uid="uid://cfr100khjkloh"]
 
 [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/WeaponStats.cs" id="1_vroib"]
+[ext_resource type="Script" uid="uid://cc7byqeolw5y4" path="res://src/items/weapons/WeaponStats.cs" id="1_vroib"]
 
 [resource]
 script = ExtResource("1_vroib")
-Damage = 12
-Luck = 0.05
 AttackSpeed = 1.0
-TelluricDamageBonus = 0.0
-AeolicDamageBonus = 25.0
-BaseHydricDamageBonus = 0.0
-IgneousDamageBonus = 0.0
-FerrumDamageBonus = 0.0
-WeaponTags = []
+WeaponElement = 0
+WeaponTag = 0
 Name = "Love Judgement"
 Description = "+12 ATK
 A mace only wieldable by the strong of heart."
-Texture = ExtResource("1_ivlxj")
 SpawnRate = 0.01
+BonusAttack = 12
+Defense = 0
+Luck = 0.05
+ThrowSpeed = 12.0
+IncreaseMaxHPAmount = 0
+IncreaseMaxVTAmount = 0
+ThrowDamage = 5
+ItemTag = 0
+Texture = ExtResource("1_ivlxj")

Zennysoft.Game.Ma/src/items/weapons/resources/Palm of Heaven.tres

@@ -1,22 +1,24 @@
 [gd_resource type="Resource" script_class="WeaponStats" load_steps=3 format=3 uid="uid://ckj1m4iv4m02r"]
 
 [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/WeaponStats.cs" id="1_pwwg7"]
+[ext_resource type="Script" uid="uid://cc7byqeolw5y4" path="res://src/items/weapons/WeaponStats.cs" id="1_pwwg7"]
 
 [resource]
 script = ExtResource("1_pwwg7")
-Damage = 10
-Luck = 0.05
 AttackSpeed = 1.0
-TelluricDamageBonus = 0.0
-AeolicDamageBonus = 0.0
-BaseHydricDamageBonus = 0.0
-IgneousDamageBonus = 0.0
-FerrumDamageBonus = 0.0
-WeaponTags = [3]
+WeaponElement = 0
+WeaponTag = 0
 Name = "Palm of Heaven"
 Description = "+10 ATK
 Very Powerful.
  Breaks upon leaving the floor."
-Texture = ExtResource("1_hi6xm")
 SpawnRate = 0.01
+BonusAttack = 10
+Defense = 0
+Luck = 0.05
+ThrowSpeed = 12.0
+IncreaseMaxHPAmount = 0
+IncreaseMaxVTAmount = 0
+ThrowDamage = 5
+ItemTag = 0
+Texture = ExtResource("1_hi6xm")

Zennysoft.Game.Ma/src/items/weapons/resources/Rondo.tres

@@ -1,21 +1,23 @@
 [gd_resource type="Resource" script_class="WeaponStats" load_steps=3 format=3 uid="uid://gebgo2x6nr3t"]
 
 [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/WeaponStats.cs" id="1_xfb0x"]
+[ext_resource type="Script" uid="uid://cc7byqeolw5y4" path="res://src/items/weapons/WeaponStats.cs" id="1_xfb0x"]
 
 [resource]
 script = ExtResource("1_xfb0x")
-Damage = 7
-Luck = 0.05
 AttackSpeed = 1.333
-TelluricDamageBonus = 0.0
-AeolicDamageBonus = 0.0
-BaseHydricDamageBonus = 0.0
-IgneousDamageBonus = 0.0
-FerrumDamageBonus = 0.0
-WeaponTags = [1]
+WeaponElement = 0
+WeaponTag = 0
 Name = "Rondo"
 Description = "+7 ATK
 An eastern blade outside of time and reproach."
-Texture = ExtResource("1_cvwbh")
 SpawnRate = 0.01
+BonusAttack = 7
+Defense = 0
+Luck = 0.05
+ThrowSpeed = 12.0
+IncreaseMaxHPAmount = 0
+IncreaseMaxVTAmount = 0
+ThrowDamage = 5
+ItemTag = 0
+Texture = ExtResource("1_cvwbh")

Zennysoft.Game.Ma/src/items/weapons/resources/SealingRod.tres

@@ -1,26 +1,24 @@
 [gd_resource type="Resource" script_class="WeaponStats" load_steps=3 format=3 uid="uid://b7xr0l4a8g1gk"]
 
-[ext_resource type="Script" path="res://src/items/weapons/WeaponStats.cs" id="1_40b5j"]
+[ext_resource type="Script" uid="uid://cc7byqeolw5y4" path="res://src/items/weapons/WeaponStats.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")
-Damage = 2
-Luck = 0.05
 AttackSpeed = 1.0
-TelluricDamageBonus = 0.0
-AeolicDamageBonus = 0.0
-BaseHydricDamageBonus = 0.0
-IgneousDamageBonus = 0.0
-FerrumDamageBonus = 0.0
-WeaponTags = []
+WeaponElement = 0
+WeaponTag = 0
 Name = "Sealing Rod"
 Description = "+2 ATK
 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")
 SpawnRate = 0.5
+BonusAttack = 2
+Defense = 0
+Luck = 0.05
 ThrowSpeed = 12.0
-HealHPAmount = 0
-HealVTAmount = 0
+IncreaseMaxHPAmount = 0
+IncreaseMaxVTAmount = 0
 ThrowDamage = 5
+ItemTag = 0
+Texture = ExtResource("1_wiylj")

Zennysoft.Game.Ma/src/items/weapons/resources/SpadedStaff.tres

@@ -1,20 +1,22 @@
 [gd_resource type="Resource" script_class="WeaponStats" load_steps=3 format=3 uid="uid://dj6i0em2a3hj8"]
 
 [ext_resource type="Texture2D" uid="uid://cixq2naufiuhv" path="res://src/items/weapons/textures/spaded staff.PNG" id="1_6tifm"]
-[ext_resource type="Script" path="res://src/items/weapons/WeaponStats.cs" id="2_w4n0u"]
+[ext_resource type="Script" uid="uid://cc7byqeolw5y4" path="res://src/items/weapons/WeaponStats.cs" id="2_w4n0u"]
 
 [resource]
 script = ExtResource("2_w4n0u")
-Damage = 5
-Luck = 0.1
 AttackSpeed = 0.75
-TelluricDamageBonus = 0.0
-AeolicDamageBonus = 0.0
-BaseHydricDamageBonus = 0.0
-IgneousDamageBonus = 0.0
-FerrumDamageBonus = 0.0
-WeaponTags = []
+WeaponElement = 0
+WeaponTag = 0
 Name = "Monk's Spade"
 Description = "+5 ATK, Slow"
-Texture = ExtResource("1_6tifm")
 SpawnRate = 0.3
+BonusAttack = 5
+Defense = 0
+Luck = 0.1
+ThrowSpeed = 12.0
+IncreaseMaxHPAmount = 0
+IncreaseMaxVTAmount = 0
+ThrowDamage = 5
+ItemTag = 0
+Texture = ExtResource("1_6tifm")

Zennysoft.Game.Ma/src/items/weapons/resources/Swan Sword Odette.tres

@@ -5,21 +5,21 @@
 
 [resource]
 script = ExtResource("1_cik6n")
-Damage = 12
-Luck = 0.05
 AttackSpeed = 1.25
 WeaponElement = 0
-ElementalDamageBonus = 1.0
-WeaponTag = 0
+WeaponTag = 2
 Name = "Swan Sword Odette"
 Description = "+12 ATK
 Ignores Affinity.
 
 The blade of a thousand faced heroine."
-Texture = ExtResource("1_qc4eu")
 SpawnRate = 0.01
+BonusAttack = 12
+Defense = 0
+Luck = 0.05
 ThrowSpeed = 12.0
-HealHPAmount = 0
-HealVTAmount = 0
+IncreaseMaxHPAmount = 0
+IncreaseMaxVTAmount = 0
 ThrowDamage = 5
 ItemTag = 0
+Texture = ExtResource("1_qc4eu")

Zennysoft.Game.Ma/src/items/weapons/resources/Talwar.tres

@@ -1,20 +1,22 @@
 [gd_resource type="Resource" script_class="WeaponStats" load_steps=3 format=3 uid="uid://bs01dnjkcmi7a"]
 
 [ext_resource type="Texture2D" uid="uid://d02gqi3icdp8l" path="res://src/items/weapons/textures/talwar.PNG" id="1_8a832"]
-[ext_resource type="Script" path="res://src/items/weapons/WeaponStats.cs" id="2_a7ln4"]
+[ext_resource type="Script" uid="uid://cc7byqeolw5y4" path="res://src/items/weapons/WeaponStats.cs" id="2_a7ln4"]
 
 [resource]
 script = ExtResource("2_a7ln4")
-Damage = 3
-Luck = 0.07
 AttackSpeed = 1.0
-TelluricDamageBonus = 0.0
-AeolicDamageBonus = 0.0
-BaseHydricDamageBonus = 0.0
-IgneousDamageBonus = 0.0
-FerrumDamageBonus = 0.0
-WeaponTags = []
+WeaponElement = 0
+WeaponTag = 0
 Name = "Talwar"
 Description = "+3 ATK"
-Texture = ExtResource("1_8a832")
 SpawnRate = 0.3
+BonusAttack = 3
+Defense = 0
+Luck = 0.07
+ThrowSpeed = 12.0
+IncreaseMaxHPAmount = 0
+IncreaseMaxVTAmount = 0
+ThrowDamage = 5
+ItemTag = 0
+Texture = ExtResource("1_8a832")