Update icons in-game

Still working on Demon Wall boss fight overall

Zennysoft.Game.Ma.Implementation/Components/IAttackComponent.cs

@@ -15,4 +15,6 @@ public interface IAttackComponent : IEntityComponent
   public void SetAttack(int attack);
 
   public void RaiseMaximumAttack(int raiseAmount);
+
+  public void LowerMaximumAttack(int lowerAmount);
 }

Zennysoft.Game.Ma.Implementation/Components/IDefenseComponent.cs

@@ -15,4 +15,6 @@ public interface IDefenseComponent : IEntityComponent
   public void SetDefense(int attack);
 
   public void RaiseMaximumDefense(int raiseAmount);
+
+  public void LowerMaximumDefense(int lowerAmount);
 }

Zennysoft.Game.Ma.Implementation/Components/IEquipmentComponent.cs

@@ -1,25 +1,24 @@
 using Chickensoft.Collections;
-using Godot;
 using Zennysoft.Ma.Adapter.Entity;
 
 namespace Zennysoft.Ma.Adapter;
 public interface IEquipmentComponent : IEntityComponent
 {
-  public IAutoProp<EquipableItem> EquippedWeapon { get; }
+  public IAutoProp<IWeapon> EquippedWeapon { get; }
 
-  public IAutoProp<EquipableItem> EquippedArmor { get; }
+  public IAutoProp<IArmor> EquippedArmor { get; }
 
-  public IAutoProp<EquipableItem> EquippedAccessory { get; }
+  public IAutoProp<IAccessory> EquippedAccessory { get; }
 
-  public IAutoProp<EquipableItem> EquippedAmmo { get; }
+  public IAutoProp<IEquipableItem> EquippedAmmo { get; }
 
-  public void Equip(EquipableItem equipable);
+  public void Equip(IEquipableItem equipable);
 
-  public void Unequip(EquipableItem equipable);
+  public void Unequip(IEquipableItem equipable);
 
-  public bool IsItemEquipped(InventoryItem item);
+  public bool IsItemEquipped(IEquipableItem item);
 
-  public void UpdateEquipment(EquipableItem equipable);
+  public void UpdateEquipment(IEquipableItem equipable);
 
   public bool AugmentableEquipmentExists();
 
@@ -35,5 +34,5 @@ public interface IEquipmentComponent : IEntityComponent
 
   public ElementalResistanceSet ElementalResistance { get; }
 
-  public event Action<EquipableItem> EquipmentChanged;
+  public event Action<IEquipableItem> EquipmentChanged;
 }

Zennysoft.Game.Ma.Implementation/Components/IExperiencePointsComponent.cs

@@ -16,7 +16,13 @@ public interface IExperiencePointsComponent : IEntityComponent
 
   public void Gain(int baseExpGain);
 
+  public void GainUnmodified(int flateRateExpGain);
+
   public void LevelUp();
 
+  public void LevelDown();
+
   public event Action PlayerLevelUp;
+
+  public event Action PlayerLevelDown;
 }

Zennysoft.Game.Ma.Implementation/Components/IHealthComponent.cs

@@ -22,4 +22,6 @@ public interface IHealthComponent : IEntityComponent
   public void SetMaximumHealth(int health);
 
   public void RaiseMaximumHP(int raiseAmount, bool restoreHP = false);
+
+  public void LowerMaximumHP(int lowerAmount);
 }

Zennysoft.Game.Ma.Implementation/Components/IStatusEffectComponent.cs

@@ -0,0 +1,13 @@
+
+using Chickensoft.Collections;
+using Godot;
+using Zennysoft.Ma.Adapter;
+
+public interface IStatusEffectComponent : IEntityComponent
+{
+  [Export] public double RustDuration { get; set; }
+
+  public AutoProp<bool> Rust { get; }
+
+  public bool ImmuneToRust { get; set; }
+}

Zennysoft.Game.Ma.Implementation/Components/LuckComponent.cs

@@ -4,7 +4,11 @@ namespace Zennysoft.Ma.Adapter;
 
 public interface ILuckComponent : IEntityComponent
 {
+  public int InitialLuck { get; }
+
   public IAutoProp<int> Luck { get; }
 
   public void IncreaseLuck(int value);
+
+  void DecreaseLuck(int value);
 }

Zennysoft.Game.Ma.Implementation/Components/VTComponent.cs

@@ -18,5 +18,7 @@ public interface IVTComponent : IEntityComponent
 
   public void RaiseMaximumVT(int raiseAmount, bool restoreVT = true);
 
+  public void LowerMaximumVT(int lowerAmount);
+
   public void SetMaximumVT(int vt);
 }

Zennysoft.Game.Ma.Implementation/Entity/Behaviors/PatrolBehavior.tscn

@@ -1,6 +1,6 @@
-[gd_scene load_steps=2 format=3 uid="uid://c7e5g8l6wuph"]
+[gd_scene load_steps=2 format=3]
 
-[ext_resource type="Script" uid="uid://87d8kluait8y" path="res://src/enemy/behaviors/PatrolBehavior.cs" id="1_lobva"]
+[ext_resource type="Script" path="res://src/enemy/behaviors/PatrolBehavior.cs" id="1_lobva"]
 
 [node name="NavigationAgent" type="NavigationAgent3D"]
 avoidance_enabled = true

Zennysoft.Game.Ma.Implementation/Entity/IEnemy.cs

@@ -31,6 +31,8 @@ namespace Zennysoft.Ma.Adapter.Entity
 
     public IDefenseComponent DefenseComponent { get; }
 
+    public IStatusEffectComponent StatusEffectComponent { get; }
+
     public ElementalResistanceSet ElementalResistanceSet { get; }
 
     public int InitialHP { get; }

Zennysoft.Game.Ma.Implementation/Entity/SpellFXEnum.cs

@@ -0,0 +1,11 @@
+namespace Zennysoft.Ma.Adapter;
+
+public enum SpellFXEnum
+{
+  AnBradan,
+  DivinityRecall,
+  ItemBreak,
+  Kyuuketsuki,
+  Persiko,
+  Radial
+}

Zennysoft.Game.Ma.Implementation/Equipment/Augment.cs

@@ -1,23 +1,26 @@
-using Zennysoft.Ma.Adapter;
+using Godot;
+using Zennysoft.Ma.Adapter;
 
 public class Augment
 {
   public JewelTags AugmentTag;
 
-  public Augment(JewelTags tag, IAugmentType augment)
+  public Augment(JewelTags tag, IAugmentType augment, string name, string description, Texture2D augmentTexture)
   {
     AugmentTag = tag;
+    AugmentName = name;
     AugmentType = augment;
+    AugmentDescription = description;
+    AugmentTexture = augmentTexture;
   }
 
   public IAugmentType AugmentType { get; set; }
-}
 
-public interface IAugmentType
+  public string AugmentName { get; set; }
-{
-  void Apply();
 
-  void Remove();
+  public string AugmentDescription { get; set; }
+
+  public Texture2D AugmentTexture { get; set; }
 }
 
 public class HPRecoverySpeedAugment : IAugmentType
@@ -101,6 +104,33 @@ public class LowerEXPRateAugment : IAugmentType
   public void Remove() => _player.ExperiencePointsComponent.ModifyExpGainRate(_player.ExperiencePointsComponent.ExpGainRate.Value + 0.25f);
 }
 
+public class BoostStatsAugment : IAugmentType
+{
+  private readonly IPlayer _player;
+  private readonly int _bonusLuck;
+  private readonly int _bonusHp;
+  private readonly int _bonusVt;
+
+  public BoostStatsAugment(IPlayer player, int bonusLuck, int bonusHp, int bonusVt)
+  {
+    _player = player;
+    _bonusLuck = bonusLuck;
+    _bonusHp = bonusHp;
+    _bonusVt = bonusVt;
+  }
+
+  public void Apply()
+  {
+    _player.HealthComponent.RaiseMaximumHP(_bonusHp);
+    _player.VTComponent.RaiseMaximumVT(_bonusVt);
+    _player.LuckComponent.IncreaseLuck(_bonusLuck);
+  }
+
+  public void Remove()
+  {
+  }
+}
+
 public class LowerHPRecoveryAugment : IAugmentType
 {
   private readonly IPlayer _player;

Zennysoft.Game.Ma.Implementation/Equipment/EquipableItem.cs

@@ -1,28 +0,0 @@
-using Chickensoft.Introspection;
-using Chickensoft.Serialization;
-using Zennysoft.Ma.Adapter.Entity;
-
-namespace Zennysoft.Ma.Adapter;
-
-[Meta, Id("equipable_item")]
-public abstract partial class EquipableItem : InventoryItem
-{
-  [Save("bonus_attack_stats")]
-  public virtual int BonusAttack { get; }
-  [Save("bonus_defense_stats")]
-  public virtual int BonusDefense { get; }
-  [Save("bonus_hp_stats")]
-  public virtual int BonusHP { get; }
-  [Save("bonus_vt_stats")]
-  public virtual int BonusVT { get; }
-  [Save("bonus_luck_stats")]
-  public virtual int BonusLuck { get; }
-
-  [Save("equipment_is_glued")]
-  public bool Glued { get; set; }
-
-  public virtual Augment? Augment { get; set; }
-
-  [Save("bonus_elemental_resist_stats")]
-  public virtual ElementalResistanceSet ElementalResistance { get; } = new ElementalResistanceSet(0, 0, 0, 0, 0, 0, 0);
-}

Zennysoft.Game.Ma.Implementation/Equipment/IAugmentType.cs

@@ -0,0 +1,6 @@
+public interface IAugmentType
+{
+  void Apply();
+
+  void Remove();
+}

Zennysoft.Game.Ma.Implementation/Equipment/InventoryItem.cs

@@ -1,26 +0,0 @@
-using Chickensoft.Introspection;
-using Chickensoft.Serialization;
-using Godot;
-
-namespace Zennysoft.Ma.Adapter;
-
-[Meta, Id("inventory_item")]
-public abstract partial class InventoryItem : Node3D
-{
-  [Save("inventory_item_id")]
-  public Guid ID => Guid.NewGuid();
-  [Save("inventory_item_name")]
-  public abstract string ItemName { get; }
-  [Save("inventory_item_description")]
-  public abstract string Description { get; }
-  [Save("inventory_item_spawn_rate")]
-  public abstract float SpawnRate { get; }
-  [Save("inventory_item_throw_damage")]
-  public abstract int ThrowDamage { get; }
-  [Save("inventory_item_throw_speed")]
-  public abstract float ThrowSpeed { get; }
-  [Save("inventory_item_tag")]
-  public abstract ItemTag ItemTag { get; }
-
-  public abstract Texture2D GetTexture();
-}

Zennysoft.Game.Ma.Implementation/Equipment/Tags/AccessoryTag.cs

@@ -4,5 +4,6 @@ public enum AccessoryTag
 {
   None,
   HalfVTConsumption,
-  StatusEffectImmunity
+  StatusEffectImmunity,
+  BoostEXPGainRate
 }

Zennysoft.Game.Ma.Implementation/Equipment/Tags/ArmorTag.cs

@@ -0,0 +1,7 @@
+namespace Zennysoft.Ma.Adapter;
+
+public enum ArmorTag
+{
+  None,
+  DegradeOnHit
+}

Zennysoft.Game.Ma.Implementation/Equipment/Tags/ItemTag.cs

@@ -3,7 +3,7 @@
 public enum ItemTag
 {
   None,
-  BreaksOnChange,
+  BreaksOnFloorExit,
   MysteryItem,
   DamagesPlayer,
   ContainsRestorative,
@@ -20,5 +20,8 @@ public enum ItemTag
   RestrictUnequip,
   UnequipAllItems,
   EjectAllItems,
-  UseAllItems
+  UseAllItems,
+  GlueOnEquip,
+  BreaksOnUnequip,
+  ContainsJewel
 }

Zennysoft.Game.Ma.Implementation/Equipment/Tags/UsableItemTag.cs

@@ -14,11 +14,26 @@ public enum UsableItemTag
   DealElementalDamageToAllEnemiesInRoom,
   RaiseCurrentWeaponAttack,
   RaiseCurrentDefenseArmor,
+  LowerCurrentDefenseArmor,
   RaiseLevel,
+  LowerLevel,
   RandomEffect,
   DoubleExp,
   LowerTargetTo1HP,
   CanChangeAffinity,
   TeleportToRandomLocation,
-  WarpToExitIfFound
+  WarpToExitIfFound,
+  IncreaseDefense,
+  IncreaseLuck,
+  IncreaseAttack,
+  DecreaseDefense,
+  DecreaseLuck,
+  DecreaseAttack,
+  DecreaseAllStats,
+  Clone,
+  MeltAllEquipment,
+  RestoreStats,
+  GlueAllEquipment,
+  DoubleStackedItems,
+  IdentifyRandomItem
 }

Zennysoft.Game.Ma.Implementation/Game/GameRepo.cs

@@ -16,21 +16,11 @@ public interface IGameRepo : IDisposable
 
   event Action<string>? AnnounceMessageInInventoryEvent;
 
-  event Action<int>? DoubleExpTimeStart;
+  event Action<IBaseInventoryItem>? RemoveItemFromInventoryEvent;
 
-  event Action? DoubleExpTimeEnd;
+  event Action<IEquipableItem>? EquippedItem;
 
-  event Action<InventoryItem>? RemoveItemFromInventoryEvent;
+  event Action<IEquipableItem>? UnequippedItem;
-
-  event Action? PlayerAttack;
-
-  event Action? PlayerAttackedWall;
-
-  event Action? PlayerAttackedEnemy;
-
-  event Action<EquipableItem>? EquippedItem;
-
-  event Action<EquipableItem>? UnequippedItem;
 
   event Action<IEnemy>? EnemyDied;
 
@@ -40,31 +30,21 @@ public interface IGameRepo : IDisposable
 
   IAutoProp<bool> IsPaused { get; }
 
-  public void StartDoubleEXP(TimeSpan lengthOfEffect);
-
-  public void EndDoubleExp();
-
   public void AnnounceMessageOnMainScreen(string message);
 
   public void AnnounceMessageInInventory(string message);
 
-  public void RemoveItemFromInventory(InventoryItem item);
+  public void RemoveItemFromInventory(IBaseInventoryItem item);
-
-  public void OnPlayerAttack();
-
-  public void OnPlayerAttackedWall();
 
   public void CloseInventory();
 
   public void GameEnded();
 
-  public void OnEquippedItem(EquipableItem item);
+  public void OnEquippedItem(IEquipableItem item);
 
-  public void OnUnequippedItem(EquipableItem item);
+  public void OnUnequippedItem(IEquipableItem item);
 
   public void OnEnemyDied(IEnemy enemy);
-
-  public double ExpRate { get; }
 }
 
 public class GameRepo : IGameRepo
@@ -73,26 +53,18 @@ public class GameRepo : IGameRepo
   public event Action? CloseInventoryEvent;
   public event Action<string>? AnnounceMessageOnMainScreenEvent;
   public event Action<string>? AnnounceMessageInInventoryEvent;
