Update icons in-game

Still working on Demon Wall boss fight overall

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.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);
     }
 
@@ -26,7 +25,7 @@ namespace Zennysoft.Ma.Adapter
       int incomingDamage,
       double elementalResistance)
     {
-      var result = incomingDamage - (int)(incomingDamage * elementalResistance);
+      var result = incomingDamage - (int)(incomingDamage * (elementalResistance / 100));
       return result;
     }
   }

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

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

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

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

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

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

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

@@ -1,21 +1,26 @@
 using Chickensoft.Collections;
-using Godot;
 using Zennysoft.Ma.Adapter.Entity;
 
 namespace Zennysoft.Ma.Adapter;
 public interface IEquipmentComponent : IEntityComponent
 {
-  public IAutoProp<EquipableItem> EquippedWeapon { get; }
+  public IAutoProp<IWeapon> EquippedWeapon { get; }
 
-  public IAutoProp<EquipableItem> EquippedArmor { get; }
+  public IAutoProp<IArmor> EquippedArmor { get; }
 
-  public IAutoProp<EquipableItem> EquippedAccessory { get; }
+  public IAutoProp<IAccessory> EquippedAccessory { get; }
 
-  public 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 +34,5 @@ public interface IEquipmentComponent : IEntityComponent
 
   public ElementalResistanceSet ElementalResistance { get; }
 
-  public event Action<EquipableItem> EquipmentChanged;
+  public event Action<IEquipableItem> EquipmentChanged;
 }

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

@@ -12,7 +12,17 @@ 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 void LevelDown();
+
+  public event Action PlayerLevelUp;
+
+  public event Action PlayerLevelDown;
 }

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

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

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

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

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

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

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

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

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

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

Zennysoft.Game.Ma.Implementation/Entity/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

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

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

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

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

