diff --git a/project.godot b/project.godot
index 0ee38be2..ebb50bae 100644
--- a/project.godot
+++ b/project.godot
@@ -14,7 +14,7 @@ config/name="GameJamDungeon"
 run/main_scene="uid://d1gjaijijd5ot"
 run/print_header=false
 config/features=PackedStringArray("4.4", "C#", "GL Compatibility")
-run/max_fps=60
+run/delta_smoothing=false
 boot_splash/show_image=false
 
 [autoload]
diff --git a/src/game/Game.tscn b/src/game/Game.tscn
index 37d7132c..d294a516 100644
--- a/src/game/Game.tscn
+++ b/src/game/Game.tscn
@@ -1,10 +1,9 @@
-[gd_scene load_steps=14 format=3 uid="uid://33ek675mfb5n"]
+[gd_scene load_steps=13 format=3 uid="uid://33ek675mfb5n"]
 
 [ext_resource type="Script" uid="uid://chftlu4proh3d" path="res://src/game/Game.cs" id="1_ytcii"]
 [ext_resource type="Shader" uid="uid://dmjxo4k2rx1an" path="res://src/app/App.gdshader" id="2_6ifxs"]
 [ext_resource type="PackedScene" uid="uid://by67pn7fdsg1m" path="res://src/map/Map.tscn" id="3_d8awv"]
 [ext_resource type="PackedScene" uid="uid://cfecvvav8kkp6" path="res://src/player/Player.tscn" id="3_kk6ly"]
-[ext_resource type="Resource" uid="uid://bpdbuf0k0exb5" path="res://src/items/weapons/resources/Swan Sword Odette.tres" id="4_6pp6l"]
 [ext_resource type="PackedScene" uid="uid://b1muxus5qdbeu" path="res://src/ui/in_game_ui/InGameUI.tscn" id="5_lxtnp"]
 [ext_resource type="PackedScene" uid="uid://b16ejcwanod72" path="res://src/audio/InGameAudio.tscn" id="6_qc71l"]
 [ext_resource type="Script" uid="uid://daphxl6vvsbjm" path="res://src/game/DialogueController.cs" id="10_58pbt"]
@@ -49,8 +48,7 @@ process_mode = 1
 [node name="Player" parent="SubViewportContainer/SubViewport/PauseContainer" instance=ExtResource("3_kk6ly")]
 unique_name_in_owner = true
 process_mode = 1
-transform = Transform3D(0.0141716, 0, 0.9999, 0, 1, 0, -0.9999, 0, 0.0141716, 0, -2.25339, -6.18796)
-_defaultWeapon = ExtResource("4_6pp6l")
+transform = Transform3D(-4.37114e-08, 0, 1, 0, 1, 0, -1, 0, -4.37114e-08, 0, -3, 0)
 
 [node name="Map" parent="SubViewportContainer/SubViewport/PauseContainer" instance=ExtResource("3_d8awv")]
 unique_name_in_owner = true
diff --git a/src/items/InventoryItem.cs b/src/items/InventoryItem.cs
index 3e83206b..2b9d2dac 100644
--- a/src/items/InventoryItem.cs
+++ b/src/items/InventoryItem.cs
@@ -37,4 +37,6 @@ public abstract partial class InventoryItem : Node3D, IInventoryItem
 
   [Save("inventory_item_stats")]
   public abstract InventoryItemStats ItemStats { get; set; }
+
+  public Sprite3D Sprite { get; set; }
 }
diff --git a/src/items/ItemDatabase.cs b/src/items/ItemDatabase.cs
index 3f51c4c2..91c6d416 100644
--- a/src/items/ItemDatabase.cs
+++ b/src/items/ItemDatabase.cs
@@ -34,6 +34,8 @@ public partial class ItemDatabase : Node
       var armorInfo = GD.Load<ArmorStats>($"res://src/items/armor/resources/{armor}");
       var armorScene = ArmorScene.Instantiate<Armor>();
       armorScene.ItemStats = armorInfo;
+      armorScene.Sprite = armorScene.GetNode<Sprite3D>("%Sprite");
+      armorScene.Sprite.Texture = armorInfo.Texture;
       database.Add(armorScene);
     }
 
@@ -42,6 +44,8 @@ public partial class ItemDatabase : Node
       var weaponInfo = GD.Load<WeaponStats>($"res://src/items/weapons/resources/{weapon}");
       var weaponScene = WeaponScene.Instantiate<Weapon>();
       weaponScene.ItemStats = weaponInfo;
+      weaponScene.Sprite = weaponScene.GetNode<Sprite3D>("%Sprite");
+      weaponScene.Sprite.Texture = weaponInfo.Texture;
       database.Add(weaponScene);
     }
 
@@ -50,6 +54,8 @@ public partial class ItemDatabase : Node
       var accessoryInfo = GD.Load<AccessoryStats>($"res://src/items/accessory/resources/{accessory}");
       var accessoryScene = AccessoryScene.Instantiate<Accessory>();
       accessoryScene.ItemStats = accessoryInfo;
+      accessoryScene.Sprite = accessoryScene.GetNode<Sprite3D>("%Sprite");
+      accessoryScene.Sprite.Texture = accessoryInfo.Texture;
       database.Add(accessoryScene);
     }
 
@@ -58,6 +64,8 @@ public partial class ItemDatabase : Node
       var throwableItemInfo = GD.Load<ThrowableItemStats>($"res://src/items/throwable/resources/{throwable}");
       var throwableItemScene = ThrowableItemScene.Instantiate<ThrowableItem>();
       throwableItemScene.ItemStats = throwableItemInfo;
+      throwableItemScene.Sprite = throwableItemScene.GetNode<Sprite3D>("%Sprite");
+      throwableItemScene.Sprite.Texture = throwableItemInfo.Texture;
       database.Add(throwableItemScene);
     }
 
@@ -66,6 +74,8 @@ public partial class ItemDatabase : Node
       var consumableItemInfo = GD.Load<ConsumableItemStats>($"res://src/items/consumable/resources/{consumable}");
       var consumableItemScene = ConsumableItemScene.Instantiate<ConsumableItem>();
       consumableItemScene.ItemStats = consumableItemInfo;
+      consumableItemScene.Sprite = consumableItemScene.GetNode<Sprite3D>("%Sprite");
+      consumableItemScene.Sprite.Texture = consumableItemInfo.Texture;
       database.Add(consumableItemScene);
     }
 
diff --git a/src/items/accessory/Accessory.cs b/src/items/accessory/Accessory.cs
index a90a9213..6bb9687f 100644
--- a/src/items/accessory/Accessory.cs
+++ b/src/items/accessory/Accessory.cs
@@ -1,6 +1,4 @@
-using Chickensoft.AutoInject;
 using Chickensoft.Introspection;
-using Chickensoft.Serialization;
 using Godot;
 
 namespace GameJamDungeon;
diff --git a/src/items/accessory/resources/MaskAvarice.tres b/src/items/accessory/resources/MaskAvarice.tres
index 3ee88455..09247e0e 100644
--- a/src/items/accessory/resources/MaskAvarice.tres
+++ b/src/items/accessory/resources/MaskAvarice.tres
@@ -10,7 +10,7 @@ DEFUp = 0
 LuckUp = 0.1
 MaxHPUp = 0
 MaxVTUp = 0
-AccessoryTags = Array[int]([])
+AccessoryTag = 0
 Name = "Mask of the Goddess of Avarice"
 Description = "Raises Luck"
 Texture = ExtResource("1_q42cv")
@@ -19,4 +19,4 @@ ThrowSpeed = 12.0
 HealHPAmount = 0
 HealVTAmount = 0
 ThrowDamage = 5
-ItemTags = Array[int]([])
+ItemTag = 0
diff --git a/src/items/effect/resources/AeolicCaster.tres b/src/items/effect/resources/AeolicCaster.tres
index ea539e87..f3d3d997 100644
--- a/src/items/effect/resources/AeolicCaster.tres
+++ b/src/items/effect/resources/AeolicCaster.tres
@@ -5,7 +5,7 @@
 
 [resource]
 script = ExtResource("2_yytis")
-UsableItemTags = Array[int]([9])
+UsableItemTag = 0
 ElementalDamageType = 1
 Name = "Aeolic Caster"
 Description = "Deal Aeolic Damage to all enemies in the room."
@@ -15,5 +15,5 @@ ThrowSpeed = 12.0
 HealHPAmount = 0
 HealVTAmount = 0
 ThrowDamage = 5
-ItemTags = Array[int]([])
+ItemTag = 0
 metadata/_custom_type_script = "uid://b5w4iw4iqmxtn"
diff --git a/src/items/effect/resources/ClothResolution.tres b/src/items/effect/resources/ClothResolution.tres
index f11bb56e..0a35a09e 100644
--- a/src/items/effect/resources/ClothResolution.tres
+++ b/src/items/effect/resources/ClothResolution.tres
@@ -5,7 +5,7 @@
 
 [resource]
 script = ExtResource("2_53wiy")
-UsableItemTags = Array[int]([11])
+UsableItemTag = 0
 ElementalDamageType = 0
 Name = "Cloth Resolution"
 Description = "Raises currently equipped armor's defense by 1."
@@ -15,5 +15,5 @@ ThrowSpeed = 12.0
 HealHPAmount = 0
 HealVTAmount = 0
 ThrowDamage = 5
-ItemTags = Array[int]([])
+ItemTag = 0
 metadata/_custom_type_script = "uid://b5w4iw4iqmxtn"
diff --git a/src/items/effect/resources/Cosmos.tres b/src/items/effect/resources/Cosmos.tres
index 1d94de2e..1d443866 100644
--- a/src/items/effect/resources/Cosmos.tres
+++ b/src/items/effect/resources/Cosmos.tres
@@ -5,7 +5,7 @@
 
 [resource]
 script = ExtResource("2_n1557")