-  public event Action<int>? DoubleExpTimeStart;
+  public event Action<IBaseInventoryItem>? RemoveItemFromInventoryEvent;
-  public event Action? DoubleExpTimeEnd;
+  public event Action<IEquipableItem>? EquippedItem;
-  public event Action<InventoryItem>? RemoveItemFromInventoryEvent;
+  public event Action<IEquipableItem>? UnequippedItem;
-  public event Action? PlayerAttack;
-  public event Action? PlayerAttackedWall;
-  public event Action? PlayerAttackedEnemy;
-  public event Action<EquipableItem>? EquippedItem;
-  public event Action<EquipableItem>? UnequippedItem;
   public event Action<IEnemy>? EnemyDied;
   public IAutoProp<bool> IsPaused => _isPaused;
   private readonly AutoProp<bool> _isPaused;
 
-  public double ExpRate { get; private set; }
-
   private bool _disposedValue;
 
   public GameRepo()
   {
     _isPaused = new AutoProp<bool>(true);
-    ExpRate = 1;
   }
 
   public void Pause()
@@ -107,20 +79,6 @@ public class GameRepo : IGameRepo
     GD.Print("Resume");
   }
 
-  public void StartDoubleEXP(TimeSpan lengthOfEffect)
-  {
-    AnnounceMessageInInventory("Experience points temporarily doubled.");
-    DoubleExpTimeStart?.Invoke(lengthOfEffect.Seconds);
-    ExpRate *= 2;
-  }
-
-  public void EndDoubleExp()
-  {
-    AnnounceMessageOnMainScreen("Experience points effect wore off.");
-    DoubleExpTimeEnd?.Invoke();
-    ExpRate /= 2;
-  }
-
   public void AnnounceMessageOnMainScreen(string message)
   {
     AnnounceMessageOnMainScreenEvent?.Invoke(message);
@@ -131,29 +89,19 @@ public class GameRepo : IGameRepo
     AnnounceMessageInInventoryEvent?.Invoke(message);
   }
 
-  public void RemoveItemFromInventory(InventoryItem item)
+  public void RemoveItemFromInventory(IBaseInventoryItem item)
   {
     RemoveItemFromInventoryEvent?.Invoke(item);
   }
 
-  public void OnPlayerAttack()
-  {
-    PlayerAttack?.Invoke();
-  }
-
-  public void OnPlayerAttackedWall()
-  {
-    PlayerAttackedWall?.Invoke();
-  }
-
   public void CloseInventory()
   {
     CloseInventoryEvent?.Invoke();
   }
 
-  public void OnEquippedItem(EquipableItem item) => EquippedItem?.Invoke(item);
+  public void OnEquippedItem(IEquipableItem item) => EquippedItem?.Invoke(item);
 
-  public void OnUnequippedItem(EquipableItem item) => UnequippedItem?.Invoke(item);
+  public void OnUnequippedItem(IEquipableItem item) => UnequippedItem?.Invoke(item);
 
   public void OnEnemyDied(IEnemy enemy) => EnemyDied?.Invoke(enemy);
 

Zennysoft.Game.Ma.Implementation/Item/IAccessory.cs

@@ -0,0 +1,5 @@
+using Zennysoft.Ma.Adapter;
+
+public interface IAccessory : IEquipableItem, IAugmentableItem
+{
+}

Zennysoft.Game.Ma.Implementation/Item/IArmor.cs

@@ -0,0 +1,10 @@
+using Zennysoft.Ma.Adapter;
+
+public interface IArmor : IEquipableItem, IAugmentableItem
+{
+  public void IncreaseArmorDefense(int bonus);
+
+  public void DecreaseArmorDefense(int lowerAmount);
+
+  public ArmorTag ArmorTag { get; }
+}

Zennysoft.Game.Ma.Implementation/Item/IAugmentItem.cs

@@ -1,7 +1,5 @@
-namespace Zennysoft.Ma.Adapter
+public interface IAugmentItem : IBaseInventoryItem
 {
-  public interface IAugmentItem
+
-  {
+  public IAugmentType Augment { get; }
-    public JewelTags Augment { get; }
-  }
 }

Zennysoft.Game.Ma.Implementation/Item/IAugmentableItem.cs

@@ -0,0 +1,7 @@
+namespace Zennysoft.Ma.Adapter
+{
+  public interface IAugmentableItem
+  {
+    public Augment? Augment { get; }
+  }
+}

Zennysoft.Game.Ma.Implementation/Item/IBaseInventoryItem.cs

@@ -0,0 +1,16 @@
+
+using Godot;
+using Zennysoft.Ma.Adapter;
+
+public interface IBaseInventoryItem
+{
+  public string ItemName { get; }
+  public string StatDescription { get; }
+  public string FlavorText { get; }
+  public float SpawnRate { get; }
+  public int ThrowDamage { get; }
+  public float ThrowSpeed { get; }
+  public ItemTag ItemTag { get; }
+
+  public abstract Texture2D GetTexture();
+}

Zennysoft.Game.Ma.Implementation/Item/IDroppedItem.cs

@@ -4,6 +4,6 @@
   {
     void RescueItem();
 
-    public InventoryItem Item { get; }
+    public IBaseInventoryItem Item { get; }
   }
 }

Zennysoft.Game.Ma.Implementation/Item/IEquipableItem.cs

@@ -0,0 +1,14 @@
+using Zennysoft.Ma.Adapter.Entity;
+
+public interface IEquipableItem : IBaseInventoryItem
+{
+  public int BonusAttack { get; }
+  public int BonusDefense { get; }
+  public int BonusHP { get; }
+  public int BonusVT { get; }
+  public int BonusLuck { get; }
+
+  public bool Glued { get; set; }
+
+  public ElementalResistanceSet ElementalResistance { get; }
+}

Zennysoft.Game.Ma.Implementation/Item/IInventory.cs

@@ -2,17 +2,17 @@
 
 public interface IInventory
 {
-  public bool PickUpItem(InventoryItem item);
+  public bool PickUpItem(IBaseInventoryItem item);
 
-  public List<InventoryItem> Items { get; }
+  public List<IBaseInventoryItem> Items { get; }
 
-  public bool TryAdd(InventoryItem inventoryItem);
+  public bool TryAdd(IBaseInventoryItem inventoryItem);
 
-  public bool TryInsert(InventoryItem inventoryItem, int index);
+  public bool TryInsert(IBaseInventoryItem inventoryItem, int index);
 
-  public void Remove(InventoryItem inventoryItem);
+  public void Remove(IBaseInventoryItem inventoryItem);
 
-  public bool Sort(EquipableItem currentWeapon, EquipableItem currentArmor, EquipableItem currentAccessory, EquipableItem ammo);
+  public bool Sort(IWeapon currentWeapon, IArmor currentArmor, IAccessory currentAccessory, IEquipableItem ammo);
 
   public bool AtCapacity();
 

Zennysoft.Game.Ma.Implementation/Item/IThrownItem.cs

@@ -2,5 +2,5 @@
 
 public interface IThrownItem
 {
-  public InventoryItem ItemThatIsThrown { get; set; }
+  public IBaseInventoryItem ItemThatIsThrown { get; set; }
 }

Zennysoft.Game.Ma.Implementation/Item/IWeapon.cs

@@ -0,0 +1,5 @@
+using Zennysoft.Ma.Adapter;
+
+public interface IWeapon : IEquipableItem, IAugmentableItem
+{
+}

Zennysoft.Game.Ma.Implementation/Item/RescuedItemDatabase.cs

@@ -1,16 +1,38 @@
-using Chickensoft.Introspection;
+using Chickensoft.Serialization;
-using Chickensoft.Serialization;
 
 namespace Zennysoft.Ma.Adapter;
 
-[Meta, Id("rescued_items")]
+public class RescuedItemDatabase
-public partial class RescuedItemDatabase
 {
   [Save("rescued_item_list")]
-  public List<InventoryItem> Items { get; init; }
+  private List<IBaseInventoryItem> _items { get; init; }
+  private int _maxSize { get; init; } = 20;
 
-  public RescuedItemDatabase()
+  public RescuedItemDatabase(int maxSize)
   {
-    Items = new List<InventoryItem>();
+    _items = [];
+    _maxSize = maxSize;
   }
+
+  public RescuedItemDatabase(List<IBaseInventoryItem> items, int maxSize)
+  {
+    _items = items;
+    _maxSize = maxSize;
+  }
+
+  public bool TryAdd(IBaseInventoryItem item)
+  {
+    if (_items.Count >= _maxSize)
+      return false;
+    if (item is IEquipableItem equipable)
+      equipable.Glued = false;
+    _items.Add(item);
+    return true;
+  }
+
+  public void Remove(IBaseInventoryItem item) => _items.Remove(item);
+
+  public List<IBaseInventoryItem> GetItems() => _items;
+
+  public void Clear() => _items.Clear();
 }

Zennysoft.Game.Ma.Implementation/JsonConverters/EnumConverters.cs

@@ -19,3 +19,18 @@ public partial class BoxItemTagEnumContext : JsonSerializerContext;
 
 [JsonSerializable(typeof(ElementType))]
 public partial class ElementTypeEnumContext : JsonSerializerContext;
+
+[JsonSerializable(typeof(JewelTags))]
+public partial class JewelTagsEnumContext : JsonSerializerContext;
+
+[JsonSerializable(typeof(IBaseInventoryItem))]
+public partial class BaseInventoryItemContext : JsonSerializerContext
+{
+
+}
+
+[JsonSerializable(typeof(RescuedItemDatabase))]
+public partial class RescuedItemDatabaseContext : JsonSerializerContext
+{
+
+}

Zennysoft.Game.Ma.Implementation/Map/IDungeonFloor.cs

@@ -11,7 +11,5 @@ public interface IDungeonFloor : INode3D
 
   public ImmutableList<IDungeonRoom> Rooms { get; }
 
-  public void FadeOutAudio();
-
   public bool FloorIsLoaded { get; set; }
 }

Zennysoft.Game.Ma.Implementation/Module/Module.cs

@@ -10,8 +10,6 @@ public class Module
   public static void Bootstrap(Container container)
   {
     container.RegisterSingleton<IFileSystem, FileSystem>();
-    container.RegisterSingleton<ISaveFileManager, SaveFileManager>();
-    container.RegisterSingleton<IMaSaveFileManager, MaSaveFileManager>();
     container.RegisterSingleton<IGameRepo, GameRepo>();
     container.RegisterSingleton<IGameState, GameState>();
     container.RegisterSingleton<IDimmableAudioStreamPlayer, DimmableAudioStreamPlayer>();

Zennysoft.Game.Ma.Implementation/Player/IPlayer.cs

@@ -20,15 +20,15 @@ public interface IPlayer : IKillable, ICharacterBody3D
 
   public void TeleportPlayer((Vector3 Rotation, Vector3 Position) newTransform);
 
-  public void Equip(EquipableItem equipable);
+  public void Equip(IEquipableItem equipable);
 
-  public void Unequip(EquipableItem equipable);
+  public void Unequip(IEquipableItem equipable);
 
   public void PlayJumpScareAnimation();
 
-  public void ApplyNewAugment(IAugmentItem jewel, EquipableItem equipableItem);
+  public void ApplyNewAugment(IAugmentItem jewel, IAugmentableItem equipableItem);
 
-  public void IdentifyItem(InventoryItem unidentifiedItem);
+  public IBaseInventoryItem IdentifyItem(IBaseInventoryItem unidentifiedItem);
 
   public IInventory Inventory { get; }
 
@@ -46,10 +46,14 @@ public interface IPlayer : IKillable, ICharacterBody3D
 
   public IEquipmentComponent EquipmentComponent { get; }
 
+  public IStatusEffectComponent StatusEffectComponent { get; }
+
   public void SetHealthTimerStatus(bool isActive);
 
   public void ModifyHealthTimerSpeed(float newModifier);
 
+  public void PlaySpellFX(SpellFXEnum spellEnum);
+
   public bool AutoRevive { get; set; }
 
   public int TotalAttack { get; }
@@ -63,5 +67,5 @@ public interface IPlayer : IKillable, ICharacterBody3D
   public bool AutoIdentifyItems { get; set; }
 
   public event Action PlayerDied;
-  public delegate InventoryItem RerollItem(InventoryItem item);
+  public delegate IBaseInventoryItem RerollItem(IBaseInventoryItem item);
 }

Zennysoft.Game.Ma.Implementation/UI/InGameUI/InGameUILogic.State.cs

@@ -38,7 +38,7 @@ public partial class InGameUILogic
       Output(new Output.AnnounceMessageInInventory(message));
     }
 
-    private void OnRemoveItemFromInventory(InventoryItem item) => Output(new Output.RemoveItemFromInventory(item));
+    private void OnRemoveItemFromInventory(IBaseInventoryItem item) => Output(new Output.RemoveItemFromInventory(item));
 
   }
 }

Zennysoft.Game.Ma.Implementation/UI/InGameUI/state/InGameUILogic.Output.cs

@@ -8,7 +8,7 @@ public partial class InGameUILogic
   {
     public readonly record struct AnnounceMessageOnMainScreen(string Message);
     public readonly record struct AnnounceMessageInInventory(string Message);
-    public readonly record struct RemoveItemFromInventory(InventoryItem Item);
+    public readonly record struct RemoveItemFromInventory(IBaseInventoryItem Item);
     public readonly record struct ShowInventory;
     public readonly record struct HideInventory;
   }

Zennysoft.Game.Ma.Implementation/Zennysoft.Ma.Adapter.csproj

@@ -31,4 +31,8 @@
 		<ProjectReference Include="..\Zennysoft.Game.Godot.Implementation\Zennysoft.Game.Implementation.csproj" />
 	</ItemGroup>
 
+	<ItemGroup>
+	  <Folder Include="Save\" />
+	</ItemGroup>
+
 </Project>

Zennysoft.Game.Ma/Game.sln

