no message

This reverts commit fe0241ac88.

.gitignore

@@ -715,3 +715,8 @@ healthchecksdb
 
 # Backup folder for Package Reference Convert tool in Visual Studio 2017
 MigrationBackup/
+/Zennysoft.Game.Ma/src/map/dungeon/models/Area 2/Puer/A2-Puer.glb.import
+/Zennysoft.Game.Ma/src/audio/AMB/amb_beach.wav.import
+/Zennysoft.Game.Ma/src/audio/AMB/amb_perlin.wav.import
+/Zennysoft.Game.Ma/src/audio/AMB/amb_white_noise.wav.import
+/Zennysoft.Game.Ma/src/audio/AMB/amb_wind_loop_altar.wav.import

Zennysoft.Game.Abstractions/App/IAppRepo.cs

@@ -10,6 +10,8 @@ public interface IAppRepo : IDisposable
 
   event Action? MainMenuEntered;
 
+  event Action? DataViewerExited;
+
   void SkipSplashScreen();
 
   void OnMainMenuEntered();
@@ -19,4 +21,6 @@ public interface IAppRepo : IDisposable
   void OnExitGame();
 
   void OnGameOver();
+
+  void OnDataViewerExited();
 }

Zennysoft.Game.Abstractions/Entity/IBehavior.cs

@@ -0,0 +1,5 @@
+namespace Zennysoft.Game.Abstractions.Entity;
+
+public interface IBehavior
+{
+}

Zennysoft.Game.Abstractions/Entity/IEntity.cs

@@ -0,0 +1,11 @@
+namespace Zennysoft.Game.Abstractions.Entity
+{
+  public interface IAction
+  {
+    public Task PerformAction();
+  }
+  public interface IAction<T>
+  {
+    public Task PerformAction(T arg);
+  }
+}

Zennysoft.Game.Abstractions/Entity/IStackable.cs

@@ -1,8 +0,0 @@
-namespace Zennysoft.Game.Abstractions;
-
-public interface IStackable
-{
-  int Count { get; }
-
-  void SetCount(int count);
-}

Zennysoft.Game.Abstractions/NPCs/ICanPatrol.cs

@@ -1,6 +0,0 @@
-namespace Zennysoft.Game.Abstractions;
-
-public interface ICanPatrol
-{
-  public void Patrol();
-}

Zennysoft.Game.Abstractions/Pickups/IHealthPack.cs

@@ -2,5 +2,5 @@
 
 public interface IHealthPack
 {
-  public double RestoreAmount { get; }
+  public int RestoreAmount { get; }
 }

Zennysoft.Game.Abstractions/Save/ISaveFileManager.cs

@@ -1,15 +1,18 @@
-using System.Text.Json;
-using System.Text.Json.Serialization.Metadata;
+using System.Text.Json.Serialization.Metadata;
 
 namespace Zennysoft.Game.Abstractions;
 
-public interface ISaveFileManager<T>
+public interface ISaveFileManager
 {
-  public Task WriteToFile(T gameData, params IJsonTypeInfoResolver?[] resolvers);
+  public Task WriteToFile<T>(T gameData, params IJsonTypeInfoResolver?[] resolvers);
 
-  public Task WriteToFile(T gameData, string filePath, params IJsonTypeInfoResolver?[] resolvers);
+  public Task WriteToFile<T>(T gameData, string filePath, params IJsonTypeInfoResolver?[] resolvers);
 
-  public Task<T?> ReadFromFile(params IJsonTypeInfoResolver?[] resolvers);
+  public Task<T?> ReadFromFile<T>(params IJsonTypeInfoResolver?[] resolvers);
 
-  public Task<T?> ReadFromFile(string filePath, params IJsonTypeInfoResolver?[] resolvers);
+  public Task<T?> ReadFromFile<T>(string filePath, params IJsonTypeInfoResolver?[] resolvers);
+
+  public void DeleteSaveData(string filePath);
+
+  public void DeleteSaveData();
 }

Zennysoft.Game.Godot.Implementation/Audio/DimmableAudioStreamPlayer3D.cs

@@ -0,0 +1,54 @@
+namespace Zennysoft.Game.Implementation;
+
+using Chickensoft.GodotNodeInterfaces;
+using Godot;
+using Zennysoft.Game.Abstractions;
+
+public partial class DimmableAudioStreamPlayer3D : AudioStreamPlayer3D, IDimmableAudioStreamPlayer
+{
+  #region Constants
+  // -60 to -80 is considered inaudible for decibels.
+  public const float VOLUME_DB_INAUDIBLE = -80f;
+  public const double FADE_DURATION = 3d; // seconds
+  #endregion Constants
+
+  public ITween? FadeTween { get; set; }
+
+  public float InitialVolumeDb;
+
+  public override void _Ready()
+  {
+    InitialVolumeDb = VolumeDb;
+    VolumeDb = VOLUME_DB_INAUDIBLE;
+  }
+
+  public void FadeIn()
+  {
+    SetupFade(InitialVolumeDb, Tween.EaseType.Out);
+    Play();
+  }
+
+  public void FadeOut()
+  {
+    SetupFade(VOLUME_DB_INAUDIBLE, Tween.EaseType.In);
+    FadeTween!.TweenCallback(Callable.From(Stop));
+  }
+
+  public void SetupFade(float volumeDb, Tween.EaseType ease)
+  {
+    FadeTween?.Kill();
+
+    FadeTween = GodotInterfaces.Adapt<ITween>(CreateTween());
+
+    FadeTween.TweenProperty(
+      this,
+      "volume_db",
+      volumeDb,
+      FADE_DURATION
+    ).SetTrans(Tween.TransitionType.Circ).SetEase(ease);
+  }
+
+  public override void _EnterTree() => FadeIn();
+
+  public override void _ExitTree() => FadeOut();
+}

Zennysoft.Game.Godot.Implementation/Entity/IStackable.cs

@@ -0,0 +1,10 @@
+using Chickensoft.Collections;
+
+namespace Zennysoft.Game.Implementation;
+
+public interface IStackable
+{
+  AutoProp<int> Count { get; }
+
+  void SetCount(int count);
+}

Zennysoft.Game.Godot.Implementation/Save/SaveFileManager.cs

@@ -9,10 +9,9 @@ using Zennysoft.Game.Abstractions;
 
 namespace Zennysoft.Game.Implementation;
 
-public class SaveFileManager<T> : ISaveFileManager<T>
+public class SaveFileManager : ISaveFileManager
 {
   private readonly IFileSystem _fileSystem;
-  private readonly JsonSerializerOptions _jsonOptions;
   private string _defaultSaveLocation;
   public const string DEFAULT_SAVE_FILE_NAME = "game.json";
 
@@ -23,27 +22,17 @@ public class SaveFileManager<T> : ISaveFileManager<T>
 
     GodotSerialization.Setup();
     Serializer.AddConverter(new Texture2DConverter());
-
-    var upgradeDependencies = new Blackboard();
-
-    _jsonOptions = new JsonSerializerOptions
-    {
-      Converters = {
-        new SerializableTypeConverter(upgradeDependencies)
-      },
-      WriteIndented = true
-    };
   }
 
 
-  public Task<T?> ReadFromFile(params IJsonTypeInfoResolver?[] resolvers)
+  public Task<T?> ReadFromFile<T>(params IJsonTypeInfoResolver?[] resolvers)
   {
     if (!_fileSystem.File.Exists(_defaultSaveLocation))
       throw new FileNotFoundException();
-    return ReadFromFile(_defaultSaveLocation, resolvers);
+    return ReadFromFile<T>(_defaultSaveLocation, resolvers);
   }
 
-  public async Task<T?> ReadFromFile(string filePath, params IJsonTypeInfoResolver?[] resolvers)
+  public async Task<T?> ReadFromFile<T>(string filePath, params IJsonTypeInfoResolver?[] resolvers)
   {
     if (!_fileSystem.File.Exists(filePath))
       throw new FileNotFoundException();
@@ -51,20 +40,42 @@ public class SaveFileManager<T> : ISaveFileManager<T>
     var json = await _fileSystem.File.ReadAllTextAsync(filePath);
 
     var resolver = new SerializableTypeResolver();
-    _jsonOptions.TypeInfoResolver = JsonTypeInfoResolver.Combine([resolver, .. resolvers]);
-    return JsonSerializer.Deserialize<T?>(json, _jsonOptions);
+    var upgradeDependencies = new Blackboard();
+
+    var jsonOptions = new JsonSerializerOptions
+    {
+      Converters = {
+        new SerializableTypeConverter(upgradeDependencies)
+      },
+      WriteIndented = true
+    };
+    jsonOptions.TypeInfoResolver = JsonTypeInfoResolver.Combine([resolver, .. resolvers]);
+    return JsonSerializer.Deserialize<T?>(json, jsonOptions);
   }
 
-  public Task WriteToFile(T gameData, params IJsonTypeInfoResolver?[] resolvers)
+  public Task WriteToFile<T>(T gameData, params IJsonTypeInfoResolver?[] resolvers)
   {
     return WriteToFile(gameData, _defaultSaveLocation, resolvers);
   }
 
-  public async Task WriteToFile(T gameData, string filePath, params IJsonTypeInfoResolver?[] resolvers)
+  public async Task WriteToFile<T>(T gameData, string filePath, params IJsonTypeInfoResolver?[] resolvers)
   {
     var resolver = new SerializableTypeResolver();
-    _jsonOptions.TypeInfoResolver = JsonTypeInfoResolver.Combine([resolver, .. resolvers]);
-    var json = JsonSerializer.Serialize(gameData, _jsonOptions);
+    var upgradeDependencies = new Blackboard();
+
+    var jsonOptions = new JsonSerializerOptions
+    {
+      Converters = {
+        new SerializableTypeConverter(upgradeDependencies)
+      },
+      WriteIndented = true
+    };
+    jsonOptions.TypeInfoResolver = JsonTypeInfoResolver.Combine([resolver, .. resolvers]);
+    var json = JsonSerializer.Serialize(gameData, jsonOptions);
     await _fileSystem.File.WriteAllTextAsync(filePath, json);
   }
