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/IStackable.cs

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

Zennysoft.Game.Abstractions/Pickups/IHealthPack.cs

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

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/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

@@ -11,6 +11,7 @@ public partial class AppLogic
     {
       public MainMenu()
       {
+        OnAttach(() => Output(new Output.ShowMainMenu()));
       }
 
       public Transition On(in Input.NewGame input) => To<GameStarted>();

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/Calculators/IDamageCalculator.cs

@@ -12,7 +12,6 @@ namespace Zennysoft.Ma.Adapter
         calculatedDamage = CalculateDefenseResistance(calculatedDamage, defense);
       if (!damage.IgnoreElementalResistance)
         calculatedDamage = CalculateElementalResistance(calculatedDamage, elementalResistanceSet.ElementalResistance[damage.ElementType]);
-
       return Mathf.Max(1, calculatedDamage);
     }
 

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/IEquipmentComponent.cs

@@ -5,17 +5,23 @@ 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 void Equip(EquipableItem equipable);
+  public IAutoProp<IEquipableItem> EquippedAmmo { get; }
 
-  public void Unequip(EquipableItem equipable);
+  public void Equip(IEquipableItem equipable);
 
-  public bool IsItemEquipped(InventoryItem item);
+  public void Unequip(IEquipableItem equipable);
+
+  public bool IsItemEquipped(IEquipableItem item);
+
+  public void UpdateEquipment(IEquipableItem equipable);
+
+  public bool AugmentableEquipmentExists();
 
   public int BonusAttack { get; }
 
@@ -29,5 +35,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

@@ -12,7 +12,13 @@ public interface IExperiencePointsComponent : IEntityComponent
 
   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/Entity/ElementalResistanceSet.cs

@@ -7,9 +7,9 @@ namespace Zennysoft.Ma.Adapter.Entity
     [Save("elemental_resist_set")]
     public Dictionary<ElementType, double> ElementalResistance { get; }
 
-    public static ElementalResistanceSet None => new ElementalResistanceSet(0, 0, 0, 0, 0);
+    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)
+    public ElementalResistanceSet(double aeolicResistance, double hydricResistance, double igneousResistance, double ferrumResistance, double telluricResistance, double holyResistance, double curseResistance)
     {
       ElementalResistance = new Dictionary<ElementType, double>
       {
@@ -19,6 +19,9 @@ namespace Zennysoft.Ma.Adapter.Entity
         { ElementType.Igneous, igneousResistance },
         { ElementType.Ferrum, ferrumResistance },
         { ElementType.Telluric, telluricResistance },
+        { ElementType.Holy, holyResistance },
+        { ElementType.Curse, curseResistance },
+        { ElementType.All, aeolicResistance + hydricResistance + igneousResistance + ferrumResistance + telluricResistance + holyResistance + curseResistance },
       };
     }
 
@@ -29,7 +32,9 @@ namespace Zennysoft.Ma.Adapter.Entity
         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.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

@@ -1,4 +1,5 @@
 using Chickensoft.GodotNodeInterfaces;
+using Godot;
 using System.Collections.Immutable;
 using Zennysoft.Game.Ma;
 
@@ -30,6 +31,8 @@ namespace Zennysoft.Ma.Adapter.Entity
 
     public IDefenseComponent DefenseComponent { get; }
 
+    public ElementalResistanceSet ElementalResistanceSet { get; }
+
     public int InitialHP { get; }
 
     public int InitialAttack { get; }

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/EquipableItem.cs

@@ -1,22 +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("bonus_elemental_resist_stats")]
-  public virtual ElementalResistanceSet ElementalResistance { get; } = new ElementalResistanceSet(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/ItemTag.cs

@@ -4,5 +4,21 @@ public enum ItemTag
 {
   None,
   BreaksOnChange,
-  MysteryItem
-}
+  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/ThrowableItemTag.cs

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

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

@@ -7,4 +7,12 @@ public enum WeaponTag
   IgnoreAffinity,
   IgnoreDefense,
   Knockback,
+  InverseHPAttackPower,
+  RustChanceSelfAndEnemy,
+  Instakill,
+  DegradeOnSwing,
+  DoubleAttack,
+  TripleAttack,
+  ElementalProjectile,
+  KineticProjectile
 }

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

@@ -2,6 +2,7 @@
 using Godot;
 using Zennysoft.Game.Abstractions;
 using Zennysoft.Game.Implementation;
+using Zennysoft.Ma.Adapter.Entity;
 
 namespace Zennysoft.Ma.Adapter;
 
@@ -19,7 +20,7 @@ public interface IGameRepo : IDisposable
 
   event Action? DoubleExpTimeEnd;
 
-  event Action<InventoryItem>? RemoveItemFromInventoryEvent;
+  event Action<IBaseInventoryItem>? RemoveItemFromInventoryEvent;
 
   event Action? PlayerAttack;
 
@@ -27,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();
 
@@ -47,21 +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 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; }
 }
@@ -74,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;
 
@@ -110,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)
@@ -130,7 +131,7 @@ public class GameRepo : IGameRepo
     AnnounceMessageInInventoryEvent?.Invoke(message);
   }
 
-  public void RemoveItemFromInventory(InventoryItem item)
+  public void RemoveItemFromInventory(IBaseInventoryItem item)
   {
     RemoveItemFromInventoryEvent?.Invoke(item);
   }
@@ -145,19 +146,16 @@ public class GameRepo : IGameRepo
     PlayerAttackedWall?.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,10 +8,14 @@ public partial class GameState
 
     public readonly record struct LoadGame;
 
+    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;
@@ -24,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.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.GameOver.cs

@@ -8,13 +8,20 @@ public partial class GameState
   public partial record State
   {
     [Meta, LogicBlock(typeof(State), Diagram = true)]
-    public partial record GameOver : State, IGet<Input.NewGame>
+    public partial record GameOver : InGame, IGet<Input.NewGame>, IGet<Input.ExitGame>
     {
       public Transition On(in Input.NewGame input)
       {
         Output(new Output.InitializeGame());
         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/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.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/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

@@ -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,19 @@
 
 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);
+  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

@@ -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

@@ -7,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/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;
 

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

@@ -7,9 +7,11 @@ public interface IDungeonFloor : INode3D
 {
   void InitializeDungeon();
 
-  public Transform3D GetPlayerSpawnPoint();
+  public abstract (Vector3 Rotation, Vector3 Position) GetPlayerSpawnPoint();
 
   public ImmutableList<IDungeonRoom> Rooms { get; }
 
+  public void FadeOutAudio();
+
   public bool FloorIsLoaded { get; set; }
 }

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

@@ -18,11 +18,17 @@ public interface IPlayer : IKillable, ICharacterBody3D
 
   public void LevelUp();
 
-  public void TeleportPlayer(Transform3D newTransform);
+  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, IAugmentableItem equipableItem);
+
+  public void IdentifyItem(IBaseInventoryItem unidentifiedItem);
 
   public IInventory Inventory { get; }
 
@@ -40,6 +46,22 @@ public interface IPlayer : IKillable, ICharacterBody3D
 
   public IEquipmentComponent EquipmentComponent { get; }
 
+  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 InventoryItem RerollItem(InventoryItem item);
+  public delegate IBaseInventoryItem RerollItem(IBaseInventoryItem item);
 }

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

@@ -8,8 +8,6 @@ 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;

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

@@ -6,6 +6,9 @@ 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

@@ -19,7 +19,7 @@ public sealed class MaSaveFileManager : IMaSaveFileManager
   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>(T gameData)

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

@@ -7,8 +7,11 @@
 	</PropertyGroup>
 
 	<ItemGroup>
+		<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>
 
@@ -28,8 +31,4 @@
 		<ProjectReference Include="..\Zennysoft.Game.Godot.Implementation\Zennysoft.Game.Implementation.csproj" />
 	</ItemGroup>
 
-	<ItemGroup>
-		<Folder Include="Actions\" />
-	</ItemGroup>
-
 </Project>

Zennysoft.Game.Ma/Ma.csproj

@@ -1,4 +1,4 @@
-<Project Sdk="Godot.NET.Sdk/4.4.0">
+<Project Sdk="Godot.NET.Sdk/4.4.1">
 	<PropertyGroup>
 		<TargetFramework>net8.0</TargetFramework>
 		<EnableDynamicLoading>true</EnableDynamicLoading>

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/Ma.csproj.old.1

@@ -1,38 +0,0 @@
-<Project Sdk="Godot.NET.Sdk/4.4.0">
-	<PropertyGroup>
-		<TargetFramework>net8.0</TargetFramework>
-		<EnableDynamicLoading>true</EnableDynamicLoading>
-		<WarningsAsErrors>CS9057</WarningsAsErrors>
-	</PropertyGroup>
-	<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>
-		<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/Ma.csproj.old.2

@@ -1,38 +0,0 @@
-<Project Sdk="Godot.NET.Sdk/4.4.0">
-	<PropertyGroup>
-		<TargetFramework>net8.0</TargetFramework>
-		<EnableDynamicLoading>true</EnableDynamicLoading>
-		<WarningsAsErrors>CS9057</WarningsAsErrors>
-	</PropertyGroup>
-	<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>
-		<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/Ma.csproj.old.3

@@ -1,38 +0,0 @@
-<Project Sdk="Godot.NET.Sdk/4.4.1">
-	<PropertyGroup>
-		<TargetFramework>net8.0</TargetFramework>
-		<EnableDynamicLoading>true</EnableDynamicLoading>
-		<WarningsAsErrors>CS9057</WarningsAsErrors>
-	</PropertyGroup>
-	<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>
-		<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/Ma.csproj.old.4

@@ -1,38 +0,0 @@
-<Project Sdk="Godot.NET.Sdk/4.4.0">
-	<PropertyGroup>
-		<TargetFramework>net8.0</TargetFramework>
-		<EnableDynamicLoading>true</EnableDynamicLoading>
-		<WarningsAsErrors>CS9057</WarningsAsErrors>
-	</PropertyGroup>
-	<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>
-		<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/default_bus_layout.tres

@@ -1,4 +1,8 @@
-[gd_resource type="AudioBusLayout" load_steps=2 format=3 uid="uid://c2mk6c27y0mdf"]
+[gd_resource type="AudioBusLayout" load_steps=4 format=3 uid="uid://c2mk6c27y0mdf"]
+
+[sub_resource type="AudioEffectLimiter" id="AudioEffectLimiter_j3pel"]
+resource_name = "Limiter"
+soft_clip_db = 1.0
 
 [sub_resource type="AudioEffectReverb" id="AudioEffectReverb_j3pel"]
 resource_name = "Reverb"
@@ -7,8 +11,16 @@ damping = 0.9
 dry = 0.99
 wet = 0.05
 
+[sub_resource type="AudioEffectLimiter" id="AudioEffectLimiter_g28q7"]
+resource_name = "Limiter"
+ceiling_db = -0.5
+threshold_db = -0.6
+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/1/name = &"AMBIENT"
 bus/1/solo = false
 bus/1/mute = false
@@ -23,6 +35,8 @@ bus/2/volume_db = 0.0
 bus/2/send = &"Master"
 bus/2/effect/0/effect = SubResource("AudioEffectReverb_j3pel")
 bus/2/effect/0/enabled = true
+bus/2/effect/1/effect = SubResource("AudioEffectLimiter_g28q7")
+bus/2/effect/1/enabled = true
 bus/3/name = &"MUSIC"
 bus/3/solo = false
 bus/3/mute = false

Zennysoft.Game.Ma/export_presets.cfg

@@ -1,23 +1,22 @@
 [preset.0]
 
-name="Steamdeck"
-platform="Linux"
+name="Windows Desktop"
+platform="Windows Desktop"
 runnable=true
-advanced_options=false
+advanced_options=true
 dedicated_server=false
 custom_features=""
-export_filter="exclude"
-export_files=PackedStringArray()
+export_filter="all_resources"
 include_filter=""
 exclude_filter=""
-export_path=""
+export_path="Export/Ma.exe"
 patches=PackedStringArray()
 encryption_include_filters=""
 encryption_exclude_filters=""
 seed=0
 encrypt_pck=false
 encrypt_directory=false
-script_export_mode=2
+script_export_mode=1
 
 [preset.0.options]
 
@@ -28,51 +27,6 @@ binary_format/embed_pck=false
 texture_format/s3tc_bptc=true
 texture_format/etc2_astc=false
 binary_format/architecture="x86_64"
