From fd96eb2dc99137c81a2ea00811e4c2b1bdb6c165 Mon Sep 17 00:00:00 2001
From: Zenny <zenayi@gmail.com>
Date: Mon, 2 Feb 2026 23:24:48 -0800
Subject: [PATCH] Fix minimap height Rework boss code to separate boss A
 concerns from demon wall

---
 Zennysoft.Game.Ma/src/enemy/BossAModelView.cs |  42 ++++++
 .../src/enemy/BossAModelView.cs.uid           |   1 +
 .../src/enemy/BossBModelView.cs.uid           |   1 +
 Zennysoft.Game.Ma/src/enemy/BossTypeA.cs      |   2 +-
 Zennysoft.Game.Ma/src/enemy/Enemy.cs          |  19 ++-
 .../src/enemy/EnemyModelView2D.cs             | 128 +++++++++---------
 .../src/enemy/EnemyModelView3D.cs             |  32 +----
 .../14. horse_head/HorseFaceModelView.tscn    |  42 +++---
 .../enemy/enemy_types/15. ox_face/OxFace.tscn |  30 ----
 .../15. ox_face/OxFaceModelView.tscn          |  43 +++---
 .../enemy_types/16. demon wall/DemonWall.tscn |   1 +
 .../map/dungeon/floors/Floor01/Floor 1B.tscn  |   2 +-
 .../map/dungeon/floors/Floor01/Floor 1C.tscn  |   2 +-
 .../map/dungeon/floors/Floor02/Floor 2A.tscn  |   2 +-
 .../map/dungeon/floors/Floor02/Floor 2B.tscn  |   2 +-
 .../map/dungeon/floors/Floor02/Floor 2C.tscn  |   2 +-
 .../map/dungeon/floors/Floor03/Floor 3A.tscn  |   2 +-
 .../map/dungeon/floors/Floor03/Floor 3B.tscn  |   2 +-
 .../map/dungeon/floors/Floor03/Floor 3C.tscn  |   2 +-
 .../map/dungeon/floors/Floor04/Floor 4A.tscn  |   2 +-
 .../map/dungeon/floors/Floor04/Floor 4B.tscn  |   2 +-
 .../map/dungeon/floors/Floor04/Floor 4C.tscn  |   2 +-
 .../map/dungeon/floors/Floor05/Floor 5B.tscn  |   2 +-
 .../map/dungeon/floors/Floor05/Floor 5Z.tscn  |   2 +-
 .../map/dungeon/floors/Floor06/Floor 6A.tscn  |   3 +-
 .../map/dungeon/floors/Floor06/Floor 6B.tscn  |   2 +-
 .../map/dungeon/floors/Floor06/Floor 6C.tscn  |   2 +-
 .../map/dungeon/floors/Floor07/Floor 7A.tscn  |   2 +-
 .../map/dungeon/floors/Floor07/Floor 7B.tscn  |   2 +-
 .../map/dungeon/floors/Floor09/Floor 9A.tscn  |   2 +-
 .../map/dungeon/floors/Floor09/Floor 9B.tscn  |   2 +-
 .../map/dungeon/floors/Floor11/Floor 11A.tscn |   2 +-
 .../map/dungeon/floors/Floor11/Floor 11B.tscn |   2 +-
 .../map/dungeon/floors/Floor12/Floor 12A.tscn |   2 +-
 .../map/dungeon/floors/Floor12/Floor 12B.tscn |   2 +-
 .../map/dungeon/floors/Floor13/Floor 13A.tscn |   2 +-
 .../map/dungeon/floors/Floor14/Floor 14B.tscn |   2 +-
 .../Special Floors/Floor 16 Boss Floor B.tscn |   9 +-
 .../floors/Special Floors/Overworld.tscn      |   8 +-
 Zennysoft.Game.Ma/src/npc/Rat/Rat.tscn        |  10 +-
 40 files changed, 205 insertions(+), 216 deletions(-)
 create mode 100644 Zennysoft.Game.Ma/src/enemy/BossAModelView.cs
 create mode 100644 Zennysoft.Game.Ma/src/enemy/BossAModelView.cs.uid
 create mode 100644 Zennysoft.Game.Ma/src/enemy/BossBModelView.cs.uid

diff --git a/Zennysoft.Game.Ma/src/enemy/BossAModelView.cs b/Zennysoft.Game.Ma/src/enemy/BossAModelView.cs
new file mode 100644
index 00000000..6f9daf5a
--- /dev/null
+++ b/Zennysoft.Game.Ma/src/enemy/BossAModelView.cs
@@ -0,0 +1,42 @@
+using Chickensoft.AutoInject;
+using Chickensoft.GodotNodeInterfaces;
+using Chickensoft.Introspection;
+using Godot;
+
+namespace Zennysoft.Game.Ma;
+
+[Meta(typeof(IAutoNode))]
+public partial class BossAModelView : EnemyModelView3D, INode3D
+{
+  public override void _Notification(int what) => this.Notify(what);
+
+  [Node] public Node3D Armature { get; set; } = default!;
+
+  [Node] public Area3D Hitbox { get; set; } = default!;
+
+  [Node] public Node3D ExplodingModel { get; set; } = default!;
+
+  [Node] public AnimationPlayer DeathAnimation { get; set; } = default!;
+
+  [Signal] public delegate void OnDeathAnimationCompletedEventHandler();
+
+  public void Setup()
+  {
+    Hitbox.AreaEntered += Hitbox_AreaEntered;
+    DeathAnimation.AnimationFinished += DeathAnimation_AnimationFinished;
+  }
+
+  private void Hitbox_AreaEntered(Area3D area) => OnPlayerHit(new AttackEventArgs(AttackData));
+
+  private void DeathAnimation_AnimationFinished(StringName animName)
+  {
+    EmitSignal(SignalName.OnDeathAnimationCompleted);
+  }
+
+  public override void PlayDeathAnimation()
+  {
+    Armature.Hide();
+    ExplodingModel.Show();
+    DeathAnimation.Play("Animation");
+  }
+}
diff --git a/Zennysoft.Game.Ma/src/enemy/BossAModelView.cs.uid b/Zennysoft.Game.Ma/src/enemy/BossAModelView.cs.uid
new file mode 100644
index 00000000..1b24153f
--- /dev/null
+++ b/Zennysoft.Game.Ma/src/enemy/BossAModelView.cs.uid
@@ -0,0 +1 @@
+uid://cycffa0wn7sks
diff --git a/Zennysoft.Game.Ma/src/enemy/BossBModelView.cs.uid b/Zennysoft.Game.Ma/src/enemy/BossBModelView.cs.uid
new file mode 100644
index 00000000..99ad70cb
--- /dev/null
+++ b/Zennysoft.Game.Ma/src/enemy/BossBModelView.cs.uid
@@ -0,0 +1 @@
+uid://brnlf1ybd4mu
diff --git a/Zennysoft.Game.Ma/src/enemy/BossTypeA.cs b/Zennysoft.Game.Ma/src/enemy/BossTypeA.cs
index 9e228a58..87118d94 100644
--- a/Zennysoft.Game.Ma/src/enemy/BossTypeA.cs
+++ b/Zennysoft.Game.Ma/src/enemy/BossTypeA.cs
@@ -44,7 +44,7 @@ public partial class BossTypeA : Enemy, IHaveEngagePlayerBehavior, IHaveFollowBe
   public void OnResolved()
   {
     FollowBehavior.Init(NavigationAgent);
-    var enemyModelView3D = EnemyModelView as EnemyModelView3D;
+    var enemyModelView3D = EnemyModelView as BossAModelView;
     enemyModelView3D.OnDeathAnimationCompleted += EnemyModelView3D_OnDeathAnimationCompleted;
   }
 
diff --git a/Zennysoft.Game.Ma/src/enemy/Enemy.cs b/Zennysoft.Game.Ma/src/enemy/Enemy.cs
index eb53dc5e..780908b4 100644
--- a/Zennysoft.Game.Ma/src/enemy/Enemy.cs
+++ b/Zennysoft.Game.Ma/src/enemy/Enemy.cs
@@ -37,7 +37,7 @@ public abstract partial class Enemy : CharacterBody3D, IEnemy, IProvide<IEnemyLo
   public Vector3 TargetPosition { get; private set; }
 
   [ExportGroup("Enemy Stats")]
-  [Export] public int InitialHP { get; set; }
+  [Export] public int InitialHP { get; set; } = 50;
 
   [Export] public int InitialAttack { get; set; } = 8;
 
@@ -76,6 +76,13 @@ public abstract partial class Enemy : CharacterBody3D, IEnemy, IProvide<IEnemyLo
     EnemyModelView.HitPlayer += EnemyModelView_HitPlayer;
     EnemyBinding = _enemyLogic.Bind();
 