+
+  public void DeleteSaveData() => DeleteSaveData(_defaultSaveLocation);
+
+  public void DeleteSaveData(string filePath) => _fileSystem.File.Delete(filePath);
 }

Zennysoft.Game.Godot.Implementation/Zennysoft.Game.Implementation.csproj

@@ -13,7 +13,7 @@
 		<PackageReference Include="Chickensoft.Serialization.Godot" Version="0.7.6" />
 		<PackageReference Include="System.IO.Abstractions" Version="22.0.11" />
 	</ItemGroup>
-	
+
 
 	<ItemGroup>
 		<ProjectReference Include="..\Zennysoft.Game.Abstractions\Zennysoft.Game.Abstractions.csproj" />

Zennysoft.Game.Ma.Implementation/App/AppRepo.cs

@@ -8,6 +8,7 @@ public class AppRepo : IAppRepo
   public event Action? MainMenuEntered;
   public event Action? GameEntered;
   public event Action? GameExited;
+  public event Action? DataViewerExited;
 
   private bool _disposedValue;
 
@@ -21,6 +22,8 @@ public class AppRepo : IAppRepo
 
   public void OnGameOver() => GameExited?.Invoke();
 
+  public void OnDataViewerExited() => DataViewerExited?.Invoke();
+
   protected void Dispose(bool disposing)
   {
     if (!_disposedValue)

Zennysoft.Game.Ma.Implementation/App/State/AppLogic.Input.cs

@@ -24,6 +24,8 @@ public partial class AppLogic
 
     public readonly record struct EnemyViewerOpened;
 
+    public readonly record struct EnemyViewerExited;
+
     public readonly record struct GalleryOpened;
   }
 }

Zennysoft.Game.Ma.Implementation/App/State/AppLogic.Output.cs

@@ -4,6 +4,8 @@ public partial class AppLogic
 {
   public static class Output
   {
+    public readonly record struct Initialize;
+
     public readonly record struct FadeToBlack;
 
     public readonly record struct ShowSplashScreen;
@@ -24,6 +26,8 @@ public partial class AppLogic
 
     public readonly record struct ShowMainMenu;
 
+    public readonly record struct CloseGame;
+
     public readonly record struct ExitGame;
 
     public readonly record struct GameOver;
@@ -32,6 +36,8 @@ public partial class AppLogic
 
     public readonly record struct EnemyViewerOpened;
 
+    public readonly record struct EnemyViewerExited;
+
     public readonly record struct GalleryOpened;
   }
 }

Zennysoft.Game.Ma.Implementation/App/State/AppLogic.cs

@@ -9,5 +9,5 @@ public interface IAppLogic : ILogicBlock<AppLogic.State>;
 [LogicBlock(typeof(State), Diagram = true)]
 public partial class AppLogic : LogicBlock<AppLogic.State>, IAppLogic
 {
-  public override Transition GetInitialState() => To<State.MainMenu>();
+  public override Transition GetInitialState() => To<State.Initialize>();
 }

Zennysoft.Game.Ma.Implementation/App/State/States/AppLogic.State.EnemyViewer.cs

@@ -9,7 +9,7 @@ public partial class AppLogic
   public partial record State
   {
     [Meta]
-    public partial record EnemyViewer : State
+    public partial record EnemyViewer : State, IGet<Input.EnemyViewerExited>
     {
       public EnemyViewer()
       {
@@ -18,7 +18,13 @@ public partial class AppLogic
         {
           Output(new Output.EnemyViewerOpened());
         });
+        this.OnExit(() =>
+        {
+          Output(new Output.EnemyViewerExited());
+        });
       }
+
+      public Transition On(in Input.EnemyViewerExited input) => To<MainMenu>();
     }
   }
 }

Zennysoft.Game.Ma.Implementation/App/State/States/AppLogic.State.GameStarted.cs

@@ -9,7 +9,7 @@ public partial class AppLogic
   public partial record State
   {
     [Meta]
-    public partial record GameStarted : State
+    public partial record GameStarted : State, IGet<Input.QuitGame>
     {
       public GameStarted()
       {
@@ -26,6 +26,11 @@ public partial class AppLogic
         OnDetach(() => Get<IAppRepo>().GameExited -= OnGameExited);
       }
 
+      public Transition On(in Input.QuitGame input)
+      {
+        Output(new Output.CloseGame());
+        return To<MainMenu>();
+      }
       public void OnGameExited() => Input(new Input.QuitGame());
     }
   }

Zennysoft.Game.Ma.Implementation/App/State/States/AppLogic.State.Initialize.cs

@@ -0,0 +1,21 @@
+namespace Zennysoft.Ma.Adapter;
+
+using Chickensoft.Introspection;
+using Chickensoft.LogicBlocks;
+
+public partial class AppLogic
+{
+  public partial record State
+  {
+    [Meta]
+    public partial record Initialize : State, IGet<Input.SaveFileLoaded>
+    {
+      public Initialize()
+      {
+        this.OnEnter(() => Output(new Output.Initialize()));
+      }
+
+      public Transition On(in Input.SaveFileLoaded input) => To<SplashScreen>();
+    }
+  }
+}

Zennysoft.Game.Ma.Implementation/App/State/States/AppLogic.State.LoadingSaveFile.cs

@@ -15,7 +15,7 @@ public partial class AppLogic
         this.OnEnter(() => Output(new Output.StartLoadingSaveFile()));
       }
 
-      public Transition On(in Input.SaveFileLoaded input) => To<GameStarted>();
+      public Transition On(in Input.SaveFileLoaded input) => To<MainMenu>();
     }
   }
 }

Zennysoft.Game.Ma.Implementation/App/State/States/AppLogic.State.MainMenu.cs

@@ -7,15 +7,21 @@ public partial class AppLogic
   public partial record State
   {
     [Meta]
-    public partial record MainMenu : State, IGet<Input.NewGame>, IGet<Input.EnemyViewerOpened>
+    public partial record MainMenu : State, IGet<Input.NewGame>, IGet<Input.EnemyViewerOpened>, IGet<Input.QuitGame>
     {
       public MainMenu()
       {
+        OnAttach(() => Output(new Output.ShowMainMenu()));
       }
 
       public Transition On(in Input.NewGame input) => To<GameStarted>();
 
       public Transition On(in Input.EnemyViewerOpened input) => To<EnemyViewer>();
+      public Transition On(in Input.QuitGame input)
+      {
+        Output(new Output.ExitGame());
+        return ToSelf();
+      }
     }
   }
 }

Zennysoft.Game.Ma.Implementation/App/State/States/AppLogic.State.SplashScreen.cs

@@ -16,15 +16,17 @@ public partial class AppLogic
         this.OnEnter(() => Output(new Output.ShowSplashScreen()));
 
         OnAttach(
-          () => Get<IAppRepo>().SplashScreenSkipped += OnSplashScreenSkipped
-        );
+          () =>
+          {
+            Get<IAppRepo>().SplashScreenSkipped += OnSplashScreenSkipped;
+          });
 
         OnDetach(
           () => Get<IAppRepo>().SplashScreenSkipped -= OnSplashScreenSkipped
         );
       }
 
-      public Transition On(in Input.FadeOutFinished input) => To<GameStarted>();
+      public Transition On(in Input.FadeOutFinished input) => To<MainMenu>();
 
       public void OnSplashScreenSkipped() =>
         Output(new Output.HideSplashScreen());

Zennysoft.Game.Ma.Implementation/Audio/AudioManager.cs

@@ -1,30 +0,0 @@
-using Godot;
-
-namespace Zennysoft.Ma.Adapter;
-
-public partial class AudioManager : Node
-{
-#pragma warning disable IDE0044 // Add readonly modifier
-#pragma warning disable CS8618 // Non-nullable field must contain a non-null value when exiting constructor. Consider adding the 'required' modifier or declaring as nullable.
-  private static string _sfxPath = $"res://src/audio/sfx";
-  private AudioStreamPlayer _audioPlayer;
-  private IDictionary<SoundEffects, AudioStream> _sfxDictionary;
-#pragma warning restore CS8618 // Non-nullable field must contain a non-null value when exiting constructor. Consider adding the 'required' modifier or declaring as nullable.
-#pragma warning restore IDE0044 // Add readonly modifier
-
-  public override void _Ready()
-  {
-    _audioPlayer = new AudioStreamPlayer();
-    _sfxDictionary = new Dictionary<SoundEffects, AudioStream>();
-    var soundEffects = Enum.GetValues(typeof(SoundEffects));
-    foreach (var effect in soundEffects)
-      _sfxDictionary.Add((SoundEffects)effect, GD.Load<AudioStream>(_sfxPath + effect + ".ogg"));
-  }
-
-  public void Play(SoundEffects soundEffect)
-  {
-    _sfxDictionary.TryGetValue(soundEffect, out var stream);
-    _audioPlayer.Stream = stream;
-    _audioPlayer.Play();
-  }
-}

Zennysoft.Game.Ma.Implementation/Audio/SoundEffects.cs

@@ -1,14 +0,0 @@
-namespace Zennysoft.Ma.Adapter;
-
-public enum SoundEffects
-{
-  Cancel,
-  Equip,
-  Heal,
-  MenuBack,
-  MoveThroughOptions,
-  PlayerAttack,
-  PlayerHitWall,
-  Sort,
-  Unequip
-}

Zennysoft.Game.Ma.Implementation/Calculators/IDamageCalculator.cs