@@ -0,0 +1,204 @@
+using Godot;
+using Zennysoft.Ma.Adapter;
+
+public class Augment
+{
+  public JewelTags AugmentTag;
+
+  public Augment(JewelTags tag, IAugmentType augment, string name, string description, Texture2D augmentTexture)
+  {
+    AugmentTag = tag;
+    AugmentName = name;
+    AugmentType = augment;
+    AugmentDescription = description;
+    AugmentTexture = augmentTexture;
+  }
+
+  public IAugmentType AugmentType { get; set; }
+
+  public string AugmentName { get; set; }
+
+  public string AugmentDescription { get; set; }
+
+  public Texture2D AugmentTexture { 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 BoostStatsAugment : IAugmentType
+{
+  private readonly IPlayer _player;
+  private readonly int _bonusLuck;
+  private readonly int _bonusHp;
+  private readonly int _bonusVt;
+
+  public BoostStatsAugment(IPlayer player, int bonusLuck, int bonusHp, int bonusVt)
+  {
+    _player = player;
+    _bonusLuck = bonusLuck;
+    _bonusHp = bonusHp;
+    _bonusVt = bonusVt;
+  }
+
+  public void Apply()
+  {
+    _player.HealthComponent.RaiseMaximumHP(_bonusHp);
+    _player.VTComponent.RaiseMaximumVT(_bonusVt);
+    _player.LuckComponent.IncreaseLuck(_bonusLuck);
+  }
+
+  public void Remove()
+  {
+  }
+}
+
+public class LowerHPRecoveryAugment : IAugmentType
+{
+  private readonly IPlayer _player;
+
+  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/AccessoryTag.cs

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

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

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

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

@@ -3,6 +3,25 @@
 public enum ItemTag
 {
   None,
-  BreaksOnChange,
+  BreaksOnFloorExit,
-  MysteryItem
+  MysteryItem,
+  DamagesPlayer,
+  ContainsRestorative,
+  ContainsWeapon,
+  ContainsArmor,
+  ContainsBox,
+  RandomSpell,
+  ContainsAccessory,
+  DropTo1HPAndGainRareItem,
+  TradeOneRandomItem,
+  TradeAllRandomItems,
+  ContainsUnobtainedItem,
+  ContainsBasicItem,
+  RestrictUnequip,
+  UnequipAllItems,
+  EjectAllItems,
+  UseAllItems,
+  GlueOnEquip,
+  BreaksOnUnequip,
+  ContainsJewel
 }

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

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

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;
 
@@ -15,23 +16,13 @@ public interface IGameRepo : IDisposable
 
   event Action<string>? AnnounceMessageInInventoryEvent;
 
-  event Action<int>? DoubleExpTimeStart;
+  event Action<IBaseInventoryItem>? RemoveItemFromInventoryEvent;
 
-  event Action? DoubleExpTimeEnd;
+  event Action<IEquipableItem>? EquippedItem;
 
-  event Action<InventoryItem>? RemoveItemFromInventoryEvent;
+  event Action<IEquipableItem>? UnequippedItem;
 
-  event Action? PlayerAttack;
+  event Action<IEnemy>? EnemyDied;
-
-  event Action? PlayerAttackedWall;
-
-  event Action? PlayerAttackedEnemy;
-
-  event Action<EquipableItem>? EquippedItem;
-
-  event Action<EquipableItem>? UnequippedItem;
-
-  event Action<IHealthPack>? RestorativePickedUp;
 
   void Pause();
 
@@ -39,31 +30,21 @@ public interface IGameRepo : IDisposable
 
   IAutoProp<bool> IsPaused { get; }
 
-  public void StartDoubleEXP(TimeSpan lengthOfEffect);
-
-  public void EndDoubleExp();
-
   public void AnnounceMessageOnMainScreen(string message);
 
   public void AnnounceMessageInInventory(string message);
 
-  public void RemoveItemFromInventory(InventoryItem item);
+  public void RemoveItemFromInventory(IBaseInventoryItem item);
-
-  public void OnPlayerAttack();
-
-  public void OnPlayerAttackedWall();
-
-  public void 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 double ExpRate { get; }
+  public void OnEnemyDied(IEnemy enemy);
 }
 
 public class GameRepo : IGameRepo
@@ -72,26 +53,18 @@ public class GameRepo : IGameRepo
   public event Action? CloseInventoryEvent;
   public event Action<string>? AnnounceMessageOnMainScreenEvent;
   public event Action<string>? AnnounceMessageInInventoryEvent;
-  public event Action<int>? DoubleExpTimeStart;
+  public event Action<IBaseInventoryItem>? RemoveItemFromInventoryEvent;
-  public event Action? DoubleExpTimeEnd;
+  public event Action<IEquipableItem>? EquippedItem;
-  public event Action<InventoryItem>? RemoveItemFromInventoryEvent;
+  public event Action<IEquipableItem>? UnequippedItem;
-  public event Action? PlayerAttack;
+  public event Action<IEnemy>? EnemyDied;
-  public event Action? PlayerAttackedWall;
-  public event Action? PlayerAttackedEnemy;
-  public event Action<EquipableItem>? EquippedItem;
-  public event Action<EquipableItem>? UnequippedItem;
-  public event Action<IHealthPack>? RestorativePickedUp;
   public IAutoProp<bool> IsPaused => _isPaused;
   private readonly AutoProp<bool> _isPaused;
 
-  public double ExpRate { get; private set; }
-
   private bool _disposedValue;
 
   public GameRepo()
   {
     _isPaused = new AutoProp<bool>(true);
-    ExpRate = 1;
   }
 
   public void Pause()
@@ -106,20 +79,6 @@ public class GameRepo : IGameRepo
     GD.Print("Resume");
   }
 
-  public void StartDoubleEXP(TimeSpan lengthOfEffect)
-  {
-    AnnounceMessageInInventory("Experience points temporarily doubled.");
-    DoubleExpTimeStart?.Invoke(lengthOfEffect.Seconds);
-    ExpRate = 2;
-  }
-
-  public void EndDoubleExp()
-  {
-    AnnounceMessageOnMainScreen("Experience points effect wore off.");
-    DoubleExpTimeEnd?.Invoke();
-    ExpRate = 1;
-  }
-
   public void AnnounceMessageOnMainScreen(string message)
   {
     AnnounceMessageOnMainScreenEvent?.Invoke(message);
@@ -130,34 +89,21 @@ public class GameRepo : IGameRepo
     AnnounceMessageInInventoryEvent?.Invoke(message);
   }
 
-  public void RemoveItemFromInventory(InventoryItem item)
+  public void RemoveItemFromInventory(IBaseInventoryItem item)
   {
     RemoveItemFromInventoryEvent?.Invoke(item);
   }
 
-  public void OnPlayerAttack()
-  {
-    PlayerAttack?.Invoke();
-  }
-
-  public void OnPlayerAttackedWall()
-  {
-    PlayerAttackedWall?.Invoke();
-  }
-
-  public void 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/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/Item/IAccessory.cs

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

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

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

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

@@ -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,16 @@
+
+using Godot;
+using Zennysoft.Ma.Adapter;
+
+public interface IBaseInventoryItem
+{
+  public string ItemName { get; }
+  public string StatDescription { get; }
+  public string FlavorText { get; }
+  public float SpawnRate { get; }
+  public int ThrowDamage { get; }
+  public float ThrowSpeed { get; }
+  public ItemTag ItemTag { get; }
+
+  public abstract Texture2D GetTexture();
+}

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

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

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

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

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

@@ -2,17 +2,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

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

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

@@ -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;
 
@@ -22,3 +19,18 @@ public partial class BoxItemTagEnumContext : JsonSerializerContext;
 
 [JsonSerializable(typeof(ElementType))]
 public partial class ElementTypeEnumContext : JsonSerializerContext;
+
+[JsonSerializable(typeof(JewelTags))]
+public partial class JewelTagsEnumContext : JsonSerializerContext;
+
+[JsonSerializable(typeof(IBaseInventoryItem))]
+public partial class BaseInventoryItemContext : JsonSerializerContext
+{
+
+}
+
+[JsonSerializable(typeof(RescuedItemDatabase))]
+public partial class RescuedItemDatabaseContext : JsonSerializerContext
+{
+
+}

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

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

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

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

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

@@ -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 IBaseInventoryItem IdentifyItem(IBaseInventoryItem unidentifiedItem);
 
   public IInventory Inventory { get; }
 
@@ -40,10 +46,26 @@ public interface IPlayer : IKillable, ICharacterBody3D
 
   public IEquipmentComponent EquipmentComponent { get; }
 
-  public void PlayTestAnimation();
+  public IStatusEffectComponent StatusEffectComponent { get; }
 
   public void SetHealthTimerStatus(bool isActive);
 
+  public void ModifyHealthTimerSpeed(float newModifier);
+
+  public void PlaySpellFX(SpellFXEnum spellEnum);
+
+  public bool AutoRevive { get; set; }
+
+  public int TotalAttack { get; }
+  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/Save/MaSaveFileManager.cs

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

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

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

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

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

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

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

Zennysoft.Game.Ma/Game.sln

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

Zennysoft.Game.Ma/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/Ma.csproj.old.5

@@ -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/addons/dialogue_manager/components/code_edit.tscn

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

Zennysoft.Game.Ma/default_bus_layout.tres

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

Zennysoft.Game.Ma/export_presets.cfg

@@ -1,23 +1,22 @@
 [preset.0]
 
-name="Steamdeck"
+name="Windows Desktop"
-platform="Linux"
+platform="Windows Desktop"
 runnable=true
-advanced_options=false
+advanced_options=true
 dedicated_server=false
 custom_features=""
-export_filter="exclude"
+export_filter="all_resources"
-export_files=PackedStringArray()
 include_filter=""
 exclude_filter=""
-export_path=""
+export_path="../../Demo/Export.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

@@ -8,13 +8,16 @@
 
 config_version=5
 
+[animation]
+
+warnings/check_invalid_track_paths=false
+
 [application]
 
 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]