-ssh_remote_deploy/enabled=false
-ssh_remote_deploy/host="user@host_ip"
-ssh_remote_deploy/port="22"
-ssh_remote_deploy/extra_args_ssh=""
-ssh_remote_deploy/extra_args_scp=""
-ssh_remote_deploy/run_script="#!/usr/bin/env bash
-export DISPLAY=:0
-unzip -o -q \"{temp_dir}/{archive_name}\" -d \"{temp_dir}\"
-\"{temp_dir}/{exe_name}\" {cmd_args}"
-ssh_remote_deploy/cleanup_script="#!/usr/bin/env bash
-kill $(pgrep -x -f \"{temp_dir}/{exe_name} {cmd_args}\")
-rm -rf \"{temp_dir}\""
-dotnet/include_scripts_content=false
-dotnet/include_debug_symbols=true
-dotnet/embed_build_outputs=false
-
-[preset.1]
-
-name="Windows Desktop"
-platform="Windows Desktop"
-runnable=true
-advanced_options=false
-dedicated_server=false
-custom_features=""
-export_filter="all_resources"
-include_filter=""
-exclude_filter=""
-export_path="Output/Ma.zip"
-patches=PackedStringArray()
-encryption_include_filters=""
-encryption_exclude_filters=""
-seed=0
-encrypt_pck=false
-encrypt_directory=false
-script_export_mode=2
-
-[preset.1.options]
-
-custom_template/debug=""
-custom_template/release=""
-debug/export_console_wrapper=0
-binary_format/embed_pck=true
-texture_format/s3tc_bptc=true
-texture_format/etc2_astc=false
-binary_format/architecture="x86_64"
 codesign/enable=false
 codesign/timestamp=true
 codesign/timestamp_server_url=""
@@ -111,5 +65,5 @@ ssh_remote_deploy/cleanup_script="Stop-ScheduledTask -TaskName godot_remote_debu
 Unregister-ScheduledTask -TaskName godot_remote_debug -Confirm:$false -ErrorAction:SilentlyContinue
 Remove-Item -Recurse -Force '{temp_dir}'"
 dotnet/include_scripts_content=false
-dotnet/include_debug_symbols=false
+dotnet/include_debug_symbols=true
 dotnet/embed_build_outputs=false

Zennysoft.Game.Ma/project.godot

@@ -12,9 +12,8 @@ config_version=5
 
 config/name="Ma"
 run/main_scene="uid://d1gjaijijd5ot"
-run/print_header=false
 config/features=PackedStringArray("4.4", "C#", "GL Compatibility")
-run/delta_smoothing=false
+run/max_fps=60
 boot_splash/show_image=false
 
 [autoload]
@@ -36,13 +35,16 @@ runtime/advanced/uses_dotnet=true
 
 window/size/viewport_width=1920
 window/size/viewport_height=1080
-window/stretch/mode="viewport"
-window/stretch/aspect="expand"
+window/stretch/mode="canvas_items"
 
 [dotnet]
 
 project/assembly_name="Ma"
 
+[editor]
+
+export/convert_text_resources_to_binary=false
+
 [editor_plugins]
 
 enabled=PackedStringArray("res://addons/dialogue_manager/plugin.cfg", "res://addons/input_helper/plugin.cfg")
@@ -55,6 +57,20 @@ folder_colors={
 "res://src/game/": "orange",
 "res://src/items/": "teal",
 "res://src/map/": "gray",
+"res://src/map/dungeon/floors/Floor01/": "red",
+"res://src/map/dungeon/floors/Floor02/": "red",
+"res://src/map/dungeon/floors/Floor03/": "red",
+"res://src/map/dungeon/floors/Floor04/": "red",
+"res://src/map/dungeon/floors/Floor05/": "red",
+"res://src/map/dungeon/floors/Floor06/": "red",
+"res://src/map/dungeon/floors/Floor07/": "red",
+"res://src/map/dungeon/floors/Floor09/": "teal",
+"res://src/map/dungeon/floors/Floor10/": "teal",
+"res://src/map/dungeon/floors/Floor11/": "teal",
+"res://src/map/dungeon/floors/Floor12/": "teal",
+"res://src/map/dungeon/floors/Floor13/": "teal",
+"res://src/map/dungeon/floors/Floor14/": "teal",
+"res://src/map/dungeon/floors/Floor15/": "teal",
 "res://src/player/": "blue",
 "res://src/ui/inventory_menu/": "green"
 }
@@ -63,10 +79,16 @@ folder_colors={
 
 import/blender/enabled=false
 
+[global_group]
+
+DimmableAudio=""
+
 [importer_defaults]
 
 texture={
-"detect_3d/compress_to": 0
+&"compress/high_quality": true,
+&"compress/mode": 2,
+&"detect_3d/compress_to": 0
 }
 
 [input]
@@ -124,24 +146,28 @@ MoveUp={
 "deadzone": 0.5,
 "events": [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":87,"key_label":0,"unicode":119,"location":0,"echo":false,"script":null)
 , Object(InputEventJoypadButton,"resource_local_to_scene":false,"resource_name":"","device":-1,"button_index":11,"pressure":0.0,"pressed":false,"script":null)
+, Object(InputEventJoypadMotion,"resource_local_to_scene":false,"resource_name":"","device":-1,"axis":1,"axis_value":-1.0,"script":null)
 ]
 }
 MoveLeft={
 "deadzone": 0.5,
 "events": [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":65,"key_label":0,"unicode":97,"location":0,"echo":false,"script":null)
 , Object(InputEventJoypadButton,"resource_local_to_scene":false,"resource_name":"","device":-1,"button_index":13,"pressure":0.0,"pressed":false,"script":null)
+, Object(InputEventJoypadMotion,"resource_local_to_scene":false,"resource_name":"","device":-1,"axis":0,"axis_value":-1.0,"script":null)
 ]
 }
 MoveRight={
 "deadzone": 0.5,
 "events": [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":68,"key_label":0,"unicode":100,"location":0,"echo":false,"script":null)
 , Object(InputEventJoypadButton,"resource_local_to_scene":false,"resource_name":"","device":-1,"button_index":14,"pressure":0.0,"pressed":false,"script":null)
+, Object(InputEventJoypadMotion,"resource_local_to_scene":false,"resource_name":"","device":-1,"axis":0,"axis_value":1.0,"script":null)
 ]
 }
 MoveDown={
 "deadzone": 0.5,
 "events": [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":83,"key_label":0,"unicode":115,"location":0,"echo":false,"script":null)
 , Object(InputEventJoypadButton,"resource_local_to_scene":false,"resource_name":"","device":-1,"button_index":12,"pressure":0.0,"pressed":false,"script":null)
+, Object(InputEventJoypadMotion,"resource_local_to_scene":false,"resource_name":"","device":-1,"axis":1,"axis_value":1.0,"script":null)
 ]
 }
 Attack={
@@ -225,10 +251,30 @@ AltAttack={
 "events": [Object(InputEventMouseButton,"resource_local_to_scene":false,"resource_name":"","device":-1,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"button_mask":0,"position":Vector2(0, 0),"global_position":Vector2(0, 0),"factor":1.0,"button_index":2,"canceled":false,"pressed":false,"double_click":false,"script":null)
 ]
 }
+CameraForward={
+"deadzone": 0.2,
+"events": [Object(InputEventJoypadMotion,"resource_local_to_scene":false,"resource_name":"","device":-1,"axis":3,"axis_value":-1.0,"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)
+]
+}
+EnemyViewerIdle={
+"deadzone": 0.2,
+"events": [Object(InputEventJoypadMotion,"resource_local_to_scene":false,"resource_name":"","device":-1,"axis":4,"axis_value":1.0,"script":null)
+]
+}
+EnemyViewerWalk={
+"deadzone": 0.2,
+"events": [Object(InputEventJoypadMotion,"resource_local_to_scene":false,"resource_name":"","device":-1,"axis":5,"axis_value":1.0,"script":null)
+]
+}
 
 [internationalization]
 
-locale/translations_pot_files=PackedStringArray("res://src/dialog/Dialogue.dialogue", "res://src/npc/Ran/ran.dialogue", "res://src/npc/Rat/ratdialogue.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", "res://tutorialstone.dialogue")
 
 [layer_names]
 
@@ -244,6 +290,8 @@ locale/translations_pot_files=PackedStringArray("res://src/dialog/Dialogue.dialo
 3d_physics/layer_10="Minimap"
 3d_physics/layer_11="ItemRescue"
 3d_physics/layer_12="EnemyHitbox"
+3d_physics/layer_13="UnlockableDoor"
+3d_physics/layer_14="ExplodableWall"
 3d_physics/layer_32="Navigation"
 
 [navigation]
@@ -254,6 +302,7 @@ locale/translations_pot_files=PackedStringArray("res://src/dialog/Dialogue.dialo
 
 3d/run_on_separate_thread=true
 common/physics_ticks_per_second=144
+jolt_physics_3d/simulation/areas_detect_static_bodies=true
 
 [rendering]
 

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

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

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

@@ -1,5 +1,4 @@
 using Chickensoft.Collections;
-using Godot;
 using System;
 using Zennysoft.Ma.Adapter;
 using Zennysoft.Ma.Adapter.Entity;
@@ -7,19 +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 AutoProp<EquipableItem> _equippedWeapon;
+  public IAutoProp<IEquipableItem> EquippedAmmo => _equippedAmmo;
 
-  public AutoProp<EquipableItem> _equippedArmor;
+  public AutoProp<IWeapon> _equippedWeapon;
 
-  public AutoProp<EquipableItem> _equippedAccessory;
+  public AutoProp<IArmor> _equippedArmor;
 
-  public event Action<EquipableItem> EquipmentChanged;
+  public AutoProp<IAccessory> _equippedAccessory;
+
+  public AutoProp<IEquipableItem> _equippedAmmo;
+
+  public event Action<IEquipableItem> EquipmentChanged;
 
   public int BonusAttack => _equippedWeapon.Value.BonusAttack + _equippedArmor.Value.BonusAttack + _equippedAccessory.Value.BonusAttack;
 
@@ -35,9 +38,10 @@ public class EquipmentComponent : IEquipmentComponent
 
   public EquipmentComponent()
   {
-    _equippedWeapon = new AutoProp<EquipableItem>(new Weapon());
-    _equippedArmor = new AutoProp<EquipableItem>(new Armor());
-    _equippedAccessory = new AutoProp<EquipableItem>(new Accessory());
+    _equippedWeapon = new AutoProp<IWeapon>(new Weapon());
+    _equippedArmor = new AutoProp<IArmor>(new Armor());
+    _equippedAccessory = new AutoProp<IAccessory>(new Accessory());
+    _equippedAmmo = new AutoProp<IEquipableItem>(new Ammo());
   }
 
   public void Reset()
@@ -45,9 +49,10 @@ public class EquipmentComponent : IEquipmentComponent
     _equippedWeapon.OnNext(new Weapon());
     _equippedArmor.OnNext(new Armor());
     _equippedAccessory.OnNext(new Accessory());
+    _equippedAmmo.OnNext(new Ammo());
   }
 
-  public void Equip(EquipableItem equipable)
+  public void Equip(IEquipableItem equipable)
   {
     if (equipable is Weapon weapon)
       _equippedWeapon.OnNext(weapon);
@@ -55,10 +60,12 @@ public class EquipmentComponent : IEquipmentComponent
       _equippedArmor.OnNext(armor);
     if (equipable is Accessory accessory)
       _equippedAccessory.OnNext(accessory);
+    if (equipable is Ammo ammo)
+      _equippedAmmo.OnNext(ammo);
     EquipmentChanged?.Invoke(equipable);
   }
 
-  public void Unequip(EquipableItem equipable)
+  public void Unequip(IEquipableItem equipable)
   {
     if (equipable is Weapon weapon)
       _equippedWeapon.OnNext(new Weapon());
@@ -66,14 +73,20 @@ public class EquipmentComponent : IEquipmentComponent
       _equippedArmor.OnNext(new Armor());
     if (equipable is Accessory accessory)
       _equippedAccessory.OnNext(new Accessory());
+    if (equipable is Ammo ammo)
+      _equippedAmmo.OnNext(new Ammo());
     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;
+  }
 
-    return item == _equippedWeapon.Value || item == _equippedArmor.Value || item == _equippedAccessory.Value;
+  public void UpdateEquipment(IEquipableItem equipable) => EquipmentChanged?.Invoke(equipable);
+
+  public bool AugmentableEquipmentExists()
+  {
+    return (_equippedWeapon.Value.ItemName != null && _equippedWeapon.Value.Augment == null) || (_equippedArmor.Value.ItemName != null && _equippedArmor.Value.Augment == null) || (_equippedAccessory.Value.ItemName != null && _equippedAccessory.Value.Augment == null);
   }
 }

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

@@ -22,6 +22,8 @@ public class ExperiencePointsComponent : IExperiencePointsComponent
 
   private readonly AutoProp<int> _level;
 
+  public event Action PlayerLevelUp;
+
   public ExperiencePointsComponent()
   {
     var firstLevelExpRequirement = ExpToNextLevelCalculation(1);
@@ -50,6 +52,17 @@ public class ExperiencePointsComponent : IExperiencePointsComponent
     _currentExp.OnNext(cappedAmount);
   }
 
+  public void GainUnmodified(int flatRateExp)
+  {
+    var newCurrentExpTotal = flatRateExp + _currentExp.Value;
+    while (flatRateExp + _currentExp.Value >= _expToNextLevel.Value)
+      LevelUp();
+    var cappedAmount = Math.Min(flatRateExp + _currentExp.Value, _expToNextLevel.Value);
+    _currentExp.OnNext(cappedAmount);
+  }
+
+  public void ModifyExpGainRate(double newRate) => _expGainRate.OnNext(newRate);
+
   public void LevelUp()
   {
     SfxDatabase.Instance.Play(SoundEffect.LevelUp);
@@ -57,6 +70,7 @@ public class ExperiencePointsComponent : IExperiencePointsComponent
     var expToNextLevel = ExpToNextLevelCalculation(_level.Value);
     _currentExp.OnNext(_currentExp.Value - _expToNextLevel.Value);
     _expToNextLevel.OnNext(expToNextLevel);
+    PlayerLevelUp?.Invoke();
   }
 
   private int ExpToNextLevelCalculation(int nextLevel)

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

@@ -36,12 +36,18 @@ public class HealthComponent : IHealthComponent
 
   public void Heal(int healAmount)
   {
+    if (CurrentHP.Value <= 0)
+      return;
+
     var cappedAmount = Math.Min(healAmount + _currentHP.Value, _maximumHP.Value);
     _currentHP.OnNext(cappedAmount);
   }
 
   public void Damage(int damageAmount)
   {
+    if (CurrentHP.Value <= 0)
+      return;
+
     var cappedAmount = Math.Max(_currentHP.Value - damageAmount, 0);
     _currentHP.OnNext(cappedAmount);
 

Zennysoft.Game.Ma/src/Main.cs

@@ -2,15 +2,10 @@ namespace Zennysoft.Game.Ma;
 
 using Godot;
 
-#if DEBUG
-using System.Reflection;
-#endif
-
 public partial class Main : Node
 {
   public override void _Ready()
   {
-	// If we don't need to run tests, we can just switch to the game scene.
 	CallDeferred("RunScene");
   }
 

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

@@ -1,13 +1,10 @@
 using Chickensoft.AutoInject;
-using Chickensoft.Collections;
 using Chickensoft.GodotNodeInterfaces;
 using Chickensoft.Introspection;
 using Godot;
-using Godot.Collections;
 using NathanHoad;
 using SimpleInjector.Lifestyles;
 using System.IO.Abstractions;
-using System.Linq;
 using System.Threading.Tasks;
 using Zennysoft.Game.Abstractions;
 using Zennysoft.Game.Implementation;
@@ -32,7 +29,7 @@ public partial class App : Node, IApp
 
   [Node] private OptionsMenu OptionsMenu { get; set; }
 
-  public IInstantiator Instantiator { get; set; } = default!;
+  [Node] private GalleryMenu GalleryMenu { get; set; }
 
   IAppRepo IProvide<IAppRepo>.Value() => AppRepo;
 
@@ -40,15 +37,19 @@ public partial class App : Node, IApp
   public IAppLogic AppLogic { get; set; } = default!;
   public AppLogic.IBinding AppBinding { get; set; } = default!;
 
-  private Array _progress;
+  private Godot.Collections.Array _progress;
   private SimpleInjector.Container _container;
 
-  private AutoProp<string> _loadedScene = new(string.Empty);
+  private DataViewer _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 double _reportedProgress = 0;
 
   public void Initialize()
   {
@@ -63,11 +64,18 @@ public partial class App : Node, IApp
     _optionsSavePath = $"{OS.GetUserDataDir()}/options.json";
     _controllerSavePath = $"{OS.GetUserDataDir()}/controls.json";
 
-    Task.Run(() => _saveFileManager.ReadFromFile<OptionsData>(_optionsSavePath).ContinueWith((data) =>
-    {
-      if (data.IsCompletedSuccessfully)
-        OptionsMenu.CallDeferred("Load", data.Result);
-    }));
+    MainMenu.StartGame += OnStartGame;
+    MainMenu.EnemyViewer += OnEnemyViewer;
+    MainMenu.Gallery += OnGallery;
+    MainMenu.Options += OnOptions;
+    MainMenu.Quit += OnQuit;
+
+    GalleryMenu.GalleryExited += GalleryExited;
+
+    OptionsMenu.OptionsMenuExited += OptionsMenu_OptionsMenuExited;
+    OptionsMenu.DeleteSaveData += DeleteSaveData;
+    AppRepo = _container.GetInstance<IAppRepo>();
+    AppLogic = _container.GetInstance<IAppLogic>();
 
     Task.Run(() => _saveFileManager.ReadFromFile<string>(_controllerSavePath).ContinueWith((data) =>
     {
@@ -75,31 +83,32 @@ public partial class App : Node, IApp
         OptionsMenu.Controller.CallDeferred(nameof(OptionsMenu.Controller.LoadControllerInput), data.Result);
     }));
 
-    MainMenu.StartGame += OnStartGame;
-    MainMenu.EnemyViewer += OnEnemyViewer;
-    MainMenu.Options += OnOptions;
-    MainMenu.Quit += OnQuit;
-    _loadedScene.Changed += OnGameLoaded;
-
-    OptionsMenu.OptionsMenuExited += OptionsMenu_OptionsMenuExited;
-    OptionsMenu.DeleteSaveData += DeleteSaveData;
-    AppRepo = _container.GetInstance<IAppRepo>();
-    AppLogic = _container.GetInstance<IAppLogic>();
-
     AppLogic.Set(AppRepo);
     AppLogic.Set(new AppLogic.Data());
 
+    AppRepo.DataViewerExited += DataViewerExited;
+
     Input.MouseMode = Input.MouseModeEnum.Visible;
     _progress = [];
     this.Provide();
   }
 
+  private void GameExitRequested()
+  {
+    AppLogic.Input(new AppLogic.Input.QuitGame());
+  }
+
   private void DeleteSaveData()
   {
     var saveFileManager = _container.GetInstance<ISaveFileManager>();
     saveFileManager.DeleteSaveData();
   }
 
+  private void DataViewerExited()
+  {
+    AppLogic.Input(new AppLogic.Input.EnemyViewerExited());
+  }
+
   private async void OptionsMenu_OptionsMenuExited()
   {
     var saveFileManager = _container.GetInstance<ISaveFileManager>();
@@ -110,12 +119,10 @@ public partial class App : Node, IApp
     MainMenu.OptionsButton.GrabFocus();
   }
 
-  private void OnGameLoaded(string sceneName)
+  private void GalleryExited()
   {
-    LoadingScreen.Hide();
-    var scene = (PackedScene)ResourceLoader.LoadThreadedGet(sceneName);
-    var node = scene.Instantiate();
-    AddChild(node);
+    GalleryMenu.Hide();
+    MainMenu.GalleryButton.GrabFocus();
   }
 
   public void OnReady()
@@ -123,33 +130,53 @@ public partial class App : Node, IApp
     AppBinding = AppLogic.Bind();
 
     AppBinding
+      .Handle((in AppLogic.Output.Initialize _) =>
+      {
+        Task.Run(() => _saveFileManager.ReadFromFile<string>(_optionsSavePath).ContinueWith((data) =>
+        {
+          AppLogic.Input(new AppLogic.Input.SaveFileLoaded());
+        }));
+      })
       .Handle((in AppLogic.Output.ShowSplashScreen _) =>
       {
+        AppLogic.Input(new AppLogic.Input.FadeOutFinished());
       })
       .Handle((in AppLogic.Output.HideSplashScreen _) =>
       {
       })
       .Handle((in AppLogic.Output.SetupGameScene _) =>
       {
-        ResourceLoader.LoadThreadedRequest(GAME_SCENE_PATH);
-        _loadingGame = true;
-        MainMenu.ReleaseFocus();
-        MainMenu.Hide();
+        LoadingScreen.ShowLoadingScreen();
+        LoadGame(GAME_SCENE_PATH);
       })
       .Handle((in AppLogic.Output.ShowMainMenu _) =>
       {
+        MainMenu.CallDeferred(MainMenu.MethodName.FadeIn);
       })
-      .Handle((in AppLogic.Output.ShowGame _) =>
+      .Handle((in AppLogic.Output.CloseGame _) =>
       {
+        LoadingScreen.HideLoadingScreen();
+        _game.GameExitRequested -= GameExitRequested;
+        MainMenu.StartGameButton.GrabFocus();
+        _game.CallDeferred(MethodName.QueueFree, []);
+        GetTree().Paused = false;
       })
       .Handle((in AppLogic.Output.StartLoadingSaveFile _) =>
         {
         })
       .Handle((in AppLogic.Output.EnemyViewerOpened _) =>
       {
-        ResourceLoader.LoadThreadedRequest(ENEMY_VIEWER_PATH);
-        _loadingEnemyViewer = true;
+        LoadingScreen.ShowLoadingScreen();
         MainMenu.Hide();
+        LoadEnemyViewer(ENEMY_VIEWER_PATH);
+      })
+      .Handle((in AppLogic.Output.EnemyViewerExited _) =>
+      {
+        LoadingScreen.HideLoadingScreen();
+        if (_enemyViewer != null && _enemyViewer is DataViewer enemyViewer)
+          enemyViewer.CallDeferred(MethodName.QueueFree);
+        MainMenu.Show();
+        MainMenu.EnemyViewerButton.GrabFocus();
       })
       .Handle((in AppLogic.Output.ExitGame _) =>
       {
@@ -161,31 +188,60 @@ public partial class App : Node, IApp
 
   public override void _Process(double delta)
   {
-    if (_loadingGame)
-    {
-      ResourceLoader.LoadThreadedGetStatus(GAME_SCENE_PATH, _progress);
-      LoadingScreen.ProgressBar.Value = (double)_progress.Single();
-      if ((double)_progress.Single() == 1)
-        _loadedScene.OnNext(GAME_SCENE_PATH);
-    }
-
-    if (_loadingEnemyViewer)
-    {
-      ResourceLoader.LoadThreadedGetStatus(ENEMY_VIEWER_PATH, _progress);
-      LoadingScreen.ProgressBar.Value = (double)_progress.Single();
-      if ((double)_progress.Single() == 1)
-        _loadedScene.OnNext(ENEMY_VIEWER_PATH);
-    }
+    LoadingScreen.ProgressBar.Value = Mathf.RoundToInt(Mathf.Lerp(LoadingScreen.ProgressBar.Value, _reportedProgress * 100, (float)delta * 2));
   }
 
   public void OnStartGame() => AppLogic.Input(new AppLogic.Input.NewGame());
 
   private void OnEnemyViewer() => AppLogic.Input(new AppLogic.Input.EnemyViewerOpened());
 
+  private void OnGalleryViewer() => AppLogic.Input(new AppLogic.Input.GalleryOpened());
+
+  private async void LoadGame(string sceneName)
+  {
+    var scene = await LoadSceneInternal(sceneName);
+    _game = scene as IGame;
+    _game.GameLoaded += OnGameLoaded;
+    _game.GameExitRequested += GameExitRequested;
+    CallDeferred(MethodName.AddChild, scene);
+  }
+
+  private void OnGameLoaded() => LoadingScreen.HideLoadingScreen();
+
+  private async void LoadEnemyViewer(string sceneName)
+  {
+    var scene = await LoadSceneInternal(sceneName);
+    _enemyViewer = scene as IDataViewer;
+    CallDeferred(MethodName.AddChild, scene);
+    LoadingScreen.HideLoadingScreen();
+  }
+
+  private async Task<Node> LoadSceneInternal(string sceneName)
+  {
+    LoadingScreen.ShowLoadingScreen();
+    LoadingScreen.ProgressBar.Value = 0;
+    var sceneLoader = new SceneLoader();
+    CallDeferred(MethodName.AddChild, sceneLoader);
+    sceneLoader.LoadSceneRequest(sceneName);
+    sceneLoader.SceneReportedProgress += SceneLoader_SceneReportedProgress;
+    await ToSignal(sceneLoader, SceneLoader.SignalName.SceneLoaded);
+    var result = sceneLoader.LoadedScene;
+    sceneLoader.QueueFree();
+    return result;
+  }
+
+  private void SceneLoader_SceneReportedProgress(double progress) => _reportedProgress = progress;
+
   private async void OnOptions()
   {
     OptionsMenu.Show();
-    OptionsMenu.MasterVolumeSlider.GrabFocus();
+    OptionsMenu.GameTab.GrabFocus();
+  }
+
+  private async void OnGallery()
+  {
+    GalleryMenu.Show();
+    GalleryMenu.ItemButton1.GrabFocus();
   }
 
   public void OnQuit() => AppLogic.Input(new AppLogic.Input.QuitGame());
@@ -203,7 +259,13 @@ public partial class App : Node, IApp
 
     MainMenu.StartGame -= OnStartGame;
     MainMenu.EnemyViewer -= OnEnemyViewer;
+    MainMenu.Gallery -= OnGallery;
+    MainMenu.Options -= OnOptions;
     MainMenu.Quit -= OnQuit;
-    _loadedScene.Changed -= OnGameLoaded;
+
+    GalleryMenu.GalleryExited -= GalleryExited;
+
+    OptionsMenu.OptionsMenuExited -= OptionsMenu_OptionsMenuExited;
+    OptionsMenu.DeleteSaveData -= DeleteSaveData;
   }
 }

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

@@ -1,140 +1,42 @@
+// Attach to a ColorRect in front of texture/background
+
 shader_type canvas_item;
 
-// Handles the resolution changes, color depth, and dithering
-group_uniforms resolution_and_colors;
-uniform bool change_color_depth = false;
-uniform int target_color_depth : hint_range(1, 8) = 5;
-uniform bool dithering = false;
-uniform bool scale_resolution = false;
-uniform int target_resolution_scale = 3;
+// Handles the concentric ripples
+uniform float frequency: hint_range(0, 15, 0.01) = 4.0;
+uniform float amplitude: hint_range(0, 3, 0.1) = 2.0;
+uniform float ripple_rate : hint_range(0, 20.0, 1) = 5;
 
-// Handles the LUTish recoloring
-group_uniforms gradient_recoloring;
-uniform bool enable_recolor = false;
-uniform sampler2D to_gradient: hint_default_black;
+// Handles the waves themselves
+uniform float wave_amplitude: hint_range(0.001, 0.1, 0.001) = 0.05;
+uniform float wave_frequency: hint_range(0, 15, 0.01) = 4.0;
 
-int dithering_pattern(ivec2 fragcoord) {
-	const int pattern[] = {
-		-4, +0, -3, +1,
-		+2, -2, +3, -1,
-		-3, +1, -4, +0,
-		+3, -1, +2, -2
-	};
+uniform sampler2D noise;
 
-	int x = fragcoord.x % 4;
-	int y = fragcoord.y % 4;
+uniform sampler2D SCREEN_TEXTURE: hint_screen_texture, filter_linear_mipmap;
 
-	return pattern[y * 4 + x];
-}
-
-vec3 rgb2hsv(vec3 rgb) { //Converts RGB values to HSV
-	float r = rgb.r;
-	float g = rgb.g;
-	float b = rgb.b;
-
-	float cmax = max(r,max(g,b));
-	float cmin = min(r,min(g,b));
-	float delta = cmax - cmin;
-
-	float h = 0.f; //hue
-
-	if (delta > 0.f){
-		if (cmax == r){
-			h = (g-b)/delta;
-			h = mod(h,6.f);
-		} else if (cmax == g){
-			h = ((b - r) / delta) + 2.f;
-		} else {
-			h = ((r-g)/delta) + 4.f;
-		}
-		h = h * 60.f;
-	}
-
-	float s = 0.f; //saturation
-	if (cmax > 0.f){
-		s = delta / cmax;
-	}
-
-	return vec3(h,s,cmax); // Keep original alpha value
-
-}
-
-vec3 hsv2rgb(vec3 hsv) { //Converts HSV values to RGB
-	float h = hsv.r;
-	float s = hsv.g;
-	float v = hsv.b;
-	float c = v * s;
-	//X = C × (1 - |(H / 60°) mod 2 - 1|)
-	float x = h / 60.f;
-	x = mod(x,2.f);
-	x = abs(x - 1.f);
-	x = c * (1.f - x);
-
-	float m = v - c;
-
-	vec3 rgb = vec3(0.f,0.f,0.f);
-
-	if (h < 60.f) {
-		rgb = vec3(c,x,0.f);
-	} else if (h < 120.f){
-		rgb = vec3(x,c,0.f);
-	} else if (h < 180.f){
-		rgb = vec3(0.f,c,x);
-	} else if (h < 240.f){
-		rgb = vec3(0.f,x,c);
-	} else if (h < 300.f){
-		rgb = vec3(x,0.f,c);
-	} else if (h < 360.f){
-		rgb = vec3(c,0.f,x);
-	}
-	rgb[0] = rgb[0] + m;
-	rgb[1] = rgb[1] + m;
-	rgb[2] = rgb[2] + m;
-
-	return rgb;
+vec2 wave(vec2 uv, float time) {
+    return vec2(
+        uv.x + sin(uv.y * wave_frequency + time) * wave_amplitude,
+        uv.y + sin(uv.x * wave_frequency + time) * wave_amplitude
+    );
 }
 
 void fragment() {
-	ivec2 uv;
-	vec3 color;
+	vec2 center_position = -1.0 + 2.0 * UV / (1.0 / TEXTURE_PIXEL_SIZE);
+	float center_distance = length(center_position);
 
-	if(scale_resolution){
-		uv = ivec2(FRAGCOORD.xy / float(target_resolution_scale));
-		color = texelFetch(TEXTURE, uv * target_resolution_scale, 0).rgb;
-	} else {
-		uv = ivec2(FRAGCOORD.xy);
-		color = texelFetch(TEXTURE, uv, 0).rgb;
-	}
+	float ripple = sin(center_distance * -frequency * PI + ripple_rate * TIME) * amplitude / (center_distance + 1.0);
 
-	if(enable_recolor){
-		vec3 hsv = rgb2hsv(color);
-		float color_pos = (hsv.x / 360.0);
-		vec3 new_color = texture(to_gradient, vec2((color_pos), 0.5)).rgb;
-		vec3 new_hsv = rgb2hsv(new_color);
-		hsv.x = new_hsv.x;
-		vec3 final_rgb = hsv2rgb(hsv);
+	vec2 uv = FRAGCOORD.xy / (1.0 / SCREEN_PIXEL_SIZE).xy + (center_position/center_distance) * ripple * wave_amplitude;
+    vec2 background_wave = wave(uv, TIME);
+	vec4 background_texture = texture(SCREEN_TEXTURE,background_wave) * sqrt(amplitude);
 
-		color.rgb = final_rgb;
-	}
+	float alpha_scalar = (1.0 - min(center_distance, 1.0)) * background_texture.x * 2.5;
 
+	background_texture.a *= 1.0 * alpha_scalar * (ripple + background_texture.x * background_texture.y);
+	background_texture.a = max(background_texture.a - (background_texture.y * 0.45), 0.0);
 
-	// Convert from [0.0, 1.0] range to [0, 255] range
-	ivec3 c = ivec3(round(color * 255.0));
+	COLOR = vec4(background_texture.xyz, background_texture.a);
 
-	// Apply the dithering pattern
-	if (dithering) {
-		c += ivec3(dithering_pattern(uv));
-	}
-
-	vec3 final_color;
-	if(change_color_depth){
-		// Truncate from 8 bits to color_depth bits
-		c >>= (8 - target_color_depth);
-		final_color = vec3(c) / float(1 << target_color_depth);
-	} else {
-		final_color = vec3(c) / float(1 << 8);
-	}
-
-	// Convert back to [0.0, 1.0] range
-	COLOR.rgb = final_color;
 }

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

@@ -1,20 +1,36 @@
-[gd_scene load_steps=5 format=3 uid="uid://cagfc5ridmteu"]
+[gd_scene load_steps=6 format=3 uid="uid://cagfc5ridmteu"]
 
 [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"]
 [ext_resource type="PackedScene" uid="uid://drkl3btdy6uxj" path="res://src/options/OptionsMenu.tscn" id="2_v0mgf"]
 [ext_resource type="PackedScene" uid="uid://cpjlj7kxdhv16" path="res://src/menu/LoadingScreen.tscn" id="3_3st5l"]
+[ext_resource type="PackedScene" uid="uid://cm6fo70yb2hip" path="res://src/ui/gallery/GalleryMenu.tscn" id="5_iuu71"]
 
 [node name="App" type="Node"]
 process_mode = 3
 script = ExtResource("1_rt73h")
 
-[node name="LoadingScreen" parent="." instance=ExtResource("3_3st5l")]
+[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
 
 [node name="OptionsMenu" parent="." instance=ExtResource("2_v0mgf")]
 unique_name_in_owner = true
 visible = false
 
-[node name="MainMenu" parent="." instance=ExtResource("2_1uiag")]
+[node name="GalleryMenu" parent="." instance=ExtResource("5_iuu71")]
 unique_name_in_owner = true
+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/AMB/amb_beach.wav.import

@@ -1,24 +0,0 @@
-[remap]
-
-importer="wav"
-type="AudioStreamWAV"
-uid="uid://ddii3pi8x75xc"
-path="res://.godot/imported/amb_beach.wav-046e4f838e50e43a1aba1a754b92aad6.sample"
-
-[deps]
-
-source_file="res://src/audio/AMB/amb_beach.wav"
-dest_files=["res://.godot/imported/amb_beach.wav-046e4f838e50e43a1aba1a754b92aad6.sample"]
-
-[params]
-
-force/8_bit=false
-force/mono=false
-force/max_rate=false
-force/max_rate_hz=44100
-edit/trim=false
-edit/normalize=false
-edit/loop_mode=3
-edit/loop_begin=0
-edit/loop_end=-1
-compress/mode=2

Zennysoft.Game.Ma/src/audio/AMB/amb_perlin.wav.import

@@ -1,24 +0,0 @@
-[remap]
-
-importer="wav"
-type="AudioStreamWAV"
-uid="uid://ym4ur8a2qxhp"
-path="res://.godot/imported/amb_perlin.wav-ba6da0d5591f392e4aca7d2f85c4dfc2.sample"
-
-[deps]
-
-source_file="res://src/audio/AMB/amb_perlin.wav"
-dest_files=["res://.godot/imported/amb_perlin.wav-ba6da0d5591f392e4aca7d2f85c4dfc2.sample"]
-
-[params]
-
-force/8_bit=false
-force/mono=false
-force/max_rate=false
-force/max_rate_hz=44100
-edit/trim=false
-edit/normalize=false
-edit/loop_mode=3
-edit/loop_begin=0
-edit/loop_end=-1
-compress/mode=2

Zennysoft.Game.Ma/src/audio/AMB/amb_white_noise.wav.import

@@ -1,24 +0,0 @@
-[remap]
-
-importer="wav"
-type="AudioStreamWAV"
-uid="uid://b7wxddjx3qw5o"
-path="res://.godot/imported/amb_white_noise.wav-d316dd05afe429f6bcdda594285ad718.sample"
-
-[deps]
-
-source_file="res://src/audio/AMB/amb_white_noise.wav"
-dest_files=["res://.godot/imported/amb_white_noise.wav-d316dd05afe429f6bcdda594285ad718.sample"]
-
-[params]
-
-force/8_bit=false
-force/mono=false
-force/max_rate=false
-force/max_rate_hz=44100
-edit/trim=false
-edit/normalize=false
-edit/loop_mode=3
-edit/loop_begin=0
-edit/loop_end=-1
-compress/mode=2

Zennysoft.Game.Ma/src/audio/AMB/amb_wind_loop_altar.wav.import

@@ -1,24 +0,0 @@
-[remap]
-
-importer="wav"
-type="AudioStreamWAV"
-uid="uid://bmiitw4fcs68e"
-path="res://.godot/imported/amb_wind_loop_altar.wav-e766e3db29faa01ad6dbaa8cb18d7de6.sample"
-
-[deps]
-
-source_file="res://src/audio/AMB/amb_wind_loop_altar.wav"
-dest_files=["res://.godot/imported/amb_wind_loop_altar.wav-e766e3db29faa01ad6dbaa8cb18d7de6.sample"]
-
-[params]
-
-force/8_bit=false
-force/mono=false
-force/max_rate=false
-force/max_rate_hz=44100
-edit/trim=false
-edit/normalize=false
-edit/loop_mode=3
-edit/loop_begin=0
-edit/loop_end=-1
-compress/mode=2

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

@@ -0,0 +1,6 @@
+using Zennysoft.Game.Implementation;
+
+public partial class AmbientSFXPlayer : DimmableAudioStreamPlayer
+{
+  public override void _EnterTree() => FadeIn();
+}

Zennysoft.Game.Ma/src/audio/AmbientSFXPlayer.cs.uid

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

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

@@ -0,0 +1,6 @@
+using Zennysoft.Game.Implementation;
+
+public partial class AmbientSFXPlayer3D : DimmableAudioStreamPlayer3D
+{
+  public override void _EnterTree() => FadeIn();
+}

Zennysoft.Game.Ma/src/audio/AmbientSFXPlayer3D.cs.uid

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

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

@@ -1,4 +1,4 @@
-[gd_scene load_steps=25 format=3 uid="uid://brgi35xj3b4ud"]
+[gd_scene load_steps=26 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"]
@@ -11,6 +11,7 @@
 [ext_resource type="AudioStream" uid="uid://doeefxilh0luj" path="res://src/audio/sfx/ITEM_SORT.ogg" id="9_l6w22"]
 [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"]
 [ext_resource type="AudioStream" uid="uid://oslvh60ec5gc" path="res://src/audio/sfx/UI_CANCEL_BACK.ogg" id="11_rloay"]
 [ext_resource type="AudioStream" uid="uid://bo2u1ceci6k1i" path="res://src/audio/sfx/PLAYER_quicker_slash.ogg" id="13_fa8i8"]
 [ext_resource type="AudioStream" uid="uid://na0lxb1lib11" path="res://src/audio/sfx/player_crit.ogg" id="14_p5cio"]
@@ -38,6 +39,7 @@ bus = &"SFX"
 [node name="MoveSound" type="AudioStreamPlayer" parent="UI"]
 unique_name_in_owner = true
 stream = ExtResource("6_r16t0")
+max_polyphony = 5
 bus = &"SFX"
 
 [node name="SelectSound" type="AudioStreamPlayer" parent="UI"]
@@ -67,11 +69,16 @@ unique_name_in_owner = true
 stream = ExtResource("3_kac56")
 bus = &"SFX"
 
-[node name="WeaponSwingSound" type="AudioStreamPlayer" parent="Player"]
+[node name="WeaponQuickSlashSound" type="AudioStreamPlayer" parent="Player"]
 unique_name_in_owner = true
 stream = ExtResource("13_fa8i8")
 bus = &"SFX"
 
+[node name="WeaponSlowSlashSound" type="AudioStreamPlayer" parent="Player"]
+unique_name_in_owner = true
+stream = ExtResource("10_vyvit")
+bus = &"SFX"
+
 [node name="CritSound" type="AudioStreamPlayer" parent="Player"]
 unique_name_in_owner = true
 stream = ExtResource("14_p5cio")

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

@@ -24,7 +24,6 @@ public partial class SfxDatabase : Node
       {SoundEffect.TakeDamage, TakeDamageSound },
       {SoundEffect.HealVT, HealVTSound },
       {SoundEffect.IncreaseStat, IncreaseStatSound },
-      {SoundEffect.WeaponSwing, WeaponSwingSound },
       {SoundEffect.Crit, CritSound },
       {SoundEffect.PickupItem, PickupItemSound },
       {SoundEffect.OpenInventory, OpenInventorySound },
@@ -42,6 +41,8 @@ public partial class SfxDatabase : Node
       {SoundEffect.TeleportToExit, TeleportToExitSound},
       {SoundEffect.AbsorbHPFromAllEnemies, AbsorbHPFromAllEnemiesSound},
       {SoundEffect.TurnAllEnemiesIntoHealingItems, TurnAllEnemiesIntoHealingItemsSound},
+      {SoundEffect.WeaponQuickSlash, WeaponQuickSlashSound },
+      {SoundEffect.WeaponSlowSlash, WeaponSlowSlashSound },
     };
   }
 
@@ -49,7 +50,8 @@ 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 WeaponSwingSound { get; set; } = default!;
+  [Node] private AudioStreamPlayer WeaponQuickSlashSound { get; set; } = default!;
+  [Node] private AudioStreamPlayer WeaponSlowSlashSound { get; set; } = default!;
   [Node] private AudioStreamPlayer CritSound { get; set; } = default!;
   [Node] private AudioStreamPlayer PickupItemSound { get; set; } = default!;
   [Node] private AudioStreamPlayer OpenInventorySound { get; set; }
@@ -85,7 +87,6 @@ public enum SoundEffect
   TakeDamage,
   HealVT,
   IncreaseStat,
-  WeaponSwing,
   Crit,
   PickupItem,
   OpenInventory,
@@ -104,5 +105,7 @@ public enum SoundEffect
   AbsorbHPFromAllEnemies,
   SwapHPAndVT,
   TurnAllEnemiesIntoHealingItems,
+  WeaponQuickSlash,
+  WeaponSlowSlash,
 }
 

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

@@ -0,0 +1,51 @@
+using Chickensoft.AutoInject;
+using Chickensoft.Introspection;
+using Godot;
+using System;
+
+[Meta(typeof(IAutoNode))]
+public partial class ShakeCamera : Camera3D
+{
+  public override void _Notification(int what) => this.Notify(what);
+
+  [Export] private double _shakeIntensity = 1.0;
+
+  [Export] private double _maxX = 10;
+  [Export] private double _maxY = 10;
+  [Export] private double _maxZ = 5;
+
+  [Export] private FastNoiseLite _noise;
+  [Export] private double _noiseSpeed = 50.0;
+
+  private double _shake = 0.0;
+  private double _time = 0.0;
+
+  private Vector3 _initialRotation;
+
+  public override void _Ready()
+  {
+	_initialRotation = RotationDegrees;
+  }
+
+  public override void _Process(double delta)
+  {
+	_time += delta;
+	_shake = Mathf.Max(_shake - delta * _shakeIntensity, 0.0);
+
+	RotationDegrees = new Vector3(
+	  (float)(_initialRotation.X + _maxX * Mathf.Pow(_shake, 2) * GetNoiseFromSeed(0)),
+	  (float)(_initialRotation.Y + _maxY * Mathf.Pow(_shake, 2) * GetNoiseFromSeed(1)),
+	  (float)(_initialRotation.Z + _maxZ * Mathf.Pow(_shake, 2) * GetNoiseFromSeed(2)));
+  }
+
+  public void AddShake(float shakeAmount)
+  {
+	_shake = Mathf.Clamp(_shake + shakeAmount, 0.0, 1.0);
+  }
+
+  private double GetNoiseFromSeed(int seed)
+  {
+	_noise.Seed = seed;
+	return _noise.GetNoise1D((float)(_time * _noiseSpeed));
+  }
+}

Zennysoft.Game.Ma/src/camera/ShakeCamera.cs.uid

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

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

@@ -0,0 +1,20 @@
+[gd_scene load_steps=3 format=3 uid="uid://didc6vnf5ftlg"]
+
+[ext_resource type="Script" uid="uid://bb36q1wpe0tlw" path="res://src/camera/ShakeCamera.cs" id="1_ubmds"]
+
+[sub_resource type="FastNoiseLite" id="FastNoiseLite_ubmds"]
+frequency = 0.08
+fractal_octaves = 4
+
+[node name="Camera3D" type="Camera3D"]
+cull_mask = 1048569
+doppler_tracking = 1
+fov = 52.0
+near = 0.01
+far = 9000.0
+script = ExtResource("1_ubmds")
+_shakeIntensity = 1.8
+_maxX = 0.0
+_maxY = 5.0
+_noise = SubResource("FastNoiseLite_ubmds")
+_noiseSpeed = 40.0

Zennysoft.Game.Ma/src/data_viewer/BlurSprite3D.gdshader

@@ -0,0 +1,47 @@
+shader_type spatial;
+render_mode diffuse_toon,specular_toon,cull_disabled;
+uniform sampler2D iChannel0 : source_color;
+uniform int samples =100;
+//
+//
+uniform float alpha_cut ;
+uniform float gain = 1.0; // gain : (gain), min = 0., max = 50.
+//
+uniform float blur_x =50.0; // X blur : (X blur), min = 0, max = 1000.
+uniform float blur_y = 50.0; // Y blur : (Y blur), min = 0, max = 1000.
+uniform float Rot_Angle : hint_range(0.0, 100.0, 0.1);
+uniform float Metal : hint_range(0.0, 1.0, 0.1);
+//
+//
+//
+vec2 rotate(vec2 uv, vec2 p, float angle)
+{
+	mat2 rotation = mat2(vec2(cos(angle), -sin(angle)),vec2(sin(angle), cos(angle)));
+	uv -= p;
+	uv = uv * rotation;
+	uv += p;
+	return uv;
+}
+
+void fragment(){
+	float Angle = Rot_Angle/-100.0;
+	vec2 uv = UV;
+	vec2 origin;
+	float precompute = Angle * (1.0 / float(samples - 1));
+	origin = vec2(0.5,0.5);
+    vec4 color = vec4(0.0);
+    float ws = 0.0;
+	vec2 center = vec2(0.5,0.5);
+	for(int i = 0; i <= samples; i++)
+    {
+		float p =  (float(i)* precompute);
+		float w = 1.0 ;
+        color += texture(iChannel0, rotate(uv,origin, p)) * w;
+        ws += w;
+    }
+
+	ALBEDO = vec4(color.rgb / ws * gain, 1.0).rgb;
+	//ALPHA = vec4(color.rgb / ws * gain, 1.0).r;
+	ALPHA = step(alpha_cut,1.0 - distance(center,UV));
+	METALLIC = Metal;
+}

Zennysoft.Game.Ma/src/data_viewer/BlurSprite3D.gdshader.uid

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

Zennysoft.Game.Ma/src/data_viewer/DataViewer.cs

@@ -1,16 +1,25 @@
 using Chickensoft.AutoInject;
 using Chickensoft.Introspection;
 using Godot;
+using System;
+using System.Collections.Generic;
 using System.Linq;
+using Zennysoft.Game.Abstractions;
 
 namespace Zennysoft.Game.Ma;
 
+public interface IDataViewer
+{
+
+}
+
 [Meta(typeof(IAutoNode))]
-public partial class DataViewer : Control
+public partial class DataViewer : Control, IDataViewer
 {
   public override void _Notification(int what) => this.Notify(what);
 
-  public IInstantiator Instantiator { get; set; } = default!;
+  [Dependency]
+  public IAppRepo AppRepo => this.DependOn<IAppRepo>();
 
   [Export]
   public float _cameraSpeed = 0.01f;
@@ -21,73 +30,142 @@ public partial class DataViewer : Control
 
   [Node] public Node3D ModelPivot { get; set; } = default!;
 
-  [Node] public DataViewerRepository DataViewerRepository { get; set; } = default!;
-
   #region UI
   [Node] public RichTextLabel EnemyName { get; set; } = default!;
   [Node] public RichTextLabel Description { get; set; } = default!;
+  [Node] public Label HPValue { get; set; } = default!;
+  [Node] public Label ATKValue { get; set; } = default!;
+  [Node] public Label DEFValue { get; set; } = default!;
+  [Node] public Label Drop1Value { get; set; } = default!;
+  [Node] public Label Drop2Value { get; set; } = default!;
+  [Node] public Label AffinityValue { get; set; } = default!;
+  [Node] public Label WeaknessValue { get; set; } = default!;
+
+  [Node] public Control EnemyInfo { get; set; } = default!;
+
+  [Node] public Button BackButton { get; set; } = default!;
   #endregion
 
-  private EnemyModelView2D _currentModel;
+  private EnemyModelView _currentModel;
+  private float _cameraStartingPoint = 0f;
+  private int _currentIndex = 0;
 
-  private int _modelIndex = 0;
+  private List<EnemyModelView> _enemies;
 
-  public void Initialize()
+  public void OnReady()
   {
-    Instantiator = new Instantiator(GetTree());
-    LoadModel();
+    BackButton.Pressed += BackButton_Pressed;
+    _enemies = [.. ModelPivot.GetChildren().Cast<EnemyModelView>()];
+    _currentModel = _enemies.First();
+    DisplayEnemy();
+  }
+
+  public void OnEnterTree()
+  {
+    GetTree().Paused = false;
+  }
+
+  public void OnExitTree()
+  {
+    GetTree().Paused = false;
+    BackButton.Pressed -= BackButton_Pressed;
+  }
+
+  private void BackButton_Pressed() => AppRepo.OnDataViewerExited();
+
+  public override void _Input(InputEvent @event)
+  {
+    if (BackButton.HasFocus() && @event.IsActionPressed(GameInputs.Interact))
+    {
+      GetTree().Paused = false;
+      BackButton.ReleaseFocus();
+      return;
+    }
+
+    if (_currentModel == null || BackButton.HasFocus())
+      return;
+
+    if (@event.IsActionPressed(GameInputs.Attack))
+      _currentModel.PlayPrimaryAttackAnimation();
+    if (@event.IsActionPressed(GameInputs.InventorySort))
+      _currentModel.PlaySecondaryAttackAnimation();
+    if (Input.IsActionJustPressed(GameInputs.Inventory))
+      _currentModel.PlayActivateAnimation();
+    if (@event.IsActionPressed(GameInputs.EnemyViewerWalk))
+      _currentModel.PlayWalkAnimation();
+    if (@event.IsActionReleased(GameInputs.EnemyViewerWalk))
+      _currentModel.PlayIdleAnimation();
+
+    if (@event.IsActionPressed(GameInputs.Interact))
+    {
+      GetTree().Paused = true;
+      BackButton.GrabFocus();
+    }
+
+    if (@event.IsActionPressed(GameInputs.StrafeRight))
+    {
+      // Load next model
+      _enemies[_currentIndex].Hide();
+      if (_currentIndex == _enemies.Count - 1)
+        _currentIndex = 0;
+      else
+        _currentIndex++;
+      DisplayEnemy();
+    }
+    if (@event.IsActionPressed(GameInputs.StrafeLeft))
+    {
+      _enemies[_currentIndex].Hide();
+      // Load previous model
+      if (_currentIndex == 0)
+        _currentIndex = _enemies.Count - 1;
+      else
+        _currentIndex--;
+      DisplayEnemy();
+    }
   }
 
   public override void _Process(double delta)
   {
-    if (Input.IsActionPressed(GameInputs.MoveLeft))
-      CameraPivot.RotateY(_cameraSpeed);
-    if (Input.IsActionPressed(GameInputs.MoveRight))
-      CameraPivot.RotateY(-_cameraSpeed);
-    if (Input.IsActionPressed(GameInputs.StrafeLeft))
-      Camera3D.Position = Camera3D.Position.MoveToward(CameraPivot.Position, (float)delta * 2f);
-    if (Input.IsActionPressed(GameInputs.StrafeRight))
-      Camera3D.Position = Camera3D.Position.MoveToward(CameraPivot.Position, -(float)delta * 2f);
+    if (_currentModel == null || BackButton.HasFocus())
+      return;
 
-    Camera3D.Position = Camera3D.Position.Clamp(new Vector3(0, 0, 1), new Vector3(0, 0, 4));
+    var forwardStrength = Input.GetActionStrength(GameInputs.CameraForward);
+    Camera3D.Position = Camera3D.Position.MoveToward(CameraPivot.Position, _cameraSpeed * forwardStrength * (_cameraStartingPoint / 10));
+    var backStrength = Input.GetActionStrength(GameInputs.CameraBack);
+    Camera3D.Position = Camera3D.Position.MoveToward(CameraPivot.Position, -_cameraSpeed * backStrength * (_cameraStartingPoint / 10));
+    var leftStrength = Input.GetActionStrength(GameInputs.MoveLeft);
+    CameraPivot.RotateY(_cameraSpeed * leftStrength);
+    var rightStrength = Input.GetActionStrength(GameInputs.MoveRight);
+    CameraPivot.RotateY(-_cameraSpeed * rightStrength);
+
+    Camera3D.Position = Camera3D.Position.Clamp(new Vector3(0, 0, _cameraStartingPoint / 2), new Vector3(0, 0, _cameraStartingPoint));
     ModelPivot.Rotation = ModelPivot.Rotation.Clamp(Mathf.DegToRad(-60), Mathf.DegToRad(60));
-    _currentModel.SetCurrentDirection(_currentModel.GlobalBasis, -CameraPivot.Basis.Z);
-    Description.Text = (-CameraPivot.RotationDegrees).ToString();
 
-    if (Input.IsActionJustPressed(GameInputs.Attack))
-      _currentModel.PlayPrimaryAttackAnimation();
-    if (Input.IsActionJustPressed(GameInputs.AltAttack))
-      _currentModel.PlaySecondaryAttackAnimation();
-    if (Input.IsActionJustPressed(GameInputs.Inventory))
-      _currentModel.PlayActivateAnimation();
-    if (Input.IsActionPressed(GameInputs.StrafeRight))
-      _currentModel.PlayWalkAnimation();
-    if (Input.IsActionJustReleased(GameInputs.StrafeRight))
-      _currentModel.PlayIdleAnimation();
-
-    if (Input.IsActionJustPressed(GameInputs.Next))
-    {
-      // Load next model
-      _currentModel.CallDeferred(MethodName.QueueFree);
-      _modelIndex = (_modelIndex + 1) % DataViewerRepository.ModelRepository.Count;
-      GD.Print(_modelIndex);
-      CallDeferred(MethodName.LoadModel);
-    }
-    if (Input.IsActionJustPressed(GameInputs.Previous))
-    {
-      // Load previous model
-      _currentModel.CallDeferred(MethodName.QueueFree);
-      _modelIndex = (_modelIndex - 1 < 0 ? DataViewerRepository.ModelRepository.Count : _modelIndex) - 1;
-      CallDeferred(MethodName.LoadModel);
-    }
+    if (_currentModel is EnemyModelView2D enemyModelView2D)
+      enemyModelView2D.SetCurrentDirection(_currentModel.GlobalBasis, -CameraPivot.Basis.Z);
   }
 
-  private void LoadModel()
+  private void DisplayEnemy()
   {
-    var modelScene = DataViewerRepository.ModelRepository.ElementAt(_modelIndex);
-    _currentModel = modelScene.Instantiate<EnemyModelView2D>();
-    ModelPivot.AddChild(_currentModel);
-    EnemyName.Text = _currentModel.EnemyLoreInfo.Name;
-    Description.Text = _currentModel.EnemyLoreInfo.Description;
+    _currentModel = _enemies[_currentIndex];
+
+    var size = _currentModel.GetSize();
+    if (_currentModel is EnemyModelView2D)
+      _cameraStartingPoint = size.X / 50;
+    else
+      _cameraStartingPoint = size.X * 2;
+
+    Camera3D.Position = new Vector3(Camera3D.Position.X, Camera3D.Position.Y, _cameraStartingPoint);
+    EnemyName.Text = _currentModel.EnemyLoreInfo != null ? _currentModel.EnemyLoreInfo.Name : "Placeholder Text";
+    Description.Text = _currentModel.EnemyLoreInfo != null ? _currentModel.EnemyLoreInfo.Description : "Placeholder Text";
+    HPValue.Text = _currentModel.EnemyLoreInfo != null ? _currentModel.EnemyLoreInfo.MaximumHP : "Placeholder Text";
+    ATKValue.Text = _currentModel.EnemyLoreInfo != null ? _currentModel.EnemyLoreInfo.ATK : "Placeholder Text";
+    DEFValue.Text = _currentModel.EnemyLoreInfo != null ? _currentModel.EnemyLoreInfo.DEF : "Placeholder Text";
+    Drop1Value.Text = _currentModel.EnemyLoreInfo != null ? _currentModel.EnemyLoreInfo.Drop1 : "Placeholder Text";
+    Drop2Value.Text = _currentModel.EnemyLoreInfo != null ? _currentModel.EnemyLoreInfo.Drop2 : "Placeholder Text";
+    AffinityValue.Text = _currentModel.EnemyLoreInfo != null ? _currentModel.EnemyLoreInfo.Affinity : "Placeholder Text";
+    WeaknessValue.Text = _currentModel.EnemyLoreInfo != null ? _currentModel.EnemyLoreInfo.Weakness : "Placeholder Text";
+
+    _enemies[_currentIndex].Show();
   }
 }

Zennysoft.Game.Ma/src/data_viewer/DataViewer.tscn

@@ -1,28 +1,35 @@
-[gd_scene load_steps=22 format=3 uid="uid://c7wjbgbrdivol"]
+[gd_scene load_steps=19 format=3 uid="uid://c7wjbgbrdivol"]
 
 [ext_resource type="Script" uid="uid://bgaflnnur26vk" path="res://src/data_viewer/DataViewer.cs" id="1_1qako"]
-[ext_resource type="Theme" uid="uid://daxuhpmyxwxck" path="res://src/ui/inventory_menu/InventoryDialogueSelectionStyle.tres" id="2_bef6s"]
-[ext_resource type="Texture2D" uid="uid://bg7elvikjtl36" path="res://src/map/assets/Sarcophagus/sarco altar_greeen2.png" id="3_3wl4s"]
-[ext_resource type="PackedScene" uid="uid://c16i1gmg6yu5a" path="res://src/data_viewer/DataViewerRepository.tscn" id="3_ejdn0"]
-[ext_resource type="PackedScene" uid="uid://bjg8wyvp8q6oc" path="res://src/enemy/enemy_types/02. michael/MichaelModelView.tscn" id="4_bef6s"]
-[ext_resource type="PackedScene" uid="uid://dcm53j3rncxdm" path="res://src/enemy/enemy_types/06. chariot/ChariotModelView.tscn" id="5_vk1lh"]
-[ext_resource type="PackedScene" uid="uid://bimjnsu52y3xi" path="res://src/enemy/enemy_types/01. sproingy/SproingyModelView.tscn" id="6_hpkd1"]
-[ext_resource type="PackedScene" uid="uid://bup8c4x1na3aw" path="res://src/enemy/enemy_types/03. filth_eater/FilthEaterModelView.tscn" id="8_dvixg"]
-[ext_resource type="PackedScene" uid="uid://bls3mcsyld4vy" path="res://src/enemy/enemy_types/09. Agni/AgniDemonModelView.tscn" id="9_utjpw"]
-[ext_resource type="PackedScene" uid="uid://cu7n814hhtjwm" path="res://src/enemy/enemy_types/9b. Aqueos Demon/AqueosModelView.tscn" id="10_ylptw"]
-[ext_resource type="PackedScene" uid="uid://c2i8ylr3y0bri" path="res://src/enemy/enemy_types/08a. Ambassador/AmbassadorModelView.tscn" id="11_fm7p5"]
-[ext_resource type="PackedScene" uid="uid://72lbcmp4bcx4" path="res://src/enemy/enemy_types/08b. Ambassador (red)/AmbassadorSmallModelView.tscn" id="12_5hrw6"]
-[ext_resource type="PackedScene" uid="uid://lc5koiqn1sca" path="res://src/enemy/enemy_types/08c. Ambassador (steel)/AmbassadorSteelModelView.tscn" id="13_5hrw6"]
-[ext_resource type="PackedScene" uid="uid://dxwwfbt2mtmer" path="res://src/enemy/enemy_types/11. Palan/PalanModelView.tscn" id="14_3wl4s"]
-[ext_resource type="PackedScene" uid="uid://drkaq6grim1fb" path="res://src/enemy/enemy_types/12. Shield of Heaven/ShieldModelView.tscn" id="15_37gx6"]
-[ext_resource type="PackedScene" uid="uid://bli0t0d6ommvi" path="res://src/enemy/enemy_types/04. sara/SaraModelView.tscn" id="16_alsxp"]
-[ext_resource type="PackedScene" uid="uid://byd7cwxq1be6f" path="res://src/enemy/enemy_types/07. chinthe/ChintheModelView.tscn" id="17_qov77"]
-[ext_resource type="PackedScene" uid="uid://c5xijwxkg4pf6" path="res://src/enemy/enemy_types/05. ballos/BallosModelView.tscn" id="18_sxd8s"]
-[ext_resource type="PackedScene" uid="uid://c5asojy73n44d" path="res://src/enemy/enemy_types/13. gold sproingy/GoldSproingyModelView2.tscn" id="19_gkucd"]
+[ext_resource type="Texture2D" uid="uid://dsf5l6g8n1tkw" path="res://src/ui/rendered_assets/SCREEN_RENDERS_Viewer_720_16_9.png" id="2_hpkd1"]
+[ext_resource type="Texture2D" uid="uid://bophm5or5opdf" path="res://src/data_viewer/bafkreicavupacvvhtig6ii2zb3svww7luvmuknyttza6s4doxm4oursnzm.jpg" id="3_hpkd1"]
+[ext_resource type="PackedScene" uid="uid://bimjnsu52y3xi" path="res://src/enemy/enemy_types/01. sproingy/SproingyModelView.tscn" id="3_vk1lh"]
+[ext_resource type="Shader" uid="uid://o80s4yvp0rto" path="res://src/data_viewer/BlurSprite3D.gdshader" id="4_vk1lh"]
+[ext_resource type="LabelSettings" uid="uid://b6f8ggy3ulonb" path="res://src/ui/label_settings/GeorgiaItalic.tres" id="6_vk1lh"]
+[ext_resource type="FontFile" uid="uid://beh6d5lo5ihq0" path="res://src/ui/fonts/georgiai.ttf" id="7_dvixg"]
+[ext_resource type="PackedScene" uid="uid://bjg8wyvp8q6oc" path="res://src/enemy/enemy_types/02. michael/MichaelModelView.tscn" id="8_ekqja"]
+[ext_resource type="PackedScene" uid="uid://c5xijwxkg4pf6" path="res://src/enemy/enemy_types/05. ballos/BallosModelView.tscn" id="11_icshd"]
+[ext_resource type="PackedScene" uid="uid://bid6f48l0q58o" path="res://src/enemy/enemy_types/14. horse_head/HorseFaceModelView.tscn" id="19_qagkd"]
+[ext_resource type="PackedScene" uid="uid://dnomfbym36ivg" path="res://src/enemy/enemy_types/15. ox_face/OxFaceModelView.tscn" id="20_bw7jv"]
+[ext_resource type="PackedScene" uid="uid://l4413jwn0m8v" path="res://src/enemy/enemy_types/16. demon wall/DemonWallModelView.tscn" id="21_i7aes"]
+[ext_resource type="StyleBox" uid="uid://bxuy4tnftibfq" path="res://src/options/SelectedOptionsBox.tres" id="25_gdy4a"]
+[ext_resource type="StyleBox" uid="uid://bl15q835s4ene" path="res://src/options/UnselectedOptionsBox.tres" id="26_br3ej"]
 
-[sub_resource type="StandardMaterial3D" id="StandardMaterial3D_dvixg"]
-shading_mode = 0
-albedo_texture = ExtResource("3_3wl4s")
+[sub_resource type="Environment" id="Environment_vk1lh"]
+
+[sub_resource type="CameraAttributesPhysical" id="CameraAttributesPhysical_dvixg"]
+
+[sub_resource type="ShaderMaterial" id="ShaderMaterial_dvixg"]
+render_priority = 0
+shader = ExtResource("4_vk1lh")
+shader_parameter/iChannel0 = ExtResource("3_hpkd1")
+shader_parameter/samples = 100
+shader_parameter/alpha_cut = 0.0
+shader_parameter/gain = 17.73
+shader_parameter/blur_x = 50.0
+shader_parameter/blur_y = 50.0
+shader_parameter/Rot_Angle = 4.9
+shader_parameter/Metal = 0.0
 
 [sub_resource type="Environment" id="Environment_3wl4s"]
 background_mode = 1
@@ -37,131 +44,245 @@ grow_vertical = 2
 size_flags_horizontal = 3
 size_flags_vertical = 3
 script = ExtResource("1_1qako")
-_cameraSpeed = 0.015
+_cameraSpeed = 0.08
 
-[node name="CenterContainer" type="CenterContainer" parent="."]
+[node name="TextureRect" type="TextureRect" parent="."]
 layout_mode = 1
 anchors_preset = 15
 anchor_right = 1.0
 anchor_bottom = 1.0
 grow_horizontal = 2
 grow_vertical = 2
+texture = ExtResource("2_hpkd1")
 
-[node name="VBoxContainer" type="VBoxContainer" parent="CenterContainer"]
-layout_mode = 2
-theme_override_constants/separation = 0
-alignment = 1
+[node name="CenterContainer2" type="CenterContainer" parent="."]
+layout_mode = 0
+offset_left = 69.0
+offset_top = 196.0
+offset_right = 900.0
+offset_bottom = 942.0
 
-[node name="HBoxContainer" type="HBoxContainer" parent="CenterContainer/VBoxContainer"]
-layout_mode = 2
-theme_override_constants/separation = 0
-
-[node name="LeftPanel" type="Panel" parent="CenterContainer/VBoxContainer/HBoxContainer"]
-custom_minimum_size = Vector2(390, 0)
-layout_mode = 2
-size_flags_horizontal = 3
-
-[node name="EnemyName" type="RichTextLabel" parent="CenterContainer/VBoxContainer/HBoxContainer/LeftPanel"]
-unique_name_in_owner = true
-layout_mode = 1
-anchors_preset = 15
-anchor_right = 1.0
-anchor_bottom = 1.0
-grow_horizontal = 2
-grow_vertical = 2
-theme = ExtResource("2_bef6s")
-text = "Placeholder Text"
-
-[node name="SubViewportContainer" type="SubViewportContainer" parent="CenterContainer/VBoxContainer/HBoxContainer"]
-custom_minimum_size = Vector2(500, 500)
+[node name="SubViewportContainer" type="SubViewportContainer" parent="CenterContainer2"]
+custom_minimum_size = Vector2(750, 600)
 layout_mode = 2
 stretch = true
 
-[node name="SubViewport" type="SubViewport" parent="CenterContainer/VBoxContainer/HBoxContainer/SubViewportContainer"]
+[node name="SubViewport" type="SubViewport" parent="CenterContainer2/SubViewportContainer"]
+process_mode = 1
 own_world_3d = true
 handle_input_locally = false
-size = Vector2i(500, 500)
+size = Vector2i(750, 600)
 render_target_update_mode = 4
 
-[node name="ModelPivot" type="Node3D" parent="CenterContainer/VBoxContainer/HBoxContainer/SubViewportContainer/SubViewport"]
+[node name="Light" type="OmniLight3D" parent="CenterContainer2/SubViewportContainer/SubViewport"]
+transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 1, 0.401216)
+omni_range = 4096.0
+
+[node name="ModelPivot" type="Node3D" parent="CenterContainer2/SubViewportContainer/SubViewport"]
 unique_name_in_owner = true
 transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0.82392, 0)
 
-[node name="CameraPivot" type="Node3D" parent="CenterContainer/VBoxContainer/HBoxContainer/SubViewportContainer/SubViewport"]
+[node name="Sproingy" parent="CenterContainer2/SubViewportContainer/SubViewport/ModelPivot" instance=ExtResource("3_vk1lh")]
+transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0.26108, 0)
+visible = false
+
+[node name="Michael" parent="CenterContainer2/SubViewportContainer/SubViewport/ModelPivot" instance=ExtResource("8_ekqja")]
+transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0.20608, 0)
+visible = false
+
+[node name="Ballos" parent="CenterContainer2/SubViewportContainer/SubViewport/ModelPivot" instance=ExtResource("11_icshd")]
+transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0.23608, 0)
+visible = false
+
+[node name="Horse Face" parent="CenterContainer2/SubViewportContainer/SubViewport/ModelPivot" instance=ExtResource("19_qagkd")]
+visible = false
+
+[node name="Ox Face" parent="CenterContainer2/SubViewportContainer/SubViewport/ModelPivot" instance=ExtResource("20_bw7jv")]
+visible = false
+
+[node name="Demon Wall" parent="CenterContainer2/SubViewportContainer/SubViewport/ModelPivot" instance=ExtResource("21_i7aes")]
+visible = false
+
+[node name="CameraPivot" type="Node3D" parent="CenterContainer2/SubViewportContainer/SubViewport"]
 unique_name_in_owner = true
-transform = Transform3D(-1, 0, -8.74228e-08, 0, 1, 0, 8.74228e-08, 0, -1, 0, 1, 0)
+transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 1, 0)
 
-[node name="Camera3D" type="Camera3D" parent="CenterContainer/VBoxContainer/HBoxContainer/SubViewportContainer/SubViewport/CameraPivot"]
+[node name="Camera3D" type="Camera3D" parent="CenterContainer2/SubViewportContainer/SubViewport/CameraPivot"]
 unique_name_in_owner = true
-transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -9.82023e-08, 0, 3.1233)
+transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, 5)
+environment = SubResource("Environment_vk1lh")
+attributes = SubResource("CameraAttributesPhysical_dvixg")
 
-[node name="CSGCylinder3D" type="CSGCylinder3D" parent="CenterContainer/VBoxContainer/HBoxContainer/SubViewportContainer/SubViewport"]
-transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, -2.84891, 0)
-radius = 1.5
-height = 5.46951
-material = SubResource("StandardMaterial3D_dvixg")
+[node name="Sprite3D" type="Sprite3D" parent="CenterContainer2/SubViewportContainer/SubViewport/CameraPivot/Camera3D"]
+transform = Transform3D(-1, 0, 8.74228e-08, 0, 1, 0, -8.74228e-08, 0, -1, 349.344, -203.088, -300)
+material_override = SubResource("ShaderMaterial_dvixg")
+pixel_size = 1.0
+billboard = 2
+transparent = false
+texture_filter = 2
+texture = ExtResource("3_hpkd1")
 