@@ -3,50 +3,30 @@ using Zennysoft.Ma.Adapter.Entity;
 
 namespace Zennysoft.Ma.Adapter
 {
-  public class DamageCalculator : IDamageCalculator
+  public static class DamageCalculator
   {
-    public double CalculateDamage(double damage,
-      ElementType elementType,
-      double defense,
-      ElementalResistanceSet elementalResistanceSet,
-      bool isCriticalHit = false,
-      bool ignoreDefense = false,
-      bool ignoreElementalResistance = false)
+    public static int CalculateDamage(AttackData damage, double defense, ElementalResistanceSet elementalResistanceSet)
     {
-      var calculatedDamage = damage;
-      if (!ignoreElementalResistance)
-        calculatedDamage = CalculateElementalResistance(calculatedDamage, elementType, elementalResistanceSet);
-      if (!ignoreDefense)
+      var calculatedDamage = damage.BaseDamage;
+      if (!damage.IgnoreDefense)
         calculatedDamage = CalculateDefenseResistance(calculatedDamage, defense);
-      if (isCriticalHit)
-        calculatedDamage *= 2;
-
-      return calculatedDamage;
+      if (!damage.IgnoreElementalResistance)
+        calculatedDamage = CalculateElementalResistance(calculatedDamage, elementalResistanceSet.ElementalResistance[damage.ElementType]);
+      return Mathf.Max(1, calculatedDamage);
     }
 
-    private static double CalculateDefenseResistance(double incomingDamage, double defense)
+    private static int CalculateDefenseResistance(int incomingDamage, double defense)
     {
-      return Mathf.Max(incomingDamage - defense, 0.0);
+      var result = incomingDamage - (int)(incomingDamage * (defense / 100));
+      return result;
     }
 
-    private static double CalculateElementalResistance(
-      double incomingDamage,
-      ElementType incomingElementType,
-      ElementalResistanceSet elementalResistanceSet)
+    private static int CalculateElementalResistance(
+      int incomingDamage,
+      double elementalResistance)
     {
-      var resistance = elementalResistanceSet.ElementalResistance[incomingElementType];
-      return Mathf.Max(incomingDamage - (incomingDamage * resistance), 0.0);
+      var result = incomingDamage - (int)(incomingDamage * (elementalResistance / 100));
+      return result;
     }
   }
-
-  public interface IDamageCalculator
-  {
-    public double CalculateDamage(double damage,
-      ElementType elementType,
-      double defense,
-      ElementalResistanceSet elementalResistanceSet,
-      bool isCriticalHit = false,
-      bool ignoreDefense = false,
-      bool ignoreElementalResistance = false);
-  }
 }

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

@@ -7,5 +7,8 @@ public enum ElementType
   Telluric,
   Hydric,
   Igneous,
-  Ferrum
+  Ferrum,
+  Holy,
+  Curse,
+  All
 }

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

@@ -0,0 +1,18 @@
+using Chickensoft.Collections;
+
+namespace Zennysoft.Ma.Adapter;
+
+public interface IAttackComponent : IEntityComponent
+{
+  public IAutoProp<int> CurrentAttack { get; }
+
+  public IAutoProp<int> MaximumAttack { get; }
+
+  public void Restore(int restoreAmount);
+
+  public void Reduce(int reduceAmount);
+
+  public void SetAttack(int attack);
+
+  public void RaiseMaximumAttack(int raiseAmount);
+}

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

@@ -0,0 +1,18 @@
+using Chickensoft.Collections;
+
+namespace Zennysoft.Ma.Adapter;
+
+public interface IDefenseComponent : IEntityComponent
+{
+  public IAutoProp<int> CurrentDefense { get; }
+
+  public IAutoProp<int> MaximumDefense { get; }
+
+  public void Restore(int restoreAmount);
+
+  public void Reduce(int reduceAmount);
+
+  public void SetDefense(int attack);
+
+  public void RaiseMaximumDefense(int raiseAmount);
+}

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

@@ -0,0 +1,6 @@
+namespace Zennysoft.Ma.Adapter;
+
+public interface IEntityComponent
+{
+  public void Reset();
+}

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

@@ -0,0 +1,39 @@
+using Chickensoft.Collections;
+using Godot;
+using Zennysoft.Ma.Adapter.Entity;
+
+namespace Zennysoft.Ma.Adapter;
+public interface IEquipmentComponent : IEntityComponent
+{
+  public IAutoProp<IWeapon> EquippedWeapon { get; }
+
+  public IAutoProp<IArmor> EquippedArmor { get; }
+
+  public IAutoProp<IAccessory> EquippedAccessory { get; }
+
+  public IAutoProp<IEquipableItem> EquippedAmmo { get; }
+
+  public void Equip(IEquipableItem equipable);
+
+  public void Unequip(IEquipableItem equipable);
+
+  public bool IsItemEquipped(IEquipableItem item);
+
+  public void UpdateEquipment(IEquipableItem equipable);
+
+  public bool AugmentableEquipmentExists();
+
+  public int BonusAttack { get; }
+
+  public int BonusDefense { get; }
+
+  public int BonusHP { get; }
+
+  public int BonusVT { get; }
+
+  public int BonusLuck { get; }
+
+  public ElementalResistanceSet ElementalResistance { get; }
+
+  public event Action<IEquipableItem> EquipmentChanged;
+}

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

@@ -0,0 +1,24 @@
+using Chickensoft.Collections;
+
+namespace Zennysoft.Ma.Adapter;
+
+public interface IExperiencePointsComponent : IEntityComponent
+{
+  public IAutoProp<int> CurrentExp { get; }
+
+  public IAutoProp<int> ExpToNextLevel { get; }
+
+  public IAutoProp<double> ExpGainRate { get; }
+
+  public IAutoProp<int> Level { get; }
+
+  public void ModifyExpGainRate(double newRate);
+
+  public void Gain(int baseExpGain);
+
+  public void GainUnmodified(int flateRateExpGain);
+
+  public void LevelUp();
+
+  public event Action PlayerLevelUp;
+}

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

@@ -0,0 +1,25 @@
+using Chickensoft.Collections;
+
+namespace Zennysoft.Ma.Adapter;
+
+public interface IHealthComponent : IEntityComponent
+{
+  public IAutoProp<int> CurrentHP { get; }
+
+  public IAutoProp<int> MaximumHP { get; }
+
+  public event Action? HealthReachedZero;
+  public event Action? DamageTaken;
+
+  public bool AtFullHealth { get; }
+
+  public void Heal(int healAmount);
+
+  public void Damage(int damageAmount);
+
+  public void SetCurrentHealth(int health);
+
+  public void SetMaximumHealth(int health);
+
+  public void RaiseMaximumHP(int raiseAmount, bool restoreHP = false);
+}

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

@@ -0,0 +1,10 @@
+using Chickensoft.Collections;
+
+namespace Zennysoft.Ma.Adapter;
+
+public interface ILuckComponent : IEntityComponent
+{
+  public IAutoProp<int> Luck { get; }
+
+  public void IncreaseLuck(int value);
+}

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

@@ -0,0 +1,22 @@
+using Chickensoft.Collections;
+
+namespace Zennysoft.Ma.Adapter;
+
+public interface IVTComponent : IEntityComponent
+{
+  public IAutoProp<int> CurrentVT { get; }
+
+  public IAutoProp<int> MaximumVT { get; }
+
+  public bool AtFullVT { get; }
+
+  public void Restore(int restoreAmount);
+
+  public void Reduce(int reduceAmount);
+
+  public void SetVT(int vt);
+
+  public void RaiseMaximumVT(int raiseAmount, bool restoreVT = true);
+
+  public void SetMaximumVT(int vt);
+}

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

@@ -0,0 +1,3 @@
+namespace Zennysoft.Ma.Adapter;
+
+public record AttackData(int BaseDamage, ElementType ElementType, bool IgnoreDefense = false, bool IgnoreElementalResistance = false);

Zennysoft.Game.Ma.Implementation/Entity/Behaviors/IBehavior.cs.uid

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

Zennysoft.Game.Ma.Implementation/Entity/Behaviors/PatrolBehavior.cs.uid

@@ -0,0 +1 @@
+uid://87d8kluait8y

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

@@ -0,0 +1,9 @@
+[gd_scene load_steps=2 format=3 uid="uid://c7e5g8l6wuph"]
+
+[ext_resource type="Script" uid="uid://87d8kluait8y" path="res://src/enemy/behaviors/PatrolBehavior.cs" id="1_lobva"]
+
+[node name="NavigationAgent" type="NavigationAgent3D"]
+avoidance_enabled = true
+debug_enabled = true
+script = ExtResource("1_lobva")
+_patrolSpeed = 100.0

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

@@ -1,10 +1,15 @@
-namespace Zennysoft.Ma.Adapter.Entity
+using Chickensoft.Serialization;
+
+namespace Zennysoft.Ma.Adapter.Entity
 {
   public record ElementalResistanceSet
   {
+    [Save("elemental_resist_set")]
     public Dictionary<ElementType, double> ElementalResistance { get; }
 
-    public ElementalResistanceSet(double aeolicResistance, double hydricResistance, double igneousResistance, double ferrumResistance, double telluricResistance)
+    public static ElementalResistanceSet None => new ElementalResistanceSet(0, 0, 0, 0, 0, 0, 0);
+
+    public ElementalResistanceSet(double aeolicResistance, double hydricResistance, double igneousResistance, double ferrumResistance, double telluricResistance, double holyResistance, double curseResistance)
     {
       ElementalResistance = new Dictionary<ElementType, double>
       {
@@ -14,7 +19,22 @@
         { ElementType.Igneous, igneousResistance },
         { ElementType.Ferrum, ferrumResistance },
         { ElementType.Telluric, telluricResistance },
+        { ElementType.Holy, holyResistance },
+        { ElementType.Curse, curseResistance },
+        { ElementType.All, aeolicResistance + hydricResistance + igneousResistance + ferrumResistance + telluricResistance + holyResistance + curseResistance },
       };
     }
+
+    public static ElementalResistanceSet operator +(ElementalResistanceSet left, ElementalResistanceSet right)
+    {
+      return new ElementalResistanceSet(
+        left.ElementalResistance[ElementType.Aeolic] + right.ElementalResistance[ElementType.Aeolic],
+        left.ElementalResistance[ElementType.Hydric] + right.ElementalResistance[ElementType.Hydric],
+        left.ElementalResistance[ElementType.Igneous] + right.ElementalResistance[ElementType.Igneous],
+        left.ElementalResistance[ElementType.Ferrum] + right.ElementalResistance[ElementType.Ferrum],
+        left.ElementalResistance[ElementType.Telluric] + right.ElementalResistance[ElementType.Telluric],
+        left.ElementalResistance[ElementType.Holy] + right.ElementalResistance[ElementType.Holy],
+        left.ElementalResistance[ElementType.Curse] + right.ElementalResistance[ElementType.Curse]);
+    }
   }
 }

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