@@ -37,11 +40,16 @@ runtime/advanced/uses_dotnet=true
 window/size/viewport_width=1920
 window/size/viewport_height=1080
 window/stretch/mode="canvas_items"
+window/stretch/aspect="expand"
 
 [dotnet]
 
 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")
@@ -76,10 +84,17 @@ folder_colors={
 
 import/blender/enabled=false
 
+[global_group]
+
+DimmableAudio=""
+enemy=""
+
 [importer_defaults]
 
 texture={
-"detect_3d/compress_to": 0
+&"compress/high_quality": true,
+&"compress/mode": 2,
+&"detect_3d/compress_to": 0
 }
 
 [input]
@@ -245,11 +260,15 @@ AltAttack={
 CameraForward={
 "deadzone": 0.2,
 "events": [Object(InputEventJoypadMotion,"resource_local_to_scene":false,"resource_name":"","device":-1,"axis":3,"axis_value":-1.0,"script":null)
+, Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":-1,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":0,"physical_keycode":4194320,"key_label":0,"unicode":0,"location":0,"echo":false,"script":null)
+, Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":-1,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":0,"physical_keycode":4194446,"key_label":0,"unicode":56,"location":0,"echo":false,"script":null)
 ]
 }
 CameraBack={
 "deadzone": 0.2,
 "events": [Object(InputEventJoypadMotion,"resource_local_to_scene":false,"resource_name":"","device":-1,"axis":3,"axis_value":1.0,"script":null)
+, Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":-1,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":0,"physical_keycode":4194322,"key_label":0,"unicode":0,"location":0,"echo":false,"script":null)
+, Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":-1,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":0,"physical_keycode":4194440,"key_label":0,"unicode":50,"location":0,"echo":false,"script":null)
 ]
 }
 EnemyViewerIdle={
@@ -265,7 +284,7 @@ EnemyViewerWalk={
 
 [internationalization]
 
-locale/translations_pot_files=PackedStringArray("res://src/dialog/Dialogue.dialogue", "res://src/npc/Ran/ran.dialogue", "res://src/npc/Rat/ratdialogue.dialogue", "res://src/dialog/Altar.dialogue", "res://stone.dialogue")
+locale/translations_pot_files=PackedStringArray("res://src/dialog/Dialogue.dialogue", "res://src/npc/Ran/ran.dialogue", "res://src/npc/Rat/ratdialogue.dialogue", "res://src/dialog/Altar.dialogue", "res://stone.dialogue", "res://src/npc/Proscenium/JumpScare.dialogue")
 
 [layer_names]
 
@@ -293,11 +312,13 @@ 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]
 
 textures/canvas_textures/default_texture_filter=0
 textures/lossless_compression/force_png=true
+lights_and_shadows/directional_shadow/size=2048
 lights_and_shadows/directional_shadow/soft_shadow_filter_quality=4
 lights_and_shadows/directional_shadow/16_bits=false
 lights_and_shadows/positional_shadow/soft_shadow_filter_quality=3

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

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

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

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

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

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

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

@@ -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());
+    _equippedWeapon = new AutoProp<IWeapon>(new Weapon());
-    _equippedArmor = new AutoProp<EquipableItem>(new Armor());
+    _equippedArmor = new AutoProp<IArmor>(new Armor());
-    _equippedAccessory = new AutoProp<EquipableItem>(new Accessory());
+    _equippedAccessory = new AutoProp<IAccessory>(new Accessory());
+    _equippedAmmo = new AutoProp<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 item == _equippedWeapon.Value || item == _equippedArmor.Value || item == _equippedAccessory.Value || item == _equippedAmmo.Value;
-      return false;
+  }
 