-UsableItemTags = Array[int]([12])
+UsableItemTag = 0
 ElementalDamageType = 0
 Name = "Cosmos"
 Description = "Raises current Level by 1."
@@ -15,5 +15,5 @@ ThrowSpeed = 12.0
 HealHPAmount = 0
 HealVTAmount = 0
 ThrowDamage = 5
-ItemTags = Array[int]([])
+ItemTag = 0
 metadata/_custom_type_script = "uid://b5w4iw4iqmxtn"
diff --git a/src/items/effect/resources/DevicBalance.tres b/src/items/effect/resources/DevicBalance.tres
index e710e2d0..e7e37615 100644
--- a/src/items/effect/resources/DevicBalance.tres
+++ b/src/items/effect/resources/DevicBalance.tres
@@ -5,7 +5,8 @@
 
 [resource]
 script = ExtResource("1_50lqu")
-UsableItemTags = Array[int]([6])
+UsableItemTag = 0
+ElementalDamageType = 0
 Name = "Devic Balance"
 Description = "Kill half of all enemies in current room."
 Texture = ExtResource("1_j7j7j")
@@ -14,5 +15,5 @@ ThrowSpeed = 12.0
 HealHPAmount = 0
 HealVTAmount = 0
 ThrowDamage = 5
-ItemTags = Array[int]([])
+ItemTag = 0
 metadata/_custom_type_script = "uid://b5w4iw4iqmxtn"
diff --git a/src/items/effect/resources/DevicRecall.tres b/src/items/effect/resources/DevicRecall.tres
index 0f98458c..806960f4 100644
--- a/src/items/effect/resources/DevicRecall.tres
+++ b/src/items/effect/resources/DevicRecall.tres
@@ -5,7 +5,8 @@
 
 [resource]
 script = ExtResource("1_0uaie")
-UsableItemTags = Array[int]([4])
+UsableItemTag = 0
+ElementalDamageType = 0
 Name = "Devic Recall"
 Description = "Teleports all enemies to current room."
 Texture = ExtResource("1_j462p")
@@ -14,5 +15,5 @@ ThrowSpeed = 12.0
 HealHPAmount = 0
 HealVTAmount = 0
 ThrowDamage = 5
-ItemTags = Array[int]([])
+ItemTag = 0
 metadata/_custom_type_script = "uid://b5w4iw4iqmxtn"
diff --git a/src/items/effect/resources/EntropicSeal.tres b/src/items/effect/resources/EntropicSeal.tres
index 0bcebf21..a6686e25 100644
--- a/src/items/effect/resources/EntropicSeal.tres
+++ b/src/items/effect/resources/EntropicSeal.tres
@@ -5,7 +5,7 @@
 
 [resource]
 script = ExtResource("1_3l06v")
-UsableItemTags = Array[int]([10])
+UsableItemTag = 0
 ElementalDamageType = 0
 Name = "Entropic Seal"
 Description = "Random effect."
@@ -15,5 +15,5 @@ ThrowSpeed = 12.0
 HealHPAmount = 0
 HealVTAmount = 0
 ThrowDamage = 5
-ItemTags = Array[int]([])
+ItemTag = 0
 metadata/_custom_type_script = "uid://b5w4iw4iqmxtn"
diff --git a/src/items/effect/resources/FerrousResolution.tres b/src/items/effect/resources/FerrousResolution.tres
index 256bb412..812995ee 100644
--- a/src/items/effect/resources/FerrousResolution.tres
+++ b/src/items/effect/resources/FerrousResolution.tres
@@ -5,7 +5,7 @@
 
 [resource]
 script = ExtResource("1_uojwo")
-UsableItemTags = Array[int]([10])
+UsableItemTag = 0
 ElementalDamageType = 0
 Name = "Ferrous Resolution"
 Description = "Raises currently equipped weapon's attack by 1."
@@ -15,5 +15,5 @@ ThrowSpeed = 12.0
 HealHPAmount = 0
 HealVTAmount = 0
 ThrowDamage = 5
-ItemTags = Array[int]([])
+ItemTag = 0
 metadata/_custom_type_script = "uid://b5w4iw4iqmxtn"
diff --git a/src/items/effect/resources/FerrumCaster.tres b/src/items/effect/resources/FerrumCaster.tres
index 447723d9..2a7bdf05 100644
--- a/src/items/effect/resources/FerrumCaster.tres
+++ b/src/items/effect/resources/FerrumCaster.tres
@@ -5,7 +5,7 @@
 
 [resource]
 script = ExtResource("2_i4na1")
-UsableItemTags = Array[int]([9])
+UsableItemTag = 0
 ElementalDamageType = 5
 Name = "Ferrum Caster"
 Description = "Deal Ferrum Damage to all enemies in the room."
@@ -15,5 +15,5 @@ ThrowSpeed = 12.0
 HealHPAmount = 0
 HealVTAmount = 0
 ThrowDamage = 5
-ItemTags = Array[int]([])
+ItemTag = 0
 metadata/_custom_type_script = "uid://b5w4iw4iqmxtn"
diff --git a/src/items/effect/resources/HeavensRebellion.tres b/src/items/effect/resources/HeavensRebellion.tres
index 326eb83b..6fcd9083 100644
--- a/src/items/effect/resources/HeavensRebellion.tres
+++ b/src/items/effect/resources/HeavensRebellion.tres
@@ -5,7 +5,8 @@
 
 [resource]
 script = ExtResource("1_drp30")
-UsableItemTags = Array[int]([8])
+UsableItemTag = 0
+ElementalDamageType = 0
 Name = "Heaven's Rebellion"
 Description = "Heals self and all enemies in current room to maximum HP."
 Texture = ExtResource("1_g0a3x")
@@ -14,5 +15,5 @@ ThrowSpeed = 12.0
 HealHPAmount = 0
 HealVTAmount = 0
 ThrowDamage = 5
-ItemTags = Array[int]([])
+ItemTag = 0
 metadata/_custom_type_script = "uid://b5w4iw4iqmxtn"
diff --git a/src/items/effect/resources/HydricCaster.tres b/src/items/effect/resources/HydricCaster.tres
index d840b933..9b563cf4 100644
--- a/src/items/effect/resources/HydricCaster.tres
+++ b/src/items/effect/resources/HydricCaster.tres
@@ -5,7 +5,7 @@
 
 [resource]
 script = ExtResource("1_mj844")
-UsableItemTags = Array[int]([9])
+UsableItemTag = 0
 ElementalDamageType = 3
 Name = "Hydric Caster"
 Description = "Deal Hydric Damage to all enemies in the room."
@@ -15,5 +15,5 @@ ThrowSpeed = 12.0
 HealHPAmount = 0
 HealVTAmount = 0
 ThrowDamage = 5
-ItemTags = Array[int]([])
+ItemTag = 0
 metadata/_custom_type_script = "uid://b5w4iw4iqmxtn"
diff --git a/src/items/effect/resources/IgneousCaster.tres b/src/items/effect/resources/IgneousCaster.tres
index fb87e173..e085e761 100644
--- a/src/items/effect/resources/IgneousCaster.tres
+++ b/src/items/effect/resources/IgneousCaster.tres
@@ -5,7 +5,7 @@
 
 [resource]
 script = ExtResource("2_cl8lc")
-UsableItemTags = Array[int]([9])
+UsableItemTag = 0
 ElementalDamageType = 4
 Name = "Igneous Caster"
 Description = "Deal Igneous Damage to all enemies in the room."
@@ -15,5 +15,5 @@ ThrowSpeed = 12.0
 HealHPAmount = 0
 HealVTAmount = 0
 ThrowDamage = 5
-ItemTags = Array[int]([])
+ItemTag = 0
 metadata/_custom_type_script = "uid://b5w4iw4iqmxtn"
diff --git a/src/items/effect/resources/Perspective.tres b/src/items/effect/resources/Perspective.tres
index e4d8db90..e027848d 100644
--- a/src/items/effect/resources/Perspective.tres
+++ b/src/items/effect/resources/Perspective.tres
@@ -5,7 +5,7 @@
 
 [resource]
 script = ExtResource("1_lq0bc")
-UsableItemTags = Array[int]([3])
+UsableItemTag = 0
 ElementalDamageType = 0
 Name = "Perspective"
 Description = "Swap current HP and VT."
@@ -15,5 +15,5 @@ ThrowSpeed = 12.0
 HealHPAmount = 0
 HealVTAmount = 0
 ThrowDamage = 5
-ItemTags = Array[int]([])
+ItemTag = 0
 metadata/_custom_type_script = "uid://b5w4iw4iqmxtn"
diff --git a/src/items/effect/resources/SineMorphization.tres b/src/items/effect/resources/SineMorphization.tres
index d6c2935d..806dbd43 100644
--- a/src/items/effect/resources/SineMorphization.tres
+++ b/src/items/effect/resources/SineMorphization.tres
@@ -5,7 +5,8 @@
 
 [resource]
 script = ExtResource("1_ksb1c")
-UsableItemTags = Array[int]([5])
+UsableItemTag = 0
+ElementalDamageType = 0
 Name = "Sine Morphization"
 Description = "Turns all enemies in room to healing item."
 Texture = ExtResource("1_vqhky")
@@ -14,5 +15,5 @@ ThrowSpeed = 12.0
 HealHPAmount = 0
 HealVTAmount = 0
 ThrowDamage = 5
-ItemTags = Array[int]([])
+ItemTag = 0
 metadata/_custom_type_script = "uid://b5w4iw4iqmxtn"
diff --git a/src/items/effect/resources/TelluricCaster.tres b/src/items/effect/resources/TelluricCaster.tres
index 0cf7e249..14c76744 100644
--- a/src/items/effect/resources/TelluricCaster.tres
+++ b/src/items/effect/resources/TelluricCaster.tres
@@ -5,7 +5,7 @@
 
 [resource]
 script = ExtResource("2_38yjb")