@@ -0,0 +1,42 @@
+using Chickensoft.GodotNodeInterfaces;
+using Godot;
+using System.Collections.Immutable;
+using Zennysoft.Game.Ma;
+
+namespace Zennysoft.Ma.Adapter.Entity
+{
+  public interface IEnemy : ICharacterBody3D
+  {
+    public void Activate();
+
+    public void Idle();
+
+    public void Die();
+
+    public void PerformAction();
+
+    public void ReturnToDefaultState();
+
+    public void OnAbsorb();
+
+    public void OnMorph();
+
+    public IDungeonRoom GetCurrentRoom(ImmutableList<IDungeonRoom> dungeonRooms);
+
+    public void MoveEnemyToNewRoom(IDungeonRoom newRoom);
+
+    public IHealthComponent HealthComponent { get; }
+
+    public IAttackComponent AttackComponent { get; }
+
+    public IDefenseComponent DefenseComponent { get; }
+
+    public ElementalResistanceSet ElementalResistanceSet { get; }
+
+    public int InitialHP { get; }
+
+    public int InitialAttack { get; }
+
+    public int InitialDefense { get; }
+  }
+}

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

@@ -0,0 +1,9 @@
+using Godot;
+
+namespace Zennysoft.Ma.Adapter.Entity
+{
+  public interface IKnockbackable
+  {
+    void Knockback(float impulse, Vector3 direction);
+  }
+}

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

@@ -0,0 +1,167 @@
+using Zennysoft.Ma.Adapter;
+
+public class Augment
+{
+  public JewelTags AugmentTag;
+
+  public Augment(JewelTags tag, IAugmentType augment)
+  {
+    AugmentTag = tag;
+    AugmentType = augment;
+  }
+
+  public IAugmentType AugmentType { get; set; }
+}
+
+public class HPRecoverySpeedAugment : IAugmentType
+{
+  private readonly IPlayer _player;
+
+  public HPRecoverySpeedAugment(IPlayer player)
+  {
+    _player = player;
+  }
+
+  public void Apply() => _player.HealthTimerHPRate += 2;
+
+  public void Remove() => _player.HealthTimerHPRate -= 2;
+}
+
+public class BasicAugment : IAugmentType
+{
+  public void Apply()
+  {
+    // do nothing
+  }
+
+  public void Remove()
+  {
+    // do nothing
+  }
+}
+
+public class HastenVTAugment : IAugmentType
+{
+  private readonly IPlayer _player;
+
+  public HastenVTAugment(IPlayer player)
+  {
+    _player = player;
+  }
+
+  public void Apply() => _player.ModifyHealthTimerSpeed(_player.HealthTimerSpeedModifier + 0.25f);
+
+  public void Remove() => _player.ModifyHealthTimerSpeed(_player.HealthTimerSpeedModifier - 0.25f);
+}
+
+public class SlowVTReductionAugment : IAugmentType
+{
+  private readonly IPlayer _player;
+
+  public SlowVTReductionAugment(IPlayer player)
+  {
+    _player = player;
+  }
+
+  public void Apply() => _player.ModifyHealthTimerSpeed(_player.HealthTimerSpeedModifier - 0.25f);
+
+  public void Remove() => _player.ModifyHealthTimerSpeed(_player.HealthTimerSpeedModifier + 0.25f);
+}
+
+public class IncreaseEXPRateAugment : IAugmentType
+{
+  private readonly IPlayer _player;
+
+  public IncreaseEXPRateAugment(IPlayer player)
+  {
+    _player = player;
+  }
+
+  public void Apply() => _player.ExperiencePointsComponent.ModifyExpGainRate(_player.ExperiencePointsComponent.ExpGainRate.Value + 0.25f);
+  public void Remove() => _player.ExperiencePointsComponent.ModifyExpGainRate(_player.ExperiencePointsComponent.ExpGainRate.Value - 0.25f);
+}
+
+public class LowerEXPRateAugment : IAugmentType
+{
+  private readonly IPlayer _player;
+
+  public LowerEXPRateAugment(IPlayer player)
+  {
+    _player = player;
+  }
+
+  public void Apply() => _player.ExperiencePointsComponent.ModifyExpGainRate(_player.ExperiencePointsComponent.ExpGainRate.Value - 0.25f);
+  public void Remove() => _player.ExperiencePointsComponent.ModifyExpGainRate(_player.ExperiencePointsComponent.ExpGainRate.Value + 0.25f);
+}
+
+public class LowerHPRecoveryAugment : IAugmentType
+{
+  private readonly IPlayer _player;
+
+  public LowerHPRecoveryAugment(IPlayer player)
+  {
+    _player = player;
+  }
+
+  public void Apply() => _player.HealthTimerHPRate -= 1;
+  public void Remove() => _player.HealthTimerHPRate += 1;
+}
+
+public class IdentifyAllItemsAugment : IAugmentType
+{
+  private readonly IPlayer _player;
+
+  public IdentifyAllItemsAugment(IPlayer player)
+  {
+    _player = player;
+  }
+
+  public void Apply()
+  {
+    _player.AutoIdentifyItems = true;
+    foreach (var item in _player.Inventory.Items.ToList())
+    {
+      if (item.ItemTag == ItemTag.MysteryItem)
+        _player.IdentifyItem(item);
+    }
+  }
+
+  public void Remove()
+  {
+    var weaponAugment = _player.EquipmentComponent.EquippedWeapon.Value.Augment;
+    var armorAugment = _player.EquipmentComponent.EquippedArmor.Value.Augment;
+    var accessoryAugment = _player.EquipmentComponent.EquippedAccessory.Value.Augment;
+    var augments = new List<Augment?>() { weaponAugment, armorAugment, accessoryAugment };
+    if (augments.Count(x => x != null && x.AugmentTag == JewelTags.AutoIdentifyAllItems) > 1)
+      return;
+    else
+      _player.AutoIdentifyItems = false;
+  }
+}
+
+public class RevivePlayerAugment : IAugmentType
+{
+  private readonly IPlayer _player;
+
+  public RevivePlayerAugment(IPlayer player)
+  {
+    _player = player;
+  }
+
+  public void Apply()
+  {
+    _player.AutoRevive = true;
+  }
+
+  public void Remove()
+  {
+    var weaponAugment = _player.EquipmentComponent.EquippedWeapon.Value.Augment;
+    var armorAugment = _player.EquipmentComponent.EquippedArmor.Value.Augment;
+    var accessoryAugment = _player.EquipmentComponent.EquippedAccessory.Value.Augment;
+    var augments = new List<Augment?>() { weaponAugment, armorAugment, accessoryAugment };
+    if (augments.Count(x => x != null && x.AugmentTag == JewelTags.ReviveUserOnce) > 1)
+      return;
+    else
+      _player.AutoRevive = false;
+  }
+}

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

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

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

@@ -0,0 +1,24 @@
+namespace Zennysoft.Ma.Adapter;
+
+public enum ItemTag
+{
+  None,
+  BreaksOnChange,
+  MysteryItem,
+  DamagesPlayer,
+  ContainsRestorative,
+  ContainsWeapon,
+  ContainsArmor,
+  ContainsBox,
+  RandomSpell,
+  ContainsAccessory,
+  DropTo1HPAndGainRareItem,
+  TradeOneRandomItem,
+  TradeAllRandomItems,
+  ContainsUnobtainedItem,
+  ContainsBasicItem,
+  RestrictUnequip,
+  UnequipAllItems,
+  EjectAllItems,
+  UseAllItems
+}

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

@@ -0,0 +1,21 @@
+
+public enum JewelTags
+{
+  None,
+  AeolicElement,
+  IncreaseHPRecovery,
+  HastenVT,
+  LowerEXPGain,
+  Glue,
+  ItemRescue,
+  HydricElement,
+  IgneousElement,
+  IncreaseEXPGain,
+  LowerHPRecovery,
+  SlowVTReduction,
+  AutoIdentifyAllItems,
+  ReviveUserOnce,
+  TelluricElement,
+  IncreaseAtkDefLuck,
+  IncreaseLuck
+}

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

@@ -16,4 +16,9 @@ public enum UsableItemTag
   RaiseCurrentDefenseArmor,
   RaiseLevel,
   RandomEffect,
+  DoubleExp,
+  LowerTargetTo1HP,
+  CanChangeAffinity,
+  TeleportToRandomLocation,
+  WarpToExitIfFound
 }

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

@@ -0,0 +1,18 @@
+namespace Zennysoft.Ma.Adapter;
+
+public enum WeaponTag
+{
+  None,
+  SelfDamage,
+  IgnoreAffinity,
+  IgnoreDefense,
+  Knockback,
+  InverseHPAttackPower,
+  RustChanceSelfAndEnemy,
+  Instakill,
+  DegradeOnSwing,
+  DoubleAttack,
+  TripleAttack,
+  ElementalProjectile,
+  KineticProjectile
+}