+    HealthComponent = new HealthComponent(InitialHP);
+    HealthComponent.HealthReachedZero += Die;
+    HealthComponent.DamageTaken += TakeHit;
+
+    AttackComponent = new AttackComponent(InitialAttack);
+    DefenseComponent = new DefenseComponent(InitialDefense);
+
     EnemyBinding
       .Handle((in EnemyLogic.Output.Activate _) =>
       {
@@ -109,16 +116,6 @@ public abstract partial class Enemy : CharacterBody3D, IEnemy, IProvide<IEnemyLo
 
     _enemyLogic.Start();
   }
-
-  public void OnReady()
-  {
-    HealthComponent = new HealthComponent(InitialHP);
-    HealthComponent.HealthReachedZero += Die;
-    HealthComponent.DamageTaken += TakeHit;
-
-    AttackComponent = new AttackComponent(InitialAttack);
-    DefenseComponent = new DefenseComponent(InitialDefense);
-  }
   #endregion
 
   public virtual void Activate()
diff --git a/Zennysoft.Game.Ma/src/enemy/EnemyModelView2D.cs b/Zennysoft.Game.Ma/src/enemy/EnemyModelView2D.cs
index f0460264..ca37da4f 100644
--- a/Zennysoft.Game.Ma/src/enemy/EnemyModelView2D.cs
+++ b/Zennysoft.Game.Ma/src/enemy/EnemyModelView2D.cs
@@ -26,18 +26,16 @@ public partial class EnemyModelView2D : EnemyModelView, IEnemyModelView
 
   EnemyDirection _enemyDirection { get; set; } = EnemyDirection.Forward;
 
-  public AttackData AttackData { get; set; }
-
   public new void OnReady()
   {
-	Hitbox.AreaEntered += Hitbox_AreaEntered;
-	base.OnReady();
+    Hitbox.AreaEntered += Hitbox_AreaEntered;
+    base.OnReady();
   }
 
 
   public override Vector2 GetSize()
   {
-	return Sprite3D.GetItemRect().Size;
+    return Sprite3D.GetItemRect().Size;
   }
 
   private void Hitbox_AreaEntered(Area3D area) => OnPlayerHit(new AttackEventArgs(AttackData));
@@ -46,102 +44,102 @@ public partial class EnemyModelView2D : EnemyModelView, IEnemyModelView
 
   public override void PlayHitAnimation()
   {
-	LoadShader("res://src/vfx/shaders/DamageHit.gdshader");
-	var tweener = GetTree().CreateTween();
-	tweener.TweenMethod(Callable.From((float x) => SetShaderValue(x)), 0.0f, 1.0f, 1.0f);
+    LoadShader("res://src/vfx/shaders/DamageHit.gdshader");
+    var tweener = GetTree().CreateTween();
+    tweener.TweenMethod(Callable.From((float x) => SetShaderValue(x)), 0.0f, 1.0f, 1.0f);
   }
 
   public override void PlayDeathAnimation()
   {
-	LoadShader("res://src/vfx/shaders/PixelMelt.gdshader");
-	var tweener = GetTree().CreateTween();
-	tweener.TweenMethod(Callable.From((float x) => SetShaderValue(x)), 0.0f, 0.1f, 0.8f);
+    LoadShader("res://src/vfx/shaders/PixelMelt.gdshader");
+    var tweener = GetTree().CreateTween();
+    tweener.TweenMethod(Callable.From((float x) => SetShaderValue(x)), 0.0f, 0.1f, 0.8f);
   }
 
   private EnemyDirection GetEnemyDirection(
-	Basis enemyBasis,
-	Vector3 cameraDirection,
-	float rotateUpperThreshold,
-	float rotateLowerThreshold)
+    Basis enemyBasis,
+    Vector3 cameraDirection,
+    float rotateUpperThreshold,
+    float rotateLowerThreshold)
   {
-	var enemyForwardDirection = enemyBasis.Z;
-	var enemyLeftDirection = enemyBasis.X;
+    var enemyForwardDirection = enemyBasis.Z;
+    var enemyLeftDirection = enemyBasis.X;
 
-	var leftDotProduct = enemyLeftDirection.Dot(cameraDirection);
-	var forwardDotProduct = enemyForwardDirection.Dot(cameraDirection);
+    var leftDotProduct = enemyLeftDirection.Dot(cameraDirection);
+    var forwardDotProduct = enemyForwardDirection.Dot(cameraDirection);
 
-	// Check if forward facing. If the dot product is -1, the enemy is facing the camera.
-	if (forwardDotProduct < _lowerThreshold)
-	{
-	  SetForward();
-	  return EnemyDirection.Forward;
-	}
+    // Check if forward facing. If the dot product is -1, the enemy is facing the camera.
+    if (forwardDotProduct < _lowerThreshold)
+    {
+      SetForward();
+      return EnemyDirection.Forward;
+    }
 
-	// Check if backward facing. If the dot product is 1, the enemy is facing the same direction as the camera.
-	else if (forwardDotProduct > rotateUpperThreshold)
-	{
-	  SetBack();
-	  return EnemyDirection.Backward;
-	}
-	else
-	{
-	  // If the dot product of the perpendicular direction is positive (up to 1), the enemy is facing to the left (since it's mirrored).
-	  if (leftDotProduct < _lowerThreshold)
-	  {
-		SetRight();
-		return EnemyDirection.Left;
-	  }
+    // Check if backward facing. If the dot product is 1, the enemy is facing the same direction as the camera.
+    else if (forwardDotProduct > rotateUpperThreshold)
+    {
+      SetBack();
+      return EnemyDirection.Backward;
+    }
+    else
+    {
+      // If the dot product of the perpendicular direction is positive (up to 1), the enemy is facing to the left (since it's mirrored).
+      if (leftDotProduct < _lowerThreshold)
+      {
+        SetRight();
+        return EnemyDirection.Left;
+      }
 
-	  // Check if side facing. If the dot product is close to zero in the positive or negative direction, its close to the threshold for turning.
-	  if (leftDotProduct > rotateUpperThreshold)
-	  {
-		SetLeft();
-		return EnemyDirection.Right;
-	  }
-	}
+      // Check if side facing. If the dot product is close to zero in the positive or negative direction, its close to the threshold for turning.
+      if (leftDotProduct > rotateUpperThreshold)
+      {
+        SetLeft();
+        return EnemyDirection.Right;
+      }
+    }
 
-	return _enemyDirection;
+    return _enemyDirection;
   }
 
   private void LoadShader(string shaderPath)
   {
-	var shader = GD.Load<Shader>(shaderPath);
-	var sprites = FindChildren("*", "AnimatedSprite2D", true).Cast<AnimatedSprite2D>();
-	foreach (var sprite in sprites)
-	{
-	  sprite.Material = new ShaderMaterial();
-	  var shaderMaterial = (ShaderMaterial)sprite.Material;
-	  shaderMaterial.Shader = shader;
-	}
+    var shader = GD.Load<Shader>(shaderPath);
+    var sprites = FindChildren("*", "AnimatedSprite2D", true).Cast<AnimatedSprite2D>();
+    foreach (var sprite in sprites)
+    {
+      sprite.Material = new ShaderMaterial();
+      var shaderMaterial = (ShaderMaterial)sprite.Material;
+      shaderMaterial.Shader = shader;
+    }
   }
 
   private void SetShaderValue(float shaderValue)
   {
-	var sprites = FindChildren("*", "AnimatedSprite2D", true).Cast<AnimatedSprite2D>();
-	foreach (var sprite in sprites)
-	{
-	  var shaderMaterial = (ShaderMaterial)sprite.Material;
-	  shaderMaterial.SetShaderParameter("progress", shaderValue);
-	}
+    var sprites = FindChildren("*", "AnimatedSprite2D", true).Cast<AnimatedSprite2D>();
+    foreach (var sprite in sprites)
+    {
+      var shaderMaterial = (ShaderMaterial)sprite.Material;
+      shaderMaterial.SetShaderParameter("progress", shaderValue);
+    }
   }
 
   private void SetForward()
   {
-	_enemyDirection = EnemyDirection.Forward;
+    _enemyDirection = EnemyDirection.Forward;
   }
 
   private void SetLeft()
   {
-	_enemyDirection = EnemyDirection.Left;
+    _enemyDirection = EnemyDirection.Left;
   }
 
   private void SetRight()
   {
-	_enemyDirection = EnemyDirection.Right;
+    _enemyDirection = EnemyDirection.Right;
   }
 
   private void SetBack()
   {
-	_enemyDirection = EnemyDirection.Backward;
+    _enemyDirection = EnemyDirection.Backward;
   }
 }
diff --git a/Zennysoft.Game.Ma/src/enemy/EnemyModelView3D.cs b/Zennysoft.Game.Ma/src/enemy/EnemyModelView3D.cs
index cd1ffb53..20c1a687 100644
--- a/Zennysoft.Game.Ma/src/enemy/EnemyModelView3D.cs
+++ b/Zennysoft.Game.Ma/src/enemy/EnemyModelView3D.cs
@@ -13,22 +13,6 @@ public partial class EnemyModelView3D : EnemyModelView
 
   [Node] public MeshInstance3D MeshInstance { get; set; } = default!;
 
-  [Node] public AnimationPlayer DeathAnimation { get; set; } = default!;
-
-  [Node] public Node3D Armature { get; set; } = default!;
-
-  [Node] public Area3D Hitbox { get; set; } = default!;
-
-  [Node] public Node3D ExplodingModel { get; set; } = default!;
-
-  [Signal] public delegate void OnDeathAnimationCompletedEventHandler();
-
-  public void OnResolved()
-  {
-    Hitbox.AreaEntered += Hitbox_AreaEntered;
-    DeathAnimation.AnimationFinished += DeathAnimation_AnimationFinished;
-  }
-
   public override void PlayWalkAnimation()
   {
     _stateMachine.Travel(_walkingName, false);
@@ -39,13 +23,6 @@ public partial class EnemyModelView3D : EnemyModelView
     _stateMachine.Travel(_idleName, false);
   }
 
-  private void Hitbox_AreaEntered(Area3D area) => OnPlayerHit(new AttackEventArgs(AttackData));
-
-  private void DeathAnimation_AnimationFinished(StringName animName)
-  {
-    EmitSignal(SignalName.OnDeathAnimationCompleted);
-  }
-
   public override Vector2 GetSize()
   {
     var aabb = MeshInstance.GetAabb();
@@ -57,13 +34,6 @@ public partial class EnemyModelView3D : EnemyModelView
 
   }
 
-  public override void PlayDeathAnimation()
-  {
-    Armature.Hide();
-    ExplodingModel.Show();
-    DeathAnimation.Play("Animation");
-  }
-
   private void ChangeMaterial()
   {
     var material = new StandardMaterial3D
@@ -89,4 +59,4 @@ public partial class EnemyModelView3D : EnemyModelView
   {
     MeshInstance.Transparency = transparencyAmount;
   }
-}
+}
\ No newline at end of file
diff --git a/Zennysoft.Game.Ma/src/enemy/enemy_types/14. horse_head/HorseFaceModelView.tscn b/Zennysoft.Game.Ma/src/enemy/enemy_types/14. horse_head/HorseFaceModelView.tscn
index 7e4e086b..d77ab238 100644
--- a/Zennysoft.Game.Ma/src/enemy/enemy_types/14. horse_head/HorseFaceModelView.tscn	
+++ b/Zennysoft.Game.Ma/src/enemy/enemy_types/14. horse_head/HorseFaceModelView.tscn	
@@ -1,6 +1,6 @@
 [gd_scene load_steps=134 format=4 uid="uid://bid6f48l0q58o"]
 
-[ext_resource type="Script" uid="uid://ckv5dmrw6pvn6" path="res://src/enemy/EnemyModelView3D.cs" id="1_oxssn"]
+[ext_resource type="Script" uid="uid://cycffa0wn7sks" path="res://src/enemy/BossAModelView.cs" id="1_58wyj"]
 [ext_resource type="Texture2D" uid="uid://csj3kjwyn3s2u" path="res://src/enemy/enemy_types/14. horse_head/animation/HORSE-FACE 1_Metal054C_1K-JPG_Color.jpg" id="2_58wyj"]
 [ext_resource type="Animation" uid="uid://bhsp32c05j2o5" path="res://src/enemy/enemy_types/14. horse_head/animation/walking.res" id="2_yvw71"]
 [ext_resource type="Texture2D" uid="uid://dd7ocxanos2o7" path="res://src/enemy/enemy_types/14. horse_head/animation/HORSE-FACE 1_Metal054C_1K-JPG_Displacement.jpg" id="3_b3lw2"]