@@ -0,0 +1,61 @@
+
+Microsoft Visual Studio Solution File, Format Version 12.00
+# Visual Studio Version 17
+VisualStudioVersion = 17.11.35222.181
+MinimumVisualStudioVersion = 10.0.40219.1
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Ma", "Ma.csproj", "{94D57D73-EDC5-47B2-BF34-7B57BA9C3881}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Zennysoft.Game.Abstractions", "..\Zennysoft.Game.Abstractions\Zennysoft.Game.Abstractions.csproj", "{D65D2AE9-D371-49F8-9E1D-BBA2907AB4AA}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Zennysoft.Game.Implementation", "..\Zennysoft.Game.Godot.Implementation\Zennysoft.Game.Implementation.csproj", "{F6808C1C-EDFB-4602-BA01-34FB682A270C}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Zennysoft.Ma.Adapter", "..\Zennysoft.Game.Ma.Implementation\Zennysoft.Ma.Adapter.csproj", "{CC55EDC3-B9EA-4393-BE4D-630C34393A94}"
+EndProject
+Global
+	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		Debug|Any CPU = Debug|Any CPU
+		ExportDebug|Any CPU = ExportDebug|Any CPU
+		ExportRelease|Any CPU = ExportRelease|Any CPU
+		Release|Any CPU = Release|Any CPU
+	EndGlobalSection
+	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{94D57D73-EDC5-47B2-BF34-7B57BA9C3881}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{94D57D73-EDC5-47B2-BF34-7B57BA9C3881}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{94D57D73-EDC5-47B2-BF34-7B57BA9C3881}.ExportDebug|Any CPU.ActiveCfg = ExportDebug|Any CPU
+		{94D57D73-EDC5-47B2-BF34-7B57BA9C3881}.ExportDebug|Any CPU.Build.0 = ExportDebug|Any CPU
+		{94D57D73-EDC5-47B2-BF34-7B57BA9C3881}.ExportRelease|Any CPU.ActiveCfg = ExportRelease|Any CPU
+		{94D57D73-EDC5-47B2-BF34-7B57BA9C3881}.ExportRelease|Any CPU.Build.0 = ExportRelease|Any CPU
+		{94D57D73-EDC5-47B2-BF34-7B57BA9C3881}.Release|Any CPU.ActiveCfg = ExportRelease|Any CPU
+		{94D57D73-EDC5-47B2-BF34-7B57BA9C3881}.Release|Any CPU.Build.0 = ExportRelease|Any CPU
+		{D65D2AE9-D371-49F8-9E1D-BBA2907AB4AA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{D65D2AE9-D371-49F8-9E1D-BBA2907AB4AA}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{D65D2AE9-D371-49F8-9E1D-BBA2907AB4AA}.ExportDebug|Any CPU.ActiveCfg = Debug|Any CPU
+		{D65D2AE9-D371-49F8-9E1D-BBA2907AB4AA}.ExportDebug|Any CPU.Build.0 = Debug|Any CPU
+		{D65D2AE9-D371-49F8-9E1D-BBA2907AB4AA}.ExportRelease|Any CPU.ActiveCfg = Release|Any CPU
+		{D65D2AE9-D371-49F8-9E1D-BBA2907AB4AA}.ExportRelease|Any CPU.Build.0 = Release|Any CPU
+		{D65D2AE9-D371-49F8-9E1D-BBA2907AB4AA}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{D65D2AE9-D371-49F8-9E1D-BBA2907AB4AA}.Release|Any CPU.Build.0 = Release|Any CPU
+		{F6808C1C-EDFB-4602-BA01-34FB682A270C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{F6808C1C-EDFB-4602-BA01-34FB682A270C}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{F6808C1C-EDFB-4602-BA01-34FB682A270C}.ExportDebug|Any CPU.ActiveCfg = Debug|Any CPU
+		{F6808C1C-EDFB-4602-BA01-34FB682A270C}.ExportDebug|Any CPU.Build.0 = Debug|Any CPU
+		{F6808C1C-EDFB-4602-BA01-34FB682A270C}.ExportRelease|Any CPU.ActiveCfg = Release|Any CPU
+		{F6808C1C-EDFB-4602-BA01-34FB682A270C}.ExportRelease|Any CPU.Build.0 = Release|Any CPU
+		{F6808C1C-EDFB-4602-BA01-34FB682A270C}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{F6808C1C-EDFB-4602-BA01-34FB682A270C}.Release|Any CPU.Build.0 = Release|Any CPU
+		{CC55EDC3-B9EA-4393-BE4D-630C34393A94}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{CC55EDC3-B9EA-4393-BE4D-630C34393A94}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{CC55EDC3-B9EA-4393-BE4D-630C34393A94}.ExportDebug|Any CPU.ActiveCfg = Debug|Any CPU
+		{CC55EDC3-B9EA-4393-BE4D-630C34393A94}.ExportDebug|Any CPU.Build.0 = Debug|Any CPU
+		{CC55EDC3-B9EA-4393-BE4D-630C34393A94}.ExportRelease|Any CPU.ActiveCfg = Release|Any CPU
+		{CC55EDC3-B9EA-4393-BE4D-630C34393A94}.ExportRelease|Any CPU.Build.0 = Release|Any CPU
+		{CC55EDC3-B9EA-4393-BE4D-630C34393A94}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{CC55EDC3-B9EA-4393-BE4D-630C34393A94}.Release|Any CPU.Build.0 = Release|Any CPU
+	EndGlobalSection
+	GlobalSection(SolutionProperties) = preSolution
+		HideSolutionNode = FALSE
+	EndGlobalSection
+	GlobalSection(ExtensibilityGlobals) = postSolution
+		SolutionGuid = {797FF6A1-5959-42C9-A7A2-A8D39F9AC1A4}
+	EndGlobalSection
+EndGlobal

Zennysoft.Game.Ma/addons/dialogue_manager/components/code_edit.tscn

@@ -1,4 +1,4 @@
-[gd_scene load_steps=4 format=3 uid="uid://civ6shmka5e8u"]
+[gd_scene load_steps=4 format=3 uid="uid://ekf8y405ewyq"]
 
 [ext_resource type="Script" uid="uid://klpiq4tk3t7a" path="res://addons/dialogue_manager/components/code_edit_syntax_highlighter.gd" id="1_58cfo"]
 [ext_resource type="Script" uid="uid://djeybvlb332mp" path="res://addons/dialogue_manager/components/code_edit.gd" id="1_g324i"]

Zennysoft.Game.Ma/addons/dialogue_manager/components/download_update_panel.tscn

@@ -1,4 +1,4 @@
-[gd_scene load_steps=3 format=3 uid="uid://qdxrxv3c3hxk"]
+[gd_scene load_steps=3 format=3 uid="uid://cstps104wl17j"]
 
 [ext_resource type="Script" uid="uid://kpwo418lb2t2" path="res://addons/dialogue_manager/components/download_update_panel.gd" id="1_4tm1k"]
 [ext_resource type="Texture2D" uid="uid://d3baj6rygkb3f" path="res://addons/dialogue_manager/assets/update.svg" id="2_4o2m6"]

Zennysoft.Game.Ma/addons/dialogue_manager/components/editor_property/editor_property_control.tscn

@@ -1,8 +1,8 @@
-[gd_scene load_steps=4 format=3 uid="uid://ycn6uaj7dsrh"]
+[gd_scene load_steps=4 format=3 uid="uid://bsal283gclopj"]
 
 [ext_resource type="Script" uid="uid://dooe2pflnqtve" path="res://addons/dialogue_manager/components/editor_property/editor_property_control.gd" id="1_het12"]
-[ext_resource type="PackedScene" uid="uid://b16uuqjuof3n5" path="res://addons/dialogue_manager/components/editor_property/resource_button.tscn" id="2_hh3d4"]
+[ext_resource type="PackedScene" path="res://addons/dialogue_manager/components/editor_property/resource_button.tscn" id="2_hh3d4"]
-[ext_resource type="PackedScene" uid="uid://dnufpcdrreva3" path="res://addons/dialogue_manager/components/files_list.tscn" id="3_l8fp6"]
+[ext_resource type="PackedScene" path="res://addons/dialogue_manager/components/files_list.tscn" id="3_l8fp6"]
 
 [node name="PropertyEditorButton" type="HBoxContainer"]
 offset_right = 40.0

Zennysoft.Game.Ma/addons/dialogue_manager/components/editor_property/resource_button.tscn

@@ -1,4 +1,4 @@
-[gd_scene load_steps=2 format=3 uid="uid://b16uuqjuof3n5"]
+[gd_scene load_steps=2 format=3 uid="uid://bylecer7aexlb"]
 
 [ext_resource type="Script" uid="uid://damhqta55t67c" path="res://addons/dialogue_manager/components/editor_property/resource_button.gd" id="1_7u2i7"]
 

Zennysoft.Game.Ma/addons/dialogue_manager/components/errors_panel.tscn

@@ -1,4 +1,4 @@
-[gd_scene load_steps=4 format=3 uid="uid://cs8pwrxr5vxix"]
+[gd_scene load_steps=4 format=3 uid="uid://c3pniua1enw8v"]
 
 [ext_resource type="Script" uid="uid://d2l8nlb6hhrfp" path="res://addons/dialogue_manager/components/errors_panel.gd" id="1_nfm3c"]
 

Zennysoft.Game.Ma/addons/dialogue_manager/components/files_list.tscn

@@ -1,4 +1,4 @@
-[gd_scene load_steps=3 format=3 uid="uid://dnufpcdrreva3"]
+[gd_scene load_steps=3 format=3 uid="uid://b21h8gsbo60xg"]
 
 [ext_resource type="Script" uid="uid://dqa4a4wwoo0aa" path="res://addons/dialogue_manager/components/files_list.gd" id="1_cytii"]
 [ext_resource type="Texture2D" uid="uid://d3lr2uas6ax8v" path="res://addons/dialogue_manager/assets/icon.svg" id="2_3ijx1"]

Zennysoft.Game.Ma/addons/dialogue_manager/components/find_in_files.tscn

@@ -1,4 +1,4 @@
-[gd_scene load_steps=3 format=3 uid="uid://0n7hwviyyly4"]
+[gd_scene load_steps=3 format=3 uid="uid://c5to0aeerreb4"]
 
 [ext_resource type="Script" uid="uid://q368fmxxa8sd" path="res://addons/dialogue_manager/components/find_in_files.gd" id="1_3xicy"]
 

Zennysoft.Game.Ma/addons/dialogue_manager/components/search_and_replace.tscn

@@ -1,4 +1,4 @@
-[gd_scene load_steps=2 format=3 uid="uid://gr8nakpbrhby"]
+[gd_scene load_steps=2 format=3 uid="uid://xnv1ojlgiss3"]
 
 [ext_resource type="Script" uid="uid://cijsmjkq21cdq" path="res://addons/dialogue_manager/components/search_and_replace.gd" id="1_8oj1f"]
 

Zennysoft.Game.Ma/addons/dialogue_manager/components/title_list.tscn

@@ -1,4 +1,4 @@
-[gd_scene load_steps=2 format=3 uid="uid://ctns6ouwwd68i"]
+[gd_scene load_steps=2 format=3 uid="uid://b7v2agbddgaoi"]
 
 [ext_resource type="Script" uid="uid://d0k2wndjj0ifm" path="res://addons/dialogue_manager/components/title_list.gd" id="1_5qqmd"]
 

Zennysoft.Game.Ma/addons/dialogue_manager/components/update_button.tscn

@@ -1,7 +1,7 @@
-[gd_scene load_steps=3 format=3 uid="uid://co8yl23idiwbi"]
+[gd_scene load_steps=3 format=3 uid="uid://c1dliyrsif5jj"]
 
 [ext_resource type="Script" uid="uid://cr1tt12dh5ecr" path="res://addons/dialogue_manager/components/update_button.gd" id="1_d2tpb"]
-[ext_resource type="PackedScene" uid="uid://qdxrxv3c3hxk" path="res://addons/dialogue_manager/components/download_update_panel.tscn" id="2_iwm7r"]
+[ext_resource type="PackedScene" uid="uid://cstps104wl17j" path="res://addons/dialogue_manager/components/download_update_panel.tscn" id="2_iwm7r"]
 
 [node name="UpdateButton" type="Button"]
 visible = false

Zennysoft.Game.Ma/addons/dialogue_manager/dialogue_label.tscn

@@ -1,4 +1,4 @@
-[gd_scene load_steps=2 format=3 uid="uid://ckvgyvclnwggo"]
+[gd_scene load_steps=2 format=3 uid="uid://b0sflwm2j27gu"]
 
 [ext_resource type="Script" uid="uid://g32um0mltv5d" path="res://addons/dialogue_manager/dialogue_label.gd" id="1_cital"]
 

Zennysoft.Game.Ma/addons/dialogue_manager/example_balloon/example_balloon.tscn

@@ -1,7 +1,7 @@
-[gd_scene load_steps=9 format=3 uid="uid://73jm5qjy52vq"]
+[gd_scene load_steps=9 format=3 uid="uid://bs44fggx87t73"]
 
 [ext_resource type="Script" uid="uid://5b3w40kwakl3" path="res://addons/dialogue_manager/example_balloon/ExampleBalloon.cs" id="1_36de5"]
-[ext_resource type="PackedScene" uid="uid://ckvgyvclnwggo" path="res://addons/dialogue_manager/dialogue_label.tscn" id="2_a8ve6"]
+[ext_resource type="PackedScene" path="res://addons/dialogue_manager/dialogue_label.tscn" id="2_a8ve6"]
 [ext_resource type="Script" uid="uid://bb52rsfwhkxbn" path="res://addons/dialogue_manager/dialogue_responses_menu.gd" id="3_72ixx"]
 
 [sub_resource type="StyleBoxFlat" id="StyleBoxFlat_spyqn"]

Zennysoft.Game.Ma/addons/dialogue_manager/example_balloon/small_example_balloon.tscn

@@ -1,7 +1,7 @@
-[gd_scene load_steps=10 format=3 uid="uid://13s5spsk34qu"]
+[gd_scene load_steps=10 format=3 uid="uid://c4tqvq4mjcfv2"]
 
 [ext_resource type="Script" uid="uid://5b3w40kwakl3" path="res://addons/dialogue_manager/example_balloon/ExampleBalloon.cs" id="1_s2gbs"]
-[ext_resource type="PackedScene" uid="uid://ckvgyvclnwggo" path="res://addons/dialogue_manager/dialogue_label.tscn" id="2_hfvdi"]
+[ext_resource type="PackedScene" path="res://addons/dialogue_manager/dialogue_label.tscn" id="2_hfvdi"]
 [ext_resource type="Script" uid="uid://bb52rsfwhkxbn" path="res://addons/dialogue_manager/dialogue_responses_menu.gd" id="3_1j1j0"]
 
 [sub_resource type="StyleBoxFlat" id="StyleBoxFlat_235ry"]

Zennysoft.Game.Ma/addons/dialogue_manager/test_scene.tscn

@@ -1,4 +1,4 @@
-[gd_scene load_steps=2 format=3 uid="uid://ugd552efvil0"]
+[gd_scene load_steps=2 format=3 uid="uid://c3ty75yb1un26"]
 
 [ext_resource type="Script" uid="uid://c8e16qdgu40wo" path="res://addons/dialogue_manager/test_scene.gd" id="1_yupoh"]
 

Zennysoft.Game.Ma/addons/dialogue_manager/views/main_view.tscn

@@ -1,15 +1,15 @@
-[gd_scene load_steps=16 format=3 uid="uid://cbuf1q3xsse3q"]
+[gd_scene load_steps=16 format=3 uid="uid://b2lot8kdw2snd"]
 
 [ext_resource type="Script" uid="uid://cipjcc7bkh1pc" path="res://addons/dialogue_manager/views/main_view.gd" id="1_h6qfq"]
-[ext_resource type="PackedScene" uid="uid://civ6shmka5e8u" path="res://addons/dialogue_manager/components/code_edit.tscn" id="2_f73fm"]
+[ext_resource type="PackedScene" uid="uid://ekf8y405ewyq" path="res://addons/dialogue_manager/components/code_edit.tscn" id="2_f73fm"]
-[ext_resource type="PackedScene" uid="uid://dnufpcdrreva3" path="res://addons/dialogue_manager/components/files_list.tscn" id="2_npj2k"]
+[ext_resource type="PackedScene" uid="uid://b21h8gsbo60xg" path="res://addons/dialogue_manager/components/files_list.tscn" id="2_npj2k"]
-[ext_resource type="PackedScene" uid="uid://ctns6ouwwd68i" path="res://addons/dialogue_manager/components/title_list.tscn" id="2_onb4i"]
+[ext_resource type="PackedScene" uid="uid://b7v2agbddgaoi" path="res://addons/dialogue_manager/components/title_list.tscn" id="2_onb4i"]
-[ext_resource type="PackedScene" uid="uid://co8yl23idiwbi" path="res://addons/dialogue_manager/components/update_button.tscn" id="2_ph3vs"]
+[ext_resource type="PackedScene" uid="uid://c1dliyrsif5jj" path="res://addons/dialogue_manager/components/update_button.tscn" id="2_ph3vs"]
-[ext_resource type="PackedScene" uid="uid://gr8nakpbrhby" path="res://addons/dialogue_manager/components/search_and_replace.tscn" id="6_ylh0t"]
+[ext_resource type="PackedScene" uid="uid://xnv1ojlgiss3" path="res://addons/dialogue_manager/components/search_and_replace.tscn" id="6_ylh0t"]
-[ext_resource type="PackedScene" uid="uid://cs8pwrxr5vxix" path="res://addons/dialogue_manager/components/errors_panel.tscn" id="7_5cvl4"]
+[ext_resource type="PackedScene" uid="uid://c3pniua1enw8v" path="res://addons/dialogue_manager/components/errors_panel.tscn" id="7_5cvl4"]
 [ext_resource type="Script" uid="uid://klpiq4tk3t7a" path="res://addons/dialogue_manager/components/code_edit_syntax_highlighter.gd" id="7_necsa"]
 [ext_resource type="Texture2D" uid="uid://cnm67htuohhlo" path="res://addons/dialogue_manager/assets/banner.png" id="9_y6rqu"]
-[ext_resource type="PackedScene" uid="uid://0n7hwviyyly4" path="res://addons/dialogue_manager/components/find_in_files.tscn" id="10_yold3"]
+[ext_resource type="PackedScene" uid="uid://c5to0aeerreb4" path="res://addons/dialogue_manager/components/find_in_files.tscn" id="10_yold3"]
 
 [sub_resource type="Image" id="Image_y6rqu"]
 data = {

Zennysoft.Game.Ma/addons/input_helper/components/download_update_panel.tscn

@@ -1,4 +1,4 @@
-[gd_scene load_steps=3 format=3 uid="uid://b7mst0qu7vjk1"]
+[gd_scene load_steps=3 format=3 uid="uid://bf5kpeg711bo8"]
 
 [ext_resource type="Script" uid="uid://dcff0mowkn6km" path="res://addons/input_helper/components/download_update_panel.gd" id="1_4tm1k"]
 [ext_resource type="Texture2D" uid="uid://ddixs2ish5bi6" path="res://addons/input_helper/assets/update.svg" id="2_j7shv"]

Zennysoft.Game.Ma/addons/input_helper/views/download_dialog.tscn

@@ -1,6 +1,6 @@
-[gd_scene load_steps=3 format=3 uid="uid://bownbkcmm43gn"]
+[gd_scene load_steps=3 format=3 uid="uid://bsi3bm7ig32p"]
 
-[ext_resource type="PackedScene" uid="uid://b7mst0qu7vjk1" path="res://addons/input_helper/components/download_update_panel.tscn" id="1_37q37"]
+[ext_resource type="PackedScene" uid="uid://bf5kpeg711bo8" path="res://addons/input_helper/components/download_update_panel.tscn" id="1_37q37"]
 [ext_resource type="Script" uid="uid://1t3qhgrro2es" path="res://addons/input_helper/views/download_dialog.gd" id="1_ltktf"]
 
 [node name="DownloadDialog" type="AcceptDialog"]

Zennysoft.Game.Ma/default_bus_layout.tres

@@ -1,9 +1,12 @@
-[gd_resource type="AudioBusLayout" load_steps=4 format=3 uid="uid://c2mk6c27y0mdf"]
+[gd_resource type="AudioBusLayout" load_steps=5 format=3 uid="uid://c2mk6c27y0mdf"]
 
 [sub_resource type="AudioEffectLimiter" id="AudioEffectLimiter_j3pel"]
 resource_name = "Limiter"
 soft_clip_db = 1.0
 
+[sub_resource type="AudioEffectHardLimiter" id="AudioEffectHardLimiter_j3pel"]
+resource_name = "HardLimiter"
+
 [sub_resource type="AudioEffectReverb" id="AudioEffectReverb_j3pel"]
 resource_name = "Reverb"
 room_size = 0.5
@@ -20,7 +23,9 @@ soft_clip_db = 1.5
 [resource]
 bus/0/volume_db = -0.130497
 bus/0/effect/0/effect = SubResource("AudioEffectLimiter_j3pel")
-bus/0/effect/0/enabled = true
+bus/0/effect/0/enabled = false
+bus/0/effect/1/effect = SubResource("AudioEffectHardLimiter_j3pel")
+bus/0/effect/1/enabled = true
 bus/1/name = &"AMBIENT"
 bus/1/solo = false
 bus/1/mute = false

Zennysoft.Game.Ma/export_presets.cfg

@@ -9,7 +9,7 @@ custom_features=""
 export_filter="all_resources"
 include_filter=""
 exclude_filter=""
-export_path="Export/Ma.exe"
+export_path="../../Demo/Export.exe"
 patches=PackedStringArray()
 encryption_include_filters=""
 encryption_exclude_filters=""

Zennysoft.Game.Ma/project.godot

@@ -8,6 +8,10 @@
 
 config_version=5
 
+[animation]
+
+warnings/check_invalid_track_paths=false
+
 [application]
 
 config/name="Ma"
@@ -36,6 +40,7 @@ runtime/advanced/uses_dotnet=true
 window/size/viewport_width=1920
 window/size/viewport_height=1080
 window/stretch/mode="canvas_items"
+window/stretch/aspect="expand"
 
 [dotnet]
 
@@ -82,6 +87,7 @@ import/blender/enabled=false
 [global_group]
 
 DimmableAudio=""
+enemy=""
 
 [importer_defaults]
 
@@ -254,11 +260,15 @@ AltAttack={
 CameraForward={
 "deadzone": 0.2,
 "events": [Object(InputEventJoypadMotion,"resource_local_to_scene":false,"resource_name":"","device":-1,"axis":3,"axis_value":-1.0,"script":null)
+, Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":-1,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":0,"physical_keycode":4194320,"key_label":0,"unicode":0,"location":0,"echo":false,"script":null)
+, Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":-1,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":0,"physical_keycode":4194446,"key_label":0,"unicode":56,"location":0,"echo":false,"script":null)
 ]
 }
 CameraBack={
 "deadzone": 0.2,
 "events": [Object(InputEventJoypadMotion,"resource_local_to_scene":false,"resource_name":"","device":-1,"axis":3,"axis_value":1.0,"script":null)
+, Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":-1,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":0,"physical_keycode":4194322,"key_label":0,"unicode":0,"location":0,"echo":false,"script":null)
+, Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":-1,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":0,"physical_keycode":4194440,"key_label":0,"unicode":50,"location":0,"echo":false,"script":null)
 ]
 }
 EnemyViewerIdle={
@@ -274,7 +284,7 @@ EnemyViewerWalk={
 
 [internationalization]
 
-locale/translations_pot_files=PackedStringArray("res://src/dialog/Dialogue.dialogue", "res://src/npc/Ran/ran.dialogue", "res://src/npc/Rat/ratdialogue.dialogue", "res://src/dialog/Altar.dialogue", "res://stone.dialogue", "res://src/npc/Proscenium/JumpScare.dialogue", "res://tutorialstone.dialogue")
+locale/translations_pot_files=PackedStringArray("res://src/dialog/Dialogue.dialogue", "res://src/npc/Ran/ran.dialogue", "res://src/npc/Rat/ratdialogue.dialogue", "res://src/dialog/Altar.dialogue", "res://stone.dialogue", "res://src/npc/Proscenium/JumpScare.dialogue")
 
 [layer_names]
 
@@ -308,6 +318,7 @@ jolt_physics_3d/simulation/areas_detect_static_bodies=true
 
 textures/canvas_textures/default_texture_filter=0
 textures/lossless_compression/force_png=true
+lights_and_shadows/directional_shadow/size=2048
 lights_and_shadows/directional_shadow/soft_shadow_filter_quality=4
 lights_and_shadows/directional_shadow/16_bits=false
 lights_and_shadows/positional_shadow/soft_shadow_filter_quality=3

Zennysoft.Game.Ma/src/Components/AttackComponent.cs

@@ -1,4 +1,5 @@
 using Chickensoft.Collections;
+using Godot;
 using System;
 using Zennysoft.Ma.Adapter;
 
@@ -49,7 +50,14 @@ public class AttackComponent : IAttackComponent
 
   public void RaiseMaximumAttack(int raiseAmount)
   {
-    _maximumAttack.OnNext(raiseAmount);
+    _maximumAttack.OnNext(_maximumAttack.Value + raiseAmount);
     Restore(raiseAmount);
   }
+
+  public void LowerMaximumAttack(int lowerAmount)
+  {
+    _maximumAttack.OnNext(Mathf.Max(_maximumAttack.Value - lowerAmount, 1));
+    if (_currentAttack.Value > _maximumAttack.Value)
+      _currentAttack.OnNext(_maximumAttack.Value);
+  }
 }

Zennysoft.Game.Ma/src/Components/DefenseComponent.cs

@@ -1,4 +1,5 @@
 using Chickensoft.Collections;
+using Godot;
 using System;
 using Zennysoft.Ma.Adapter;
 
@@ -49,7 +50,14 @@ public class DefenseComponent : IDefenseComponent
 
   public void RaiseMaximumDefense(int raiseAmount)
   {
-    _maximumDefense.OnNext(raiseAmount);
+    _maximumDefense.OnNext(_maximumDefense.Value + raiseAmount);
     Restore(raiseAmount);
   }
+
+  public void LowerMaximumDefense(int lowerAmount)
+  {
+    _maximumDefense.OnNext(Mathf.Max(_maximumDefense.Value - lowerAmount, 1));
+    if (_currentDefense.Value > _maximumDefense.Value)
+      _currentDefense.OnNext(_maximumDefense.Value);
+  }
 }