Zennysoft.Game.Ma.Implementation/Game/GameData.cs

@@ -1,18 +0,0 @@
-using Chickensoft.Introspection;
-using Chickensoft.Serialization;
-using Zennysoft.Game.Ma;
-
-namespace Zennysoft.Ma.Adapter;
-
-[Meta, Id("game_data")]
-public partial record GameData
-{
-  [Save("player_data")]
-  public required PlayerData PlayerData { get; init; }
-
-  [Save("map_data")]
-  public required MapData MapData { get; init; }
-
-  [Save("rescued_items")]
-  public required RescuedItemDatabase RescuedItems { get; init; }
-}

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

@@ -1,6 +1,8 @@
 using Chickensoft.Collections;
 using Godot;
 using Zennysoft.Game.Abstractions;
+using Zennysoft.Game.Implementation;
+using Zennysoft.Ma.Adapter.Entity;
 
 namespace Zennysoft.Ma.Adapter;
 
@@ -18,7 +20,7 @@ public interface IGameRepo : IDisposable
 
   event Action? DoubleExpTimeEnd;
 
-  event Action<InventoryItem>? RemoveItemFromInventoryEvent;
+  event Action<IBaseInventoryItem>? RemoveItemFromInventoryEvent;
 
   event Action? PlayerAttack;
 
@@ -26,11 +28,11 @@ public interface IGameRepo : IDisposable
 
   event Action? PlayerAttackedEnemy;
 
-  event Action<EquipableItem>? EquippedItem;
+  event Action<IEquipableItem>? EquippedItem;
 
-  event Action<EquipableItem>? UnequippedItem;
+  event Action<IEquipableItem>? UnequippedItem;
 
-  event Action<IHealthPack>? RestorativePickedUp;
+  event Action<IEnemy>? EnemyDied;
 
   void Pause();
 
@@ -46,23 +48,21 @@ public interface IGameRepo : IDisposable
 
   public void AnnounceMessageInInventory(string message);
 
-  public void RemoveItemFromInventory(InventoryItem item);
+  public void RemoveItemFromInventory(IBaseInventoryItem item);
 
   public void OnPlayerAttack();
 
   public void OnPlayerAttackedWall();
 
-  public void OnPlayerAttackedEnemy();
-
-  public void OnRestorativePickedUp(IHealthPack restorative);
-
   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; }
 }
@@ -75,13 +75,13 @@ public class GameRepo : IGameRepo
   public event Action<string>? AnnounceMessageInInventoryEvent;
   public event Action<int>? DoubleExpTimeStart;
   public event Action? DoubleExpTimeEnd;
-  public event Action<InventoryItem>? RemoveItemFromInventoryEvent;
+  public event Action<IBaseInventoryItem>? RemoveItemFromInventoryEvent;
   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<IHealthPack>? RestorativePickedUp;
+  public event Action<IEquipableItem>? EquippedItem;
+  public event Action<IEquipableItem>? UnequippedItem;
+  public event Action<IEnemy>? EnemyDied;
   public IAutoProp<bool> IsPaused => _isPaused;
   private readonly AutoProp<bool> _isPaused;
 
@@ -111,14 +111,14 @@ public class GameRepo : IGameRepo
   {
     AnnounceMessageInInventory("Experience points temporarily doubled.");
     DoubleExpTimeStart?.Invoke(lengthOfEffect.Seconds);
-    ExpRate = 2;
+    ExpRate *= 2;
   }
 
   public void EndDoubleExp()
   {
     AnnounceMessageOnMainScreen("Experience points effect wore off.");
     DoubleExpTimeEnd?.Invoke();
-    ExpRate = 1;
+    ExpRate /= 2;
   }
 
   public void AnnounceMessageOnMainScreen(string message)
@@ -131,7 +131,7 @@ public class GameRepo : IGameRepo
     AnnounceMessageInInventoryEvent?.Invoke(message);
   }
 
-  public void RemoveItemFromInventory(InventoryItem item)
+  public void RemoveItemFromInventory(IBaseInventoryItem item)
   {
     RemoveItemFromInventoryEvent?.Invoke(item);
   }
@@ -146,24 +146,16 @@ public class GameRepo : IGameRepo
     PlayerAttackedWall?.Invoke();
   }
 
-  public void OnPlayerAttackedEnemy()
-  {
-    PlayerAttackedEnemy?.Invoke();
-  }
-
-  public void OnRestorativePickedUp(IHealthPack restorative)
-  {
-    RestorativePickedUp?.Invoke(restorative);
-  }
-
   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);
 
   public void GameEnded()
   {

Zennysoft.Game.Ma.Implementation/Game/state/GameState.Input.cs

@@ -8,14 +8,14 @@ public partial class GameState
 
     public readonly record struct LoadGame;
 
-    public readonly record struct ContinueGame;
-
-    public readonly record struct ReturnToMainMenu;
+    public readonly record struct ExitGame;
 
     public readonly record struct LoadNextFloor;
 
     public readonly record struct InventoryButtonPressed;
 
+    public readonly record struct InteractButtonPressed;
+
     public readonly record struct PauseButtonPressed;
 
     public readonly record struct DebugButtonPressed;
@@ -28,6 +28,8 @@ public partial class GameState
 
     public readonly record struct CloseTeleport;
 
+    public readonly record struct CloseInventory;
+
     public readonly record struct GameOver;
   }
 }

Zennysoft.Game.Ma.Implementation/Game/state/GameState.Output.cs

@@ -6,6 +6,8 @@ public partial class GameState
   {
     public readonly record struct InitializeGame;
 
+    public readonly record struct ExitGame;
+
     public readonly record struct LoadGameFromFile;
 
     public readonly record struct OpenInventoryMenu;

Zennysoft.Game.Ma.Implementation/Game/state/gamestates/GameState.State.AskForTeleportScreen.cs

@@ -16,11 +16,6 @@ public partial class GameState
         OnAttach(() => Get<IGameRepo>().Pause());
       }
 