-UsableItemTags = Array[int]([9])
+UsableItemTag = 0
 ElementalDamageType = 2
 Name = "Telluric Caster"
 Description = "Deal Telluric Damage to all enemies in the room."
@@ -15,5 +15,5 @@ ThrowSpeed = 12.0
 HealHPAmount = 0
 HealVTAmount = 0
 ThrowDamage = 5
-ItemTags = Array[int]([])
+ItemTag = 0
 metadata/_custom_type_script = "uid://b5w4iw4iqmxtn"
diff --git a/src/items/throwable/resources/Gospel of Dimension.tres b/src/items/throwable/resources/Gospel of Dimension.tres
index 51ce6ae7..96dd58e9 100644
--- a/src/items/throwable/resources/Gospel of Dimension.tres	
+++ b/src/items/throwable/resources/Gospel of Dimension.tres	
@@ -5,9 +5,9 @@
 
 [resource]
 script = ExtResource("2_m680r")
-ThrowableItemTags = Array[int]([2])
+ThrowableItemTag = 0
 ElementType = 0
-UsableItemTags = Array[int]([])
+UsableItemTag = 0
 Name = "Gospel of Dimension"
 Description = "Teleports target to a random location."
 Texture = ExtResource("1_xt2mp")
@@ -16,4 +16,4 @@ ThrowSpeed = 20.0
 HealHPAmount = 0
 HealVTAmount = 0
 ThrowDamage = 20
-ItemTags = Array[int]([])
+ItemTag = 0
diff --git a/src/items/throwable/resources/GospelOfEscape.tres b/src/items/throwable/resources/GospelOfEscape.tres
index 7ee06591..28a6ca2f 100644
--- a/src/items/throwable/resources/GospelOfEscape.tres
+++ b/src/items/throwable/resources/GospelOfEscape.tres
@@ -5,9 +5,9 @@
 
 [resource]
 script = ExtResource("1_pn8sr")
-ThrowableItemTags = Array[int]([3])
+ThrowableItemTag = 0
 ElementType = 0
-UsableItemTags = Array[int]([])
+UsableItemTag = 0
 Name = "Gospel of Escape"
 Description = "Warps target to the exit. No effect on player if exit has not been found."
 Texture = ExtResource("1_26kno")
@@ -16,5 +16,5 @@ ThrowSpeed = 12.0
 HealHPAmount = 0
 HealVTAmount = 0
 ThrowDamage = 5
-ItemTags = Array[int]([])
+ItemTag = 0
 metadata/_custom_type_script = "uid://d3wlunkcuv2w2"