@@ -4235,7 +4235,7 @@ _data = {
 
 [node name="EnemyModelView" type="Node3D"]
 transform = Transform3D(0.15, 0, 0, 0, 0.15, 0, 0, 0, 0.15, 0, 0, 0)
-script = ExtResource("1_oxssn")
+script = ExtResource("1_58wyj")
 
 [node name="Armature" type="Node3D" parent="."]
 unique_name_in_owner = true
@@ -4246,7 +4246,7 @@ bones/0/name = "spine1"
 bones/0/parent = -1
 bones/0/rest = Transform3D(1.49012e-06, 0.00846654, -0.999964, 2.93367e-08, 0.999964, 0.00846654, 1, -4.19517e-08, 1.48981e-06, 0.000155807, -0.00105953, -2.01735)
 bones/0/enabled = true
-bones/0/position = Vector3(0.0996386, -0.100203, -1.53144)
+bones/0/position = Vector3(0.0996386, -0.401585, -1.53144)
 bones/0/rotation = Quaternion(0.0256267, -0.805691, 0.0118477, 0.591662)
 bones/0/scale = Vector3(1, 1, 1)
 bones/1/name = "spine0"
@@ -4275,21 +4275,21 @@ bones/4/parent = 3
 bones/4/rest = Transform3D(0.901905, -0.410135, 0.135488, 0.412416, 0.910915, 0.0120912, -0.128377, 0.0449723, 0.990705, 2.5332e-07, 0.990515, -7.07805e-08)
 bones/4/enabled = true
 bones/4/position = Vector3(2.5332e-07, 0.990515, -7.07805e-08)
-bones/4/rotation = Quaternion(-0.00638545, 0.0590521, 0.183295, 0.981262)
+bones/4/rotation = Quaternion(-0.00333627, 0.060827, 0.18899, 0.980088)
 bones/4/scale = Vector3(1, 1, 1)
 bones/5/name = "neck4"
 bones/5/parent = 4
 bones/5/rest = Transform3D(0.999746, -0.0223582, -0.00293604, 0.0225401, 0.994675, 0.10057, 0.000671851, -0.10061, 0.994926, 2.23517e-07, 1.26785, -4.84288e-08)
 bones/5/enabled = true
 bones/5/position = Vector3(2.23517e-07, 1.26785, -4.84288e-08)
-bones/5/rotation = Quaternion(-0.0503622, -0.000903206, 0.0112395, 0.998667)
+bones/5/rotation = Quaternion(-0.0503622, -0.000903181, 0.0112395, 0.998667)
 bones/5/scale = Vector3(1, 1, 1)
 bones/6/name = "head1"
 bones/6/parent = 5
 bones/6/rest = Transform3D(0.0598389, 0.98531, 0.15995, -0.975271, 0.0235553, 0.219755, 0.212759, -0.169144, 0.962353, 3.65078e-07, 1.40318, 0)
 bones/6/enabled = true
 bones/6/position = Vector3(3.65078e-07, 1.40318, 0)
-bones/6/rotation = Quaternion(-0.327135, 0.0505906, -0.45005, 0.829384)
+bones/6/rotation = Quaternion(-0.330625, 0.0509286, -0.459739, 0.822638)
 bones/6/scale = Vector3(1, 1, 1)
 bones/7/name = "Bone.007"
 bones/7/parent = 6
@@ -4324,7 +4324,7 @@ bones/11/parent = 1
 bones/11/rest = Transform3D(0.981457, 0.0769315, -0.175568, 0.18837, -0.217537, 0.957703, 0.035485, -0.973015, -0.227995, -1.09896e-07, 3.84743, -2.10479e-07)
 bones/11/enabled = true
 bones/11/position = Vector3(-1.09896e-07, 3.84743, -2.10479e-07)
-bones/11/rotation = Quaternion(-0.814455, -0.0954406, -0.0238501, 0.571826)
+bones/11/rotation = Quaternion(-0.812698, -0.0920842, -0.0237739, 0.574872)
 bones/11/scale = Vector3(1, 1, 1)
 bones/12/name = "arm2_L"
 bones/12/parent = 11
@@ -4351,7 +4351,7 @@ bones/15/name = "arm1_R"
 bones/15/parent = 1
 bones/15/rest = Transform3D(-0.98213, 0.0512573, -0.181089, -0.187541, -0.185921, 0.964501, 0.0157695, 0.981227, 0.192212, 0.00107862, 3.8461, -0.0821097)
 bones/15/enabled = true
-bones/15/position = Vector3(-0.168656, 3.38988, 0.124869)
+bones/15/position = Vector3(-0.175918, 3.44573, 0.114308)
 bones/15/rotation = Quaternion(-0.502686, 0.531044, 0.680821, -0.0422068)
 bones/15/scale = Vector3(1, 1, 1)
 bones/16/name = "arm2_R"
@@ -4366,7 +4366,7 @@ bones/17/parent = 16
 bones/17/rest = Transform3D(0.998789, 0.0488077, -0.00615137, -0.0491113, 0.996528, -0.0672226, 0.00284903, 0.0674433, 0.997719, -5.21541e-08, 3.04263, -1.31503e-06)
 bones/17/enabled = true
 bones/17/position = Vector3(-5.21541e-08, 3.04263, -1.31503e-06)
-bones/17/rotation = Quaternion(-0.0077377, 0.0960272, 0.278179, 0.955686)
+bones/17/rotation = Quaternion(-0.0159131, 0.096325, 0.275379, 0.956365)
 bones/17/scale = Vector3(1, 1, 1)
 bones/18/name = "hand_R"
 bones/18/parent = 17
@@ -4379,7 +4379,7 @@ bones/19/name = "hip_L"
 bones/19/parent = -1
 bones/19/rest = Transform3D(0.138486, 0.897208, 0.419333, -0.129033, -0.403458, 0.905854, 0.981923, -0.179556, 0.0598959, 0.000155807, -0.00105953, -2.01735)
 bones/19/enabled = true
-bones/19/position = Vector3(0.147751, -0.351276, -1.49267)
+bones/19/position = Vector3(0.147751, -0.352904, -1.49267)
 bones/19/rotation = Quaternion(0.427793, 0.34021, 0.687061, -0.478745)
 bones/19/scale = Vector3(1, 1, 1)
 bones/20/name = "leg1_L"
@@ -4387,14 +4387,14 @@ bones/20/parent = 19
 bones/20/rest = Transform3D(0.945603, 0.113405, 0.304916, -0.324072, 0.410457, 0.852351, -0.0284943, -0.9048, 0.424881, 2.08616e-07, 2.00996, -7.1153e-07)
 bones/20/enabled = true
 bones/20/position = Vector3(2.08616e-07, 2.00996, -7.1153e-07)
-bones/20/rotation = Quaternion(-0.438031, -0.297412, -0.399899, 0.748168)
+bones/20/rotation = Quaternion(-0.43422, -0.329708, -0.37484, 0.749828)
 bones/20/scale = Vector3(1, 1, 1)
 bones/21/name = "leg2_L"
 bones/21/parent = 20
 bones/21/rest = Transform3D(0.990336, -0.138679, 0.00180777, 0.138628, 0.990193, 0.0173138, -0.00419111, -0.0168959, 0.999848, 5.96046e-08, 5.85994, -5.23403e-07)
 bones/21/enabled = true
 bones/21/position = Vector3(5.96046e-08, 5.85994, -5.23403e-07)
-bones/21/rotation = Quaternion(-0.0492879, 0.00187756, 0.394257, 0.917676)
+bones/21/rotation = Quaternion(-0.0490764, 0.00187908, 0.392566, 0.918412)
 bones/21/scale = Vector3(1, 1, 1)
 bones/22/name = "foot1_L"
 bones/22/parent = 21
@@ -4414,21 +4414,21 @@ bones/24/name = "kneeIK_L"
 bones/24/parent = -1
 bones/24/rest = Transform3D(-0.176321, 1.3411e-06, 0.984333, 0.984333, 1.66893e-06, 0.176321, -1.3411e-06, 1, -1.54972e-06, 1.83022, -6.67107, 3.18901)
 bones/24/enabled = true
-bones/24/position = Vector3(1.83022, -6.67107, 3.18901)
-bones/24/rotation = Quaternion(0.453784, 0.542292, 0.542291, 0.453784)
+bones/24/position = Vector3(2.31525, -7.34861, 2.3999)
+bones/24/rotation = Quaternion(0.350356, 0.345508, 0.703917, 0.512226)
 bones/24/scale = Vector3(1, 1, 1)
 bones/25/name = "heelIK_L"
 bones/25/parent = -1
 bones/25/rest = Transform3D(-0.16376, -1.60933e-06, 0.9865, -0.9865, 1.19209e-07, -0.16376, 1.78814e-07, -1, -1.54972e-06, 1.91204, -13.5859, -3.56646)
 bones/25/enabled = true
-bones/25/position = Vector3(2.68465, -12.4291, 1.43256)
+bones/25/position = Vector3(2.86478, -12.4291, 1.43256)
 bones/25/rotation = Quaternion(-0.253375, 0.464951, -0.563517, 0.63409)
 bones/25/scale = Vector3(1, 1, 1)
 bones/26/name = "hip_R"
 bones/26/parent = -1
 bones/26/rest = Transform3D(0.138486, -0.897208, -0.419333, 0.129033, -0.403458, 0.905854, -0.981923, -0.179556, 0.0598959, -0.000155807, -0.00105953, -2.01735)
 bones/26/enabled = true
-bones/26/position = Vector3(0.0289171, -0.337192, -1.59603)
+bones/26/position = Vector3(0.0289172, -0.345227, -1.59603)
 bones/26/rotation = Quaternion(0.695067, -0.09936, -0.377924, -0.603475)
 bones/26/scale = Vector3(1, 1, 1)
 bones/27/name = "leg1_R"
@@ -4436,14 +4436,14 @@ bones/27/parent = 26
 bones/27/rest = Transform3D(0.945603, -0.113405, -0.304916, 0.324072, 0.410457, 0.852351, 0.0284943, -0.9048, 0.424881, -9.54606e-09, 2.00996, -3.52971e-07)
 bones/27/enabled = true
 bones/27/position = Vector3(-9.54606e-09, 2.00996, -3.52971e-07)
-bones/27/rotation = Quaternion(-0.306352, 0.192188, 0.173426, 0.916044)
+bones/27/rotation = Quaternion(-0.312572, 0.17762, 0.184248, 0.914769)
 bones/27/scale = Vector3(1, 1, 1)
 bones/28/name = "leg2_R"
 bones/28/parent = 27
 bones/28/rest = Transform3D(0.990336, 0.138679, -0.00180777, -0.138628, 0.990193, 0.0173138, 0.00419111, -0.0168959, 0.999848, 4.51691e-08, 5.85994, -3.72529e-09)
 bones/28/enabled = true
 bones/28/position = Vector3(4.51691e-08, 5.85994, -3.72529e-09)
-bones/28/rotation = Quaternion(-0.296585, 0.0199619, -0.193518, 0.934981)
+bones/28/rotation = Quaternion(-0.276536, 0.0201479, -0.180436, 0.943697)
 bones/28/scale = Vector3(1, 1, 1)
 bones/29/name = "foot1_R"
 bones/29/parent = 28
@@ -4470,7 +4470,7 @@ bones/32/name = "heelIK_R"
 bones/32/parent = -1
 bones/32/rest = Transform3D(-0.16376, 1.60933e-06, -0.9865, 0.9865, 1.19209e-07, -0.16376, -1.78814e-07, -1, -1.54972e-06, -1.91204, -13.5859, -3.56646)
 bones/32/enabled = true
-bones/32/position = Vector3(-3.64758, -12.3224, -5.7547)
+bones/32/position = Vector3(-3.87024, -12.3974, -5.7547)
 bones/32/rotation = Quaternion(0.514417, 0.701671, -0.342235, -0.354835)
 bones/32/scale = Vector3(1, 1, 1)
 
@@ -4480,12 +4480,12 @@ mesh = SubResource("ArrayMesh_jpm24")
 skin = SubResource("Skin_uxw16")
 
 [node name="BoneAttachment3D" type="BoneAttachment3D" parent="Armature/Skeleton3D"]
-transform = Transform3D(-0.370164, -0.13327, -0.919357, -0.304221, -0.917693, 0.255518, -0.87774, 0.374272, 0.299154, -2.00357, 9.05467, 6.3324)
+transform = Transform3D(-0.370164, -0.13327, -0.919357, -0.294523, -0.921764, 0.252204, -0.881042, 0.364129, 0.301953, -2.00357, 8.7346, 6.29248)
 bone_name = "TOP OF SKULL"
 bone_idx = 8
 
 [node name="BoneAttachment3D2" type="BoneAttachment3D" parent="Armature/Skeleton3D"]
-transform = Transform3D(0.960238, 0.142739, 0.239935, -0.242198, -0.00155824, 0.970226, 0.138862, -0.989759, 0.033075, -2.41575, 1.93321, -9.13936)
+transform = Transform3D(0.960238, 0.142738, 0.239936, -0.239754, -0.0187265, 0.970653, 0.143042, -0.989584, 0.0162402, -2.41576, 1.62851, -9.08846)
 bone_name = "hand_R"
 bone_idx = 18
 
diff --git a/Zennysoft.Game.Ma/src/enemy/enemy_types/15. ox_face/OxFace.tscn b/Zennysoft.Game.Ma/src/enemy/enemy_types/15. ox_face/OxFace.tscn
index 40f7ba04..4a33d87f 100644
--- a/Zennysoft.Game.Ma/src/enemy/enemy_types/15. ox_face/OxFace.tscn	
+++ b/Zennysoft.Game.Ma/src/enemy/enemy_types/15. ox_face/OxFace.tscn	
@@ -34,34 +34,6 @@ shape = SubResource("CapsuleShape3D_i0akf")
 [node name="EnemyModelView" parent="." instance=ExtResource("2_v6b2s")]
 unique_name_in_owner = true
 
-[node name="Skeleton3D" parent="EnemyModelView/Armature" index="0"]
-bones/0/position = Vector3(-0.259305, -0.942872, -1.97518)
-bones/6/rotation = Quaternion(-0.0773282, -0.305071, -0.7448, 0.588409)
-bones/11/rotation = Quaternion(-0.785852, -0.0626522, 0.0695431, 0.611289)
-bones/15/position = Vector3(0.00107886, 3.8461, -0.0821095)
-bones/15/rotation = Quaternion(-0.209521, 0.736072, 0.623544, -0.159664)
-bones/16/rotation = Quaternion(-0.486067, -0.16412, -0.362283, 0.778174)
-bones/19/position = Vector3(-0.292154, -1.11583, -2.01079)
-bones/19/rotation = Quaternion(0.609129, 0.315011, 0.574865, -0.446386)
-bones/20/rotation = Quaternion(-0.308524, -0.444015, -0.2687, 0.79716)
-bones/21/rotation = Quaternion(-0.0600846, 0.00130118, 0.486388, 0.871674)
-bones/24/position = Vector3(7.04992, -9.46662, 3.49458)
-bones/25/position = Vector3(4.82744, -12.3397, 0.183847)
-bones/26/position = Vector3(-0.284624, -1.11395, -2.01739)
-bones/27/rotation = Quaternion(-0.208994, 0.42094, 0.142755, 0.871064)
-bones/28/rotation = Quaternion(-0.0643206, -0.00115453, -0.51353, 0.855657)
-bones/31/position = Vector3(-7.29038, -6.72226, -0.133983)
-bones/32/position = Vector3(-6.21519, -12.0654, -3.61992)
-
-[node name="BoneAttachment3D" parent="EnemyModelView/Armature/Skeleton3D" index="0"]
-transform = Transform3D(-0.300414, -0.0893107, -0.949618, -0.328179, -0.925139, 0.190828, -0.895572, 0.368973, 0.248615, -1.65868, 8.32445, 4.94614)
-
-[node name="BoneAttachment3D2" parent="EnemyModelView/Armature/Skeleton3D" index="2"]
-transform = Transform3D(-0.0442326, 0.0333211, -0.998465, -0.0879628, -0.99569, -0.0293321, -0.99514, 0.0865311, 0.0469725, -6.13785, -1.32753, -0.141988)
-
-[node name="CollisionShape3D" parent="EnemyModelView/Hitbox" index="0"]
-transform = Transform3D(1, 0, 0, 0, 1, 3.48166e-13, 0, -3.48166e-13, 1, 0.300452, 13.2179, 0.257962)
-
 [node name="Collision" type="Area3D" parent="."]
 collision_layer = 2048
 collision_mask = 0
@@ -146,5 +118,3 @@ offset_left = 95.0
 offset_top = 1.0
 offset_right = 170.0
 offset_bottom = 24.0
-
-[editable path="EnemyModelView"]
diff --git a/Zennysoft.Game.Ma/src/enemy/enemy_types/15. ox_face/OxFaceModelView.tscn b/Zennysoft.Game.Ma/src/enemy/enemy_types/15. ox_face/OxFaceModelView.tscn
index 81e29750..283b4af4 100644
--- a/Zennysoft.Game.Ma/src/enemy/enemy_types/15. ox_face/OxFaceModelView.tscn	
+++ b/Zennysoft.Game.Ma/src/enemy/enemy_types/15. ox_face/OxFaceModelView.tscn	
@@ -1,5 +1,6 @@
-[gd_scene load_steps=129 format=4 uid="uid://dnomfbym36ivg"]
+[gd_scene load_steps=130 format=4 uid="uid://dnomfbym36ivg"]
 
+[ext_resource type="Script" uid="uid://cycffa0wn7sks" path="res://src/enemy/BossAModelView.cs" id="1_1ch7e"]
 [ext_resource type="Script" uid="uid://ckv5dmrw6pvn6" path="res://src/enemy/EnemyModelView3D.cs" id="1_6miqu"]
 [ext_resource type="Texture2D" uid="uid://dp6hwvuhfkji8" path="res://src/enemy/enemy_types/15. ox_face/models/OX FACE_Metal054C_1K-JPG_Color.jpg" id="1_lsf8e"]
 [ext_resource type="AnimationLibrary" uid="uid://dn4501qsypsu" path="res://src/enemy/enemy_types/14. horse_head/animation/OxFaceAnimations.tres" id="3_pmgg3"]
@@ -2679,7 +2680,7 @@ _data = {
 
 [node name="EnemyModelView" type="Node3D"]
 transform = Transform3D(0.15, 0, 0, 0, 0.15, 0, 0, 0, 0.15, 0, 0, 0)
-script = ExtResource("1_6miqu")
+script = ExtResource("1_1ch7e")
 
 [node name="Armature" type="Node3D" parent="."]
 unique_name_in_owner = true
@@ -2691,7 +2692,7 @@ bones/0/name = "spine1"
 bones/0/parent = -1
 bones/0/rest = Transform3D(1.49012e-06, 0.00846654, -0.999964, 2.93367e-08, 0.999964, 0.00846654, 1, -4.23752e-08, 1.49012e-06, 0.000155807, -0.00105953, -2.01735)
 bones/0/enabled = true
-bones/0/position = Vector3(-0.307669, -0.892014, -1.97534)
+bones/0/position = Vector3(-0.260041, -1.02704, -1.9695)
 bones/0/rotation = Quaternion(0.0915277, -0.692111, -0.0341586, 0.715149)
 bones/0/scale = Vector3(1, 1, 1)
 bones/1/name = "spine0"
@@ -2734,7 +2735,7 @@ bones/6/parent = 5
 bones/6/rest = Transform3D(0.0598389, 0.98531, 0.15995, -0.975271, 0.0235553, 0.219755, 0.212759, -0.169144, 0.962353, 3.65078e-07, 1.40318, 0)
 bones/6/enabled = true
 bones/6/position = Vector3(3.65078e-07, 1.40318, 0)
-bones/6/rotation = Quaternion(-0.0777813, -0.305234, -0.744803, 0.58826)
+bones/6/rotation = Quaternion(-0.0511204, -0.295537, -0.744273, 0.596743)
 bones/6/scale = Vector3(1, 1, 1)
 bones/7/name = "Bone.007"
 bones/7/parent = 6
@@ -2769,7 +2770,7 @@ bones/11/parent = 1
 bones/11/rest = Transform3D(0.981457, 0.0769315, -0.175568, 0.18837, -0.217537, 0.957703, 0.035485, -0.973015, -0.227995, -1.09896e-07, 3.84743, -2.10479e-07)
 bones/11/enabled = true
 bones/11/position = Vector3(-1.09896e-07, 3.84743, -2.10479e-07)
-bones/11/rotation = Quaternion(-0.786087, -0.0628615, 0.0690646, 0.61102)
+bones/11/rotation = Quaternion(-0.781012, -0.0583908, 0.0792691, 0.616706)
 bones/11/scale = Vector3(1, 0.999999, 1)
 bones/12/name = "arm2_L"
 bones/12/parent = 11
@@ -2796,15 +2797,15 @@ bones/15/name = "arm1_R"
 bones/15/parent = 1
 bones/15/rest = Transform3D(-0.98213, 0.0512573, -0.181089, -0.187541, -0.185921, 0.964501, 0.0157694, 0.981227, 0.192212, 0.00107862, 3.8461, -0.0821097)
 bones/15/enabled = true
-bones/15/position = Vector3(0.00107859, 3.8461, -0.0821097)
-bones/15/rotation = Quaternion(-0.209386, 0.735858, 0.623768, -0.15995)
+bones/15/position = Vector3(0.00107886, 3.8461, -0.0821095)
+bones/15/rotation = Quaternion(-0.21412, 0.743259, 0.615823, -0.149935)
 bones/15/scale = Vector3(1, 1, 1)
 bones/16/name = "arm2_R"
 bones/16/parent = 15
 bones/16/rest = Transform3D(0.999962, -0.00846545, 0.00203661, 0.00853768, 0.99922, -0.0385481, -0.0017087, 0.038564, 0.999254, -4.28408e-07, 3.65838, -2.16067e-06)
 bones/16/enabled = true
 bones/16/position = Vector3(-4.28408e-07, 3.65838, -2.16067e-06)
-bones/16/rotation = Quaternion(-0.424022, 0.233298, -0.489444, 0.725412)
+bones/16/rotation = Quaternion(-0.486067, -0.16412, -0.362283, 0.778174)
 bones/16/scale = Vector3(1, 1, 0.999999)
 bones/17/name = "arm3_R"
 bones/17/parent = 16
@@ -2824,22 +2825,22 @@ bones/19/name = "hip_L"
 bones/19/parent = -1
 bones/19/rest = Transform3D(0.138486, 0.897208, 0.419333, -0.129033, -0.403458, 0.905854, 0.981923, -0.179556, 0.059896, 0.000155807, -0.00105953, -2.01735)
 bones/19/enabled = true
-bones/19/position = Vector3(-0.33855, -1.06556, -2.01735)
-bones/19/rotation = Quaternion(0.608697, 0.3155, 0.575514, -0.445793)
+bones/19/position = Vector3(-0.35994, -1.17996, -1.78744)
+bones/19/rotation = Quaternion(0.623398, 0.298153, 0.552326, -0.466278)
 bones/19/scale = Vector3(1, 1, 1)
 bones/20/name = "leg1_L"
 bones/20/parent = 19
 bones/20/rest = Transform3D(0.945603, 0.113405, 0.304916, -0.324072, 0.410457, 0.852351, -0.0284943, -0.9048, 0.424881, 2.08616e-07, 2.00996, -7.1153e-07)
 bones/20/enabled = true
 bones/20/position = Vector3(2.08616e-07, 2.00996, -7.1153e-07)
-bones/20/rotation = Quaternion(-0.314691, -0.397218, -0.306481, 0.805765)
+bones/20/rotation = Quaternion(-0.323315, -0.427838, -0.293183, 0.791496)
 bones/20/scale = Vector3(1, 0.999999, 1)
 bones/21/name = "leg2_L"
 bones/21/parent = 20
 bones/21/rest = Transform3D(0.990336, -0.138679, 0.00180777, 0.138628, 0.990193, 0.0173138, -0.00419111, -0.0168959, 0.999848, 5.96046e-08, 5.85994, -5.23403e-07)
 bones/21/enabled = true
 bones/21/position = Vector3(5.96046e-08, 5.85994, -5.23403e-07)
-bones/21/rotation = Quaternion(-0.0612712, 0.00129298, 0.495993, 0.866161)
+bones/21/rotation = Quaternion(-0.0604385, 0.00129877, 0.489251, 0.870045)
 bones/21/scale = Vector3(1, 1, 1)
 bones/22/name = "foot1_L"
 bones/22/parent = 21
@@ -2859,21 +2860,21 @@ bones/24/name = "kneeIK_L"
 bones/24/parent = -1
 bones/24/rest = Transform3D(-0.176321, 1.3113e-06, 0.984333, 0.984333, 1.54972e-06, 0.176321, -1.3113e-06, 1, -1.54972e-06, 1.83022, -6.67107, 3.18901)
 bones/24/enabled = true
-bones/24/position = Vector3(6.3015, -9.41823, 3.49458)
+bones/24/position = Vector3(7.04992, -9.46662, 3.49458)
 bones/24/rotation = Quaternion(0.427621, 0.561851, 0.530083, 0.469549)
 bones/24/scale = Vector3(1, 1, 1)
 bones/25/name = "heelIK_L"
 bones/25/parent = -1
 bones/25/rest = Transform3D(-0.16376, -1.63913e-06, 0.9865, -0.9865, 1.19209e-07, -0.16376, 8.9407e-08, -1, -1.66893e-06, 1.91204, -13.5859, -3.56646)
 bones/25/enabled = true
-bones/25/position = Vector3(4.75572, -12.2213, 0.183847)
+bones/25/position = Vector3(4.82744, -12.3397, 0.183847)
 bones/25/rotation = Quaternion(-0.400051, 0.463947, -0.598439, 0.516317)
 bones/25/scale = Vector3(1, 1, 1)
 bones/26/name = "hip_R"
 bones/26/parent = -1
 bones/26/rest = Transform3D(0.138486, -0.897208, -0.419333, 0.129033, -0.403458, 0.905854, -0.981923, -0.179556, 0.059896, -0.000155807, -0.00105953, -2.01735)
 bones/26/enabled = true
-bones/26/position = Vector3(-0.338861, -1.06556, -2.01735)
+bones/26/position = Vector3(-0.0853782, -1.11395, -2.01875)
 bones/26/rotation = Quaternion(0.608697, -0.3155, -0.575514, -0.445793)
 bones/26/scale = Vector3(1, 1, 1)
 bones/27/name = "leg1_R"
@@ -2881,14 +2882,14 @@ bones/27/parent = 26
 bones/27/rest = Transform3D(0.945603, -0.113405, -0.304916, 0.324072, 0.410457, 0.852351, 0.0284943, -0.9048, 0.424881, -9.54606e-09, 2.00996, -3.52971e-07)
 bones/27/enabled = true
 bones/27/position = Vector3(-9.54606e-09, 2.00996, -3.52971e-07)
-bones/27/rotation = Quaternion(-0.209385, 0.420724, 0.143017, 0.871031)
+bones/27/rotation = Quaternion(-0.203399, 0.42403, 0.138817, 0.871526)
 bones/27/scale = Vector3(1, 0.999999, 1)
 bones/28/name = "leg2_R"
 bones/28/parent = 27
 bones/28/rest = Transform3D(0.990336, 0.138679, -0.00180777, -0.138628, 0.990193, 0.0173138, 0.00419111, -0.0168959, 0.999848, 4.51691e-08, 5.85994, -3.72529e-09)
 bones/28/enabled = true
 bones/28/position = Vector3(4.51691e-08, 5.85994, -3.72529e-09)
-bones/28/rotation = Quaternion(-0.0643786, -0.00115415, -0.513993, 0.855374)
+bones/28/rotation = Quaternion(-0.0631028, -0.00116242, -0.503807, 0.861507)
 bones/28/scale = Vector3(1, 1, 1)
 bones/29/name = "foot1_R"
 bones/29/parent = 28
@@ -2908,19 +2909,19 @@ bones/31/name = "kneeIK_R"
 bones/31/parent = -1
 bones/31/rest = Transform3D(-0.176321, -1.3113e-06, -0.984333, -0.984333, 1.54972e-06, 0.176321, 1.3113e-06, 1, -1.54972e-06, -1.83022, -6.67107, 3.18901)
 bones/31/enabled = true
-bones/31/position = Vector3(-7.33877, -6.67387, -0.133983)
+bones/31/position = Vector3(-7.29038, -6.72226, -0.133983)
 bones/31/rotation = Quaternion(-0.453784, 0.542292, 0.542291, -0.453784)
 bones/31/scale = Vector3(1, 1, 1)
 bones/32/name = "heelIK_R"
 bones/32/parent = -1
 bones/32/rest = Transform3D(-0.16376, 1.63913e-06, -0.9865, 0.9865, 1.19209e-07, -0.16376, -8.9407e-08, -1, -1.66893e-06, -1.91204, -13.5859, -3.56646)
 bones/32/enabled = true
-bones/32/position = Vector3(-6.26357, -12.0171, -3.61992)
+bones/32/position = Vector3(-6.21519, -12.0654, -3.61992)
 bones/32/rotation = Quaternion(0.456756, 0.539878, -0.539587, -0.456893)
 bones/32/scale = Vector3(1, 1, 1)
 
 [node name="BoneAttachment3D" type="BoneAttachment3D" parent="Armature/Skeleton3D"]
-transform = Transform3D(-0.300929, -0.0901167, -0.949379, -0.328078, -0.924976, 0.191792, -0.895436, 0.369186, 0.248787, -1.70658, 8.37551, 4.94593)
+transform = Transform3D(-0.270421, -0.0424509, -0.961806, -0.333173, -0.933171, 0.134862, -0.903254, 0.356917, 0.238205, -1.68568, 8.22845, 4.95477)
 bone_name = "TOP OF SKULL"
 bone_idx = 8
 
@@ -2943,7 +2944,7 @@ mesh = SubResource("ArrayMesh_5ew54")
 skin = SubResource("Skin_e330f")
 
 [node name="BoneAttachment3D2" type="BoneAttachment3D" parent="Armature/Skeleton3D"]
-transform = Transform3D(0.18092, -0.599546, -0.779622, -0.562296, -0.713422, 0.418149, -0.8069, 0.362727, -0.466195, -7.82684, -0.609435, 0.621258)
+transform = Transform3D(-0.0469599, 0.00371186, -0.998889, -0.0817386, -0.996652, 0.000138789, -0.995545, 0.0816552, 0.0471056, -6.28071, -1.24312, -0.15852)
 bone_name = "hand_R"
 bone_idx = 18
 
diff --git a/Zennysoft.Game.Ma/src/enemy/enemy_types/16. demon wall/DemonWall.tscn b/Zennysoft.Game.Ma/src/enemy/enemy_types/16. demon wall/DemonWall.tscn
index f43e7094..10274c13 100644
--- a/Zennysoft.Game.Ma/src/enemy/enemy_types/16. demon wall/DemonWall.tscn	
+++ b/Zennysoft.Game.Ma/src/enemy/enemy_types/16. demon wall/DemonWall.tscn	
@@ -33,6 +33,7 @@ shape = SubResource("BoxShape3D_5gof3")
 
 [node name="EnemyModelView" parent="." instance=ExtResource("4_affkc")]
 unique_name_in_owner = true
+CanMove = null
 
 [node name="HitSounds" type="Node3D" parent="."]
 
diff --git a/Zennysoft.Game.Ma/src/map/dungeon/floors/Floor01/Floor 1B.tscn b/Zennysoft.Game.Ma/src/map/dungeon/floors/Floor01/Floor 1B.tscn
index 295b4e50..66f800cc 100644
--- a/Zennysoft.Game.Ma/src/map/dungeon/floors/Floor01/Floor 1B.tscn	
+++ b/Zennysoft.Game.Ma/src/map/dungeon/floors/Floor01/Floor 1B.tscn	
@@ -105,7 +105,7 @@ transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -59.9942, -0.0174925, 27.8728
 transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -59.9126, 0.0301168, 12.1208)
 
 [node name="Minimap2" type="MeshInstance3D" parent="."]
-transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -28.017, 0.373, 36.8768)
+transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -28.017, -0.621108, 36.8768)
 layers = 2
 mesh = SubResource("PlaneMesh_wji58")
 