-    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

@@ -1,4 +1,5 @@
 using Chickensoft.Collections;
+using Godot;
 using System;
 using Zennysoft.Ma.Adapter;
 
@@ -22,6 +23,10 @@ public class ExperiencePointsComponent : IExperiencePointsComponent
 
   private readonly AutoProp<int> _level;
 
+  public event Action PlayerLevelUp;
+
+  public event Action PlayerLevelDown;
+
   public ExperiencePointsComponent()
   {
     var firstLevelExpRequirement = ExpToNextLevelCalculation(1);
@@ -43,13 +48,21 @@ public class ExperiencePointsComponent : IExperiencePointsComponent
   public void Gain(int baseExpGain)
   {
     var modifiedExpGain = baseExpGain * _expGainRate.Value;
-    var newCurrentExpTotal = modifiedExpGain + _currentExp.Value;
+    _currentExp.OnNext(Mathf.RoundToInt(modifiedExpGain + _currentExp.Value));
-    while (modifiedExpGain + _currentExp.Value >= _expToNextLevel.Value)
+    while (_currentExp.Value >= _expToNextLevel.Value)
       LevelUp();
-    var cappedAmount = Math.Min(baseExpGain + _currentExp.Value, _expToNextLevel.Value);
-    _currentExp.OnNext(cappedAmount);
   }
 
+  public void GainUnmodified(int flatRateExp)
+  {
+    var newCurrentExpTotal = flatRateExp + _currentExp.Value;
+    _currentExp.OnNext(newCurrentExpTotal);
+    while (_currentExp.Value >= _expToNextLevel.Value)
+      LevelUp();
+  }
+
+  public void ModifyExpGainRate(double newRate) => _expGainRate.OnNext(newRate);
+
   public void LevelUp()
   {
     SfxDatabase.Instance.Play(SoundEffect.LevelUp);
@@ -57,6 +70,22 @@ public class ExperiencePointsComponent : IExperiencePointsComponent
     var expToNextLevel = ExpToNextLevelCalculation(_level.Value);
     _currentExp.OnNext(_currentExp.Value - _expToNextLevel.Value);
     _expToNextLevel.OnNext(expToNextLevel);
+    PlayerLevelUp?.Invoke();
+  }
+
+  public void LevelDown()
+  {
+    SfxDatabase.Instance.Play(SoundEffect.DecreaseStat);
+    _currentExp.OnNext(0);
+
+    if (_level.Value == 1)
+      return;
+
+    var newLevel = Mathf.Max(_level.Value - 1, 1);
+    _level.OnNext(newLevel);
+    var expToNextLevel = ExpToNextLevelCalculation(newLevel);
+    _expToNextLevel.OnNext(expToNextLevel);
+    PlayerLevelDown.Invoke();
   }
 
   private int ExpToNextLevelCalculation(int nextLevel)

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

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

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

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

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

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

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

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

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

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

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

@@ -21,7 +21,7 @@ public partial class App : Node, IApp
 
   public const string GAME_SCENE_PATH = "res://src/game/Game.tscn";
 
-  public const string ENEMY_VIEWER_PATH = "res://src/data_viewer/DataViewer.tscn";
+  public const string ENEMY_VIEWER_PATH = "res://src/enemy_viewer/EnemyViewer.tscn";
 
   [Node] private MainMenu MainMenu { get; set; } = default!;
 
@@ -31,8 +31,6 @@ public partial class App : Node, IApp
 
   [Node] private GalleryMenu GalleryMenu { get; set; }
 
-  [Node] private VideoStreamPlayer VideoStreamPlayer { get; set; }
-
   IAppRepo IProvide<IAppRepo>.Value() => AppRepo;
 
   public IAppRepo AppRepo { get; set; } = default!;
@@ -42,14 +40,14 @@ public partial class App : Node, IApp
   private Godot.Collections.Array _progress;
   private SimpleInjector.Container _container;
 
-  private DataViewer _dataViewer;
+  private EnemyViewer _dataViewer;
   private bool _loadingGame = false;
   private bool _loadingEnemyViewer = false;
   private string _optionsSavePath = string.Empty;
   private string _controllerSavePath = string.Empty;
   private ISaveFileManager _saveFileManager;
   private IGame _game;
-  private IDataViewer _enemyViewer;
+  private IEnemyViewer _enemyViewer;
 
   private double _reportedProgress = 0;
 
@@ -148,7 +146,7 @@ public partial class App : Node, IApp
       })
       .Handle((in AppLogic.Output.SetupGameScene _) =>
       {
-		LoadingScreen.Show();
+        LoadingScreen.ShowLoadingScreen();
         LoadGame(GAME_SCENE_PATH);
       })
       .Handle((in AppLogic.Output.ShowMainMenu _) =>
@@ -157,7 +155,7 @@ public partial class App : Node, IApp
       })
       .Handle((in AppLogic.Output.CloseGame _) =>
       {
-		LoadingScreen.Hide();
+        LoadingScreen.HideLoadingScreen();
         _game.GameExitRequested -= GameExitRequested;
         MainMenu.StartGameButton.GrabFocus();
         _game.CallDeferred(MethodName.QueueFree, []);
@@ -168,13 +166,14 @@ public partial class App : Node, IApp
         })
       .Handle((in AppLogic.Output.EnemyViewerOpened _) =>
       {
-		LoadingScreen.Show();
+        LoadingScreen.ShowLoadingScreen();
+        MainMenu.Hide();
         LoadEnemyViewer(ENEMY_VIEWER_PATH);
       })
       .Handle((in AppLogic.Output.EnemyViewerExited _) =>
       {
-		LoadingScreen.Hide();
+        LoadingScreen.HideLoadingScreen();
-		if (_enemyViewer != null && _enemyViewer is DataViewer enemyViewer)
+        if (_enemyViewer != null && _enemyViewer is EnemyViewer enemyViewer)
           enemyViewer.CallDeferred(MethodName.QueueFree);
         MainMenu.Show();
         MainMenu.EnemyViewerButton.GrabFocus();
@@ -189,10 +188,7 @@ public partial class App : Node, IApp
 
   public override void _Process(double delta)
   {
-	if (_reportedProgress < 1)
     LoadingScreen.ProgressBar.Value = Mathf.RoundToInt(Mathf.Lerp(LoadingScreen.ProgressBar.Value, _reportedProgress * 100, (float)delta * 2));
-	else
-	  LoadingScreen.ProgressBar.Value = Mathf.RoundToInt(Mathf.Lerp(LoadingScreen.ProgressBar.Value, 200, (float)delta * 5));
   }
 
   public void OnStartGame() => AppLogic.Input(new AppLogic.Input.NewGame());
@@ -205,22 +201,25 @@ public partial class App : Node, IApp
   {
     var scene = await LoadSceneInternal(sceneName);
     _game = scene as IGame;
+    _game.GameLoaded += OnGameLoaded;
     _game.GameExitRequested += GameExitRequested;
-	await ToSignal(GetTree().CreateTimer(0.8f), "timeout");
     CallDeferred(MethodName.AddChild, scene);
   }
 
+  private void OnGameLoaded() => LoadingScreen.HideLoadingScreen();
+
   private async void LoadEnemyViewer(string sceneName)
   {
     var scene = await LoadSceneInternal(sceneName);
-	_enemyViewer = scene as IDataViewer;
+    _enemyViewer = scene as IEnemyViewer;
-	await ToSignal(GetTree().CreateTimer(0.8f), "timeout");
     CallDeferred(MethodName.AddChild, scene);
+    LoadingScreen.HideLoadingScreen();
   }
 
   private async Task<Node> LoadSceneInternal(string sceneName)
   {
-	LoadingScreen.Show();
+    LoadingScreen.ShowLoadingScreen();
+    MainMenu.Hide();
     LoadingScreen.ProgressBar.Value = 0;
     var sceneLoader = new SceneLoader();
     CallDeferred(MethodName.AddChild, sceneLoader);
@@ -240,11 +239,7 @@ public partial class App : Node, IApp
     OptionsMenu.GameTab.GrabFocus();
   }
 
-  private async void OnGallery()
+  private async void OnGallery() => GalleryMenu.Show();
-  {
-	GalleryMenu.Show();
-	GalleryMenu.ItemButton1.GrabFocus();
-  }
 
   public void OnQuit() => AppLogic.Input(new AppLogic.Input.QuitGame());
 
@@ -261,6 +256,13 @@ public partial class App : Node, IApp
 
     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;
   }
 }

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

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

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

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