diff --git a/src/items/thrown/ThrownItem.cs b/src/items/thrown/ThrownItem.cs
index 00cb988c..aca336cc 100644
--- a/src/items/thrown/ThrownItem.cs
+++ b/src/items/thrown/ThrownItem.cs
@@ -22,6 +22,7 @@ public partial class ThrownItem : RigidBody3D
 
   public void OnResolved()
   {
+    BodyEntered += ThrownItem_BodyEntered;
     GlobalPosition = Player.CurrentPosition;
     Sprite.Texture = ItemThatIsThrown.ItemStats.Texture;
     AddCollisionExceptionWith((Node)Player);
diff --git a/src/items/thrown/ThrownItem.tscn b/src/items/thrown/ThrownItem.tscn
index 2bb0a628..7a21c887 100644
--- a/src/items/thrown/ThrownItem.tscn
+++ b/src/items/thrown/ThrownItem.tscn
@@ -1,7 +1,6 @@
-[gd_scene load_steps=6 format=3 uid="uid://b1twcuneob5kt"]
+[gd_scene load_steps=5 format=3 uid="uid://b1twcuneob5kt"]
 
 [ext_resource type="Script" uid="uid://bx1k4yff3m82m" path="res://src/items/thrown/ThrownItem.cs" id="1_wlplc"]
-[ext_resource type="Texture2D" uid="uid://mi70lolgtf3n" path="res://src/items/throwable/textures/GEOMANCER-DICE.png" id="2_alcjn"]
 [ext_resource type="Material" uid="uid://x2bv1q51mcjq" path="res://src/enemy/PixelMelt.tres" id="2_qjpqg"]
 
 [sub_resource type="BoxShape3D" id="BoxShape3D_s4ym5"]
@@ -13,7 +12,8 @@ viewport_path = NodePath("Sprite3D/SubViewportContainer/SubViewport")
 [node name="Hitbox" type="RigidBody3D"]
 collision_layer = 1040
 collision_mask = 25
-gravity_scale = 0.25
+mass = 0.1
+gravity_scale = 0.01
 contact_monitor = true
 max_contacts_reported = 50
 script = ExtResource("1_wlplc")
@@ -54,5 +54,4 @@ render_target_update_mode = 4
 unique_name_in_owner = true
 material = ExtResource("2_qjpqg")
 scale = Vector2(0.1, 0.1)
-texture = ExtResource("2_alcjn")
 centered = false
diff --git a/src/items/weapons/Weapon.cs b/src/items/weapons/Weapon.cs
index dff78d4c..91b24af6 100644
--- a/src/items/weapons/Weapon.cs
+++ b/src/items/weapons/Weapon.cs
@@ -1,6 +1,4 @@
-using Chickensoft.AutoInject;
 using Chickensoft.Introspection;
-using Chickensoft.Serialization;
 using Godot;
 
 namespace GameJamDungeon;
@@ -8,9 +6,6 @@ namespace GameJamDungeon;
 [Meta, Id("weapon")]
 public partial class Weapon : EquipableItem
 {
-  [Signal]
-  public delegate void EquippedItemEventHandler(Weapon equippedWeapon);
-
   [Export]
   private WeaponStats _weaponStats { get; set; } = new WeaponStats();
 
diff --git a/src/items/weapons/Weapon.tscn b/src/items/weapons/Weapon.tscn
index 603a7154..40bffe6c 100644
--- a/src/items/weapons/Weapon.tscn
+++ b/src/items/weapons/Weapon.tscn
@@ -6,7 +6,6 @@
 radius = 0.470016
 
 [node name="Weapon" type="Node3D"]
-transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, -1.75, 0)
 script = ExtResource("1_7pkyf")
 
 [node name="Pickup" type="Area3D" parent="."]
diff --git a/src/map/dungeon/floors/Floor00.tscn b/src/map/dungeon/floors/Floor00.tscn
index 30558c38..b46a6868 100644
--- a/src/map/dungeon/floors/Floor00.tscn
+++ b/src/map/dungeon/floors/Floor00.tscn
@@ -1,4 +1,4 @@
-[gd_scene load_steps=60 format=4 uid="uid://dl6h1djc27ddl"]
+[gd_scene load_steps=61 format=4 uid="uid://dl6h1djc27ddl"]
 
 [ext_resource type="Script" uid="uid://c1nhqlem1ew3m" path="res://src/map/dungeon/code/Floor0.cs" id="1_db2o3"]
 [ext_resource type="Texture2D" uid="uid://b27ksiyfefb33" path="res://src/map/dungeon/models/Set A/02. Altar/02_ALTAR_FLOOR_ZER0_VER_outside_desert.png" id="2_xh2ej"]
@@ -62,13 +62,6 @@ _surfaces = [{
 "vertex_data": PackedByteArray("1B5ZwFA+8L6f2s4+kugPwMY6C0H9GTnA1B5ZwMY6C0Gf2s4+kugPwFA+8L79GTnAUh7ovVA+8L6BAjDAUTHmP8Y6C0G83yXAUh7ovcY6C0GBAjDAUTHmP0hXq7+83yXAUTHmP0hXq7+83yXA8dRrQMY6C0F+c/8/UTHmP8Y6C0G83yXA8dRrQEhXq79+c/8/SiPFP1A+8L51ykRA1B5ZwMY6C0Gf2s4+SiPFP8Y6C0F1ykRA1B5ZwFA+8L6f2s4+8dRrQEhXq79+c/8/SiPFP8Y6C0F1ykRA8dRrQMY6C0F+c/8/SiPFP1A+8L51ykRAkugPwFA+8L79GTnAUh7ovcY6C0GBAjDAkugPwMY6C0H9GTnAUh7ovVA+8L6BAjDAyoDnQVYu90AFF39B899AQqw3sr+tCn9ByYDnQaw3sr8EF39B9N9AQlYu90CtCn9B5lrHQqw3sr+tCn9B51rHQlYu90CtCn9B2pHUQqw3sr+xzn5B2pHUQgO99UCxzn5B2pHUQgO99UBMhu9A2pHUQqw3sr9Mhu9A5lrHQqw3sr9UDu9A2pHUQgO99UBMhu9A51rHQlYu90BTDu9A7N9AQqw3sr9UDu9A7d9AQlYu90BTDu9Aa7nnQaw3sr/zO+xAbLnnQVYu90DyO+xA9gVxQaXP4L+9dsZB+4lLQdTy8EDQyeVBHlx/QWS57kBhnMVBplY8QeZQ4r/KoOpB0gU3QU6u9kA0GAVCqm47QbqILcDfAwVCbp8pQKw3sr9mFQRC35uSv1Yu90AC4v1BZZ8pQFYu90BmFQRC1JuSv6w3sr8B4v1B1dvuQKw3sr8dHQZCQPmawFYu90BQcO1B09vuQFYu90AeHQZCqm47QbqILcDfAwVC0gU3QU6u9kA0GAVCPfmawKw3sr9PcO1BCN38wFYu90DNddhBAN38wKw3sr/MddhBAN38wKw3sr/MddhB0wMuwVYu90B84bxBCN38wFYu90DNddhBzgMuwaw3sr984bxBaApOwVYu90AJl59BZApOwaw3sr8Jl59BKQtiwVYu90DTJ31BJQtiwaw3sr/SJ31B4xlpwVYu90CmZzlB3xlpwaw3sr+mZzlBzqZgwVYu90CEXOhAy6Zgwaw3sr+FXOhAbLBLwVYu90C6SU9AaLBLwaw3sr+9SU9AJZYqwVYu90CIjg+/IJYqwaw3sr9rjg+/dYsAwVYu90CbV3fAcYsAwaw3sr+UV3fAcYsAwaw3sr+UV3fATaSXwFYu90DcJNHAdYsAwVYu90CbV3fAR6SXwAOYLcDZJNHAbwt7v1Yu90C2ZQnBSgt7v7K/EMC0ZQnBSv5EQFYu90C8Yh3BU/5EQKw3sr+6Yh3Btb/uQFYu90DTICTBt7/uQKw3sr/RICTBGrM6QVYu90DCWB3BG7M6Qaw3sr/BWB3BpXd+QVYu90D6yAfBpXd+Qaw3sr/5yAfBRnGdQVYu90CSLdHARnGdQaw3sr+NLdHAh5i3QVYu90CiDXXAh5i3Qaw3sr+bDXXAh5i3Qaw3sr+bDXXAGcTNQVYu90Bccey+h5i3QVYu90CiDXXAGMTNQaw3sr8gcey+Dr7dQVYu90AmxFVADb7dQaw3sr8oxFVAbLnnQVYu90DyO+xAa7nnQaw3sr/zO+xAyYDnQaw3sr8EF39BBbndQVYu90CsK6JByoDnQVYu90AFF39BBbndQaw3sr+rK6JBlLXMQVYu90CFFcFBk7XMQaw3sr+EFcFBFHG4QVYu90AwFdpBFHG4Qaw3sr8vFdpBFHG4Qaw3sr8vFdpBhaeVQS5y9kAku9NBFHG4QVYu90AwFdpBLa2VQenM9b+7eNZBHlx/QWS57kBhnMVB9gVxQaXP4L+9dsZBAAAHoQCA//8AAAehAID//wAAB6EAgP//AAAHoQCA/////2X2AID/////ZfYAgP////9l9gCA/////2X2AID/////SaUAgP////9JpQCA/////0mlAID/////SaUAgP//MFP/fwCA//8wU/9/AID//zBT/38AgP//MFP/fwCA//++qv9/AID//76q/38AgP//vqr/fwCA//++qv9/AID/////RvcAgP////9G9wCA/////0b3AID/////RvcAgP//DLf/fw03/78JgP9/CQD/vwy3/38NN/+/CYD/fwkA/7//f/9/AAD/v/9//39DACDA/7//fyFAIMDcv/9/S0BuwP//IsD///+/////v////7//////KwDpP///IsCbAOof/////28Axz///63/AADWP///rf8AANY///+WyQAAyyT//5bJAADLJHeX+n70N53T2NXRe7pa6cJ1j6V/DDEF0yrZ9HsXYf/H/bpXfmlEr7cSvj9+Q0UOxv5o/38AAH/Lslj/fwAApdP+aP9/AAB/y7JY/38AAKXTJ378fxsS18l0S/9/AABE2j59/H+lGezNEr4/fu9PRtD9uld+0FTt1nRL/38AAETaFkD/fwAA898WQP9/AADz3xZA/38WwP8/YjT/f2K0/z8WQP9/FsD/P2I0/39itP8/zyX/f86l/z/PJf9/zqX/P3YV/392lf8/dhX/f3aV/z8AACaB2H7/PwAAJoHYfv8/AAA/l79o/z8AAD+Xv2j/PwAAi6ZyWf8/AACLpnJZ/z8AAAWz+Uz/PwAABbP5TP8/AAC3v0ZA/z8AAFTAqj//PwAAVMDzSMM2AACmzJE1Iz4AALe/RkD/PwAAFs0TOLU7AAAL2tYmn0AAAEjZYC5+RQAAs+qTF15BAAAg6sceX0X//63/AADWP///rf8AANY///8E6gAAAjX//wTqAAACNf//hdoAAEEt//+F2gAAQS3//wnNAACDJv//Cc0AAIMm///hvwAA8B///+G/AADwH///4b/hv/+///8Psw+z/7///+G/4b//v///D7MPs/+///+BpYGl/7///4GlgaX/v///lsmWyf+///+WyZbJ/78Mt/9/DTf/v6Ta/3+lWv+/DLf/fw03/7+k2v9/pVr/v4bM/3+HTP+/hsz/f4dM/7+4owSBbiS0vwKiEYHEIq2/AqIRgc9GV6fKXxyDtA/bqbijBIFwVKyePF8lg+kanqV1j6V/6S7P0XeX+n6nLP2y")
 }]
 
-[sub_resource type="ConcavePolygonShape3D" id="ConcavePolygonShape3D_aqomv"]
-data = PackedVector3Array(-3.3925, -0.4692, 0.404, -3.3925, 8.7018, 0.404, -2.2486, 8.7018, -2.8922, -3.3925, -0.4692, 0.404, -2.2486, 8.7018, -2.8922, -2.2486, -0.4692, -2.8922, -0.1133, -0.4692, -2.7502, -0.1133, 8.7018, -2.7502, 1.7984, 8.7018, -2.5918, -0.1133, -0.4692, -2.7502, 1.7984, 8.7018, -2.5918, 1.7984, -1.3386, -2.5918, 1.7984, -1.3386, -2.5918, 1.7984, 8.7018, -2.5918, 3.6849, 8.7018, 1.9957, 1.7984, -1.3386, -2.5918, 3.6849, 8.7018, 1.9957, 3.6849, -1.3386, 1.9957, 1.5401, -0.4692, 3.0749, 1.5401, 8.7018, 3.0749, -3.3925, 8.7018, 0.404, 1.5401, -0.4692, 3.0749, -3.3925, 8.7018, 0.404, -3.3925, -0.4692, 0.404, 3.6849, -1.3386, 1.9957, 3.6849, 8.7018, 1.9957, 1.5401, 8.7018, 3.0749, 3.6849, -1.3386, 1.9957, 1.5401, 8.7018, 3.0749, 1.5401, -0.4692, 3.0749, -2.2486, -0.4692, -2.8922, -2.2486, 8.7018, -2.8922, -0.1133, 8.7018, -2.7502, -2.2486, -0.4692, -2.8922, -0.1133, 8.7018, -2.7502, -0.1133, -0.4692, -2.7502, 28.9379, 7.7244, 15.9431, 28.9379, -1.3923, 15.9431, 48.2187, -1.3923, 15.9401, 28.9379, 7.7244, 15.9431, 48.2187, -1.3923, 15.9401, 48.2187, 7.7244, 15.9401, 48.2187, 7.7244, 15.9401, 48.2187, -1.3923, 15.9401, 99.6775, -1.3923, 15.9401, 48.2187, 7.7244, 15.9401, 99.6775, -1.3923, 15.9401, 99.6775, 7.7244, 15.9401, 99.6775, 7.7244, 15.9401, 99.6775, -1.3923, 15.9401, 106.285, -1.3923, 15.9255, 99.6775, 7.7244, 15.9401, 106.285, -1.3923, 15.9255, 106.285, 7.6793, 15.9255, 106.285, -1.3923, 15.9255, 106.285, 7.6793, 7.4851, 106.285, 7.6793, 15.9255, 106.285, -1.3923, 15.9255, 106.285, -1.3923, 7.4851, 106.285, 7.6793, 7.4851, 99.6775, -1.3923, 7.4705, 106.285, 7.6793, 7.4851, 106.285, -1.3923, 7.4851, 99.6775, -1.3923, 7.4705, 99.6775, 7.7244, 7.4705, 106.285, 7.6793, 7.4851, 48.2187, -1.3923, 7.4705, 99.6775, 7.7244, 7.4705, 99.6775, -1.3923, 7.4705, 48.2187, -1.3923, 7.4705, 48.2187, 7.7244, 7.4705, 99.6775, 7.7244, 7.4705, 28.9655, -1.3923, 7.3823, 48.2187, 7.7244, 7.4705, 48.2187, -1.3923, 7.4705, 28.9655, -1.3923, 7.3823, 28.9655, 7.7244, 7.3823, 48.2187, 7.7244, 7.4705, 15.064, -1.7563, 24.808, 15.96, 7.4601, 24.7014, 12.7212, 7.5296, 28.7235, 15.064, -1.7563, 24.808, 12.7212, 7.5296, 28.7235, 11.7712, -1.7681, 29.3285, 11.7712, -1.7681, 29.3285, 12.7212, 7.5296, 28.7235, 11.4389, 7.7088, 33.2736, 11.7712, -1.7681, 29.3285, 11.4389, 7.7088, 33.2736, 11.7145, -2.7115, 33.2538, 2.6504, -1.3923, 33.0209, 2.6504, 7.7244, 33.0209, -1.1454, 7.7244, 31.7354, 2.6504, -1.3923, 33.0209, -1.1454, 7.7244, 31.7354, -1.1454, -1.3923, 31.7354, 7.4643, -1.3923, 33.5284, 2.6504, 7.7244, 33.0209, 2.6504, -1.3923, 33.0209, -1.1454, -1.3923, 31.7354, -1.1454, 7.7244, 31.7354, -4.8429, 7.7244, 29.6798, 7.4643, -1.3923, 33.5284, 7.4643, 7.7244, 33.5284, 2.6504, 7.7244, 33.0209, 11.7145, -2.7115, 33.2538, 7.4643, 7.7244, 33.5284, 7.4643, -1.3923, 33.5284, 11.7145, -2.7115, 33.2538, 11.4389, 7.7088, 33.2736, 7.4643, 7.7244, 33.5284, -1.1454, -1.3923, 31.7354, -4.8429, 7.7244, 29.6798, -4.8429, -1.3923, 29.6798, -4.8429, -1.3923, 29.6798, -4.8429, 7.7244, 29.6798, -7.902, 7.7244, 27.0575, -4.8429, -1.3923, 29.6798, -7.902, 7.7244, 27.0575, -7.902, -1.3923, 27.0575, -7.902, -1.3923, 27.0575, -7.902, 7.7244, 27.0575, -10.8759, 7.7244, 23.6101, -7.902, -1.3923, 27.0575, -10.8759, 7.7244, 23.6101, -10.8759, -1.3923, 23.6101, -10.8759, -1.3923, 23.6101, -10.8759, 7.7244, 23.6101, -12.8775, 7.7244, 19.9487, -10.8759, -1.3923, 23.6101, -12.8775, 7.7244, 19.9487, -12.8775, -1.3923, 19.9487, -12.8775, -1.3923, 19.9487, -12.8775, 7.7244, 19.9487, -14.1277, 7.7244, 15.8222, -12.8775, -1.3923, 19.9487, -14.1277, 7.7244, 15.8222, -14.1277, -1.3923, 15.8222, -14.1277, -1.3923, 15.8222, -14.1277, 7.7244, 15.8222, -14.5688, 7.7244, 11.5878, -14.1277, -1.3923, 15.8222, -14.5688, 7.7244, 11.5878, -14.5688, -1.3923, 11.5878, -14.5688, -1.3923, 11.5878, -14.5688, 7.7244, 11.5878, -14.0407, 7.7244, 7.2613, -14.5688, -1.3923, 11.5878, -14.0407, 7.7244, 7.2613, -14.0407, -1.3923, 7.2613, -14.0407, -1.3923, 7.2613, -14.0407, 7.7244, 7.2613, -12.7306, 7.7244, 3.2389, -14.0407, -1.3923, 7.2613, -12.7306, 7.7244, 3.2389, -12.7306, -1.3923, 3.2389, -12.7306, -1.3923, 3.2389, -12.7306, 7.7244, 3.2389, -10.6617, 7.7244, -0.5608, -12.7306, -1.3923, 3.2389, -10.6617, 7.7244, -0.5608, -10.6617, -1.3923, -0.5608, -10.6617, -1.3923, -0.5608, -10.6617, 7.7244, -0.5608, -8.034, 7.7244, -3.8647, -10.6617, -1.3923, -0.5608, -8.034, 7.7244, -3.8647, -8.034, -1.3923, -3.8647, -8.034, -1.3923, -3.8647, -8.034, 7.7244, -3.8647, -4.7388, 7.7244, -6.5357, -8.034, -1.3923, -3.8647, -4.7388, 7.7244, -6.5357, -4.7388, -2.7124, -6.5357, -4.7388, -2.7124, -6.5357, -4.7388, 7.7244, -6.5357, -0.9806, 7.7244, -8.5873, -4.7388, -2.7124, -6.5357, -0.9806, 7.7244, -8.5873, -0.9806, -2.2617, -8.5873, -0.9806, -2.2617, -8.5873, -0.9806, 7.7244, -8.5873, 3.078, 7.7244, -9.8366, -0.9806, -2.2617, -8.5873, 3.078, 7.7244, -9.8366, 3.078, -1.3923, -9.8366, 3.078, -1.3923, -9.8366, 3.078, 7.7244, -9.8366, 7.4609, 7.7244, -10.258, 3.078, -1.3923, -9.8366, 7.4609, 7.7244, -10.258, 7.4609, -1.3923, -10.258, 7.4609, -1.3923, -10.258, 7.4609, 7.7244, -10.258, 11.6687, 7.7244, -9.8342, 7.4609, -1.3923, -10.258, 11.6687, 7.7244, -9.8342, 11.6687, -1.3923, -9.8342, 11.6687, -1.3923, -9.8342, 11.6687, 7.7244, -9.8342, 15.9042, 7.7244, -8.4866, 11.6687, -1.3923, -9.8342, 15.9042, 7.7244, -8.4866, 15.9042, -1.3923, -8.4866, 15.9042, -1.3923, -8.4866, 15.9042, 7.7244, -8.4866, 19.6803, 7.7244, -6.5368, 15.9042, -1.3923, -8.4866, 19.6803, 7.7244, -6.5368, 19.6803, -1.3923, -6.5368, 19.6803, -1.3923, -6.5368, 19.6803, 7.7244, -6.5368, 22.9495, 7.7244, -3.829, 19.6803, -1.3923, -6.5368, 22.9495, 7.7244, -3.829, 22.9495, -1.3923, -3.829, 22.9495, -1.3923, -3.829, 22.9495, 7.7244, -3.829, 25.7208, 7.7244, -0.4618, 22.9495, -1.3923, -3.829, 25.7208, 7.7244, -0.4618, 25.7207, -1.3923, -0.4618, 25.7207, -1.3923, -0.4618, 25.7208, 7.7244, -0.4618, 27.7178, 7.7244, 3.3401, 25.7207, -1.3923, -0.4618, 27.7178, 7.7244, 3.3401, 27.7178, -1.3923, 3.3401, 27.7178, -1.3923, 3.3401, 27.7178, 7.7244, 3.3401, 28.9655, 7.7244, 7.3823, 27.7178, -1.3923, 3.3401, 28.9655, 7.7244, 7.3823, 28.9655, -1.3923, 7.3823, 28.9379, -1.3923, 15.9431, 28.9379, 7.7244, 15.9431, 27.7153, 7.7244, 20.2713, 28.9379, -1.3923, 15.9431, 27.7153, 7.7244, 20.2713, 27.7153, -1.3923, 20.2713, 27.7153, -1.3923, 20.2713, 27.7153, 7.7244, 20.2713, 25.5887, 7.7244, 24.1355, 27.7153, -1.3923, 20.2713, 25.5887, 7.7244, 24.1355, 25.5887, -1.3923, 24.1355, 25.5887, -1.3923, 24.1355, 25.5887, 7.7244, 24.1355, 23.0552, 7.7244, 27.2603, 25.5887, -1.3923, 24.1355, 23.0552, 7.7244, 27.2603, 23.0552, -1.3923, 27.2603, 23.0552, -1.3923, 27.2603, 23.0552, 7.7244, 27.2603, 18.7068, 7.7014, 26.4664, 23.0552, -1.3923, 27.2603, 18.7068, 7.7014, 26.4664, 18.7096, -1.9203, 26.809, 18.7096, -1.9203, 26.809, 18.7068, 7.7014, 26.4664, 15.96, 7.4601, 24.7014, 18.7096, -1.9203, 26.809, 15.96, 7.4601, 24.7014, 15.064, -1.7563, 24.808)
-
-[sub_resource type="CylinderShape3D" id="CylinderShape3D_aqomv"]
-height = 10.3777
-radius = 4.73975
-
 [sub_resource type="StandardMaterial3D" id="StandardMaterial3D_8ib2a"]
 resource_name = "DESERT"
 cull_mode = 2
@@ -686,10 +679,6 @@ _surfaces = [{
 blend_shape_mode = 0
 shadow_mesh = SubResource("ArrayMesh_8ms0n")
 
-[sub_resource type="CylinderShape3D" id="CylinderShape3D_xh2ej"]
-height = 4.02295
-radius = 0.25
-
 [sub_resource type="ArrayMesh" id="ArrayMesh_a7nv1"]
 _surfaces = [{
 "aabb": AABB(-0.944338, -1.91246, -1.09043, 1.88868, 3.24246, 2.18085),
@@ -731,149 +720,159 @@ _data = {
 &"GROUNDAction": SubResource("Animation_xgmyp")
 }
 
+[sub_resource type="ConcavePolygonShape3D" id="ConcavePolygonShape3D_aqomv"]
+data = PackedVector3Array(-3.3925, -0.4692, 0.404, -3.3925, 8.7018, 0.404, -2.2486, 8.7018, -2.8922, -3.3925, -0.4692, 0.404, -2.2486, 8.7018, -2.8922, -2.2486, -0.4692, -2.8922, -0.1133, -0.4692, -2.7502, -0.1133, 8.7018, -2.7502, 1.7984, 8.7018, -2.5918, -0.1133, -0.4692, -2.7502, 1.7984, 8.7018, -2.5918, 1.7984, -1.3386, -2.5918, 1.7984, -1.3386, -2.5918, 1.7984, 8.7018, -2.5918, 3.6849, 8.7018, 1.9957, 1.7984, -1.3386, -2.5918, 3.6849, 8.7018, 1.9957, 3.6849, -1.3386, 1.9957, 1.5401, -0.4692, 3.0749, 1.5401, 8.7018, 3.0749, -3.3925, 8.7018, 0.404, 1.5401, -0.4692, 3.0749, -3.3925, 8.7018, 0.404, -3.3925, -0.4692, 0.404, 3.6849, -1.3386, 1.9957, 3.6849, 8.7018, 1.9957, 1.5401, 8.7018, 3.0749, 3.6849, -1.3386, 1.9957, 1.5401, 8.7018, 3.0749, 1.5401, -0.4692, 3.0749, -2.2486, -0.4692, -2.8922, -2.2486, 8.7018, -2.8922, -0.1133, 8.7018, -2.7502, -2.2486, -0.4692, -2.8922, -0.1133, 8.7018, -2.7502, -0.1133, -0.4692, -2.7502, 28.9379, 7.7244, 15.9431, 28.9379, -1.3923, 15.9431, 48.2187, -1.3923, 15.9401, 28.9379, 7.7244, 15.9431, 48.2187, -1.3923, 15.9401, 48.2187, 7.7244, 15.9401, 48.2187, 7.7244, 15.9401, 48.2187, -1.3923, 15.9401, 99.6775, -1.3923, 15.9401, 48.2187, 7.7244, 15.9401, 99.6775, -1.3923, 15.9401, 99.6775, 7.7244, 15.9401, 99.6775, 7.7244, 15.9401, 99.6775, -1.3923, 15.9401, 106.285, -1.3923, 15.9255, 99.6775, 7.7244, 15.9401, 106.285, -1.3923, 15.9255, 106.285, 7.6793, 15.9255, 106.285, -1.3923, 15.9255, 106.285, 7.6793, 7.4851, 106.285, 7.6793, 15.9255, 106.285, -1.3923, 15.9255, 106.285, -1.3923, 7.4851, 106.285, 7.6793, 7.4851, 99.6775, -1.3923, 7.4705, 106.285, 7.6793, 7.4851, 106.285, -1.3923, 7.4851, 99.6775, -1.3923, 7.4705, 99.6775, 7.7244, 7.4705, 106.285, 7.6793, 7.4851, 48.2187, -1.3923, 7.4705, 99.6775, 7.7244, 7.4705, 99.6775, -1.3923, 7.4705, 48.2187, -1.3923, 7.4705, 48.2187, 7.7244, 7.4705, 99.6775, 7.7244, 7.4705, 28.9655, -1.3923, 7.3823, 48.2187, 7.7244, 7.4705, 48.2187, -1.3923, 7.4705, 28.9655, -1.3923, 7.3823, 28.9655, 7.7244, 7.3823, 48.2187, 7.7244, 7.4705, 15.064, -1.7563, 24.808, 15.96, 7.4601, 24.7014, 12.7212, 7.5296, 28.7235, 15.064, -1.7563, 24.808, 12.7212, 7.5296, 28.7235, 11.7712, -1.7681, 29.3285, 11.7712, -1.7681, 29.3285, 12.7212, 7.5296, 28.7235, 11.4389, 7.7088, 33.2736, 11.7712, -1.7681, 29.3285, 11.4389, 7.7088, 33.2736, 11.7145, -2.7115, 33.2538, 2.6504, -1.3923, 33.0209, 2.6504, 7.7244, 33.0209, -1.1454, 7.7244, 31.7354, 2.6504, -1.3923, 33.0209, -1.1454, 7.7244, 31.7354, -1.1454, -1.3923, 31.7354, 7.4643, -1.3923, 33.5284, 2.6504, 7.7244, 33.0209, 2.6504, -1.3923, 33.0209, -1.1454, -1.3923, 31.7354, -1.1454, 7.7244, 31.7354, -4.8429, 7.7244, 29.6798, 7.4643, -1.3923, 33.5284, 7.4643, 7.7244, 33.5284, 2.6504, 7.7244, 33.0209, 11.7145, -2.7115, 33.2538, 7.4643, 7.7244, 33.5284, 7.4643, -1.3923, 33.5284, 11.7145, -2.7115, 33.2538, 11.4389, 7.7088, 33.2736, 7.4643, 7.7244, 33.5284, -1.1454, -1.3923, 31.7354, -4.8429, 7.7244, 29.6798, -4.8429, -1.3923, 29.6798, -4.8429, -1.3923, 29.6798, -4.8429, 7.7244, 29.6798, -7.902, 7.7244, 27.0575, -4.8429, -1.3923, 29.6798, -7.902, 7.7244, 27.0575, -7.902, -1.3923, 27.0575, -7.902, -1.3923, 27.0575, -7.902, 7.7244, 27.0575, -10.8759, 7.7244, 23.6101, -7.902, -1.3923, 27.0575, -10.8759, 7.7244, 23.6101, -10.8759, -1.3923, 23.6101, -10.8759, -1.3923, 23.6101, -10.8759, 7.7244, 23.6101, -12.8775, 7.7244, 19.9487, -10.8759, -1.3923, 23.6101, -12.8775, 7.7244, 19.9487, -12.8775, -1.3923, 19.9487, -12.8775, -1.3923, 19.9487, -12.8775, 7.7244, 19.9487, -14.1277, 7.7244, 15.8222, -12.8775, -1.3923, 19.9487, -14.1277, 7.7244, 15.8222, -14.1277, -1.3923, 15.8222, -14.1277, -1.3923, 15.8222, -14.1277, 7.7244, 15.8222, -14.5688, 7.7244, 11.5878, -14.1277, -1.3923, 15.8222, -14.5688, 7.7244, 11.5878, -14.5688, -1.3923, 11.5878, -14.5688, -1.3923, 11.5878, -14.5688, 7.7244, 11.5878, -14.0407, 7.7244, 7.2613, -14.5688, -1.3923, 11.5878, -14.0407, 7.7244, 7.2613, -14.0407, -1.3923, 7.2613, -14.0407, -1.3923, 7.2613, -14.0407, 7.7244, 7.2613, -12.7306, 7.7244, 3.2389, -14.0407, -1.3923, 7.2613, -12.7306, 7.7244, 3.2389, -12.7306, -1.3923, 3.2389, -12.7306, -1.3923, 3.2389, -12.7306, 7.7244, 3.2389, -10.6617, 7.7244, -0.5608, -12.7306, -1.3923, 3.2389, -10.6617, 7.7244, -0.5608, -10.6617, -1.3923, -0.5608, -10.6617, -1.3923, -0.5608, -10.6617, 7.7244, -0.5608, -8.034, 7.7244, -3.8647, -10.6617, -1.3923, -0.5608, -8.034, 7.7244, -3.8647, -8.034, -1.3923, -3.8647, -8.034, -1.3923, -3.8647, -8.034, 7.7244, -3.8647, -4.7388, 7.7244, -6.5357, -8.034, -1.3923, -3.8647, -4.7388, 7.7244, -6.5357, -4.7388, -2.7124, -6.5357, -4.7388, -2.7124, -6.5357, -4.7388, 7.7244, -6.5357, -0.9806, 7.7244, -8.5873, -4.7388, -2.7124, -6.5357, -0.9806, 7.7244, -8.5873, -0.9806, -2.2617, -8.5873, -0.9806, -2.2617, -8.5873, -0.9806, 7.7244, -8.5873, 3.078, 7.7244, -9.8366, -0.9806, -2.2617, -8.5873, 3.078, 7.7244, -9.8366, 3.078, -1.3923, -9.8366, 3.078, -1.3923, -9.8366, 3.078, 7.7244, -9.8366, 7.4609, 7.7244, -10.258, 3.078, -1.3923, -9.8366, 7.4609, 7.7244, -10.258, 7.4609, -1.3923, -10.258, 7.4609, -1.3923, -10.258, 7.4609, 7.7244, -10.258, 11.6687, 7.7244, -9.8342, 7.4609, -1.3923, -10.258, 11.6687, 7.7244, -9.8342, 11.6687, -1.3923, -9.8342, 11.6687, -1.3923, -9.8342, 11.6687, 7.7244, -9.8342, 15.9042, 7.7244, -8.4866, 11.6687, -1.3923, -9.8342, 15.9042, 7.7244, -8.4866, 15.9042, -1.3923, -8.4866, 15.9042, -1.3923, -8.4866, 15.9042, 7.7244, -8.4866, 19.6803, 7.7244, -6.5368, 15.9042, -1.3923, -8.4866, 19.6803, 7.7244, -6.5368, 19.6803, -1.3923, -6.5368, 19.6803, -1.3923, -6.5368, 19.6803, 7.7244, -6.5368, 22.9495, 7.7244, -3.829, 19.6803, -1.3923, -6.5368, 22.9495, 7.7244, -3.829, 22.9495, -1.3923, -3.829, 22.9495, -1.3923, -3.829, 22.9495, 7.7244, -3.829, 25.7208, 7.7244, -0.4618, 22.9495, -1.3923, -3.829, 25.7208, 7.7244, -0.4618, 25.7207, -1.3923, -0.4618, 25.7207, -1.3923, -0.4618, 25.7208, 7.7244, -0.4618, 27.7178, 7.7244, 3.3401, 25.7207, -1.3923, -0.4618, 27.7178, 7.7244, 3.3401, 27.7178, -1.3923, 3.3401, 27.7178, -1.3923, 3.3401, 27.7178, 7.7244, 3.3401, 28.9655, 7.7244, 7.3823, 27.7178, -1.3923, 3.3401, 28.9655, 7.7244, 7.3823, 28.9655, -1.3923, 7.3823, 28.9379, -1.3923, 15.9431, 28.9379, 7.7244, 15.9431, 27.7153, 7.7244, 20.2713, 28.9379, -1.3923, 15.9431, 27.7153, 7.7244, 20.2713, 27.7153, -1.3923, 20.2713, 27.7153, -1.3923, 20.2713, 27.7153, 7.7244, 20.2713, 25.5887, 7.7244, 24.1355, 27.7153, -1.3923, 20.2713, 25.5887, 7.7244, 24.1355, 25.5887, -1.3923, 24.1355, 25.5887, -1.3923, 24.1355, 25.5887, 7.7244, 24.1355, 23.0552, 7.7244, 27.2603, 25.5887, -1.3923, 24.1355, 23.0552, 7.7244, 27.2603, 23.0552, -1.3923, 27.2603, 23.0552, -1.3923, 27.2603, 23.0552, 7.7244, 27.2603, 18.7068, 7.7014, 26.4664, 23.0552, -1.3923, 27.2603, 18.7068, 7.7014, 26.4664, 18.7096, -1.9203, 26.809, 18.7096, -1.9203, 26.809, 18.7068, 7.7014, 26.4664, 15.96, 7.4601, 24.7014, 18.7096, -1.9203, 26.809, 15.96, 7.4601, 24.7014, 15.064, -1.7563, 24.808)
+
+[sub_resource type="CylinderShape3D" id="CylinderShape3D_aqomv"]
+height = 10.3777
+radius = 4.73975
+
+[sub_resource type="CylinderShape3D" id="CylinderShape3D_xh2ej"]
+height = 4.02295
+radius = 0.25
+
 [sub_resource type="BoxShape3D" id="BoxShape3D_xh2ej"]
 size = Vector3(1.53375, 1.46143, 3.13956)
 
-[sub_resource type="BoxShape3D" id="BoxShape3D_db2o3"]
-size = Vector3(2.97754, 2.34912, 3.79205)
+[sub_resource type="BoxShape3D" id="BoxShape3D_aqomv"]
+size = Vector3(120.233, 2.00241, 52.758)
 
 [sub_resource type="BoxShape3D" id="BoxShape3D_ntxe5"]
 size = Vector3(369.423, 20, 47.9875)
 
+[sub_resource type="BoxShape3D" id="BoxShape3D_db2o3"]
+size = Vector3(2.97754, 2.34912, 3.79205)
+
 [node name="Floor0" type="Node3D"]
-transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0.63488, -5.13176)
 script = ExtResource("1_db2o3")
 
-[node name="PlayerSpawnPoint" type="Marker3D" parent="."]
-unique_name_in_owner = true
-transform = Transform3D(0.0152187, 0, 0.999884, 0, 1, 0, -0.999884, 0, 0.0152187, 3.6247, -3.07997, -1.03518)
+[node name="Model" type="Node3D" parent="."]
 
-[node name="ExitSpawnPoint" type="Marker3D" parent="."]
-unique_name_in_owner = true
-transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -9.92722, -1.94189, 1.38579)
+[node name="02_ALTAR_FLOOR_ZER0_VER_1" type="Node3D" parent="Model"]
 
-[node name="02_ALTAR_FLOOR_ZER0_VER_1" type="Node3D" parent="."]
-
-[node name="COLLISION" type="MeshInstance3D" parent="02_ALTAR_FLOOR_ZER0_VER_1"]
+[node name="COLLISION" type="MeshInstance3D" parent="Model/02_ALTAR_FLOOR_ZER0_VER_1"]
 transform = Transform3D(0.881211, 0, 0, 0, 0.881211, 0, 0, 0, 0.881211, -20.6816, -2.62104, -11.5685)
 visible = false
 mesh = SubResource("ArrayMesh_deq0h")
 skeleton = NodePath("")
 
-[node name="MeshInstance3D" type="MeshInstance3D" parent="02_ALTAR_FLOOR_ZER0_VER_1/COLLISION"]
+[node name="MeshInstance3D" type="MeshInstance3D" parent="Model/02_ALTAR_FLOOR_ZER0_VER_1/COLLISION"]
 mesh = SubResource("ArrayMesh_xh2ej")
 
-[node name="StaticBody3D" type="StaticBody3D" parent="02_ALTAR_FLOOR_ZER0_VER_1/COLLISION"]
-
-[node name="CollisionShape3D" type="CollisionShape3D" parent="02_ALTAR_FLOOR_ZER0_VER_1/COLLISION/StaticBody3D"]
-shape = SubResource("ConcavePolygonShape3D_aqomv")
-
-[node name="CollisionShape3D2" type="CollisionShape3D" parent="02_ALTAR_FLOOR_ZER0_VER_1/COLLISION/StaticBody3D"]
-transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0.444847, 3.74592, 0.492094)
-shape = SubResource("CylinderShape3D_aqomv")
-
-[node name="DUNES" type="MeshInstance3D" parent="02_ALTAR_FLOOR_ZER0_VER_1"]
+[node name="DUNES" type="MeshInstance3D" parent="Model/02_ALTAR_FLOOR_ZER0_VER_1"]
 mesh = SubResource("ArrayMesh_x286t")
 skeleton = NodePath("")
 
-[node name="Rock" type="MeshInstance3D" parent="02_ALTAR_FLOOR_ZER0_VER_1"]
+[node name="Rock" type="MeshInstance3D" parent="Model/02_ALTAR_FLOOR_ZER0_VER_1"]
 transform = Transform3D(-0.587507, -0.136201, 1.54214, -0.722351, 1.99443, -0.0641735, -1.86021, -0.731459, -0.462132, -14.2492, -3.76508, -0.788254)
 mesh = SubResource("ArrayMesh_wy8a5")
 skeleton = NodePath("")
 
-[node name="Rubble" type="MeshInstance3D" parent="02_ALTAR_FLOOR_ZER0_VER_1"]
+[node name="Rubble" type="MeshInstance3D" parent="Model/02_ALTAR_FLOOR_ZER0_VER_1"]
 transform = Transform3D(-0.122907, 0.167602, -0.0186693, 0.0244942, -0.0263571, -0.108528, -0.169632, -0.125242, -0.00214415, -5.4419, -3.47633, 16.6071)
 mesh = SubResource("ArrayMesh_8lhlb")
 skeleton = NodePath("")
 
-[node name="Base Structure" type="MeshInstance3D" parent="02_ALTAR_FLOOR_ZER0_VER_1"]
+[node name="Base Structure" type="MeshInstance3D" parent="Model/02_ALTAR_FLOOR_ZER0_VER_1"]
 transform = Transform3D(0.907055, 0, 0, 0, 0.907055, 0, 0, 0, 0.907055, 0.340337, -1.47613, 0.0319043)
 mesh = SubResource("ArrayMesh_sns5f")
 skeleton = NodePath("")
 
-[node name="Mirror Basin" type="MeshInstance3D" parent="02_ALTAR_FLOOR_ZER0_VER_1"]
+[node name="Mirror Basin" type="MeshInstance3D" parent="Model/02_ALTAR_FLOOR_ZER0_VER_1"]
 transform = Transform3D(0.333228, 0, -0.246127, 0, 0.0893, 0, 0.246127, 0, 0.333228, -13.2376, -2.04881, -0.1752)
 mesh = SubResource("ArrayMesh_ab6tk")
 skeleton = NodePath("")
 
-[node name="Posts" type="MeshInstance3D" parent="02_ALTAR_FLOOR_ZER0_VER_1"]
+[node name="Posts" type="MeshInstance3D" parent="Model/02_ALTAR_FLOOR_ZER0_VER_1"]
 mesh = SubResource("ArrayMesh_1i8xc")
 skeleton = NodePath("")
 
-[node name="GROUND" type="MeshInstance3D" parent="02_ALTAR_FLOOR_ZER0_VER_1"]
+[node name="GROUND" type="MeshInstance3D" parent="Model/02_ALTAR_FLOOR_ZER0_VER_1"]
 transform = Transform3D(-414.704, 0, 0, 0, -174.573, 0, 0, 0, -459.144, 17.6772, -3.82364, -1.8857)
 mesh = SubResource("ArrayMesh_amvb3")
 skeleton = NodePath("")
 
-[node name="Ruined Altar" type="MeshInstance3D" parent="02_ALTAR_FLOOR_ZER0_VER_1"]
+[node name="Ruined Altar" type="MeshInstance3D" parent="Model/02_ALTAR_FLOOR_ZER0_VER_1"]
 transform = Transform3D(0.0327622, 0, 1.53768, 0, 1.53803, 0, -1.53768, 0, 0.0327622, -15.9268, 2.40427, -2.65843)
 mesh = SubResource("ArrayMesh_vi6w0")
 skeleton = NodePath("")
 
-[node name="StaticBody3D" type="StaticBody3D" parent="02_ALTAR_FLOOR_ZER0_VER_1/Ruined Altar"]
-transform = Transform3D(1, 0, 3.72529e-09, 0, 1, 0, -3.72529e-09, 0, 1, 0, 0, 0)
-
-[node name="CollisionShape3D" type="CollisionShape3D" parent="02_ALTAR_FLOOR_ZER0_VER_1/Ruined Altar/StaticBody3D"]
-transform = Transform3D(1, 0, -3.72529e-09, 0, 1, 0, 3.72529e-09, 0, 1, 0.671984, -1.70312, 0.62453)
-shape = SubResource("CylinderShape3D_xh2ej")
-
-[node name="CollisionShape3D2" type="CollisionShape3D" parent="02_ALTAR_FLOOR_ZER0_VER_1/Ruined Altar/StaticBody3D"]
-transform = Transform3D(1, 0, -3.72529e-09, 0, 1, 0, 3.72529e-09, 0, 1, -0.359656, -1.70312, -0.418643)
-shape = SubResource("CylinderShape3D_xh2ej")
-
-[node name="CollisionShape3D3" type="CollisionShape3D" parent="02_ALTAR_FLOOR_ZER0_VER_1/Ruined Altar/StaticBody3D"]
-transform = Transform3D(1, 0, -3.72529e-09, 0, 1, 0, 3.72529e-09, 0, 1, -1.81569, -1.70312, -0.391741)
-shape = SubResource("CylinderShape3D_xh2ej")
-
-[node name="CollisionShape3D4" type="CollisionShape3D" parent="02_ALTAR_FLOOR_ZER0_VER_1/Ruined Altar/StaticBody3D"]
-transform = Transform3D(1, 0, -3.72529e-09, 0, 1, 0, 3.72529e-09, 0, 1, -2.90988, -1.70312, 0.583403)
-shape = SubResource("CylinderShape3D_xh2ej")
-
-[node name="FAR OFF TOWER" type="MeshInstance3D" parent="02_ALTAR_FLOOR_ZER0_VER_1"]
+[node name="FAR OFF TOWER" type="MeshInstance3D" parent="Model/02_ALTAR_FLOOR_ZER0_VER_1"]
 transform = Transform3D(3.43755, 1.42612, 2.05225, -1.44736, 12.6262, 1.83537, -1.50114, -8.90809, 2.92997, 347.705, 17.9774, 90.1682)
 mesh = SubResource("ArrayMesh_b7hhq")
 skeleton = NodePath("")
 
-[node name="FAR OFF TOWER_001" type="MeshInstance3D" parent="02_ALTAR_FLOOR_ZER0_VER_1"]
+[node name="FAR OFF TOWER_001" type="MeshInstance3D" parent="Model/02_ALTAR_FLOOR_ZER0_VER_1"]
 transform = Transform3D(1.30671, -0.990659, 2.84709, 0.0513379, 12.0886, 0.258797, -2.85818, -0.235779, 1.30629, -312.725, 17.3728, -44.983)
 mesh = SubResource("ArrayMesh_b7hhq")
 skeleton = NodePath("")
 
-[node name="FAR OFF TOWER_003" type="MeshInstance3D" parent="02_ALTAR_FLOOR_ZER0_VER_1"]
+[node name="FAR OFF TOWER_003" type="MeshInstance3D" parent="Model/02_ALTAR_FLOOR_ZER0_VER_1"]
 transform = Transform3D(1.30671, -0.990659, 2.84709, 0.0513379, 12.0886, 0.258797, -2.85818, -0.235779, 1.30629, -469.773, 14.6589, -40.4892)
 mesh = SubResource("ArrayMesh_b7hhq")
 skeleton = NodePath("")
 
-[node name="AnimationPlayer" type="AnimationPlayer" parent="02_ALTAR_FLOOR_ZER0_VER_1"]
+[node name="AnimationPlayer" type="AnimationPlayer" parent="Model/02_ALTAR_FLOOR_ZER0_VER_1"]
 libraries = {
 &"": SubResource("AnimationLibrary_6r3fr")
 }
 
-[node name="StaticBody3D" type="StaticBody3D" parent="02_ALTAR_FLOOR_ZER0_VER_1"]
+[node name="Collision" type="Node3D" parent="."]
 
-[node name="CollisionShape3D" type="CollisionShape3D" parent="02_ALTAR_FLOOR_ZER0_VER_1/StaticBody3D"]
+[node name="StaticBody3D" type="StaticBody3D" parent="Collision"]
+transform = Transform3D(0.881211, 0, 0, 0, 0.881211, 0, 0, 0, 0.881211, -20.6816, -2.62104, -11.5685)
+
+[node name="CollisionShape3D" type="CollisionShape3D" parent="Collision/StaticBody3D"]
+shape = SubResource("ConcavePolygonShape3D_aqomv")
+
+[node name="CollisionShape3D2" type="CollisionShape3D" parent="Collision/StaticBody3D"]
+transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0.444847, 3.74592, 0.492094)
+shape = SubResource("CylinderShape3D_aqomv")
+
+[node name="StaticBody3D2" type="StaticBody3D" parent="Collision"]
+transform = Transform3D(0.0327622, 0, 1.53768, 0, 1.53803, 0, -1.53768, 0, 0.0327622, -15.9268, 2.40427, -2.65843)
+
+[node name="CollisionShape3D" type="CollisionShape3D" parent="Collision/StaticBody3D2"]
+transform = Transform3D(1, 0, -3.72529e-09, 0, 1, 0, 3.72529e-09, 0, 1, 0.671984, -1.70312, 0.62453)
+shape = SubResource("CylinderShape3D_xh2ej")
+
+[node name="CollisionShape3D2" type="CollisionShape3D" parent="Collision/StaticBody3D2"]
+transform = Transform3D(1, 0, -3.72529e-09, 0, 1, 0, 3.72529e-09, 0, 1, -0.359656, -1.70312, -0.418643)
+shape = SubResource("CylinderShape3D_xh2ej")
+
+[node name="CollisionShape3D3" type="CollisionShape3D" parent="Collision/StaticBody3D2"]
+transform = Transform3D(1, 0, -3.72529e-09, 0, 1, 0, 3.72529e-09, 0, 1, -1.81569, -1.70312, -0.391741)
+shape = SubResource("CylinderShape3D_xh2ej")
+
+[node name="CollisionShape3D4" type="CollisionShape3D" parent="Collision/StaticBody3D2"]
+transform = Transform3D(1, 0, -3.72529e-09, 0, 1, 0, 3.72529e-09, 0, 1, -2.90988, -1.70312, 0.583403)
+shape = SubResource("CylinderShape3D_xh2ej")
+
+[node name="StaticBody3D3" type="StaticBody3D" parent="Collision"]
+
+[node name="CollisionShape3D" type="CollisionShape3D" parent="Collision/StaticBody3D3"]
 transform = Transform3D(0.857993, 0, 0.513661, 0, 1, 0, -0.513661, 0, 0.857993, -12.7574, -2.40091, 0.250378)
 shape = SubResource("BoxShape3D_xh2ej")
 
-[node name="CSGBox3D" type="CSGBox3D" parent="."]
-transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, -2.22379, 0)
-size = Vector3(1, 1.7, 1)
+[node name="Ground" type="StaticBody3D" parent="Collision"]
+collision_layer = 4
+collision_mask = 0
 