-[node name="RightPanel" type="Panel" parent="CenterContainer/VBoxContainer/HBoxContainer"]
-custom_minimum_size = Vector2(390, 0)
+[node name="MarginContainer" type="MarginContainer" parent="."]
+layout_mode = 2
+anchor_left = 0.5
+anchor_top = 0.186
+anchor_right = 0.969
+anchor_bottom = 0.87
+offset_left = 13.0
+offset_top = 4.12
+offset_right = 5.5199
+offset_bottom = 3.3999
+theme_override_constants/margin_left = 25
+theme_override_constants/margin_top = 25
+theme_override_constants/margin_right = 25
+
+[node name="EnemyInfo" type="VBoxContainer" parent="MarginContainer"]
+unique_name_in_owner = true
+layout_mode = 2
+theme_override_constants/separation = 20
+
+[node name="EnemyName" type="RichTextLabel" parent="MarginContainer/EnemyInfo"]
+unique_name_in_owner = true
+custom_minimum_size = Vector2(800, 50)
+layout_mode = 2
+theme_override_fonts/normal_font = ExtResource("7_dvixg")
+theme_override_font_sizes/normal_font_size = 40
+text = "Placeholder Text"
+
+[node name="HBoxContainer" type="HBoxContainer" parent="MarginContainer/EnemyInfo"]
+custom_minimum_size = Vector2(0, 150)
+layout_mode = 2
+
+[node name="StatBlock" type="VBoxContainer" parent="MarginContainer/EnemyInfo/HBoxContainer"]
+custom_minimum_size = Vector2(300, 0)
+layout_mode = 2
+
+[node name="HPBlock" type="HBoxContainer" parent="MarginContainer/EnemyInfo/HBoxContainer/StatBlock"]
+layout_mode = 2
+
+[node name="Label" type="Label" parent="MarginContainer/EnemyInfo/HBoxContainer/StatBlock/HPBlock"]
+layout_mode = 2
+text = "HP"
+label_settings = ExtResource("6_vk1lh")
+
+[node name="HPValue" type="Label" parent="MarginContainer/EnemyInfo/HBoxContainer/StatBlock/HPBlock"]
+unique_name_in_owner = true
 layout_mode = 2
 size_flags_horizontal = 3