-      public Transition On(in Input.ReturnToMainMenu input)
-      {
-        return To<MainMenu>();
-      }
-
       public Transition On(in Input.UseTeleport input)
       {
         Output(new Output.OpenFloorExitScreen());

Zennysoft.Game.Ma.Implementation/Game/state/gamestates/GameState.State.DebugMenu.cs

@@ -8,7 +8,7 @@ public partial class GameState
   public partial record State
   {
     [Meta, LogicBlock(typeof(State), Diagram = true)]
-    public partial record DebugMenu : State, IGet<Input.DebugButtonPressed>
+    public partial record DebugMenu : InGame, IGet<Input.DebugButtonPressed>
     {
       public Transition On(in Input.DebugButtonPressed input)
       {

Zennysoft.Game.Ma.Implementation/Game/state/gamestates/GameState.State.FloorExitScreen.cs

@@ -8,7 +8,7 @@ public partial class GameState
   public partial record State
   {
     [Meta, LogicBlock(typeof(State), Diagram = true)]
-    public partial record FloorExitScreen : State, IGet<Input.LoadNextFloor>, IGet<Input.ReturnToMainMenu>
+    public partial record FloorExitScreen : State, IGet<Input.LoadNextFloor>
     {
       public FloorExitScreen()
       {
@@ -20,11 +20,6 @@ public partial class GameState
         Output(new Output.LoadNextFloor());
         return To<InGame>();
       }
-
-      public Transition On(in Input.ReturnToMainMenu input)
-      {
-        return To<MainMenu>();
-      }
     }
   }
 }

Zennysoft.Game.Ma.Implementation/Game/state/gamestates/GameState.State.GameOver.cs

@@ -8,17 +8,19 @@ public partial class GameState
   public partial record State
   {
     [Meta, LogicBlock(typeof(State), Diagram = true)]
-    public partial record GameOver : State, IGet<Input.ContinueGame>, IGet<Input.ReturnToMainMenu>
+    public partial record GameOver : InGame, IGet<Input.NewGame>, IGet<Input.ExitGame>
     {
-      public Transition On(in Input.ContinueGame input)
+      public Transition On(in Input.NewGame input)
       {
         Output(new Output.InitializeGame());
         return To<InGame>();
       }
 
-      public Transition On(in Input.ReturnToMainMenu input)
+      public Transition On(in Input.ExitGame input)
       {
-        return To<MainMenu>();
+        Output(new Output.ClosePauseScreen());
+        Output(new Output.ExitGame());
+        return To<State>();
       }
     }
   }

Zennysoft.Game.Ma.Implementation/Game/state/gamestates/GameState.State.InventoryScreen..cs

@@ -8,9 +8,15 @@ public partial class GameState
   public partial record State
   {
     [Meta, LogicBlock(typeof(State), Diagram = true)]
-    public partial record InventoryScreen : State, IGet<Input.InventoryButtonPressed>
+    public partial record InventoryScreen : State, IGet<Input.InteractButtonPressed>, IGet<Input.CloseInventory>
     {
-      public Transition On(in Input.InventoryButtonPressed input)
+      public Transition On(in Input.InteractButtonPressed input)
+      {
+        Output(new Output.CloseInventoryMenu());
+        return To<InGame>();
+      }
+
+      public Transition On(in Input.CloseInventory input)
       {
         Output(new Output.CloseInventoryMenu());
         return To<InGame>();

Zennysoft.Game.Ma.Implementation/Game/state/gamestates/GameState.State.MainMenu..cs

@@ -1,32 +0,0 @@
-using Chickensoft.Introspection;
-using Chickensoft.LogicBlocks;
-
-namespace Zennysoft.Ma.Adapter;
-
-public partial class GameState
-{
-  public partial record State
-  {
-    [Meta, LogicBlock(typeof(State), Diagram = true)]
-    public partial record MainMenu : State, IGet<Input.NewGame>, IGet<Input.ContinueGame>, IGet<Input.LoadGame>
-    {
-      public Transition On(in Input.NewGame input)
-      {
-        Output(new Output.InitializeGame());
-        return To<InGame>();
-      }
-
-      public Transition On(in Input.ContinueGame input)
-      {
-        Output(new Output.InitializeGame());
-        return To<InGame>();
-      }
-
-      public Transition On(in Input.LoadGame input)
-      {
-        Output(new Output.LoadGameFromFile());
-        return To<InGame>();
-      }
-    }
-  }
-}

Zennysoft.Game.Ma.Implementation/Game/state/gamestates/GameState.State.PauseScreen..cs

@@ -1,5 +1,6 @@
 using Chickensoft.Introspection;
 using Chickensoft.LogicBlocks;
+using static Zennysoft.Ma.Adapter.GameState.Output;
 
 namespace Zennysoft.Ma.Adapter;
 
@@ -8,13 +9,20 @@ public partial class GameState
   public partial record State
   {
     [Meta, LogicBlock(typeof(State), Diagram = true)]
-    public partial record PauseScreen : State, IGet<Input.PauseButtonPressed>
+    public partial record PauseScreen : State, IGet<Input.PauseButtonPressed>, IGet<Input.ExitGame>
     {
       public Transition On(in Input.PauseButtonPressed input)
       {
         Output(new Output.ClosePauseScreen());
         return To<InGame>();
       }
+
+      public Transition On(in Input.ExitGame input)
+      {
+        Output(new Output.ClosePauseScreen());
+        Output(new Output.ExitGame());
+        return To<State>();
+      }
     }
   }
 }

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

@@ -1,11 +0,0 @@
-using Chickensoft.Introspection;
-using Chickensoft.Serialization;
-
-namespace Zennysoft.Ma.Adapter;
-
-[Meta, Id("equipable_item")]
-public abstract partial class EquipableItem : InventoryItem
-{
-  [Save("equipable_item_is_equipped")]
-  public bool IsEquipped { get; set; }
-}

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,5 @@
+using Zennysoft.Ma.Adapter;
+
+public interface IArmor : IEquipableItem, IAugmentableItem
+{
+}

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

@@ -0,0 +1,5 @@
+public interface IAugmentItem : IBaseInventoryItem
+{
+
+  public IAugmentType 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,15 @@
+
+using Godot;
+using Zennysoft.Ma.Adapter;
+
+public interface IBaseInventoryItem
+{
+  public string ItemName { get; }
+  public string Description { 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

@@ -0,0 +1,9 @@
+namespace Zennysoft.Ma.Adapter
+{
+  public interface IDroppedItem
+  {
+    void RescueItem();
+
+    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,13 +2,20 @@
 
 public interface IInventory
 {
-  public List<InventoryItem> Items { get; }
+  public bool PickUpItem(IBaseInventoryItem item);
 
-  public bool TryAdd(InventoryItem inventoryItem);
+  public List<IBaseInventoryItem> Items { get; }
 
-  public bool TryInsert(InventoryItem inventoryItem, int index);
+  public bool TryAdd(IBaseInventoryItem inventoryItem);
 
-  public void Remove(InventoryItem inventoryItem);
+  public bool TryInsert(IBaseInventoryItem inventoryItem, int index);
 
-  public void Sort();
+  public void Remove(IBaseInventoryItem inventoryItem);
+
+  public bool Sort(IWeapon currentWeapon, IArmor currentArmor, IAccessory currentAccessory, IEquipableItem ammo);
+
+  public bool AtCapacity();
+
+  public event Action<string> BroadcastMessage;
+  public event Action InventoryChanged;
 }

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

@@ -0,0 +1,6 @@
+namespace Zennysoft.Ma.Adapter;
+
+public interface IThrownItem
+{
+  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/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 double 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/Item/RescuedItemDatabase.cs

@@ -1,6 +1,5 @@
 using Chickensoft.Introspection;
 using Chickensoft.Serialization;
-using Zennysoft.Game.Abstractions;
 
 namespace Zennysoft.Ma.Adapter;
 
@@ -8,10 +7,10 @@ namespace Zennysoft.Ma.Adapter;
 public partial class RescuedItemDatabase
 {
   [Save("rescued_item_list")]
-  public List<InventoryItem> Items { get; init; }
+  public List<IBaseInventoryItem> Items { get; init; }
 
   public RescuedItemDatabase()
   {
-    Items = new List<InventoryItem>();
+    Items = new List<IBaseInventoryItem>();
   }
 }

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

@@ -1,8 +0,0 @@
-namespace Zennysoft.Ma.Adapter;
-
-public enum ItemTag
-{
-  None,
-  BreaksOnChange,
-  MysteryItem
-}

Zennysoft.Game.Ma.Implementation/Item/Tags/ThrowableItemTag.cs

@@ -1,11 +0,0 @@
-namespace Zennysoft.Ma.Adapter;
-
-public enum ThrowableItemTag
-{
-  None,
-  DoubleExp,
-  LowerTargetTo1HP,
-  CanChangeAffinity,
-  TeleportToRandomLocation,
-  WarpToExitIfFound
-}

Zennysoft.Game.Ma.Implementation/Item/Tags/WeaponTag.cs

@@ -1,9 +0,0 @@
-namespace Zennysoft.Ma.Adapter;
-
-public enum WeaponTag
-{
-  None,
-  SelfDamage,
-  IgnoreAffinity,
-  Knockback,
-}

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

@@ -11,9 +11,6 @@ public partial class ItemTagEnumContext : JsonSerializerContext;
 [JsonSerializable(typeof(AccessoryTag))]
 public partial class AccessoryTagEnumContext : JsonSerializerContext;
 
-[JsonSerializable(typeof(ThrowableItemTag))]
-public partial class ThrowableItemTagEnumContext : JsonSerializerContext;
-
 [JsonSerializable(typeof(UsableItemTag))]
 public partial class UsableItemTagEnumContext : JsonSerializerContext;
 
@@ -21,4 +18,4 @@ public partial class UsableItemTagEnumContext : JsonSerializerContext;
 public partial class BoxItemTagEnumContext : JsonSerializerContext;
 
 [JsonSerializable(typeof(ElementType))]
-public partial class ElementTypeEnumContext : JsonSerializerContext;
+public partial class ElementTypeEnumContext : JsonSerializerContext;

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

@@ -0,0 +1,17 @@
+using Chickensoft.GodotNodeInterfaces;
+using Godot;
+using System.Collections.Immutable;
+
+namespace Zennysoft.Game.Ma;
+public interface IDungeonFloor : INode3D
+{
+  void InitializeDungeon();
+
+  public abstract (Vector3 Rotation, Vector3 Position) GetPlayerSpawnPoint();
+
+  public ImmutableList<IDungeonRoom> Rooms { get; }
+
+  public void FadeOutAudio();
+
+  public bool FloorIsLoaded { get; set; }
+}

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

@@ -1,6 +1,6 @@
 using Chickensoft.GodotNodeInterfaces;
-using Godot;
 using System.Collections.Immutable;
+using Zennysoft.Ma.Adapter.Entity;
 
 namespace Zennysoft.Game.Ma;
 public interface IDungeonRoom : INode3D

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

@@ -10,8 +10,8 @@ public class Module
   public static void Bootstrap(Container container)
   {
     container.RegisterSingleton<IFileSystem, FileSystem>();
-    container.RegisterSingleton<ISaveFileManager<GameData>, SaveFileManager<GameData>>();
-    container.RegisterSingleton<IMaSaveFileManager<GameData>, MaSaveFileManager<GameData>>();
+    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

@@ -1,66 +1,67 @@
-using Chickensoft.Collections;
+using Chickensoft.GodotNodeInterfaces;
 using Godot;
 using Zennysoft.Game.Abstractions;
 
 namespace Zennysoft.Ma.Adapter;
 
-public interface IPlayer : IKillable
+public interface IPlayer : IKillable, ICharacterBody3D
 {
-  public void InitializePlayerState();
+  public void ResetPlayerData();
 
   public void Activate();
 
   public void Deactivate();
 
-  public void Attack();
-
-  public void TakeDamage(double damage, ElementType elementType = ElementType.None, bool isCriticalHit = false);
+  public void TakeDamage(AttackData damage);
 
   public void Knockback(float impulse);
 
-  public void GainExp(double expGained);
-
   public void LevelUp();
 
-  public void Move(float delta);
+  public void TeleportPlayer((Vector3 Rotation, Vector3 Position) newTransform);
 
-  public void TeleportPlayer(Transform3D newTransform);
+  public void Equip(IEquipableItem equipable);
 
-  public void HealHP(int amount);
+  public void Unequip(IEquipableItem equipable);
 
-  public void RaiseHP(int amount);
+  public void PlayJumpScareAnimation();
 
-  public void HealVT(int amount);
+  public void ApplyNewAugment(IAugmentItem jewel, IAugmentableItem equipableItem);
 
-  public void RaiseVT(int amount);
-
-  public void ModifyBonusAttack(int amount);
-
-  public void ModifyBonusDefense(int amount);
-
-  public void ModifyMaximumHP(int amount);
-
-  public void ModifyMaximumVT(int amount);
-
-  public void ModifyBonusLuck(double amount);
-
-  public void SetHealthTimerStatus(bool isActive);
+  public void IdentifyItem(IBaseInventoryItem unidentifiedItem);
 
   public IInventory Inventory { get; }
 
-  public PlayerStats Stats { get; }
+  public IHealthComponent HealthComponent { get; }
 
-  public Vector3 CurrentPosition { get; }
+  public IVTComponent VTComponent { get; }
 
-  public Basis CurrentBasis { get; }
+  public IAttackComponent AttackComponent { get; }
 
-  public AutoProp<EquipableItem> EquippedWeapon { get; }
+  public IDefenseComponent DefenseComponent { get; }
 
-  public AutoProp<EquipableItem> EquippedArmor { get; }
+  public IExperiencePointsComponent ExperiencePointsComponent { get; }
 
-  public AutoProp<EquipableItem> EquippedAccessory { get; }
+  public ILuckComponent LuckComponent { get; }
 
-  public void Equip(EquipableItem equipable);
+  public IEquipmentComponent EquipmentComponent { get; }
 
-  public void Unequip(EquipableItem equipable);
+  public void SetHealthTimerStatus(bool isActive);
+
+  public void ModifyHealthTimerSpeed(float newModifier);
+
+  public bool AutoRevive { get; set; }
+
+  public int TotalAttack { get; }
+  public int TotalDefense { get; }
+  public int TotalLuck { get; }
+
+  public int HealthTimerHPRate { get; set; }
+
+  public float HealthTimerSpeedModifier { get; }
+
+  public bool AutoIdentifyItems { get; set; }
+
+  public event Action PlayerDied;
+  public delegate IBaseInventoryItem RerollItem(IBaseInventoryItem item);
 }

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

@@ -1,20 +0,0 @@
-using Chickensoft.Introspection;
-using Chickensoft.Serialization;
-using Zennysoft.Ma.Adapter;
-
-namespace Zennysoft.Game.Ma;
-
-[Meta, Id("player_data")]
-public partial record PlayerData
-{
-  [Save("player_stats")]
-  public required PlayerStats PlayerStats { get; init; }
-
-  [Save("player_inventory")]
-  public required IInventory Inventory { get; init; }
-}
-
-[Meta, Id("map_data")]
-public partial record MapData
-{
-}

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

@@ -1,115 +0,0 @@
-namespace Zennysoft.Ma.Adapter;
-
-using Chickensoft.Collections;
-using Godot;
-
-public class PlayerStats
-{
-  public PlayerStats(AutoProp<int> currentHP,
-    AutoProp<int> maximumHP,
-    AutoProp<int> currentVT,
-    AutoProp<int> maximumVT,
-    AutoProp<int> currentAttack,
-    AutoProp<int> maxAttack,
-    AutoProp<int> bonusAttack,
-    AutoProp<int> currentDefense,
-    AutoProp<int> maxDefense,
-    AutoProp<int> bonusDefense,
-    AutoProp<double> currentExp,
-    AutoProp<int> expToNextLevel,
-    AutoProp<int> currentLevel,
-    AutoProp<double> luck)
-  {
-    CurrentHP = currentHP;
-    MaximumHP = maximumHP;
-    CurrentVT = currentVT;
-    MaximumVT = maximumVT;
-    CurrentAttack = currentAttack;
-    MaxAttack = maxAttack;
-    BonusAttack = bonusAttack;
-    CurrentDefense = currentDefense;
-    MaxDefense = maxDefense;
-    BonusDefense = bonusDefense;
-    CurrentExp = currentExp;
-    ExpToNextLevel = expToNextLevel;
-    CurrentLevel = currentLevel;
-    Luck = luck;
-  }
-
-  public AutoProp<int> CurrentHP { get; init; }
-  public AutoProp<int> MaximumHP { get; init; }
-  public AutoProp<int> CurrentVT { get; init; }
-  public AutoProp<int> MaximumVT { get; init; }
-  public AutoProp<int> CurrentAttack { get; init; }
-  public AutoProp<int> MaxAttack { get; init; }
-  public AutoProp<int> BonusAttack { get; init; }
-  public AutoProp<int> CurrentDefense { get; init; }
-  public AutoProp<int> MaxDefense { get; init; }
-  public AutoProp<int> BonusDefense { get; init; }
-  public AutoProp<double> CurrentExp { get; init; }
-  public AutoProp<int> ExpToNextLevel { get; init; }
-  public AutoProp<int> CurrentLevel { get; init; }
-  public AutoProp<double> Luck { get; init; }
-
-  public void SetCurrentHP(int newValue)
-  {
-    var clampedValue = Mathf.Clamp(newValue, 0, MaximumHP.Value);
-    CurrentHP.OnNext(clampedValue);
-  }
-  public void SetMaximumHP(int newValue)
-  {
-    MaximumHP.OnNext(newValue);
-  }
-  public void SetCurrentVT(int newValue)
-  {
-    var clampedValue = Mathf.Clamp(newValue, 0, MaximumVT.Value);
-    CurrentVT.OnNext(clampedValue);
-  }
-  public void SetMaximumVT(int newValue)
-  {
-    MaximumVT.OnNext(newValue);
-  }
-  public void SetCurrentExp(double newValue)
-  {
-    CurrentExp.OnNext(newValue);
-  }
-  public void SetCurrentLevel(int newValue)
-  {
-    CurrentLevel.OnNext(newValue);
-  }
-  public void SetCurrentAttack(int newValue)
-  {
-    var clampedValue = Mathf.Clamp(newValue, 0, MaxAttack.Value);
-    CurrentAttack.OnNext(clampedValue);
-  }
-  public void SetBonusAttack(int newValue)
-  {
-    BonusAttack.OnNext(newValue);
-  }
-  public void SetMaxAttack(int newValue)
-  {
-    MaxAttack.OnNext(newValue);
-  }
-  public void SetCurrentDefense(int newValue)
-  {
-    var clampedValue = Mathf.Clamp(newValue, 0, MaxDefense.Value);
-    CurrentDefense.OnNext(clampedValue);
-  }
-  public void SetBonusDefense(int newValue)
-  {
-    BonusDefense.OnNext(newValue);
-  }
-  public void SetMaxDefense(int newValue)
-  {
-    MaxDefense.OnNext(newValue);
-  }
-  public void SetExpToNextLevel(int newValue)
-  {
-    ExpToNextLevel.OnNext(newValue);
-  }
-  public void SetLuck(double newValue)
-  {
-    var clampedValue = Mathf.Clamp(newValue, 0, 1.0);
-    Luck.OnNext(clampedValue);
-  }
-}

Zennysoft.Game.Ma.Implementation/Player/State/PlayerLogic.Input.cs

@@ -8,14 +8,10 @@ public partial class PlayerLogic
   {
     public readonly record struct PhysicsTick(double Delta);
 
-    public readonly record struct Moved(Vector3 GlobalPosition, Transform3D GlobalTransform);
-
     public readonly record struct Enable;
 
     public readonly record struct Attack;
 
-    public readonly record struct AttackAnimationFinished;
-
     public readonly record struct Die;
   }
 }

Zennysoft.Game.Ma.Implementation/Player/State/PlayerLogic.cs

@@ -9,5 +9,5 @@ public interface IPlayerLogic : ILogicBlock<PlayerLogic.State>;
 [LogicBlock(typeof(State), Diagram = true)]
 public partial class PlayerLogic : LogicBlock<PlayerLogic.State>, IPlayerLogic
 {
-  public override Transition GetInitialState() => To<State.Idle>();
+  public override Transition GetInitialState() => To<State.Alive>();
 }

Zennysoft.Game.Ma.Implementation/Player/State/States/PlayerLogic.State.Alive.Attacking.cs

@@ -1,18 +0,0 @@
-using Chickensoft.Introspection;
-
-namespace Zennysoft.Ma.Adapter;
-
-public partial class PlayerLogic
-{
-  public partial record State
-  {
-    [Meta]
-    public partial record Attacking : Alive, IGet<Input.AttackAnimationFinished>
-    {
-      public Transition On(in Input.AttackAnimationFinished input)
-      {
-        return To<Idle>();
-      }
-    }
-  }
-}

Zennysoft.Game.Ma.Implementation/Player/State/States/PlayerLogic.State.Alive.Idle.cs

@@ -1,22 +0,0 @@
-using Chickensoft.Introspection;
-using Godot;
-
-namespace Zennysoft.Ma.Adapter;
-
-public partial class PlayerLogic
-{
-  public abstract partial record State
-  {
-    [Meta, Id("player_logic_state_alive_idle")]
-    public partial record Idle : Alive, IGet<Input.Attack>
-    {
-
-      public virtual Transition On(in Input.Attack input)
-      {
-        GD.Print("Attacking...");
-        Output(new Output.Animations.Attack());
-        return To<Attacking>();
-      }
-    }
-  }
-}

Zennysoft.Game.Ma.Implementation/Player/State/States/PlayerLogic.State.Alive.cs

@@ -8,7 +8,7 @@ public partial class PlayerLogic
   public partial record State
   {
     [Meta, Id("player_logic_alive")]
-    public abstract partial record Alive : State, IGet<Input.PhysicsTick>, IGet<Input.Die>
+    public partial record Alive : State, IGet<Input.PhysicsTick>, IGet<Input.Die>
     {
       public virtual Transition On(in Input.PhysicsTick input)
       {

Zennysoft.Game.Ma.Implementation/Player/State/States/PlayerLogic.State.Disabled.cs

@@ -16,7 +16,7 @@ public partial class PlayerLogic
         OnDetach(() => Get<IAppRepo>().GameEntered -= OnGameEntered);
       }
 
-      public Transition On(in Input.Enable input) => To<Idle>();
+      public Transition On(in Input.Enable input) => To<Alive>();
 
       public void OnGameEntered() => Input(new Input.Enable());
     }

Zennysoft.Game.Ma.Implementation/Quest/QuestData.cs

@@ -0,0 +1,14 @@
+using Chickensoft.Introspection;
+using Chickensoft.Serialization;
+
+namespace Zennysoft.Ma.Adapter;
+
+[Meta, Id("quest_data")]
+public partial record QuestData
+{
+  [Save("death_count")]
+  public int DeathCount { get; set; } = 0;
+
+  [Save("quest_data_1")]
+  public bool QuestMarker1 { get; set; } = false;
+}

Zennysoft.Game.Ma.Implementation/Save/MaSaveFileManager.cs

@@ -4,28 +4,28 @@ using Zennysoft.Game.Abstractions;
 
 namespace Zennysoft.Ma.Adapter;
 
-public interface IMaSaveFileManager<T>
+public interface IMaSaveFileManager
 {
-  Task Save(T gameData);
+  Task Save<T>(T gameData);
 
-  Task<T?> Load();
+  Task<T?> Load<T>();
 }
 
-public sealed class MaSaveFileManager<T> : IMaSaveFileManager<T>
+public sealed class MaSaveFileManager : IMaSaveFileManager
 {
-  private readonly ISaveFileManager<T> _saveFileManager;
+  private readonly ISaveFileManager _saveFileManager;
   private ImmutableList<IJsonTypeInfoResolver> _converters;
 
-  public MaSaveFileManager(ISaveFileManager<T> saveFileManager)
+  public MaSaveFileManager(ISaveFileManager saveFileManager)
   {
     _saveFileManager = saveFileManager;
-    _converters = [WeaponTagEnumContext.Default, ItemTagEnumContext.Default, ElementTypeEnumContext.Default, AccessoryTagEnumContext.Default, ThrowableItemTagEnumContext.Default, UsableItemTagEnumContext.Default, BoxItemTagEnumContext.Default];
+    _converters = [WeaponTagEnumContext.Default, ItemTagEnumContext.Default, ElementTypeEnumContext.Default, AccessoryTagEnumContext.Default, UsableItemTagEnumContext.Default, BoxItemTagEnumContext.Default];
   }
 
-  public async Task Save(T gameData)
+  public async Task Save<T>(T gameData)
   {
     await _saveFileManager.WriteToFile(gameData, [.. _converters]);
   }
 
-  public async Task<T?> Load() => await _saveFileManager.ReadFromFile([.. _converters]);
+  public async Task<T?> Load<T>() => await _saveFileManager.ReadFromFile<T>([.. _converters]);
 }

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

@@ -1,5 +1,6 @@
 using Chickensoft.Introspection;
 using Chickensoft.LogicBlocks;
+using Zennysoft.Game.Implementation;
 
 
 namespace Zennysoft.Ma.Adapter;
@@ -37,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

@@ -1,4 +1,5 @@
-using Zennysoft.Game.Ma;
+using Zennysoft.Game.Implementation;
+using Zennysoft.Game.Ma;
 
 namespace Zennysoft.Ma.Adapter;
 public partial class InGameUILogic
@@ -7,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

@@ -7,12 +7,12 @@
 	</PropertyGroup>
 
 	<ItemGroup>
-	  <Compile Remove="Game\state\states\**" />
-	  <Compile Remove="Map\**" />
-	  <EmbeddedResource Remove="Game\state\states\**" />
-	  <EmbeddedResource Remove="Map\**" />
-	  <None Remove="Game\state\states\**" />
-	  <None Remove="Map\**" />
+		<Compile Remove="Actions\**" />
+		<Compile Remove="Game\state\states\**" />
+		<EmbeddedResource Remove="Actions\**" />
+		<EmbeddedResource Remove="Game\state\states\**" />
+		<None Remove="Actions\**" />
+		<None Remove="Game\state\states\**" />
 	</ItemGroup>
 
 	<ItemGroup>

Zennysoft.Game.Ma/Ma.csproj.old

@@ -1,51 +0,0 @@
-<Project Sdk="Godot.NET.Sdk/4.4.0">
-	<PropertyGroup>
-		<TargetFramework>net8.0</TargetFramework>
-		<EnableDynamicLoading>true</EnableDynamicLoading>
-		<!-- Use NativeAOT. -->
-		<PublishAot>true</PublishAot>
-	</PropertyGroup>
-	<ItemGroup>
-		<Compile Remove="src\items\weapons\models\**" />
-		<EmbeddedResource Remove="src\items\weapons\models\**" />
-	</ItemGroup>
-	<ItemGroup>
-		<!-- Root the assemblies to avoid trimming. -->
-		<TrimmerRootAssembly Include="GodotSharp" />
-		<TrimmerRootAssembly Include="$(TargetName)" />
-	</ItemGroup>
-	<ItemGroup>
-		<PackageReference Include="Chickensoft.AutoInject" Version="2.5.0" />
-		<PackageReference Include="Chickensoft.GodotNodeInterfaces" Version="2.4.0" />
-		<PackageReference Include="Chickensoft.Introspection" Version="2.2.0" />
-		<PackageReference Include="Chickensoft.Introspection.Generator" Version="2.2.0" />
-		<PackageReference Include="Chickensoft.LogicBlocks" Version="5.16.0" />
-		<PackageReference Include="Chickensoft.LogicBlocks.DiagramGenerator" Version="5.16.0" />
-		<PackageReference Include="Chickensoft.SaveFileBuilder" Version="1.1.0" />
-		<PackageReference Include="Chickensoft.Serialization.Godot" Version="0.7.6" />
-		<PackageReference Include="GodotSharp.SourceGenerators" Version="2.6.0-250131-2115.Release" />
-		<PackageReference Include="SimpleInjector" Version="5.5.0" />
-		<PackageReference Include="SSH.NET" Version="2024.2.0" />
-		<PackageReference Include="System.IO.Abstractions" Version="22.0.11" />
-		<PackageReference Include="Zeroconf" Version="3.7.16" />
-	</ItemGroup>
-	<ItemGroup>
-		<Folder Include="src\ui\dialogue\" />
-	</ItemGroup>
-	<ItemGroup>
-		<None Include=".editorconfig" />
-	</ItemGroup>
-	<ItemGroup>
-	  <ProjectReference Include="..\Zennysoft.Game.Godot.Implementation\Zennysoft.Game.Implementation.csproj" />
-	  <ProjectReference Include="..\Zennysoft.Game.Ma.Implementation\Zennysoft.Ma.Adapter.csproj" />
-	</ItemGroup>
-	<ItemGroup>
-		<PackageReference Update="Godot.SourceGenerators" Version="4.4.0-dev.2" />
-	</ItemGroup>
-	<ItemGroup>
-		<PackageReference Update="GodotSharp" Version="4.4.0-dev.2" />
-	</ItemGroup>
-	<ItemGroup>
-		<PackageReference Update="GodotSharpEditor" Version="4.4.0-dev.2" />
-	</ItemGroup>
-</Project>

Zennysoft.Game.Ma/addons/dungeon_floor_layout/DungeonFloorLayout.cs

@@ -1,68 +0,0 @@
-using Godot;
-using Godot.Collections;
-using System.Linq;
-using Zennysoft.Game.Ma;
-
-[Tool]
-public partial class DungeonFloorLayout : LayoutType
-{
-  [Export]
-  public DungeonFloorSetType SetType
-  {
-    get => _setType;
-    set
-    {
-      _setType = value;
-      LayoutWithSpawnRate = [];
-      NotifyPropertyListChanged();
-    }
-  }
-
-  [ExportToolButton("Populate Map Data")]
-  public Callable PopulateMapList => Callable.From(() => PopulateDictionary(SetType));
-
-  [Export]
-  public Dictionary<string, float> LayoutWithSpawnRate { get; private set; }
-
-  [Export]
-  public Dictionary<EnemyType, float> EnemySpawnRates { get; set; } = default!;
-
-  private string _floorPath = "res://src/map/dungeon/floors/";
-  private DungeonFloorSetType _setType;
-
-  private void PopulateDictionary(DungeonFloorSetType setType)
-  {
-    var floorPath = _floorPath;
-    var floorType = string.Empty;
-    if (setType == DungeonFloorSetType.SetA)
-      floorType = "SetAFloors";
-    else if (setType == DungeonFloorSetType.SetB)
-      floorType = "SetBFloors";
-
-    var pathToScenes = $"{floorPath}/{floorType}";
-
-    var files = DirAccess.GetFilesAt(pathToScenes).Where(x => x.EndsWith(".tscn"));
-
-    var newMaps = new Dictionary<string, float>();
-    foreach (var file in files)
-    {
-      if (LayoutWithSpawnRate.ContainsKey($"{floorType}/{file}"))
-      {
-        var spawnRate = LayoutWithSpawnRate.TryGetValue($"{floorType}/{file}", out var currentSpawnRate);
-        newMaps.Add($"{floorType}/{file}", currentSpawnRate);
-      }
-      else
-        newMaps.Add($"{floorType}/{file}", 1.0f);
-    }
-
-    LayoutWithSpawnRate = newMaps;
-
-    NotifyPropertyListChanged();
-  }
-
-  public enum DungeonFloorSetType
-  {
-    SetA,
-    SetB
-  }
-}

Zennysoft.Game.Ma/addons/dungeon_floor_layout/DungeonFloorLayout.cs.uid

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

Zennysoft.Game.Ma/addons/dungeon_floor_layout/DungeonFloorLayoutNode.cs

@@ -1,22 +0,0 @@
-#if TOOLS
-using Godot;
-using Zennysoft.Game.Ma;
-
-[Tool]
-public partial class DungeonFloorLayoutNode : EditorPlugin
-{
-  public override void _EnterTree()
-  {
-    // Initialization of the plugin goes here.
-    var script = GD.Load<Script>("res://addons/dungeon_floor_layout/DungeonFloorLayout.cs");
-    var texture = GD.Load<Texture2D>("res://addons/dungeon_floor_layout/icon.png");
-    AddCustomType(nameof(DungeonFloorLayout), nameof(LayoutType), script, texture);
-  }
-
-  public override void _ExitTree()
-  {
-    // Clean-up of the plugin goes here.
-    RemoveCustomType(nameof(DungeonFloorLayout));
-  }
-}
-#endif

Zennysoft.Game.Ma/addons/dungeon_floor_layout/DungeonFloorLayoutNode.cs.uid

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