-[node name="Exit" type="Area3D" parent="."]
-unique_name_in_owner = true
-collision_layer = 256
-collision_mask = 256
-
-[node name="CollisionShape3D" type="CollisionShape3D" parent="Exit"]
-transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -13.1171, -2.1779, -0.0887146)
-shape = SubResource("BoxShape3D_db2o3")
-
-[node name="Model" type="Node3D" parent="."]
-
-[node name="Collision" type="Node3D" parent="."]
+[node name="CollisionShape3D" type="CollisionShape3D" parent="Collision/Ground"]
+transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 14.4904, -3.7991, 1.76942)
+shape = SubResource("BoxShape3D_aqomv")
+debug_color = Color(0.937255, 0, 0.623529, 1)
 
 [node name="Spawn Points" type="Node3D" parent="."]
 
+[node name="PlayerSpawnPoint" type="Marker3D" parent="Spawn Points"]
+unique_name_in_owner = true
+transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 3.625, -3, -1.035)
+
+[node name="ExitSpawnPoint" type="Marker3D" parent="Spawn Points"]
+unique_name_in_owner = true
+transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -9.92722, -1.94189, 1.38579)
+
 [node name="Room" type="Node3D" parent="."]
 
 [node name="Room" type="Area3D" parent="Room"]