+text = "992"
+label_settings = ExtResource("6_vk1lh")
 
-[node name="TextEdit" type="RichTextLabel" parent="CenterContainer/VBoxContainer/HBoxContainer/RightPanel"]
-layout_mode = 1
-anchors_preset = 15
-anchor_right = 1.0
-anchor_bottom = 1.0
-grow_horizontal = 2
-grow_vertical = 2
-theme = ExtResource("2_bef6s")
-text = "Placeholder Text"
-
-[node name="BottomPanel" type="Panel" parent="CenterContainer/VBoxContainer"]
-custom_minimum_size = Vector2(0, 460)
+[node name="ATKBlock" type="HBoxContainer" parent="MarginContainer/EnemyInfo/HBoxContainer/StatBlock"]
 layout_mode = 2
-size_flags_vertical = 3
 
-[node name="ColorRect" type="ColorRect" parent="CenterContainer/VBoxContainer/BottomPanel"]
-layout_mode = 1
-anchors_preset = 12
-anchor_top = 1.0
-anchor_right = 1.0
-anchor_bottom = 1.0
-grow_horizontal = 2
-grow_vertical = 0
+[node name="Label" type="Label" parent="MarginContainer/EnemyInfo/HBoxContainer/StatBlock/ATKBlock"]
+layout_mode = 2
+text = "ATK"
+label_settings = ExtResource("6_vk1lh")
 