Zennysoft.Game.Ma/src/Components/EquipmentComponent.cs

@@ -6,23 +6,23 @@ using Zennysoft.Ma.Adapter.Entity;
 namespace Zennysoft.Game.Ma;
 public class EquipmentComponent : IEquipmentComponent
 {
-  public IAutoProp<EquipableItem> EquippedWeapon => _equippedWeapon;
+  public IAutoProp<IWeapon> EquippedWeapon => _equippedWeapon;
 
-  public IAutoProp<EquipableItem> EquippedArmor => _equippedArmor;
+  public IAutoProp<IArmor> EquippedArmor => _equippedArmor;
 
-  public IAutoProp<EquipableItem> EquippedAccessory => _equippedAccessory;
+  public IAutoProp<IAccessory> EquippedAccessory => _equippedAccessory;
 
-  public IAutoProp<EquipableItem> EquippedAmmo => _equippedAmmo;
+  public IAutoProp<IEquipableItem> EquippedAmmo => _equippedAmmo;
 
-  public AutoProp<EquipableItem> _equippedWeapon;
+  public AutoProp<IWeapon> _equippedWeapon;
 
-  public AutoProp<EquipableItem> _equippedArmor;
+  public AutoProp<IArmor> _equippedArmor;
 
-  public AutoProp<EquipableItem> _equippedAccessory;
+  public AutoProp<IAccessory> _equippedAccessory;
 
-  public AutoProp<EquipableItem> _equippedAmmo;
+  public AutoProp<IEquipableItem> _equippedAmmo;
 
-  public event Action<EquipableItem> EquipmentChanged;
+  public event Action<IEquipableItem> EquipmentChanged;
 
   public int BonusAttack => _equippedWeapon.Value.BonusAttack + _equippedArmor.Value.BonusAttack + _equippedAccessory.Value.BonusAttack;
 
@@ -38,10 +38,10 @@ public class EquipmentComponent : IEquipmentComponent
 
   public EquipmentComponent()
   {
-    _equippedWeapon = new AutoProp<EquipableItem>(new Weapon());
+    _equippedWeapon = new AutoProp<IWeapon>(new Weapon());
-    _equippedArmor = new AutoProp<EquipableItem>(new Armor());
+    _equippedArmor = new AutoProp<IArmor>(new Armor());
-    _equippedAccessory = new AutoProp<EquipableItem>(new Accessory());
+    _equippedAccessory = new AutoProp<IAccessory>(new Accessory());
-    _equippedAmmo = new AutoProp<EquipableItem>(new Ammo());
+    _equippedAmmo = new AutoProp<IEquipableItem>(new Ammo());
   }
 
   public void Reset()
@@ -52,7 +52,7 @@ public class EquipmentComponent : IEquipmentComponent
     _equippedAmmo.OnNext(new Ammo());
   }
 
-  public void Equip(EquipableItem equipable)
+  public void Equip(IEquipableItem equipable)
   {
     if (equipable is Weapon weapon)
       _equippedWeapon.OnNext(weapon);
@@ -65,7 +65,7 @@ public class EquipmentComponent : IEquipmentComponent
     EquipmentChanged?.Invoke(equipable);
   }
 
-  public void Unequip(EquipableItem equipable)
+  public void Unequip(IEquipableItem equipable)
   {
     if (equipable is Weapon weapon)
       _equippedWeapon.OnNext(new Weapon());
@@ -78,15 +78,12 @@ public class EquipmentComponent : IEquipmentComponent
     EquipmentChanged?.Invoke(equipable);
   }
 
-  public bool IsItemEquipped(InventoryItem item)
+  public bool IsItemEquipped(IEquipableItem item)
   {
-    if (item is not EquipableItem)
-      return false;
-
     return item == _equippedWeapon.Value || item == _equippedArmor.Value || item == _equippedAccessory.Value || item == _equippedAmmo.Value;
   }
 