@@ -24,7 +24,7 @@ public partial class SfxDatabase : Node
       {SoundEffect.TakeDamage, TakeDamageSound },
       {SoundEffect.HealVT, HealVTSound },
       {SoundEffect.IncreaseStat, IncreaseStatSound },
-      {SoundEffect.WeaponSwing, WeaponSwingSound },
+      {SoundEffect.DecreaseStat, DecreaseStatSound },
       {SoundEffect.Crit, CritSound },
       {SoundEffect.PickupItem, PickupItemSound },
       {SoundEffect.OpenInventory, OpenInventorySound },
@@ -42,6 +42,9 @@ public partial class SfxDatabase : Node
       {SoundEffect.TeleportToExit, TeleportToExitSound},
       {SoundEffect.AbsorbHPFromAllEnemies, AbsorbHPFromAllEnemiesSound},
       {SoundEffect.TurnAllEnemiesIntoHealingItems, TurnAllEnemiesIntoHealingItemsSound},
+      {SoundEffect.WeaponQuickSlash, WeaponQuickSlashSound },
+      {SoundEffect.WeaponSlowSlash, WeaponSlowSlashSound },
+      {SoundEffect.WeaponPlasmaSword, WeaponPlasmaSword },
     };
   }
 
@@ -49,7 +52,11 @@ public partial class SfxDatabase : Node
   [Node] private AudioStreamPlayer TakeDamageSound { get; set; } = default!;
   [Node] private AudioStreamPlayer HealVTSound { get; set; } = default!;
   [Node] private AudioStreamPlayer IncreaseStatSound { get; set; } = default!;