-[node name="Description" type="RichTextLabel" parent="CenterContainer/VBoxContainer/BottomPanel"]
+[node name="ATKValue" type="Label" parent="MarginContainer/EnemyInfo/HBoxContainer/StatBlock/ATKBlock"]
 unique_name_in_owner = true
-layout_mode = 1
-anchors_preset = 15
-anchor_right = 1.0
-anchor_bottom = 1.0
-grow_horizontal = 2
-grow_vertical = 2
-theme = ExtResource("2_bef6s")
+layout_mode = 2
+size_flags_horizontal = 3
+text = "14"
+label_settings = ExtResource("6_vk1lh")
+
+[node name="DEFBlock" type="HBoxContainer" parent="MarginContainer/EnemyInfo/HBoxContainer/StatBlock"]
+layout_mode = 2
+
+[node name="Label" type="Label" parent="MarginContainer/EnemyInfo/HBoxContainer/StatBlock/DEFBlock"]
+layout_mode = 2
+text = "DEF"
+label_settings = ExtResource("6_vk1lh")
+
+[node name="DEFValue" type="Label" parent="MarginContainer/EnemyInfo/HBoxContainer/StatBlock/DEFBlock"]
+unique_name_in_owner = true
+layout_mode = 2
+size_flags_horizontal = 3
+text = "15"
+label_settings = ExtResource("6_vk1lh")
+
+[node name="DropsBlock" type="VBoxContainer" parent="MarginContainer/EnemyInfo/HBoxContainer"]
+custom_minimum_size = Vector2(300, 0)
+layout_mode = 2
+
+[node name="Drops" type="Label" parent="MarginContainer/EnemyInfo/HBoxContainer/DropsBlock"]
+layout_mode = 2
+text = "Drops:"
+label_settings = ExtResource("6_vk1lh")
+
+[node name="FirstDrop" type="HBoxContainer" parent="MarginContainer/EnemyInfo/HBoxContainer/DropsBlock"]
+layout_mode = 2
+
+[node name="Label" type="Label" parent="MarginContainer/EnemyInfo/HBoxContainer/DropsBlock/FirstDrop"]
+layout_mode = 2
+text = "1."
+label_settings = ExtResource("6_vk1lh")
+
+[node name="Drop1Value" type="Label" parent="MarginContainer/EnemyInfo/HBoxContainer/DropsBlock/FirstDrop"]
+unique_name_in_owner = true
+layout_mode = 2
+size_flags_horizontal = 3
+text = "???"
+label_settings = ExtResource("6_vk1lh")
+
+[node name="SecondDrop" type="HBoxContainer" parent="MarginContainer/EnemyInfo/HBoxContainer/DropsBlock"]
+layout_mode = 2
+
+[node name="Label" type="Label" parent="MarginContainer/EnemyInfo/HBoxContainer/DropsBlock/SecondDrop"]
+layout_mode = 2
+text = "2."
+label_settings = ExtResource("6_vk1lh")
+
+[node name="Drop2Value" type="Label" parent="MarginContainer/EnemyInfo/HBoxContainer/DropsBlock/SecondDrop"]
+unique_name_in_owner = true
+layout_mode = 2
+size_flags_horizontal = 3
+text = "Goddess Garb"
+label_settings = ExtResource("6_vk1lh")
+
+[node name="AffinityBlock" type="VBoxContainer" parent="MarginContainer/EnemyInfo"]
+custom_minimum_size = Vector2(300, 0)
+layout_mode = 2
+
+[node name="Affinity" type="HBoxContainer" parent="MarginContainer/EnemyInfo/AffinityBlock"]
+layout_mode = 2
+
+[node name="Label" type="Label" parent="MarginContainer/EnemyInfo/AffinityBlock/Affinity"]
+layout_mode = 2
+text = "Affinity:"
+label_settings = ExtResource("6_vk1lh")
+
+[node name="AffinityValue" type="Label" parent="MarginContainer/EnemyInfo/AffinityBlock/Affinity"]
+unique_name_in_owner = true
+layout_mode = 2
+size_flags_horizontal = 3
+text = "Metal"
+label_settings = ExtResource("6_vk1lh")
+
+[node name="Weakness" type="HBoxContainer" parent="MarginContainer/EnemyInfo/AffinityBlock"]
+layout_mode = 2
+
+[node name="Label" type="Label" parent="MarginContainer/EnemyInfo/AffinityBlock/Weakness"]
+layout_mode = 2
+text = "Weakness:"
+label_settings = ExtResource("6_vk1lh")
+
+[node name="WeaknessValue" type="Label" parent="MarginContainer/EnemyInfo/AffinityBlock/Weakness"]
+unique_name_in_owner = true
+layout_mode = 2
+size_flags_horizontal = 3
+text = "Holy"
+label_settings = ExtResource("6_vk1lh")
+
+[node name="Description" type="RichTextLabel" parent="MarginContainer/EnemyInfo"]
+unique_name_in_owner = true
+custom_minimum_size = Vector2(800, 625)
+layout_mode = 2
+theme_override_fonts/normal_font = ExtResource("7_dvixg")
+theme_override_font_sizes/normal_font_size = 30
 text = "Placeholder Text"
 