-  public void UpdateEquipment(EquipableItem equipable) => EquipmentChanged?.Invoke(equipable);
+  public void UpdateEquipment(IEquipableItem equipable) => EquipmentChanged?.Invoke(equipable);
 
   public bool AugmentableEquipmentExists()
   {

Zennysoft.Game.Ma/src/Components/ExperiencePointsComponent.cs

@@ -1,4 +1,5 @@
 using Chickensoft.Collections;
+using Godot;
 using System;
 using Zennysoft.Ma.Adapter;
 
@@ -24,6 +25,8 @@ public class ExperiencePointsComponent : IExperiencePointsComponent
 
   public event Action PlayerLevelUp;
 
+  public event Action PlayerLevelDown;
+
   public ExperiencePointsComponent()
   {
     var firstLevelExpRequirement = ExpToNextLevelCalculation(1);
@@ -45,12 +48,19 @@ public class ExperiencePointsComponent : IExperiencePointsComponent
   public void Gain(int baseExpGain)
   {
     var modifiedExpGain = baseExpGain * _expGainRate.Value;
-    var newCurrentExpTotal = modifiedExpGain + _currentExp.Value;
+    _currentExp.OnNext(Mathf.RoundToInt(modifiedExpGain + _currentExp.Value));
-    while (modifiedExpGain + _currentExp.Value >= _expToNextLevel.Value)
+    while (_currentExp.Value >= _expToNextLevel.Value)
       LevelUp();
-    var cappedAmount = Math.Min(baseExpGain + _currentExp.Value, _expToNextLevel.Value);
-    _currentExp.OnNext(cappedAmount);
   }
+
+  public void GainUnmodified(int flatRateExp)
+  {
+    var newCurrentExpTotal = flatRateExp + _currentExp.Value;
+    _currentExp.OnNext(newCurrentExpTotal);
+    while (_currentExp.Value >= _expToNextLevel.Value)
+      LevelUp();
+  }
+
   public void ModifyExpGainRate(double newRate) => _expGainRate.OnNext(newRate);
 
   public void LevelUp()
@@ -63,6 +73,21 @@ public class ExperiencePointsComponent : IExperiencePointsComponent
     PlayerLevelUp?.Invoke();
   }
 
+  public void LevelDown()
+  {
+    SfxDatabase.Instance.Play(SoundEffect.DecreaseStat);
+    _currentExp.OnNext(0);
+
+    if (_level.Value == 1)
+      return;
+
+    var newLevel = Mathf.Max(_level.Value - 1, 1);
+    _level.OnNext(newLevel);
+    var expToNextLevel = ExpToNextLevelCalculation(newLevel);
+    _expToNextLevel.OnNext(expToNextLevel);
+    PlayerLevelDown.Invoke();
+  }
+
   private int ExpToNextLevelCalculation(int nextLevel)
   {
     return (int)(6.5 * nextLevel + 4.5 * Math.Pow(nextLevel, 2) + Math.Pow(nextLevel, 3));

Zennysoft.Game.Ma/src/Components/HealthComponent.cs

@@ -1,4 +1,5 @@
 using Chickensoft.Collections;
+using Godot;
 using System;
 using Zennysoft.Ma.Adapter;
 
@@ -77,4 +78,11 @@ public class HealthComponent : IHealthComponent
     if (restoreHP)
       Heal(raiseAmount);
   }
+
+  public void LowerMaximumHP(int lowerAmount)
+  {
+    _maximumHP.OnNext(Mathf.Max(_maximumHP.Value - lowerAmount, 1));
+    if (_currentHP.Value > _maximumHP.Value)
+      _currentHP.OnNext(_maximumHP.Value);
+  }
 }

Zennysoft.Game.Ma/src/Components/LuckComponent.cs

@@ -1,4 +1,5 @@
 using Chickensoft.Collections;
+using System;
 using Zennysoft.Ma.Adapter;
 
 namespace Zennysoft.Game.Ma;
@@ -6,12 +7,14 @@ namespace Zennysoft.Game.Ma;
 public class LuckComponent : ILuckComponent
 {
   public IAutoProp<int> Luck => _luck;
+  public int InitialLuck { get; }
 
-  private AutoProp<int> _luck;
+  private readonly AutoProp<int> _luck;
   private readonly int _initialValue;
 
   public LuckComponent(int initialLuck)
   {
+    InitialLuck = initialLuck;
     _luck = new AutoProp<int>(initialLuck);
     _initialValue = initialLuck;
   }
@@ -22,4 +25,6 @@ public class LuckComponent : ILuckComponent
   }
 
   public void IncreaseLuck(int value) => _luck.OnNext(_luck.Value + value);
+
+  public void DecreaseLuck(int value) => _luck.OnNext(Godot.Mathf.Max(_luck.Value - value, 0));
 }

Zennysoft.Game.Ma/src/Components/StatusEffectComponent.cs

@@ -0,0 +1,20 @@
+using Chickensoft.Collections;
+
+public class StatusEffectComponent : IStatusEffectComponent
+{
+  public StatusEffectComponent(double rustDuration)
+  {
+    RustDuration = rustDuration;
+  }
+
+  public double RustDuration { get; set; }
+
+  public AutoProp<bool> Rust { get; } = new AutoProp<bool>(false);
+
+  public bool ImmuneToRust { get; set; } = false;
+
+  public void Reset()
+  {
+    Rust.OnNext(false);
+  }
+}

Zennysoft.Game.Ma/src/Components/StatusEffectComponent.cs.uid

@@ -0,0 +1 @@
+uid://chhmivq4bntxf

Zennysoft.Game.Ma/src/Components/VTComponent.cs

@@ -1,4 +1,5 @@
 using Chickensoft.Collections;
+using Godot;
 using System;
 using Zennysoft.Ma.Adapter;
 
@@ -56,6 +57,13 @@ public class VTComponent : IVTComponent
       Restore(raiseAmount);
   }
 
+  public void LowerMaximumVT(int lowerAmount)
+  {
+    _maximumVT.OnNext(Mathf.Max(_maximumVT.Value - lowerAmount, 1));
+    if (_currentVT.Value > _maximumVT.Value)
+      _currentVT.OnNext(_maximumVT.Value);
+  }
+
   public void SetMaximumVT(int vt)
   {
     _maximumVT.OnNext(vt);

Zennysoft.Game.Ma/src/app/App.cs

@@ -21,7 +21,7 @@ public partial class App : Node, IApp
 
   public const string GAME_SCENE_PATH = "res://src/game/Game.tscn";
 
-  public const string ENEMY_VIEWER_PATH = "res://src/data_viewer/DataViewer.tscn";
+  public const string ENEMY_VIEWER_PATH = "res://src/enemy_viewer/EnemyViewer.tscn";
 
   [Node] private MainMenu MainMenu { get; set; } = default!;
 
@@ -40,14 +40,14 @@ public partial class App : Node, IApp
   private Godot.Collections.Array _progress;
   private SimpleInjector.Container _container;
 
-  private DataViewer _dataViewer;
+  private EnemyViewer _dataViewer;
   private bool _loadingGame = false;
   private bool _loadingEnemyViewer = false;
   private string _optionsSavePath = string.Empty;
   private string _controllerSavePath = string.Empty;
   private ISaveFileManager _saveFileManager;
   private IGame _game;
-  private IDataViewer _enemyViewer;
+  private IEnemyViewer _enemyViewer;
 
   private double _reportedProgress = 0;
 
@@ -146,7 +146,7 @@ public partial class App : Node, IApp
       })
       .Handle((in AppLogic.Output.SetupGameScene _) =>
       {
-        LoadingScreen.Show();
+        LoadingScreen.ShowLoadingScreen();
         LoadGame(GAME_SCENE_PATH);
       })
       .Handle((in AppLogic.Output.ShowMainMenu _) =>
@@ -155,7 +155,7 @@ public partial class App : Node, IApp
       })
       .Handle((in AppLogic.Output.CloseGame _) =>
       {
-        LoadingScreen.Hide();
+        LoadingScreen.HideLoadingScreen();
         _game.GameExitRequested -= GameExitRequested;
         MainMenu.StartGameButton.GrabFocus();
         _game.CallDeferred(MethodName.QueueFree, []);
@@ -166,14 +166,14 @@ public partial class App : Node, IApp
         })
       .Handle((in AppLogic.Output.EnemyViewerOpened _) =>
       {
-        LoadingScreen.Show();
+        LoadingScreen.ShowLoadingScreen();
         MainMenu.Hide();
         LoadEnemyViewer(ENEMY_VIEWER_PATH);
       })
       .Handle((in AppLogic.Output.EnemyViewerExited _) =>
       {
-        LoadingScreen.Hide();
+        LoadingScreen.HideLoadingScreen();
-        if (_enemyViewer != null && _enemyViewer is DataViewer enemyViewer)
+        if (_enemyViewer != null && _enemyViewer is EnemyViewer enemyViewer)
           enemyViewer.CallDeferred(MethodName.QueueFree);
         MainMenu.Show();
         MainMenu.EnemyViewerButton.GrabFocus();
@@ -203,24 +203,23 @@ public partial class App : Node, IApp
     _game = scene as IGame;
     _game.GameLoaded += OnGameLoaded;
     _game.GameExitRequested += GameExitRequested;
-    await ToSignal(GetTree().CreateTimer(0.8f), "timeout");
     CallDeferred(MethodName.AddChild, scene);
   }
 
-  private void OnGameLoaded() => LoadingScreen.Hide();
+  private void OnGameLoaded() => LoadingScreen.HideLoadingScreen();
 
   private async void LoadEnemyViewer(string sceneName)
   {
     var scene = await LoadSceneInternal(sceneName);
-    _enemyViewer = scene as IDataViewer;
+    _enemyViewer = scene as IEnemyViewer;
-    await ToSignal(GetTree().CreateTimer(0.8f), "timeout");
     CallDeferred(MethodName.AddChild, scene);
-    LoadingScreen.Hide();
+    LoadingScreen.HideLoadingScreen();
   }
 
   private async Task<Node> LoadSceneInternal(string sceneName)
   {
-    LoadingScreen.Show();
+    LoadingScreen.ShowLoadingScreen();
+    MainMenu.Hide();
     LoadingScreen.ProgressBar.Value = 0;
     var sceneLoader = new SceneLoader();
     CallDeferred(MethodName.AddChild, sceneLoader);
@@ -240,11 +239,7 @@ public partial class App : Node, IApp
     OptionsMenu.GameTab.GrabFocus();
   }
 
-  private async void OnGallery()
+  private async void OnGallery() => GalleryMenu.Show();
-  {
-    GalleryMenu.Show();
-    GalleryMenu.ItemButton1.GrabFocus();
-  }
 
   public void OnQuit() => AppLogic.Input(new AppLogic.Input.QuitGame());
 

Zennysoft.Game.Ma/src/app/App.tscn

@@ -1,4 +1,4 @@
-[gd_scene load_steps=6 format=3 uid="uid://cagfc5ridmteu"]
+[gd_scene load_steps=6 format=3 uid="uid://bkhaksn82ws6h"]
 
 [ext_resource type="Script" uid="uid://d1f8blk5ucqvq" path="res://src/app/App.cs" id="1_rt73h"]
 [ext_resource type="PackedScene" uid="uid://rfvnddfqufho" path="res://src/menu/MainMenu.tscn" id="2_1uiag"]
@@ -10,9 +10,16 @@
 process_mode = 3
 script = ExtResource("1_rt73h")
 
+[node name="ColorRect" type="ColorRect" parent="."]
+anchors_preset = 15
+anchor_right = 1.0
+anchor_bottom = 1.0
+grow_horizontal = 2
+grow_vertical = 2
+color = Color(0, 0, 0, 1)
+
 [node name="MainMenu" parent="." instance=ExtResource("2_1uiag")]
 unique_name_in_owner = true
-visible = false
 
 [node name="OptionsMenu" parent="." instance=ExtResource("2_v0mgf")]
 unique_name_in_owner = true
@@ -24,5 +31,6 @@ visible = false
 
 [node name="LoadingScreen" parent="." instance=ExtResource("3_3st5l")]
 unique_name_in_owner = true
+visible = false
 top_level = true
 z_index = 999

Zennysoft.Game.Ma/src/audio/SFXDatabase.tscn

@@ -1,4 +1,4 @@
-[gd_scene load_steps=26 format=3 uid="uid://brgi35xj3b4ud"]
+[gd_scene load_steps=27 format=3 uid="uid://brgi35xj3b4ud"]
 
 [ext_resource type="Script" uid="uid://cw100tox0ufsy" path="res://src/audio/SfxDatabase.cs" id="1_ojkqd"]
 [ext_resource type="AudioStream" uid="uid://cye8wlqbx66h4" path="res://src/audio/sfx/player_heal.ogg" id="2_158j8"]
@@ -9,6 +9,7 @@
 [ext_resource type="AudioStream" uid="uid://c817txm4tmup7" path="res://src/audio/sfx/PLAYER_EQUIP.ogg" id="7_sew62"]
 [ext_resource type="AudioStream" uid="uid://qxi7qto7hhgk" path="res://src/audio/sfx/PLAYER_UNEQUIP.ogg" id="8_rf1la"]
 [ext_resource type="AudioStream" uid="uid://doeefxilh0luj" path="res://src/audio/sfx/ITEM_SORT.ogg" id="9_l6w22"]
+[ext_resource type="AudioStream" uid="uid://cyae4bt60m7p4" path="res://src/audio/sfx/item_plasma_sword.ogg" id="10_7th20"]
 [ext_resource type="AudioStream" uid="uid://4mk4hlse81if" path="res://src/audio/sfx/player_losehealth.ogg" id="10_kac56"]
 [ext_resource type="AudioStream" uid="uid://dwp3ep3jddvrr" path="res://src/audio/sfx/UI_SELECT.ogg" id="10_nerso"]
 [ext_resource type="AudioStream" uid="uid://ilf2s8ct2stt" path="res://src/audio/sfx/PLAYER_slower_slash.ogg" id="10_vyvit"]
@@ -33,21 +34,26 @@ script = ExtResource("1_ojkqd")
 
 [node name="OpenInventorySound" type="AudioStreamPlayer" parent="UI"]
 unique_name_in_owner = true
+process_mode = 3
 stream = ExtResource("5_p5cio")
 bus = &"SFX"
 
 [node name="MoveSound" type="AudioStreamPlayer" parent="UI"]
 unique_name_in_owner = true
+process_mode = 3
 stream = ExtResource("6_r16t0")
+max_polyphony = 5
 bus = &"SFX"
 
 [node name="SelectSound" type="AudioStreamPlayer" parent="UI"]
 unique_name_in_owner = true
+process_mode = 3
 stream = ExtResource("10_nerso")
 bus = &"SFX"
 
 [node name="CancelSound" type="AudioStreamPlayer" parent="UI"]
 unique_name_in_owner = true
+process_mode = 3
 stream = ExtResource("11_rloay")
 bus = &"SFX"
 
@@ -55,51 +61,67 @@ bus = &"SFX"
 
 [node name="HealHPSound" type="AudioStreamPlayer" parent="Player"]
 unique_name_in_owner = true
+process_mode = 3
 stream = ExtResource("2_158j8")
 bus = &"SFX"
 
 [node name="TakeDamageSound" type="AudioStreamPlayer" parent="Player"]
 unique_name_in_owner = true
+process_mode = 3
 stream = ExtResource("10_kac56")
 bus = &"SFX"
 
 [node name="HealVTSound" type="AudioStreamPlayer" parent="Player"]
 unique_name_in_owner = true
+process_mode = 3
 stream = ExtResource("3_kac56")
 bus = &"SFX"
 
 [node name="WeaponQuickSlashSound" type="AudioStreamPlayer" parent="Player"]
 unique_name_in_owner = true
+process_mode = 3
 stream = ExtResource("13_fa8i8")
 bus = &"SFX"
 
+[node name="WeaponPlasmaSword" type="AudioStreamPlayer" parent="Player"]
+unique_name_in_owner = true
+process_mode = 3
+stream = ExtResource("10_7th20")
+bus = &"SFX"
+
 [node name="WeaponSlowSlashSound" type="AudioStreamPlayer" parent="Player"]
 unique_name_in_owner = true
+process_mode = 3
 stream = ExtResource("10_vyvit")
 bus = &"SFX"
 
 [node name="CritSound" type="AudioStreamPlayer" parent="Player"]
 unique_name_in_owner = true
+process_mode = 3
 stream = ExtResource("14_p5cio")
 bus = &"SFX"
 
 [node name="PickupItemSound" type="AudioStreamPlayer" parent="Player"]
 unique_name_in_owner = true
+process_mode = 3
 stream = ExtResource("15_r16t0")
 bus = &"SFX"
 
 [node name="LevelUpSound" type="AudioStreamPlayer" parent="Player"]
 unique_name_in_owner = true
+process_mode = 3
 stream = ExtResource("16_sew62")
 bus = &"SFX"
 
 [node name="EquipSound" type="AudioStreamPlayer" parent="Player"]
 unique_name_in_owner = true
+process_mode = 3
 stream = ExtResource("7_sew62")
 bus = &"SFX"
 
 [node name="UnequipSound" type="AudioStreamPlayer" parent="Player"]
 unique_name_in_owner = true
+process_mode = 3
 stream = ExtResource("8_rf1la")
 bus = &"SFX"
 
@@ -107,50 +129,66 @@ bus = &"SFX"
 
 [node name="TransferItemSound" type="AudioStreamPlayer" parent="Item"]
 unique_name_in_owner = true
+process_mode = 3
 stream = ExtResource("18_l6w22")
 bus = &"SFX"
 
 [node name="IncreaseStatSound" type="AudioStreamPlayer" parent="Item"]
 unique_name_in_owner = true
+process_mode = 3
+stream = ExtResource("4_fa8i8")
+bus = &"SFX"
+
+[node name="DecreaseStatSound" type="AudioStreamPlayer" parent="Item"]
+unique_name_in_owner = true
+process_mode = 3
 stream = ExtResource("4_fa8i8")
 bus = &"SFX"
 
 [node name="SortSound" type="AudioStreamPlayer" parent="Item"]
 unique_name_in_owner = true
+process_mode = 3
 stream = ExtResource("9_l6w22")
 bus = &"SFX"
 
 [node name="RecallEnemiesSound" type="AudioStreamPlayer" parent="Item"]
 unique_name_in_owner = true
+process_mode = 3
 stream = ExtResource("19_nerso")
 bus = &"SFX"
 
 [node name="KillHalfEnemiesSound" type="AudioStreamPlayer" parent="Item"]
 unique_name_in_owner = true
+process_mode = 3
 stream = ExtResource("20_rloay")
 bus = &"SFX"
 
 [node name="TeleportToRandomRoomSound" type="AudioStreamPlayer" parent="Item"]
 unique_name_in_owner = true
+process_mode = 3
 stream = ExtResource("21_6hsck")
 bus = &"SFX"
 
 [node name="TeleportToExitSound" type="AudioStreamPlayer" parent="Item"]
 unique_name_in_owner = true
+process_mode = 3
 stream = ExtResource("22_3wq6u")
 bus = &"SFX"
 
 [node name="AbsorbHPFromAllEnemiesSound" type="AudioStreamPlayer" parent="Item"]
 unique_name_in_owner = true
+process_mode = 3
 stream = ExtResource("23_aaerj")
 bus = &"SFX"
 
 [node name="SwapHPAndVTSound" type="AudioStreamPlayer" parent="Item"]
 unique_name_in_owner = true
+process_mode = 3
 stream = ExtResource("23_jdwj3")
 bus = &"SFX"
 
 [node name="TurnAllEnemiesIntoHealingItemsSound" type="AudioStreamPlayer" parent="Item"]
 unique_name_in_owner = true
+process_mode = 3
 stream = ExtResource("24_jdwj3")
 bus = &"SFX"

Zennysoft.Game.Ma/src/audio/SfxDatabase.cs

@@ -24,6 +24,7 @@ public partial class SfxDatabase : Node
       {SoundEffect.TakeDamage, TakeDamageSound },
       {SoundEffect.HealVT, HealVTSound },
       {SoundEffect.IncreaseStat, IncreaseStatSound },
+      {SoundEffect.DecreaseStat, DecreaseStatSound },
       {SoundEffect.Crit, CritSound },
       {SoundEffect.PickupItem, PickupItemSound },
       {SoundEffect.OpenInventory, OpenInventorySound },
@@ -43,6 +44,7 @@ public partial class SfxDatabase : Node
       {SoundEffect.TurnAllEnemiesIntoHealingItems, TurnAllEnemiesIntoHealingItemsSound},
       {SoundEffect.WeaponQuickSlash, WeaponQuickSlashSound },
       {SoundEffect.WeaponSlowSlash, WeaponSlowSlashSound },
+      {SoundEffect.WeaponPlasmaSword, WeaponPlasmaSword },
     };
   }
 