diff --git a/Zennysoft.Game.Ma/src/map/dungeon/floors/Floor01/Floor 1C.tscn b/Zennysoft.Game.Ma/src/map/dungeon/floors/Floor01/Floor 1C.tscn
index beb08df8..dc7ada90 100644
--- a/Zennysoft.Game.Ma/src/map/dungeon/floors/Floor01/Floor 1C.tscn	
+++ b/Zennysoft.Game.Ma/src/map/dungeon/floors/Floor01/Floor 1C.tscn	
@@ -101,7 +101,7 @@ transform = Transform3D(-4.37114e-08, 0, 1, 0, 1, 0, -1, 0, -4.37114e-08, -9.909
 transform = Transform3D(-4.37114e-08, 0, 1, 0, 1, 0, -1, 0, -4.37114e-08, -35.2776, 0.00105417, 33.9955)
 
 [node name="Minimap2" type="MeshInstance3D" parent="."]
-transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -22.0145, 0.373, 49.5146)
+transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -22.0145, -2.51298, 49.5146)
 layers = 2
 mesh = SubResource("PlaneMesh_54mxl")
 
diff --git a/Zennysoft.Game.Ma/src/map/dungeon/floors/Floor02/Floor 2A.tscn b/Zennysoft.Game.Ma/src/map/dungeon/floors/Floor02/Floor 2A.tscn
index 3fb0af07..9f7a1485 100644
--- a/Zennysoft.Game.Ma/src/map/dungeon/floors/Floor02/Floor 2A.tscn	
+++ b/Zennysoft.Game.Ma/src/map/dungeon/floors/Floor02/Floor 2A.tscn	
@@ -166,7 +166,7 @@ transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 31.0298, 0.0294389, -12.0652)
 transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -49.0813, 0.0171744, 4.04785)
 
 [node name="Minimap2" type="MeshInstance3D" parent="."]
-transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -4.81506, 0.373, -3.07342)
+transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -4.81506, -0.678744, -3.07342)
 layers = 2
 mesh = SubResource("PlaneMesh_5v5l6")
 
diff --git a/Zennysoft.Game.Ma/src/map/dungeon/floors/Floor02/Floor 2B.tscn b/Zennysoft.Game.Ma/src/map/dungeon/floors/Floor02/Floor 2B.tscn
index a505710b..da5e892b 100644
--- a/Zennysoft.Game.Ma/src/map/dungeon/floors/Floor02/Floor 2B.tscn	
+++ b/Zennysoft.Game.Ma/src/map/dungeon/floors/Floor02/Floor 2B.tscn	
@@ -110,7 +110,7 @@ transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 76, 0, -18)
 transform = Transform3D(-4.37114e-08, 0, -1, 0, 1, 0, 1, 0, -4.37114e-08, 62, 0, -4.495)
 
 [node name="Minimap2" type="MeshInstance3D" parent="."]
-transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 77.1591, 0.373, -6.01604)
+transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 77.1591, -0.337722, -6.01604)
 layers = 2
 mesh = SubResource("PlaneMesh_7j2in")
 
diff --git a/Zennysoft.Game.Ma/src/map/dungeon/floors/Floor02/Floor 2C.tscn b/Zennysoft.Game.Ma/src/map/dungeon/floors/Floor02/Floor 2C.tscn
index ba6e0511..958316d0 100644
--- a/Zennysoft.Game.Ma/src/map/dungeon/floors/Floor02/Floor 2C.tscn	
+++ b/Zennysoft.Game.Ma/src/map/dungeon/floors/Floor02/Floor 2C.tscn	
@@ -142,7 +142,7 @@ transform = Transform3D(-4.37114e-08, 0, 1, 0, 1, 0, -1, 0, -4.37114e-08, 73.156
 transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 63, 0, -34)
 
 [node name="Minimap2" type="MeshInstance3D" parent="."]
-transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 28.9476, 0.373, 36.4698)
+transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 28.9476, -1.95209, 36.4698)
 layers = 2
 mesh = SubResource("PlaneMesh_gw6gx")
 
diff --git a/Zennysoft.Game.Ma/src/map/dungeon/floors/Floor03/Floor 3A.tscn b/Zennysoft.Game.Ma/src/map/dungeon/floors/Floor03/Floor 3A.tscn
index a42830cf..0202f9e9 100644
--- a/Zennysoft.Game.Ma/src/map/dungeon/floors/Floor03/Floor 3A.tscn	
+++ b/Zennysoft.Game.Ma/src/map/dungeon/floors/Floor03/Floor 3A.tscn	
@@ -163,7 +163,7 @@ transform = Transform3D(-4.37114e-08, 0, -1, 0, 1, 0, 1, 0, -4.37114e-08, 43.18,
 transform = Transform3D(-4.37114e-08, 0, -1, 0, 1, 0, 1, 0, -4.37114e-08, -48.4658, 0, 17.9486)
 
 [node name="Minimap2" type="MeshInstance3D" parent="."]
-transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 5.3474, 0.373, -36.0745)
+transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 5.3474, -2.627, -36.0745)
 layers = 2
 mesh = SubResource("PlaneMesh_ckihq")
 
diff --git a/Zennysoft.Game.Ma/src/map/dungeon/floors/Floor03/Floor 3B.tscn b/Zennysoft.Game.Ma/src/map/dungeon/floors/Floor03/Floor 3B.tscn
index 91799f4d..040f38d8 100644
--- a/Zennysoft.Game.Ma/src/map/dungeon/floors/Floor03/Floor 3B.tscn	
+++ b/Zennysoft.Game.Ma/src/map/dungeon/floors/Floor03/Floor 3B.tscn	
@@ -133,7 +133,7 @@ transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -7.00045, 0, 53)
 transform = Transform3D(-4.37114e-08, 0, -1, 0, 1, 0, 1, 0, -4.37114e-08, -42.0005, 0, 46)
 
 [node name="Minimap2" type="MeshInstance3D" parent="."]
-transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -7.88379, 0.373, 10.9144)
+transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -7.88379, -1.627, 10.9144)
 mesh = SubResource("PlaneMesh_ferpc")
 
 [node name="AnimationPlayer" type="AnimationPlayer" parent="Minimap2"]
diff --git a/Zennysoft.Game.Ma/src/map/dungeon/floors/Floor03/Floor 3C.tscn b/Zennysoft.Game.Ma/src/map/dungeon/floors/Floor03/Floor 3C.tscn
index 79490843..e13d2c33 100644
--- a/Zennysoft.Game.Ma/src/map/dungeon/floors/Floor03/Floor 3C.tscn	
+++ b/Zennysoft.Game.Ma/src/map/dungeon/floors/Floor03/Floor 3C.tscn	
@@ -145,7 +145,7 @@ transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 20.9012, 0, 58.0875)
 transform = Transform3D(-4.37114e-08, 0, -1, 0, 1, 0, 1, 0, -4.37114e-08, 27.3277, 0.145948, 45.946)
 
 [node name="Minimap2" type="MeshInstance3D" parent="."]
-transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -4.87502, 0.373, 11.4857)
+transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -4.87502, -1.627, 11.4857)
 mesh = SubResource("PlaneMesh_2edmy")
 
 [node name="AnimationPlayer" type="AnimationPlayer" parent="Minimap2"]
diff --git a/Zennysoft.Game.Ma/src/map/dungeon/floors/Floor04/Floor 4A.tscn b/Zennysoft.Game.Ma/src/map/dungeon/floors/Floor04/Floor 4A.tscn
index 5647a11c..7f45ebc2 100644
--- a/Zennysoft.Game.Ma/src/map/dungeon/floors/Floor04/Floor 4A.tscn	
+++ b/Zennysoft.Game.Ma/src/map/dungeon/floors/Floor04/Floor 4A.tscn	
@@ -139,7 +139,7 @@ transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 33.8492, 0, 27.9523)
 transform = Transform3D(-4.37114e-08, 0, 1, 0, 1, 0, -1, 0, -4.37114e-08, 53.734, 0, 25.972)
 
 [node name="Minimap2" type="MeshInstance3D" parent="."]
-transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 3.3232, 0.373, 9.60703)
+transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 3.3232, -9.627, 9.60703)
 mesh = SubResource("PlaneMesh_e2od1")
 
 [node name="AnimationPlayer" type="AnimationPlayer" parent="Minimap2"]
diff --git a/Zennysoft.Game.Ma/src/map/dungeon/floors/Floor04/Floor 4B.tscn b/Zennysoft.Game.Ma/src/map/dungeon/floors/Floor04/Floor 4B.tscn
index 748c9397..94b4edad 100644
--- a/Zennysoft.Game.Ma/src/map/dungeon/floors/Floor04/Floor 4B.tscn	
+++ b/Zennysoft.Game.Ma/src/map/dungeon/floors/Floor04/Floor 4B.tscn	
@@ -110,7 +110,7 @@ transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -7.11696, -0.0856504, 36.2686
 transform = Transform3D(-4.37114e-08, 0, -1, 0, 1, 0, 1, 0, -4.37114e-08, 3.02273, -0.0856504, 25.9116)
 
 [node name="Minimap2" type="MeshInstance3D" parent="."]
-transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -26.3714, 0.373, -7.52566)
+transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -26.3714, -14.627, -7.52566)
 mesh = SubResource("PlaneMesh_a154m")
 
 [node name="AnimationPlayer" type="AnimationPlayer" parent="Minimap2"]
diff --git a/Zennysoft.Game.Ma/src/map/dungeon/floors/Floor04/Floor 4C.tscn b/Zennysoft.Game.Ma/src/map/dungeon/floors/Floor04/Floor 4C.tscn
index bee0c217..603681ec 100644
--- a/Zennysoft.Game.Ma/src/map/dungeon/floors/Floor04/Floor 4C.tscn	
+++ b/Zennysoft.Game.Ma/src/map/dungeon/floors/Floor04/Floor 4C.tscn	
@@ -135,7 +135,7 @@ transform = Transform3D(-4.37114e-08, 0, -1, 0, 1, 0, 1, 0, -4.37114e-08, -73.54
 transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -66.5259, 0, -16.2525)
 
 [node name="Minimap2" type="MeshInstance3D" parent="."]
-transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -9.70335, 0.373, -3.95678)
+transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -9.70335, -5.627, -3.95678)
 mesh = SubResource("PlaneMesh_nls0x")
 
 [node name="AnimationPlayer" type="AnimationPlayer" parent="Minimap2"]
diff --git a/Zennysoft.Game.Ma/src/map/dungeon/floors/Floor05/Floor 5B.tscn b/Zennysoft.Game.Ma/src/map/dungeon/floors/Floor05/Floor 5B.tscn
index d9fd0764..ab8e91f5 100644
--- a/Zennysoft.Game.Ma/src/map/dungeon/floors/Floor05/Floor 5B.tscn	
+++ b/Zennysoft.Game.Ma/src/map/dungeon/floors/Floor05/Floor 5B.tscn	
@@ -148,7 +148,7 @@ transform = Transform3D(-4.37114e-08, 0, -1, 0, 1, 0, 1, 0, -4.37114e-08, 60.547
 transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 66.315, 0.000980735, -37.0096)
 
 [node name="Minimap2" type="MeshInstance3D" parent="."]
-transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 32.1436, 0.373, -25.006)
+transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 32.1436, -17.627, -25.006)
 mesh = SubResource("PlaneMesh_yhnvc")
 
 [node name="AnimationPlayer" type="AnimationPlayer" parent="Minimap2"]
diff --git a/Zennysoft.Game.Ma/src/map/dungeon/floors/Floor05/Floor 5Z.tscn b/Zennysoft.Game.Ma/src/map/dungeon/floors/Floor05/Floor 5Z.tscn
index 1748e9f8..c9053d12 100644
--- a/Zennysoft.Game.Ma/src/map/dungeon/floors/Floor05/Floor 5Z.tscn	
+++ b/Zennysoft.Game.Ma/src/map/dungeon/floors/Floor05/Floor 5Z.tscn	
@@ -141,7 +141,7 @@ transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -43.3299, 0, -83.3928)
 transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -51.3299, 0, -75.3928)
 
 [node name="Minimap2" type="MeshInstance3D" parent="."]
-transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -35.2676, 0.373, -16.1372)
+transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -35.2676, -9.54691, -16.1372)
 mesh = SubResource("PlaneMesh_36beo")
 
 [node name="AnimationPlayer" type="AnimationPlayer" parent="Minimap2"]
diff --git a/Zennysoft.Game.Ma/src/map/dungeon/floors/Floor06/Floor 6A.tscn b/Zennysoft.Game.Ma/src/map/dungeon/floors/Floor06/Floor 6A.tscn
index 3bd3a093..9a4d5ecf 100644
--- a/Zennysoft.Game.Ma/src/map/dungeon/floors/Floor06/Floor 6A.tscn	
+++ b/Zennysoft.Game.Ma/src/map/dungeon/floors/Floor06/Floor 6A.tscn	
@@ -157,8 +157,7 @@ transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 75.5239, 0, -31.1061)
 transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 83.5123, 0, -23.1516)
 
 [node name="Minimap2" type="MeshInstance3D" parent="."]
-transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 43.4336, 0.373, 10.6265)
-visible = false
+transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 43.4336, -7.83002, 10.6265)
 mesh = SubResource("PlaneMesh_l15fl")
 
 [node name="AnimationPlayer" type="AnimationPlayer" parent="Minimap2"]
diff --git a/Zennysoft.Game.Ma/src/map/dungeon/floors/Floor06/Floor 6B.tscn b/Zennysoft.Game.Ma/src/map/dungeon/floors/Floor06/Floor 6B.tscn
index 23cac4f6..ad1cde6f 100644
--- a/Zennysoft.Game.Ma/src/map/dungeon/floors/Floor06/Floor 6B.tscn	
+++ b/Zennysoft.Game.Ma/src/map/dungeon/floors/Floor06/Floor 6B.tscn	
@@ -142,7 +142,7 @@ transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 60, 0, 46)
 transform = Transform3D(-4.37114e-08, 0, -1, 0, 1, 0, 1, 0, -4.37114e-08, 68, 0, 72)
 
 [node name="Minimap2" type="MeshInstance3D" parent="."]
-transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 40.9971, 0.373, 12.6741)
+transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 40.9971, -1.23456, 12.6741)
 mesh = SubResource("PlaneMesh_m6pak")
 
 [node name="AnimationPlayer" type="AnimationPlayer" parent="Minimap2"]
diff --git a/Zennysoft.Game.Ma/src/map/dungeon/floors/Floor06/Floor 6C.tscn b/Zennysoft.Game.Ma/src/map/dungeon/floors/Floor06/Floor 6C.tscn
index 1133c328..a4ae7844 100644
--- a/Zennysoft.Game.Ma/src/map/dungeon/floors/Floor06/Floor 6C.tscn	
+++ b/Zennysoft.Game.Ma/src/map/dungeon/floors/Floor06/Floor 6C.tscn	
@@ -137,7 +137,7 @@ transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 102.798, 0, -16.5616)
 transform = Transform3D(0, 0, -1, 0, 1, 0, 1, 0, 0, 109.023, 0, -3.94532)
 
 [node name="Minimap2" type="MeshInstance3D" parent="."]
-transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 28.946, 2.78801, -8.047)
+transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 28.946, -1.01226, -8.047)
 mesh = SubResource("PlaneMesh_mqwjf")
 
 [node name="AnimationPlayer" type="AnimationPlayer" parent="Minimap2"]
diff --git a/Zennysoft.Game.Ma/src/map/dungeon/floors/Floor07/Floor 7A.tscn b/Zennysoft.Game.Ma/src/map/dungeon/floors/Floor07/Floor 7A.tscn
index d4ca809f..658b2f52 100644
--- a/Zennysoft.Game.Ma/src/map/dungeon/floors/Floor07/Floor 7A.tscn	
+++ b/Zennysoft.Game.Ma/src/map/dungeon/floors/Floor07/Floor 7A.tscn	
@@ -154,7 +154,7 @@ transform = Transform3D(-1, 0, -8.74228e-08, 0, 1, 0, 8.74228e-08, 0, -1, 11.128
 transform = Transform3D(-4.37114e-08, 0, 1, 0, 1, 0, -1, 0, -4.37114e-08, 25, 0, -18)
 
 [node name="Minimap2" type="MeshInstance3D" parent="."]
-transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -12.3119, 0.373, -2.33316)
+transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -12.3119, -1.65182, -2.33316)
 mesh = SubResource("PlaneMesh_u6l1h")
 
 [node name="AnimationPlayer" type="AnimationPlayer" parent="Minimap2"]
diff --git a/Zennysoft.Game.Ma/src/map/dungeon/floors/Floor07/Floor 7B.tscn b/Zennysoft.Game.Ma/src/map/dungeon/floors/Floor07/Floor 7B.tscn
index 3226faac..07be13b9 100644
--- a/Zennysoft.Game.Ma/src/map/dungeon/floors/Floor07/Floor 7B.tscn	
+++ b/Zennysoft.Game.Ma/src/map/dungeon/floors/Floor07/Floor 7B.tscn	
@@ -127,7 +127,7 @@ transform = Transform3D(-4.37114e-08, 0, 1, 0, 1, 0, -1, 0, -4.37114e-08, -28.25
 transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -40.2181, 0, -13.8913)
 
 [node name="Minimap2" type="MeshInstance3D" parent="."]
-transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -26.816, 0.373, -5.00594)
+transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -26.816, -6.57364, -5.00594)
 mesh = SubResource("PlaneMesh_cmu3s")
 
 [node name="AnimationPlayer" type="AnimationPlayer" parent="Minimap2"]
diff --git a/Zennysoft.Game.Ma/src/map/dungeon/floors/Floor09/Floor 9A.tscn b/Zennysoft.Game.Ma/src/map/dungeon/floors/Floor09/Floor 9A.tscn
index 257dbfe3..b642278f 100644
--- a/Zennysoft.Game.Ma/src/map/dungeon/floors/Floor09/Floor 9A.tscn	
+++ b/Zennysoft.Game.Ma/src/map/dungeon/floors/Floor09/Floor 9A.tscn	
@@ -137,7 +137,7 @@ transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 55.0032, 0.00976086, 51.2405)
 transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 46.9962, 0, 67.3364)
 
 [node name="Minimap2" type="MeshInstance3D" parent="."]
-transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -3.87809, 0.373, 41.5167)
+transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -3.87809, -8.95929, 41.5167)
 mesh = SubResource("PlaneMesh_53qaf")
 
 [node name="AnimationPlayer" type="AnimationPlayer" parent="Minimap2"]
diff --git a/Zennysoft.Game.Ma/src/map/dungeon/floors/Floor09/Floor 9B.tscn b/Zennysoft.Game.Ma/src/map/dungeon/floors/Floor09/Floor 9B.tscn
index e1d9983b..5d36e78c 100644
--- a/Zennysoft.Game.Ma/src/map/dungeon/floors/Floor09/Floor 9B.tscn	
+++ b/Zennysoft.Game.Ma/src/map/dungeon/floors/Floor09/Floor 9B.tscn	
@@ -130,7 +130,7 @@ transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 31.0442, 0, 67.4222)
 transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 13, 0, 19)
 
 [node name="Minimap2" type="MeshInstance3D" parent="."]
-transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -8.27648, 0.373, 38.915)
+transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -8.27648, -4.40777, 38.915)
 mesh = SubResource("PlaneMesh_qclr3")
 
 [node name="AnimationPlayer" type="AnimationPlayer" parent="Minimap2"]
diff --git a/Zennysoft.Game.Ma/src/map/dungeon/floors/Floor11/Floor 11A.tscn b/Zennysoft.Game.Ma/src/map/dungeon/floors/Floor11/Floor 11A.tscn
index 12efe6be..5d718f13 100644
--- a/Zennysoft.Game.Ma/src/map/dungeon/floors/Floor11/Floor 11A.tscn	
+++ b/Zennysoft.Game.Ma/src/map/dungeon/floors/Floor11/Floor 11A.tscn	
@@ -173,7 +173,7 @@ transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 23, 0.0358599, 66.3313)
 transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 23, 0.0358599, 38.3169)
 
 [node name="Minimap2" type="MeshInstance3D" parent="."]
-transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 6.44169, 0.373, 3.07943)
+transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 6.44169, -0.247826, 3.07943)
 mesh = SubResource("PlaneMesh_tr1gi")
 
 [node name="AnimationPlayer" type="AnimationPlayer" parent="Minimap2"]
diff --git a/Zennysoft.Game.Ma/src/map/dungeon/floors/Floor11/Floor 11B.tscn b/Zennysoft.Game.Ma/src/map/dungeon/floors/Floor11/Floor 11B.tscn
index 329f9fbe..58c03c2e 100644
--- a/Zennysoft.Game.Ma/src/map/dungeon/floors/Floor11/Floor 11B.tscn	
+++ b/Zennysoft.Game.Ma/src/map/dungeon/floors/Floor11/Floor 11B.tscn	
@@ -147,7 +147,7 @@ transform = Transform3D(-4.37114e-08, 0, -1, 0, 1, 0, 1, 0, -4.37114e-08, 38.763
 transform = Transform3D(0, 0, 1, 0, 1, 0, -1, 0, 0, 19, 0, 66)
 
 [node name="Minimap2" type="MeshInstance3D" parent="."]
-transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 17.8659, 0.373, 66.0216)
+transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 17.8659, -11.2217, 66.0216)
 mesh = SubResource("PlaneMesh_f5oy5")
 
 [node name="AnimationPlayer" type="AnimationPlayer" parent="Minimap2"]
diff --git a/Zennysoft.Game.Ma/src/map/dungeon/floors/Floor12/Floor 12A.tscn b/Zennysoft.Game.Ma/src/map/dungeon/floors/Floor12/Floor 12A.tscn
index 5154d6b1..57e2fc75 100644
--- a/Zennysoft.Game.Ma/src/map/dungeon/floors/Floor12/Floor 12A.tscn	
+++ b/Zennysoft.Game.Ma/src/map/dungeon/floors/Floor12/Floor 12A.tscn	
@@ -153,7 +153,7 @@ transform = Transform3D(-4.37114e-08, 0, 3.585, 0, 1, 0, -1, 0, -1.56705e-07, -6
 transform = Transform3D(-1, 0, -3.13411e-07, 0, 1, 0, 8.74228e-08, 0, -3.585, -82.0868, 0.0243301, -7.10035)
 
 [node name="Minimap" type="MeshInstance3D" parent="."]
-transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -11.859, 0.373, 42.4854)
+transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -11.859, -1.6004, 42.4854)
 mesh = SubResource("PlaneMesh_vi6hn")
 
 [node name="AnimationPlayer" type="AnimationPlayer" parent="Minimap"]