-[node name="Label" type="Label" parent="CenterContainer/VBoxContainer/BottomPanel"]
-layout_mode = 1
-anchors_preset = 3
-anchor_left = 1.0
-anchor_top = 1.0
-anchor_right = 1.0
-anchor_bottom = 1.0
-offset_left = -460.0
-offset_top = -228.0
-grow_horizontal = 0
-grow_vertical = 0
-theme = ExtResource("2_bef6s")
-text = "Switch: L1/R1 or <- ->
-Primary Attack: X (Space)
-Secondary Attack: ◻ (RMB)
-Activate: △ (E)"
-
-[node name="DataViewerRepository" parent="." instance=ExtResource("3_ejdn0")]
-unique_name_in_owner = true
-ModelRepository = Array[PackedScene]([ExtResource("5_vk1lh"), ExtResource("4_bef6s"), ExtResource("6_hpkd1"), ExtResource("8_dvixg"), ExtResource("9_utjpw"), ExtResource("10_ylptw"), ExtResource("11_fm7p5"), ExtResource("12_5hrw6"), ExtResource("13_5hrw6"), ExtResource("14_3wl4s"), ExtResource("15_37gx6"), ExtResource("16_alsxp"), ExtResource("17_qov77"), ExtResource("18_sxd8s"), ExtResource("19_gkucd")])
-
 [node name="WorldEnvironment" type="WorldEnvironment" parent="."]
 environment = SubResource("Environment_3wl4s")
 