@@ -50,8 +52,11 @@ public partial class SfxDatabase : Node
   [Node] private AudioStreamPlayer TakeDamageSound { get; set; } = default!;
   [Node] private AudioStreamPlayer HealVTSound { get; set; } = default!;
   [Node] private AudioStreamPlayer IncreaseStatSound { get; set; } = default!;
+
+  [Node] private AudioStreamPlayer DecreaseStatSound { get; set; } = default!;
   [Node] private AudioStreamPlayer WeaponQuickSlashSound { get; set; } = default!;
   [Node] private AudioStreamPlayer WeaponSlowSlashSound { get; set; } = default!;
+  [Node] private AudioStreamPlayer WeaponPlasmaSword { get; set; } = default!;
   [Node] private AudioStreamPlayer CritSound { get; set; } = default!;
   [Node] private AudioStreamPlayer PickupItemSound { get; set; } = default!;
   [Node] private AudioStreamPlayer OpenInventorySound { get; set; }
@@ -87,6 +92,7 @@ public enum SoundEffect
   TakeDamage,
   HealVT,
   IncreaseStat,
+  DecreaseStat,
   Crit,
   PickupItem,
   OpenInventory,
@@ -107,5 +113,6 @@ public enum SoundEffect
   TurnAllEnemiesIntoHealingItems,
   WeaponQuickSlash,
   WeaponSlowSlash,
+  WeaponPlasmaSword
 }
 

Zennysoft.Game.Ma/src/camera/ShakeCamera.tscn

@@ -1,4 +1,4 @@
-[gd_scene load_steps=3 format=3 uid="uid://didc6vnf5ftlg"]
+[gd_scene load_steps=3 format=3 uid="uid://dqvlemme0iwa"]
 
 [ext_resource type="Script" uid="uid://bb36q1wpe0tlw" path="res://src/camera/ShakeCamera.cs" id="1_ubmds"]
 

Zennysoft.Game.Ma/src/debug_info/DebugInfo.cs

@@ -0,0 +1,40 @@
+using Chickensoft.AutoInject;
+using Chickensoft.Introspection;
+using Godot;
+using System.Linq;
+using Zennysoft.Game.Ma;
+using Zennysoft.Ma.Adapter;
+using Zennysoft.Ma.Adapter.Entity;
+
+[Meta(typeof(IAutoNode)), Id("debug")]
+public partial class DebugInfo : Control
+{
+  public override void _Notification(int what) => this.Notify(what);
+
+  [Dependency] private IGame _game => this.DependOn<IGame>();
+  [Dependency] private IGameRepo _gameRepo => this.DependOn<IGameRepo>();
+  [Dependency] private IMap _map => this.DependOn<IMap>();
+  [Dependency] private IPlayer _player => this.DependOn<IPlayer>();
+
+  [Node] public Label MapName { get; set; }
+  [Node] public Label EnemyCount { get; set; }
+  [Node] public Label DeathCount { get; set; }
+
+  public void OnResolved()
+  {
+    _map.FloorLoaded += _map_FloorLoaded;
+    _gameRepo.EnemyDied += _gameRepo_EnemyDied;
+    _player.PlayerDied += _player_PlayerDied;
+  }
+
+  private void _gameRepo_EnemyDied(IEnemy obj) => EnemyCount.Text = (EnemyCount.Text.ToInt() - 1).ToString();
+
+  private void _map_FloorLoaded()
+  {
+    DeathCount.Text = _game.QuestData.DeathCount.ToString();
+    MapName.Text = _map.CurrentFloor.SceneFilePath.GetFile().TrimSuffix(".tscn");
+    EnemyCount.Text = _map.CurrentFloor.GetChild(0).GetChildren().OfType<IDungeonRoom>().Select(x => x.GetChildren().OfType<IEnemy>()).Count().ToString();
+  }
+
+  private void _player_PlayerDied() => DeathCount.Text = _game.QuestData.DeathCount.ToString();
+}

Zennysoft.Game.Ma/src/debug_info/DebugInfo.cs.uid

@@ -0,0 +1 @@
+uid://c4g3frcpt0h36

Zennysoft.Game.Ma/src/debug_info/DebugInfo.tscn

@@ -0,0 +1,82 @@
+[gd_scene load_steps=4 format=3 uid="uid://0eo47mewhlit"]
+
+[ext_resource type="Script" uid="uid://c4g3frcpt0h36" path="res://src/debug_info/DebugInfo.cs" id="1_6tk84"]
+[ext_resource type="LabelSettings" uid="uid://b6f8ggy3ulonb" path="res://src/ui/label_settings/GeorgiaItalic.tres" id="1_i766g"]
+[ext_resource type="Script" uid="uid://3fpuxsgdl8xe" path="res://src/utils/FpsCounter.cs" id="3_rco7p"]
+
+[node name="DebugInfo" type="Control"]
+layout_mode = 3
+anchors_preset = 15
+anchor_right = 1.0
+anchor_bottom = 1.0
+grow_horizontal = 2
+grow_vertical = 2
+script = ExtResource("1_6tk84")
+
+[node name="MarginContainer" type="MarginContainer" parent="."]
+layout_mode = 1
+anchors_preset = 15
+anchor_right = 1.0
+anchor_bottom = 1.0
+grow_horizontal = 2
+grow_vertical = 2
+theme_override_constants/margin_left = 20
+theme_override_constants/margin_top = 20
+theme_override_constants/margin_right = 20
+theme_override_constants/margin_bottom = 20
+
+[node name="VFlowContainer" type="VFlowContainer" parent="MarginContainer"]
+layout_mode = 2
+alignment = 2
+
+[node name="FPS" type="HBoxContainer" parent="MarginContainer/VFlowContainer"]
+layout_mode = 2
+
+[node name="FPSLabel" type="Label" parent="MarginContainer/VFlowContainer/FPS"]
+layout_mode = 2
+text = "FPS:"
+label_settings = ExtResource("1_i766g")
+
+[node name="FPSCounter" type="Label" parent="MarginContainer/VFlowContainer/FPS"]
+layout_mode = 2
+label_settings = ExtResource("1_i766g")
+script = ExtResource("3_rco7p")
+
+[node name="MapInfo" type="HBoxContainer" parent="MarginContainer/VFlowContainer"]
+layout_mode = 2
+
+[node name="Map Name Label" type="Label" parent="MarginContainer/VFlowContainer/MapInfo"]
+layout_mode = 2
+text = "Map Name:"
+label_settings = ExtResource("1_i766g")
+
+[node name="MapName" type="Label" parent="MarginContainer/VFlowContainer/MapInfo"]
+unique_name_in_owner = true
+layout_mode = 2
+label_settings = ExtResource("1_i766g")
+
+[node name="EnemyInfo" type="HBoxContainer" parent="MarginContainer/VFlowContainer"]
+layout_mode = 2
+
+[node name="Enemy Count Label" type="Label" parent="MarginContainer/VFlowContainer/EnemyInfo"]
+layout_mode = 2
+text = "Number of enemies:"
+label_settings = ExtResource("1_i766g")
+
+[node name="EnemyCount" type="Label" parent="MarginContainer/VFlowContainer/EnemyInfo"]
+unique_name_in_owner = true
+layout_mode = 2
+label_settings = ExtResource("1_i766g")
+
+[node name="HBoxContainer" type="HBoxContainer" parent="MarginContainer/VFlowContainer"]
+layout_mode = 2
+
+[node name="DeathCountLabel" type="Label" parent="MarginContainer/VFlowContainer/HBoxContainer"]
+layout_mode = 2
+text = "Player Death Count:"
+label_settings = ExtResource("1_i766g")
+
+[node name="DeathCount" type="Label" parent="MarginContainer/VFlowContainer/HBoxContainer"]
+unique_name_in_owner = true
+layout_mode = 2
+label_settings = ExtResource("1_i766g")

Zennysoft.Game.Ma/src/dialog/Dialog.tres

@@ -1,6 +1,6 @@
 [gd_resource type="Resource" script_class="DialogueResource" load_steps=2 format=3 uid="uid://dlbsw423e12au"]
 
-[ext_resource type="Script" path="res://addons/dialogue_manager/dialogue_resource.gd" id="1_p1wx7"]
+[ext_resource type="Script" uid="uid://dbs4435dsf3ry" path="res://addons/dialogue_manager/dialogue_resource.gd" id="1_p1wx7"]
 
 [resource]
 script = ExtResource("1_p1wx7")

Zennysoft.Game.Ma/src/dialog/Dialog.tscn

@@ -1,6 +1,6 @@
-[gd_scene load_steps=2 format=3 uid="uid://kt5fg0it26cf"]
+[gd_scene load_steps=2 format=3 uid="uid://ci8272gtj7oj6"]
 
-[ext_resource type="Script" path="res://addons/dialogue_manager/dialogue_label.gd" id="1_bkcfu"]
+[ext_resource type="Script" uid="uid://g32um0mltv5d" path="res://addons/dialogue_manager/dialogue_label.gd" id="1_bkcfu"]
 
 [node name="Dialog" type="RichTextLabel"]
 anchors_preset = 15

Zennysoft.Game.Ma/src/dialog/Dialogue.dialogue

@@ -1,15 +1,5 @@
 ~ general
-Hi...
 => END
 
 ~ introduction
-I haven't had a script added yet.
-=> END
-
-~ hit
-Yep, hitting me does work though.
-=> END
-
-~ get_item
-ooo yum
 => END

Zennysoft.Game.Ma/src/enemy/BasicEnemyAnimationTree.tscn

@@ -1,4 +1,4 @@
-[gd_scene load_steps=95 format=3 uid="uid://dpoonda2dwwic"]
+[gd_scene load_steps=95 format=3 uid="uid://cygwsc1gebeut"]
 
 [sub_resource type="AnimationNodeAnimation" id="AnimationNodeAnimation_53wuj"]
 animation = &"idle_back"

Zennysoft.Game.Ma/src/enemy/BossTypeA.cs

@@ -3,7 +3,6 @@ using Chickensoft.Introspection;
 using Godot;
 using System;
 using System.Collections.Generic;
-using System.Linq;
 using Zennysoft.Ma.Adapter;
 
 namespace Zennysoft.Game.Ma;
@@ -38,8 +37,6 @@ public partial class BossTypeA : Enemy, IHaveEngagePlayerBehavior, IHaveFollowBe
 
   [Node] public Area3D PlayerDetector { get; set; } = default!;
 
-  [Node] public Label BossHP { get; set; } = default!;
-
   private Vector3 _previousPosition = Vector3.Zero;
 
   public void OnResolved()
@@ -60,8 +57,6 @@ public partial class BossTypeA : Enemy, IHaveEngagePlayerBehavior, IHaveFollowBe
         _enemyLogic.Input(new EnemyLogic.Input.Move());
       _previousPosition = GlobalPosition;
     }
-
-    BossHP.Text = HealthComponent.CurrentHP.Value + "/" + HealthComponent.MaximumHP.Value;
   }
 
   public void OnPhysicsProcess(double delta)