-  [Node] private AudioStreamPlayer WeaponSwingSound { get; set; } = default!;
+
+  [Node] private AudioStreamPlayer DecreaseStatSound { get; set; } = default!;
+  [Node] private AudioStreamPlayer WeaponQuickSlashSound { get; set; } = default!;
+  [Node] private AudioStreamPlayer WeaponSlowSlashSound { get; set; } = default!;
+  [Node] private AudioStreamPlayer WeaponPlasmaSword { get; set; } = default!;
   [Node] private AudioStreamPlayer CritSound { get; set; } = default!;
   [Node] private AudioStreamPlayer PickupItemSound { get; set; } = default!;
   [Node] private AudioStreamPlayer OpenInventorySound { get; set; }
@@ -85,7 +92,7 @@ public enum SoundEffect
   TakeDamage,
   HealVT,
   IncreaseStat,
-  WeaponSwing,
+  DecreaseStat,
   Crit,
   PickupItem,
   OpenInventory,
@@ -104,5 +111,8 @@ public enum SoundEffect
   AbsorbHPFromAllEnemies,
   SwapHPAndVT,
   TurnAllEnemiesIntoHealingItems,
+  WeaponQuickSlash,
+  WeaponSlowSlash,
+  WeaponPlasmaSword
 }
 

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

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

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