@@ -885,3 +884,19 @@ collision_mask = 8
 [node name="CollisionShape3D" type="CollisionShape3D" parent="Room/Room"]
 transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 149.05, -4.02862, -1.76389)
 shape = SubResource("BoxShape3D_ntxe5")
+
+[node name="Exit" type="Area3D" parent="Room"]
+unique_name_in_owner = true
+collision_layer = 256
+collision_mask = 256
+
+[node name="CollisionShape3D" type="CollisionShape3D" parent="Room/Exit"]
+transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -13.1171, -2.1779, -0.0887146)
+shape = SubResource("BoxShape3D_db2o3")
+
+[node name="Camera3D" type="Camera3D" parent="."]
+transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -9.00384, 1.80761, 11.3571)
+
+[node name="CSGBox3D" type="CSGBox3D" parent="."]
+transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, -2.22872, 0)
+size = Vector3(1, 1.7, 1)
diff --git a/src/map/dungeon/rooms/Set A/18. Corridor A.tscn b/src/map/dungeon/rooms/Set A/18. Corridor A.tscn
index 2573f872..4efbdd4b 100644
--- a/src/map/dungeon/rooms/Set A/18. Corridor A.tscn	
+++ b/src/map/dungeon/rooms/Set A/18. Corridor A.tscn	
@@ -1,4 +1,4 @@
-[gd_scene load_steps=42 format=4 uid="uid://bn4gslp2gk8ds"]
+[gd_scene load_steps=43 format=4 uid="uid://bn4gslp2gk8ds"]
 
 [ext_resource type="Script" uid="uid://fk3jis6rsipv" path="res://src/map/dungeon/code/corridor.gd" id="1_lepkf"]
 [ext_resource type="Texture2D" uid="uid://crsw35eypj6ry" path="res://src/map/dungeon/models/Set A/18. Corridor A/18_A1_CORRIDOR_A_WALL TILE 1.jpg" id="2_jmyyj"]