@@ -79,9 +74,9 @@ public partial class BossTypeA : Enemy, IHaveEngagePlayerBehavior, IHaveFollowBe
 
   protected void OnVelocityComputed(Vector3 safeVelocity)
   {
-    Velocity = safeVelocity;
+    Velocity = new Vector3(safeVelocity.X, 0, safeVelocity.Z);
     if (!Velocity.IsZeroApprox())
-      LookAtTarget(safeVelocity);
+      LookAtTarget(Velocity);
     MoveAndSlide();
   }
 
@@ -155,7 +150,7 @@ public partial class BossTypeA : Enemy, IHaveEngagePlayerBehavior, IHaveFollowBe
 
   private float GetRotationAngle()
   {
-    var target = new Vector3(_player.GlobalPosition.X, Position.Y, _player.GlobalPosition.Z);
+    var target = new Vector3(_player.GlobalPosition.X, GlobalPosition.Y, _player.GlobalPosition.Z);
     _rotation.LookAt(target, Vector3.Up, true);
     _rotation.RotateY(Rotation.Y);
     return _rotation.Rotation.Y;

Zennysoft.Game.Ma/src/enemy/CollisionDetector.tscn

@@ -1,4 +1,4 @@
-[gd_scene load_steps=2 format=3 uid="uid://br6dlxj36fw5i"]
+[gd_scene load_steps=2 format=3 uid="uid://bbc80e2421xlb"]
 
 [sub_resource type="BoxShape3D" id="BoxShape3D_7056c"]
 

Zennysoft.Game.Ma/src/enemy/Enemy.cs

@@ -34,6 +34,8 @@ public abstract partial class Enemy : CharacterBody3D, IEnemy, IProvide<IEnemyLo
 
   public IDefenseComponent DefenseComponent { get; private set; }
 
+  public IStatusEffectComponent StatusEffectComponent { get; private set; }
+
   public virtual IEnemyModelView EnemyModelView { get; set; } = default!;
 
   public Vector3 TargetPosition { get; private set; }
@@ -69,6 +71,9 @@ public abstract partial class Enemy : CharacterBody3D, IEnemy, IProvide<IEnemyLo
   [Node] private AudioStreamPlayer3D _dieSFX { get; set; } = default!;
   [Node] private AudioStreamPlayer3D _aggroSFX { get; set; } = default!;
 
+  private Timer _rustTimer;
+  private Timer _rustDuration;
+
   protected bool _activated = false;
   private Vector3 _previousPosition = Vector3.Zero;
 
@@ -86,8 +91,22 @@ public abstract partial class Enemy : CharacterBody3D, IEnemy, IProvide<IEnemyLo
     HealthComponent.HealthReachedZero += Die;
     HealthComponent.DamageTaken += TakeHit;
 
+    _rustTimer = new Timer();
+    _rustDuration = new Timer();
+
+    _rustTimer.WaitTime = 3;
+    _rustDuration.WaitTime = 30;
+    _rustTimer.Timeout += _rustTimer_Timeout;
+    _rustDuration.Timeout += _rustDuration_Timeout;
+
+    AddChild(_rustTimer);
+    AddChild(_rustDuration);
+
     AttackComponent = new AttackComponent(InitialAttack);
     DefenseComponent = new DefenseComponent(InitialDefense);
+    StatusEffectComponent = new StatusEffectComponent(30);
+
+    StatusEffectComponent.Rust.Changed += OnRusted;
 
     EnemyBinding
       .Handle((in EnemyLogic.Output.Activate _) =>
@@ -160,6 +179,8 @@ public abstract partial class Enemy : CharacterBody3D, IEnemy, IProvide<IEnemyLo
   public virtual void Die()
   {
     SetPhysicsProcess(false);
+    _rustDuration.Stop();
+    _rustTimer.Stop();
     _enemyLogic.Input(new EnemyLogic.Input.Defeated());
     _player.ExperiencePointsComponent.Gain(ExpGiven);
     EnemyModelView.PlayDeathAnimation();
@@ -180,8 +201,11 @@ public abstract partial class Enemy : CharacterBody3D, IEnemy, IProvide<IEnemyLo
   {
     _morphSFX.Play();
     SetPhysicsProcess(false);
-    _enemyLogic.Input(new EnemyLogic.Input.Defeated());
+    _player.ExperiencePointsComponent.Gain(ExpGiven);
-    Callable.From(QueueFree);
+    EnemyModelView.PlayDeathAnimation();
+    var tweener = CreateTween();
+    tweener.TweenInterval(1.0f);
+    tweener.TweenCallback(Callable.From(QueueFree));
   }
 
   public IDungeonRoom GetCurrentRoom(ImmutableList<IDungeonRoom> roomList)
@@ -212,7 +236,8 @@ public abstract partial class Enemy : CharacterBody3D, IEnemy, IProvide<IEnemyLo
       var spawnPointsGodotCollection = new Godot.Collections.Array<Marker3D>(spawnPoints);
       var randomSpawnPoint = spawnPointsGodotCollection.PickRandom();
 
-      GlobalPosition = new Vector3(randomSpawnPoint.GlobalPosition.X, 0, randomSpawnPoint.GlobalPosition.Y);
+      GlobalPosition = new Vector3(randomSpawnPoint.GlobalPosition.X, GlobalPosition.Y, randomSpawnPoint.GlobalPosition.Z);
+      ResetPhysicsInterpolation();
       _previousPosition = GlobalPosition;
 
       if (this is IHavePatrolBehavior patrolEnemy)
@@ -240,4 +265,28 @@ public abstract partial class Enemy : CharacterBody3D, IEnemy, IProvide<IEnemyLo
   {
     _player.TakeDamage(new AttackData(AttackComponent.CurrentAttack.Value, ElementType.None));
   }
+
+  private void OnRusted(bool rustStatus)
+  {
+    if (rustStatus)
+    {
+      _rustTimer.Start();
+      _rustDuration.Start();
+    }
+    else
+    {
+      _rustTimer.Stop();
+    }
+  }
+
+  private void _rustTimer_Timeout()
+  {
+    HealthComponent.Damage(3);
+    TakeHit();
+  }
+
+  private void _rustDuration_Timeout()
+  {
+    StatusEffectComponent.Rust.OnNext(false);
+  }
 }

Zennysoft.Game.Ma/src/enemy/Enemy2D.cs

@@ -21,11 +21,13 @@ public abstract partial class Enemy2D : Enemy
   public void OnEnterTree()
   {
     LineOfSight.BodyEntered += LineOfSight_BodyEntered;
+    _previousPosition = GlobalPosition;
   }
 
   public override void _PhysicsProcess(double delta)
   {
     _enemyModelView.SetCurrentDirection(GlobalBasis, -_player.GlobalBasis.Z);
+    _previousPosition = GlobalPosition;
   }
 
   public override void _Process(double delta)
@@ -33,11 +35,10 @@ public abstract partial class Enemy2D : Enemy
     if (_enemyLogic.Value is EnemyLogic.State.FollowPlayer || _enemyLogic.Value is EnemyLogic.State.Patrolling)
     {
       var velocity = (GlobalPosition - _previousPosition) / (float)delta;
-      if (velocity.Length() < 0.3f)
+      if (velocity.Length() < 0.15f)
         _enemyLogic.Input(new EnemyLogic.Input.Idle());
       else
         _enemyLogic.Input(new EnemyLogic.Input.Move());
-      _previousPosition = GlobalPosition;
     }
   }
 
@@ -55,12 +56,16 @@ public abstract partial class Enemy2D : Enemy
 
   protected void OnVelocityComputed(Vector3 safeVelocity)
   {
-    Velocity = safeVelocity;
+    Velocity = new Vector3(safeVelocity.X, 0, safeVelocity.Z);
     LookAtTarget(safeVelocity);
     MoveAndSlide();
   }
 
-  protected void EngagePlayerBehavior_TakeAction() => PerformAction();
+  protected void EngagePlayerBehavior_TakeAction()
+  {
+    if (_player.HealthComponent.CurrentHP.Value > 0)
+      PerformAction();
+  }
 
   protected void EngagePlayerBehavior_AcquireTarget() => LookAt(new Vector3(_player.GlobalPosition.X, GlobalPosition.Y, _player.GlobalPosition.Z), Vector3.Up, true);
 

Zennysoft.Game.Ma/src/enemy/EnemyDatabase.tscn

@@ -1,10 +1,12 @@
-[gd_scene load_steps=4 format=3 uid="uid://dbvr8ewajja6a"]
+[gd_scene load_steps=4 format=3 uid="uid://dcj80fft8v6ww"]
 
-[ext_resource type="Script" uid="uid://cp02ufnj6c7kg" path="res://src/enemy/EnemyDatabase.cs" id="1_ywy58"]
+[ext_resource type="PackedScene" uid="uid://xeuulxx1p702" path="res://src/enemy/enemy_types/02. michael/Michael.tscn" id="2_tja3j"]
-[ext_resource type="PackedScene" uid="uid://b0gwivt7cw7nd" path="res://src/enemy/enemy_types/02. michael/Michael.tscn" id="2_tja3j"]
+[ext_resource type="PackedScene" uid="uid://ckow4bnkohxsj" path="res://src/enemy/enemy_types/04. sara/Sara.tscn" id="3_cpupr"]
-[ext_resource type="PackedScene" uid="uid://bksq62muhk3h5" path="res://src/enemy/enemy_types/01. sproingy/Sproingy.tscn" id="3_cpupr"]
+
+[sub_resource type="Resource" id="Resource_fevii"]
+metadata/__load_path__ = "res://src/enemy/EnemyDatabase.cs"
 
 [node name="EnemyDatabase" type="Node"]
-script = ExtResource("1_ywy58")
+script = SubResource("Resource_fevii")
 EnemyList = Array[PackedScene]([ExtResource("2_tja3j"), ExtResource("3_cpupr")])
 SpawnRate = PackedFloat32Array(1, 1)

Zennysoft.Game.Ma/src/enemy/EnemyModelView.cs

@@ -38,6 +38,9 @@ public abstract partial class EnemyModelView : Node3D, IEnemyModelView
 
   public event EventHandler TeleportAnimationFinished;
 
+  [Export]
+  public double ViewerSize { get; set; } = 1f;
+
   [Export]
   public bool CanMove { get; set; } = false;
 

Zennysoft.Game.Ma/src/enemy/EnemyTypeToEnemyConverter.cs

@@ -1,5 +1,7 @@
 using Godot;
 using System;
+using System.Collections.Generic;
+using Zennysoft.Ma.Adapter.Entity;
 
 namespace Zennysoft.Game.Ma;
 
@@ -48,6 +50,45 @@ public static class EnemyTypeToEnemyConverter
     }
   }
 