@@ -1,164 +0,0 @@
-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, IDataViewer
-{
-  public override void _Notification(int what) => this.Notify(what);
-
-  [Dependency]
-  public IAppRepo AppRepo => this.DependOn<IAppRepo>();
-
-  [Export]
-  public float _cameraSpeed = 0.01f;
-
-  [Node] public Node3D CameraPivot { get; set; } = default!;
-
-  [Node] public Camera3D Camera3D { get; set; } = default!;
-
-  [Node] public Node3D ModelPivot { 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 EnemyModelView _currentModel;
-  private float _cameraStartingPoint = 0f;
-  private int _currentIndex = 0;
-
-  private List<EnemyModelView> _enemies;
-
-  public void OnReady()
-  {
-	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;
-
-  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 (_currentModel == null || BackButton.HasFocus())
-	  return;
-
-	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));
-
-	if (_currentModel is EnemyModelView2D enemyModelView2D)
-	  enemyModelView2D.SetCurrentDirection(_currentModel.GlobalBasis, -CameraPivot.Basis.Z);
-  }
-
-  private void DisplayEnemy()
-  {
-	_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,312 +0,0 @@
-[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="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="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
-
-[node name="DataViewer" type="Control"]
-layout_mode = 3
-anchors_preset = 15
-anchor_right = 1.0
-anchor_bottom = 1.0
-grow_horizontal = 2
-grow_vertical = 2
-size_flags_horizontal = 3
-size_flags_vertical = 3
-script = ExtResource("1_1qako")
-_cameraSpeed = 0.08
-
-[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="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="SubViewportContainer" type="SubViewportContainer" parent="CenterContainer2"]
-custom_minimum_size = Vector2(750, 600)
-layout_mode = 2
-stretch = true
-
-[node name="SubViewport" type="SubViewport" parent="CenterContainer2/SubViewportContainer"]
-process_mode = 1
-own_world_3d = true
-handle_input_locally = false
-size = Vector2i(750, 600)
-render_target_update_mode = 4
-
-[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="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, 0, 0, 1, 0, 0, 0, 1, 0, 1, 0)
-
-[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, 0, 0, 5)
-environment = SubResource("Environment_vk1lh")
-attributes = SubResource("CameraAttributesPhysical_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="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="ATKBlock" type="HBoxContainer" parent="MarginContainer/EnemyInfo/HBoxContainer/StatBlock"]
-layout_mode = 2
-
-[node name="Label" type="Label" parent="MarginContainer/EnemyInfo/HBoxContainer/StatBlock/ATKBlock"]
-layout_mode = 2
-text = "ATK"
-label_settings = ExtResource("6_vk1lh")
-
-[node name="ATKValue" type="Label" parent="MarginContainer/EnemyInfo/HBoxContainer/StatBlock/ATKBlock"]
-unique_name_in_owner = true
-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="WorldEnvironment" type="WorldEnvironment" parent="."]
-environment = SubResource("Environment_3wl4s")
-
-[node name="SpotLight3D" type="SpotLight3D" parent="."]
-transform = Transform3D(1, 0, 0, 0, -0.31977, 0.947495, 0, -0.947495, -0.31977, 0, 6.05742, -1.13242)
-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/bafkreicavupacvvhtig6ii2zb3svww7luvmuknyttza6s4doxm4oursnzm.jpg.import

@@ -1,34 +0,0 @@
-[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