@@ -170,3 +291,22 @@ transform = Transform3D(1, 0, 0, 0, -0.31977, 0.947495, 0, -0.947495, -0.31977,
 light_energy = 8.943
 spot_range = 9.00889
 spot_attenuation = 3.45
+
+[node name="BackButton" type="Button" parent="."]
+unique_name_in_owner = true
+layout_mode = 0
+offset_left = 1671.0
+offset_top = 972.0
+offset_right = 1803.0
+offset_bottom = 1028.0
+theme_override_styles/focus = ExtResource("25_gdy4a")
+theme_override_styles/disabled_mirrored = ExtResource("26_br3ej")
+theme_override_styles/disabled = ExtResource("26_br3ej")
+theme_override_styles/hover_pressed_mirrored = ExtResource("26_br3ej")
+theme_override_styles/hover_pressed = ExtResource("26_br3ej")
+theme_override_styles/hover_mirrored = ExtResource("26_br3ej")
+theme_override_styles/hover = ExtResource("26_br3ej")
+theme_override_styles/pressed_mirrored = ExtResource("26_br3ej")
+theme_override_styles/pressed = ExtResource("26_br3ej")
+theme_override_styles/normal_mirrored = ExtResource("26_br3ej")
+theme_override_styles/normal = ExtResource("26_br3ej")

Zennysoft.Game.Ma/src/data_viewer/DataViewerRepository.cs

@@ -1,12 +0,0 @@
-using Chickensoft.AutoInject;
-using Chickensoft.Introspection;
-using Godot;
-
-namespace Zennysoft.Game.Ma;
-
-[Meta(typeof(IAutoNode))]
-public partial class DataViewerRepository : Node
-{
-  [Export]
-  public Godot.Collections.Array<PackedScene> ModelRepository;
-}

Zennysoft.Game.Ma/src/data_viewer/DataViewerRepository.tscn

@@ -1,6 +0,0 @@
-[gd_scene load_steps=2 format=3 uid="uid://c16i1gmg6yu5a"]
-
-[ext_resource type="Script" uid="uid://03k48fke03vu" path="res://src/data_viewer/DataViewerRepository.cs" id="1_1cvot"]
-
-[node name="DataViewerRepository" type="Node"]
-script = ExtResource("1_1cvot")

Zennysoft.Game.Ma/src/data_viewer/bafkreicavupacvvhtig6ii2zb3svww7luvmuknyttza6s4doxm4oursnzm.jpg.import

@@ -0,0 +1,34 @@
+[remap]
+
+importer="texture"
+type="CompressedTexture2D"
+uid="uid://bophm5or5opdf"
+path="res://.godot/imported/bafkreicavupacvvhtig6ii2zb3svww7luvmuknyttza6s4doxm4oursnzm.jpg-c763a9fd7b565d1015c74205c4c551f8.ctex"
+metadata={
+"vram_texture": false
+}
+
+[deps]
+
+source_file="res://src/data_viewer/bafkreicavupacvvhtig6ii2zb3svww7luvmuknyttza6s4doxm4oursnzm.jpg"
+dest_files=["res://.godot/imported/bafkreicavupacvvhtig6ii2zb3svww7luvmuknyttza6s4doxm4oursnzm.jpg-c763a9fd7b565d1015c74205c4c551f8.ctex"]
+
+[params]
+
+compress/mode=0
+compress/high_quality=false
+compress/lossy_quality=0.7
+compress/hdr_compression=1
+compress/normal_map=0
+compress/channel_pack=0
+mipmaps/generate=false
+mipmaps/limit=-1
+roughness/mode=0
+roughness/src_normal=""
+process/fix_alpha_border=true
+process/premult_alpha=false
+process/normal_map_invert_y=false
+process/hdr_as_srgb=false
+process/hdr_clamp_exposure=false
+process/size_limit=0
+detect_3d/compress_to=0

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;
+    DeathCount.Text = _game.QuestData.DeathCount.ToString();
+  }
+
+  private void _gameRepo_EnemyDied(IEnemy obj) => EnemyCount.Text = (EnemyCount.Text.ToInt() - 1).ToString();
+
+  private void _map_FloorLoaded()
+  {
+    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://t22s2y1t8ktc"]
+
+[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")