+  public static EnemyType Convert(IEnemy enemy)
+  {
+    if (enemy is Sproingy)
+      return EnemyType.Sproingy;
+    if (enemy is Michael)
+      return EnemyType.Michael;
+    if (enemy is FilthEater)
+      return EnemyType.FilthEater;
+    if (enemy is Sara)
+      return EnemyType.Sara;
+    if (enemy is Ballos)
+      return EnemyType.Ballos;
+    if (enemy is Chariot)
+      return EnemyType.Chariot;
+    if (enemy is Chinthe)
+      return EnemyType.Chinthe;
+    if (enemy is Ambassador ambassador)
+      if (ambassador.Name == "Ambassador")
+        return EnemyType.AmbassadorGreen;
+      else if (ambassador.Name == "AmbassadorRed")
+        return EnemyType.AmbassadorRed;
+      else
+        return EnemyType.AmbassadorSteel;
+    if (enemy is AgniDemon)
+      return EnemyType.AgniDemon;
+    if (enemy is AqueousDemon)
+      return EnemyType.AqueousDemon;
+    if (enemy is EdenPillar)
+      return EnemyType.EdenPillar;
+    if (enemy is Palan)
+      return EnemyType.Palan;
+    if (enemy is ShieldOfHeaven)
+      return EnemyType.ShieldOfHeaven;
+    if (enemy is GoldSproingy)
+      return EnemyType.GoldSproingy;
+
+    throw new NotImplementedException("Cannot duplicate this type of enemy.");
+  }
+
   private static Enemy InstantiateFromPath(string scenePath)
   {
     var enemyScene = GD.Load<PackedScene>(scenePath);

Zennysoft.Game.Ma/src/enemy/IEnemyModelView.cs

@@ -27,6 +27,8 @@ public interface IEnemyModelView : INode3D
 
   public void PlayDeathAnimation();
 
+  public double ViewerSize { get; }
+
   public AttackData AttackData { get; set; }
 
   public event EventHandler HitPlayer;

Zennysoft.Game.Ma/src/enemy/PatrolComponent.tscn

@@ -1,9 +1,10 @@
-[gd_scene load_steps=2 format=3 uid="uid://p74f12fh5v0i"]
+[gd_scene load_steps=2 format=3 uid="uid://ddvhuhttr5q0m"]
 
-[ext_resource type="Script" uid="uid://vjb6sjktj6m0" path="res://src/enemy/PatrolComponent.cs" id="1_dhoym"]
+[sub_resource type="Resource" id="Resource_g8n53"]
+metadata/__load_path__ = "res://src/enemy/PatrolComponent.cs"
 
 [node name="PatrolComponent" type="Node3D"]
-script = ExtResource("1_dhoym")
+script = SubResource("Resource_g8n53")
 
 [node name="Navigation" type="Node3D" parent="."]
 

Zennysoft.Game.Ma/src/enemy/TwoAttacksEnemyAnimationTree.tscn

@@ -1,4 +1,4 @@
-[gd_scene load_steps=171 format=3 uid="uid://diaxvpmwgl65u"]
+[gd_scene load_steps=171 format=3 uid="uid://3ax3e5uce27d"]
 
 [sub_resource type="AnimationNodeAnimation" id="AnimationNodeAnimation_53wuj"]
 animation = &"idle_back"

Zennysoft.Game.Ma/src/enemy/behaviors/EngagePlayerBehavior.cs

@@ -23,7 +23,7 @@ public partial class EngagePlayerBehavior : Node, IEngagePlayerBehavior
   {
     _actionTimer = new Timer();
     _acquireTargetTimer = new Timer() { WaitTime = _acquireTargetTime };
-    _actionTimer.WaitTime = RandomizeTimer(_minimumAttackTime, _maximumAttackTime);
+    _actionTimer.WaitTime = 0.8f;
     _actionTimer.Timeout += OnAttackTimeout;
     _acquireTargetTimer.Timeout += OnAcquireTargetTimeout;
     AddChild(_actionTimer);
@@ -44,6 +44,7 @@ public partial class EngagePlayerBehavior : Node, IEngagePlayerBehavior
 
   private void OnAttackTimeout()
   {
+    _actionTimer.Stop();
     _actionTimer.WaitTime = RandomizeTimer(_minimumAttackTime, _maximumAttackTime);
     _actionTimer.Start();
     EmitSignal(SignalName.TakeAction);

Zennysoft.Game.Ma/src/enemy/behaviors/EngagePlayerBehavior.tscn

@@ -1,4 +1,4 @@
-[gd_scene load_steps=2 format=3 uid="uid://8bcme8ao4axa"]
+[gd_scene load_steps=2 format=3 uid="uid://cmhem5xknjsvc"]
 
 [ext_resource type="Script" uid="uid://bbe5nt3kpvk0f" path="res://src/enemy/behaviors/EngagePlayerBehavior.cs" id="1_7r6b3"]
 

Zennysoft.Game.Ma/src/enemy/behaviors/FleeBehavior.tscn

@@ -1,4 +1,4 @@
-[gd_scene load_steps=2 format=3 uid="uid://g4cupevu280j"]
+[gd_scene load_steps=2 format=3 uid="uid://dld534cmm5twd"]
 
 [ext_resource type="Script" uid="uid://drur3hx4p4du4" path="res://src/enemy/behaviors/FleeBehavior.cs" id="1_cty3c"]
 

Zennysoft.Game.Ma/src/enemy/behaviors/FollowBehavior.tscn

@@ -1,4 +1,4 @@
-[gd_scene load_steps=2 format=3 uid="uid://mqj4jju3870v"]
+[gd_scene load_steps=2 format=3 uid="uid://cve5oouhowtff"]
 
 [ext_resource type="Script" uid="uid://chfhmralfmwva" path="res://src/enemy/behaviors/FollowBehavior.cs" id="1_3rkk2"]
 

Zennysoft.Game.Ma/src/enemy/behaviors/PatrolBehavior.cs

@@ -2,6 +2,7 @@
 using Chickensoft.Introspection;
 using Godot;
 using Godot.Collections;
+using System.Linq;
 using Zennysoft.Game.Abstractions.Entity;
 
 namespace Zennysoft.Game.Ma;
@@ -22,7 +23,6 @@ public partial class PatrolBehavior : Node3D, IBehavior
   private Timer _patrolTimer { get; set; } = default!;
   private NavigationAgent3D _navigationAgent;
 
-  private int _recursiveCounter = 0;
   private Vector3 _homePosition;
 
   public Vector3 HomePosition
@@ -82,16 +82,9 @@ public partial class PatrolBehavior : Node3D, IBehavior
     rng.Randomize();
     var randomPointX = rng.RandfRange(-_patrolRange, _patrolRange);
     var randomPointZ = rng.RandfRange(-_patrolRange, _patrolRange);
-    _navigationAgent.TargetPosition = HomePosition + new Vector3(randomPointX, 0, randomPointZ);
+    var patrolPoint = HomePosition + new Vector3(randomPointX, 0, randomPointZ);
-    if (!_navigationAgent.IsTargetReachable())
+    var rid = NavigationServer3D.GetMaps().Single();
-    {
+    _navigationAgent.TargetPosition = NavigationServer3D.MapGetClosestPoint(rid, patrolPoint);
-      _recursiveCounter++;
-      if (_recursiveCounter <= 100)
-        SetPatrolTarget();
-      else
-        _navigationAgent.TargetPosition = HomePosition;
-    }
-    _recursiveCounter = 0;
   }
 
   private void PatrolTimer_Timeout() => SetPatrolTarget();

Zennysoft.Game.Ma/src/enemy/behaviors/PatrolBehavior.tscn

@@ -1,4 +1,4 @@
-[gd_scene load_steps=2 format=3 uid="uid://2nkvacxsd46b"]
+[gd_scene load_steps=2 format=3 uid="uid://cn4fv2gv6raql"]
 
 [ext_resource type="Script" uid="uid://hpb1f5r17k5y" path="res://src/enemy/behaviors/PatrolBehavior.cs" id="1_lobva"]
 

Zennysoft.Game.Ma/src/enemy/enemy_types/01. sproingy/Sproingy.tscn

@@ -1,10 +1,10 @@
-[gd_scene load_steps=16 format=3 uid="uid://bs56ccgosmu47"]
+[gd_scene load_steps=16 format=3 uid="uid://crsy7gygjy317"]
 
 [ext_resource type="Script" uid="uid://cq6b4ma3sy1en" path="res://src/enemy/enemy_types/01. sproingy/Sproingy.cs" id="1_xsluo"]
-[ext_resource type="PackedScene" uid="uid://2nkvacxsd46b" path="res://src/enemy/behaviors/PatrolBehavior.tscn" id="4_drfkj"]
+[ext_resource type="PackedScene" uid="uid://cn4fv2gv6raql" path="res://src/enemy/behaviors/PatrolBehavior.tscn" id="4_drfkj"]
-[ext_resource type="PackedScene" uid="uid://bimjnsu52y3xi" path="res://src/enemy/enemy_types/01. sproingy/SproingyModelView.tscn" id="4_o3b7p"]
+[ext_resource type="PackedScene" uid="uid://bjcqrhtifpcvr" path="res://src/enemy/enemy_types/01. sproingy/SproingyModelView.tscn" id="4_o3b7p"]
-[ext_resource type="PackedScene" uid="uid://8bcme8ao4axa" path="res://src/enemy/behaviors/EngagePlayerBehavior.tscn" id="5_drfkj"]
+[ext_resource type="PackedScene" uid="uid://cmhem5xknjsvc" path="res://src/enemy/behaviors/EngagePlayerBehavior.tscn" id="5_drfkj"]
-[ext_resource type="PackedScene" uid="uid://mqj4jju3870v" path="res://src/enemy/behaviors/FollowBehavior.tscn" id="6_moun4"]
+[ext_resource type="PackedScene" uid="uid://cve5oouhowtff" path="res://src/enemy/behaviors/FollowBehavior.tscn" id="6_moun4"]
 [ext_resource type="AudioStream" uid="uid://ba8xendacec6" path="res://src/audio/sfx/item_kyuu_layer_2.ogg" id="6_ungov"]
 [ext_resource type="AudioStream" uid="uid://b7ycb6qvitpmw" path="res://src/audio/sfx/player_HITENEMY_3.ogg" id="7_ungov"]
 [ext_resource type="AudioStream" uid="uid://bf7adfdd857hw" path="res://src/audio/sfx/enemy_morph.ogg" id="8_agkuf"]
@@ -32,7 +32,7 @@ top_radius = 0.0
 [sub_resource type="CylinderShape3D" id="CylinderShape3D_drfkj"]
 radius = 1.0
 
-[node name="Sproingy" type="CharacterBody3D"]
+[node name="Sproingy" type="CharacterBody3D" groups=["enemy"]]
 process_mode = 1
 collision_layer = 10
 axis_lock_linear_y = true
@@ -84,7 +84,6 @@ collision_mask = 34
 shape = SubResource("CylinderShape3D_drfkj")
 
 [node name="Visual" type="Node3D" parent="."]
-transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0.975554, 0)
 
 [node name="EnemyModelView" parent="Visual" instance=ExtResource("4_o3b7p")]
 unique_name_in_owner = true
@@ -101,15 +100,13 @@ _followSpeed = 150.0
 
 [node name="EngagePlayerBehavior" parent="Components" instance=ExtResource("5_drfkj")]
 unique_name_in_owner = true
-_minimumAttackTime = 1.0
+_maximumAttackTime = 4.0
-_maximumAttackTime = 3.0
 _acquireTargetTime = 2.0
 
 [node name="NavigationAgent" type="NavigationAgent3D" parent="Components"]
 unique_name_in_owner = true
 avoidance_enabled = true
-radius = 1.0
+radius = 3.0
-debug_enabled = true
 
 [node name="SFX" type="Node3D" parent="."]
 transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 2.0617, 0)

Zennysoft.Game.Ma/src/enemy/enemy_types/01. sproingy/SproingyLoreInfo.tres

@@ -6,4 +6,11 @@
 script = ExtResource("1_1ncna")
 Name = "Sproingy"
 Description = "A guy who likes to have fun."
+MaximumHP = ""
+ATK = ""
+DEF = ""
+Affinity = ""
+Weakness = ""
+Drop1 = ""
+Drop2 = ""
 metadata/_custom_type_script = ExtResource("1_1ncna")

Zennysoft.Game.Ma/src/enemy/enemy_types/01. sproingy/SproingyModelView.tscn

@@ -1,4 +1,4 @@
-[gd_scene load_steps=80 format=3 uid="uid://bimjnsu52y3xi"]
+[gd_scene load_steps=80 format=3 uid="uid://bjcqrhtifpcvr"]
 
 [ext_resource type="Script" uid="uid://cvr1qimxpignl" path="res://src/enemy/EnemyModelView2D.cs" id="1_oh25a"]
 [ext_resource type="Texture2D" uid="uid://dd0ia6isdqg61" path="res://src/enemy/enemy_types/01. sproingy/animations/ATTACK/Layer 1.png" id="1_pbx41"]
@@ -666,7 +666,7 @@ EnemyLoreInfo = SubResource("Resource_ivy74")
 
 [node name="Sprite3D" type="Sprite3D" parent="."]
 unique_name_in_owner = true
-transform = Transform3D(6, 0, 0, 0, 6, 0, 0, 0, 6, 0, 1.1044, 0)
+transform = Transform3D(6, 0, 0, 0, 6, 0, 0, 0, 6, 0, 2.05501, 0)
 pixel_size = 0.001
 billboard = 2
 shaded = true
@@ -697,7 +697,7 @@ animation = &"idle_left_walk"
 
 [node name="Hitbox" type="Area3D" parent="."]
 unique_name_in_owner = true
-transform = Transform3D(-1, 0, -8.74228e-08, 0, 1, 0, 8.74228e-08, 0, -1, -0.152949, 1.1044, 0)
+transform = Transform3D(-1, 0, -8.74228e-08, 0, 1, 0, 8.74228e-08, 0, -1, -0.152949, 2.05501, 0)
 collision_layer = 64
 collision_mask = 64
 
@@ -722,12 +722,12 @@ anim_player = NodePath("../AnimationPlayer")
 
 [node name="WalkSFX" type="AudioStreamPlayer3D" parent="."]
 unique_name_in_owner = true
-transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 1.1044, 0)
+transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 2.05501, 0)
 autoplay = true
 bus = &"SFX"
 
 [node name="Shadow" type="Sprite3D" parent="."]
-transform = Transform3D(0.115, 0, 0, 0, -5.02681e-09, 0.115, 0, -0.115, -5.02681e-09, -0.00018537, -0.942894, 0.0453106)
+transform = Transform3D(0.115, 0, 0, 0, -5.02681e-09, 0.115, 0, -0.115, -5.02681e-09, -0.00018537, 0.00771421, 0.0453106)
 transparency = 0.1
 cast_shadow = 0
 texture_filter = 0

Zennysoft.Game.Ma/src/enemy/enemy_types/02. michael/Michael.tscn

@@ -1,12 +1,12 @@
-[gd_scene load_steps=14 format=3 uid="uid://b0gwivt7cw7nd"]
+[gd_scene load_steps=14 format=3 uid="uid://xeuulxx1p702"]
 
 [ext_resource type="Script" uid="uid://c4pdledq3bll3" path="res://src/enemy/enemy_types/02. michael/Michael.cs" id="1_lb5oy"]
-[ext_resource type="PackedScene" uid="uid://bjg8wyvp8q6oc" path="res://src/enemy/enemy_types/02. michael/MichaelModelView.tscn" id="3_wrps7"]
+[ext_resource type="PackedScene" uid="uid://uqle8gaeajg6" path="res://src/enemy/enemy_types/02. michael/MichaelModelView.tscn" id="3_wrps7"]
-[ext_resource type="PackedScene" uid="uid://2nkvacxsd46b" path="res://src/enemy/behaviors/PatrolBehavior.tscn" id="5_fkx5j"]
+[ext_resource type="PackedScene" uid="uid://cn4fv2gv6raql" path="res://src/enemy/behaviors/PatrolBehavior.tscn" id="5_fkx5j"]
-[ext_resource type="PackedScene" uid="uid://mqj4jju3870v" path="res://src/enemy/behaviors/FollowBehavior.tscn" id="6_bun8r"]
+[ext_resource type="PackedScene" uid="uid://cve5oouhowtff" path="res://src/enemy/behaviors/FollowBehavior.tscn" id="6_bun8r"]
 [ext_resource type="AudioStream" uid="uid://ba8xendacec6" path="res://src/audio/sfx/item_kyuu_layer_2.ogg" id="6_x8mrp"]
 [ext_resource type="AudioStream" uid="uid://b7ycb6qvitpmw" path="res://src/audio/sfx/player_HITENEMY_3.ogg" id="7_kwkfv"]
-[ext_resource type="PackedScene" uid="uid://8bcme8ao4axa" path="res://src/enemy/behaviors/EngagePlayerBehavior.tscn" id="7_x8mrp"]
+[ext_resource type="PackedScene" uid="uid://cmhem5xknjsvc" path="res://src/enemy/behaviors/EngagePlayerBehavior.tscn" id="7_x8mrp"]
 [ext_resource type="AudioStream" uid="uid://bf7adfdd857hw" path="res://src/audio/sfx/enemy_morph.ogg" id="8_upf7y"]
 [ext_resource type="AudioStream" uid="uid://bn6ns3jxkw03b" path="res://src/audio/sfx/ENEMY_SPROING_death.ogg" id="9_fm627"]
 
@@ -15,15 +15,16 @@ height = 5.0
 radius = 1.0
 
 [sub_resource type="CapsuleShape3D" id="CapsuleShape3D_0h5s2"]
+radius = 0.34933
 height = 2.66932
 
 [sub_resource type="CylinderShape3D" id="CylinderShape3D_eek1b"]
 radius = 1.0
 
 [sub_resource type="SphereShape3D" id="SphereShape3D_wrps7"]
-radius = 1.0
+radius = 0.552847
 
-[node name="Michael" type="CharacterBody3D"]
+[node name="Michael" type="CharacterBody3D" groups=["enemy"]]
 process_mode = 1
 collision_layer = 10
 collision_mask = 11
@@ -32,6 +33,13 @@ axis_lock_angular_x = true
 axis_lock_angular_z = true
 motion_mode = 1
 script = ExtResource("1_lb5oy")
+AeolicResistance = -20.0
+HydricResistance = -20.0
+IgenousResistance = -20.0
+FerrumResistance = -20.0
+TelluricResistance = -20.0
+HolyResistance = -20.0
+CurseResistance = -20.0
 
 [node name="LineOfSight" type="Area3D" parent="."]
 unique_name_in_owner = true
@@ -57,7 +65,7 @@ shape = SubResource("CapsuleShape3D_0h5s2")
 
 [node name="EnemyModelView" parent="." instance=ExtResource("3_wrps7")]
 unique_name_in_owner = true
-transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0.0799522, 0.805832, 0)
+transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0.08, 0, 0)
 
 [node name="PlayerDetector" type="Area3D" parent="."]
 unique_name_in_owner = true
@@ -82,6 +90,9 @@ transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 1.71715, 0)
 
 [node name="PatrolBehavior" parent="Components" instance=ExtResource("5_fkx5j")]
 unique_name_in_owner = true
+_patrolSpeed = 60.0
+_patrolRange = 15.0
+_patrolTime = 20.0
 
 [node name="FollowBehavior" parent="Components" instance=ExtResource("6_bun8r")]
 unique_name_in_owner = true
@@ -96,7 +107,7 @@ _acquireTargetTime = 2.0
 [node name="NavigationAgent" type="NavigationAgent3D" parent="Components"]
 unique_name_in_owner = true
 avoidance_enabled = true
-radius = 1.0
+radius = 3.0
 
 [node name="HitSounds" type="Node3D" parent="."]
 transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 1.71715, 0)