@@ -433,6 +433,9 @@ shadow_mesh = SubResource("ArrayMesh_etli6")
 [sub_resource type="BoxShape3D" id="BoxShape3D_d16dk"]
 size = Vector3(0.236, 5.538, 0.149)
 
+[sub_resource type="BoxShape3D" id="BoxShape3D_xywry"]
+size = Vector3(4, 0.557617, 4)
+
 [sub_resource type="StandardMaterial3D" id="StandardMaterial3D_2qrwe"]
 transparency = 1
 shading_mode = 0
@@ -741,6 +744,10 @@ shape = SubResource("BoxShape3D_d16dk")
 transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -11.637, 2.14158, 2.73139)
 shape = SubResource("BoxShape3D_d16dk")
 
+[node name="CollisionShape3D5" type="CollisionShape3D" parent="Collision/StaticBody3D"]
+transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -9.88863, -0.243546, 0.997182)
+shape = SubResource("BoxShape3D_xywry")
+
 [node name="Doors" type="Node3D" parent="."]
 
 [node name="DOOR?_F_CUT" type="CSGBox3D" parent="Doors"]
diff --git a/src/player/Player.cs b/src/player/Player.cs
index b45fff4c..0b0349c5 100644
--- a/src/player/Player.cs
+++ b/src/player/Player.cs
@@ -215,16 +215,16 @@ public partial class Player : CharacterBody3D, IPlayer
     this.Provide();
     HealthTimer.Timeout += OnHealthTimerTimeout;
     Hitbox.AreaEntered += Hitbox_AreaEntered;
-    CollisionDetector.BodyEntered += CollisionDetector_BodyEntered;
+    CollisionDetector.AreaEntered += CollisionDetector_AreaEntered;
   }
 
-  private void CollisionDetector_BodyEntered(Node3D body)
+  private void CollisionDetector_AreaEntered(Area3D area)
   {
-    if (body is InventoryItem inventoryItem)
+    if (area.GetParent() is InventoryItem inventoryItem)
     {
       var isAdded = Inventory.TryAdd(inventoryItem);
       if (isAdded)
-        QueueFree();
+        inventoryItem.QueueFree();
     }
   }