diff --git a/Zennysoft.Game.Ma/src/map/dungeon/floors/Floor12/Floor 12B.tscn b/Zennysoft.Game.Ma/src/map/dungeon/floors/Floor12/Floor 12B.tscn
index bae25f8e..58dd067c 100644
--- a/Zennysoft.Game.Ma/src/map/dungeon/floors/Floor12/Floor 12B.tscn	
+++ b/Zennysoft.Game.Ma/src/map/dungeon/floors/Floor12/Floor 12B.tscn	
@@ -170,7 +170,7 @@ transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 29, 0, -34)
 transform = Transform3D(-4.37114e-08, 0, 1, 0, 1, 0, -1, 0, -4.37114e-08, -24.6588, 0, -51)
 
 [node name="Minimap" type="MeshInstance3D" parent="."]
-transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -39.9698, 0.373, -79.843)
+transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -39.9698, -4.55022, -79.843)
 mesh = SubResource("PlaneMesh_nlvua")
 
 [node name="AnimationPlayer" type="AnimationPlayer" parent="Minimap"]
diff --git a/Zennysoft.Game.Ma/src/map/dungeon/floors/Floor13/Floor 13A.tscn b/Zennysoft.Game.Ma/src/map/dungeon/floors/Floor13/Floor 13A.tscn
index 1d35cbf5..39da471c 100644
--- a/Zennysoft.Game.Ma/src/map/dungeon/floors/Floor13/Floor 13A.tscn	
+++ b/Zennysoft.Game.Ma/src/map/dungeon/floors/Floor13/Floor 13A.tscn	
@@ -144,7 +144,7 @@ transform = Transform3D(-4.37114e-08, 0, 1, 0, 1, 0, -1, 0, -4.37114e-08, 51.377
 transform = Transform3D(-4.37114e-08, 0, -1, 0, 1, 0, 1, 0, -4.37114e-08, -1.40893, 0, -26.123)
 
 [node name="Minimap" type="MeshInstance3D" parent="."]
-transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 34.0523, 0.373, 15.9884)
+transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 34.0523, -3.76094, 15.9884)
 mesh = SubResource("PlaneMesh_wklws")
 
 [node name="AnimationPlayer" type="AnimationPlayer" parent="Minimap"]
diff --git a/Zennysoft.Game.Ma/src/map/dungeon/floors/Floor14/Floor 14B.tscn b/Zennysoft.Game.Ma/src/map/dungeon/floors/Floor14/Floor 14B.tscn
index 733a8673..d9c8a764 100644
--- a/Zennysoft.Game.Ma/src/map/dungeon/floors/Floor14/Floor 14B.tscn	
+++ b/Zennysoft.Game.Ma/src/map/dungeon/floors/Floor14/Floor 14B.tscn	
@@ -203,7 +203,7 @@ transform = Transform3D(-4.37114e-08, 0, -1, 0, 1, 0, 1, 0, -4.37114e-08, 44, 0,
 transform = Transform3D(-4.37114e-08, 0, 1, 0, 1, 0, -1, 0, -4.37114e-08, 124.339, 0, 26.1087)
 
 [node name="Minimap" type="MeshInstance3D" parent="."]
-transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 34.305, 0.373, 16.999)
+transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 34.305, -0.327558, 16.999)
 mesh = SubResource("PlaneMesh_x4fnm")
 
 [node name="AnimationPlayer" type="AnimationPlayer" parent="Minimap"]
diff --git a/Zennysoft.Game.Ma/src/map/dungeon/floors/Special Floors/Floor 16 Boss Floor B.tscn b/Zennysoft.Game.Ma/src/map/dungeon/floors/Special Floors/Floor 16 Boss Floor B.tscn
index 4dfe2ee6..0d26e6ce 100644
--- a/Zennysoft.Game.Ma/src/map/dungeon/floors/Special Floors/Floor 16 Boss Floor B.tscn	
+++ b/Zennysoft.Game.Ma/src/map/dungeon/floors/Special Floors/Floor 16 Boss Floor B.tscn	
@@ -100,11 +100,13 @@ shader_parameter/cloud_opacity = 0.36
 script = ExtResource("1_bxvob")
 
 [node name="Model" type="Node3D" parent="."]
+transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, -25.2903, 0)
 
 [node name="34_A2_BOSS FLOOR B_VER_1" parent="Model" instance=ExtResource("8_7okc1")]
 transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -1.01132, 0, 0)
 
 [node name="Collision" type="Node3D" parent="."]
+transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, -25.2903, 0)
 
 [node name="StaticBody3D2" type="StaticBody3D" parent="Collision"]
 
@@ -146,13 +148,14 @@ shape = SubResource("ConcavePolygonShape3D_s7h55")
 
 [node name="PlayerSpawn" type="Marker3D" parent="Spawn Points"]
 unique_name_in_owner = true
-transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -0.953176, 25.4308, 149.677)
+transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -0.953, 0, 149.677)
 
 [node name="ItemSpawnPoint" type="Marker3D" parent="Spawn Points"]
 unique_name_in_owner = true
 transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -115.98, -2.05432, 16.535)
 
 [node name="Room" type="Node3D" parent="."]
+transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, -25.2903, 0)
 
 [node name="ActivateTrap" type="Area3D" parent="Room"]
 unique_name_in_owner = true
@@ -165,9 +168,10 @@ shape = SubResource("BoxShape3D_bxvob")
 
 [node name="DemonWall" parent="." instance=ExtResource("25_k2q0o")]
 unique_name_in_owner = true
-transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -0.747, 29.191, 55.334)
+transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -0.747, 3.84071, 55.334)
 
 [node name="Lights" type="Node3D" parent="."]
+transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, -25.2903, 0)
 
 [node name="EXIT LIGHT" type="OmniLight3D" parent="Lights"]
 transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -8.57804, 31.8639, -46.7457)
@@ -229,6 +233,7 @@ shadow_bias = 0.072
 shadow_blur = 2.295
 
 [node name="VFX" type="Node3D" parent="."]
+transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, -25.2903, 0)
 
 [node name="FogVolume" type="FogVolume" parent="VFX"]
 transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0.815573, 25.5305, 106.124)
diff --git a/Zennysoft.Game.Ma/src/map/dungeon/floors/Special Floors/Overworld.tscn b/Zennysoft.Game.Ma/src/map/dungeon/floors/Special Floors/Overworld.tscn
index c2c455f5..e8898456 100644
--- a/Zennysoft.Game.Ma/src/map/dungeon/floors/Special Floors/Overworld.tscn	
+++ b/Zennysoft.Game.Ma/src/map/dungeon/floors/Special Floors/Overworld.tscn	
@@ -9975,7 +9975,7 @@ blend_shape_mode = 0
 shadow_mesh = SubResource("ArrayMesh_2djfl")
 
 [sub_resource type="BoxShape3D" id="BoxShape3D_b53dq"]
-size = Vector3(32.7888, 2.34912, 7.88136)
+size = Vector3(6.81866, 5.73663, 7.88136)
 
 [sub_resource type="CylinderShape3D" id="CylinderShape3D_yksd7"]
 radius = 6.19775
@@ -10482,6 +10482,7 @@ visible = false
 
 [node name="Utility Meshes" type="Node3D" parent="Node3D"]
 transform = Transform3D(27.9, 0, 0, 0, 27.9, 0, 0, 0, 27.9, -248.608, 139.71, 58.538)
+visible = false
 
 [node name="BLOCKER1" type="MeshInstance3D" parent="Node3D/Utility Meshes"]
 transform = Transform3D(1.325, 0, 0, 0, 1.325, 0, 0, 0, 1.325, 0.466, -3.173, -0.192)
@@ -10525,7 +10526,7 @@ skeleton = NodePath("../..")
 [node name="Actors" type="Node3D" parent="Node3D"]
 transform = Transform3D(-0.405705, 0, 0.533201, 0, 0.67, 0, -0.533201, 0, -0.405705, -482.222, 5.49128, 48.3922)
 
-[node name="NPC" parent="Node3D/Actors" instance=ExtResource("75_322om")]
+[node name="Rat" parent="Node3D/Actors" instance=ExtResource("75_322om")]
 transform = Transform3D(1, 0, 1.19209e-07, 0, 1, 0, -1.19209e-07, 0, 1, -36.051, 3.78707, 44.3599)
 
 [node name="Clalo" parent="Node3D/Actors" instance=ExtResource("76_nfcfh")]
@@ -10906,7 +10907,7 @@ collision_layer = 256
 collision_mask = 256
 
 [node name="CollisionShape3D" type="CollisionShape3D" parent="Spawn Points/Exit"]
-transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -7.28978, -2.1779, 7.74164)
+transform = Transform3D(0.999997, 0, 0, 0, 0.999997, 0, 0, 0, 0.999997, 49.3704, 0.654074, -3.16857)
 shape = SubResource("BoxShape3D_b53dq")
 
 [node name="RestoreArea" type="Area3D" parent="."]
@@ -10946,5 +10947,6 @@ skeleton = NodePath("")
 transform = Transform3D(0.943674, 0, -0.330877, 0, 1, 0, 0.330877, 0, 0.943674, -0.0489807, -0.637752, -0.318357)
 shape = SubResource("BoxShape3D_q7hpd")
 
+[editable path="Node3D/Actors/Rat"]
 [editable path="Node3D/Actors/Clalo"]
 [editable path="Node3D/Actors/Caretaker of Saints"]
diff --git a/Zennysoft.Game.Ma/src/npc/Rat/Rat.tscn b/Zennysoft.Game.Ma/src/npc/Rat/Rat.tscn
index 313db5e5..c8afec81 100644
--- a/Zennysoft.Game.Ma/src/npc/Rat/Rat.tscn
+++ b/Zennysoft.Game.Ma/src/npc/Rat/Rat.tscn
@@ -74,10 +74,12 @@ animations = [{
 }]
 
 [sub_resource type="CylinderShape3D" id="CylinderShape3D_wfhgc"]
-radius = 5.88818
+height = 20.9375
+radius = 18.1973
 
 [sub_resource type="CylinderShape3D" id="CylinderShape3D_gb32p"]
-radius = 9.76318
+height = 15.5671
+radius = 24.6406
 
 [sub_resource type="CapsuleShape3D" id="CapsuleShape3D_kg3qv"]
 radius = 0.837722
@@ -123,7 +125,7 @@ collision_layer = 2
 collision_mask = 2
 
 [node name="CollisionShape3D" type="CollisionShape3D" parent="DialogueZone"]
-transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0.00627995, 0, -0.00723076)
+transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0.00627995, 1.69336, -0.00723076)
 shape = SubResource("CylinderShape3D_wfhgc")
 
 [node name="DialogueExitZone" type="Area3D" parent="."]
@@ -133,7 +135,7 @@ collision_layer = 2
 collision_mask = 2
 
 [node name="CollisionShape3D" type="CollisionShape3D" parent="DialogueExitZone"]
-transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0.00627995, 0, -0.00723076)
+transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0.00627995, 1.62122, -0.00723076)
 shape = SubResource("CylinderShape3D_gb32p")
 
 [node name="Collision" type="RigidBody3D" parent="."]