diff --git a/GameCore/Combat/WeaponAcquisitionSystem.cs b/GameCore/Combat/WeaponAcquisitionSystem.cs
index 1bfc1a8..c383704 100644
--- a/GameCore/Combat/WeaponAcquisitionSystem.cs
+++ b/GameCore/Combat/WeaponAcquisitionSystem.cs
@@ -7,6 +7,7 @@ namespace GameCore.Combat;
 
 public class WeaponAcquisitionSystem : ISystem
 {
+    private const int NoWeaponEquipped = -1;
     private const string WeaponItemPrefix = "weapon_";
     private readonly World _world;
 
@@ -30,7 +31,7 @@ public class WeaponAcquisitionSystem : ISystem
         if (!equipment.EquippableWeaponItemIds.Contains(e.Item.ItemId))
             equipment.EquippableWeaponItemIds.Add(e.Item.ItemId);
 
-        if (equipment.CurrentWeaponIndex == -1)
+        if (equipment.CurrentWeaponIndex == NoWeaponEquipped)
         {
             equipment.CurrentWeaponIndex = equipment.EquippableWeaponItemIds.Count - 1;
             _world.PublishEvent(new EquipWeaponEvent(e.Target, e.Item.ItemId));
diff --git a/GameCore/Player/EquipmentComponent.cs b/GameCore/Player/EquipmentComponent.cs
index 73abba3..01fee1b 100644
--- a/GameCore/Player/EquipmentComponent.cs
+++ b/GameCore/Player/EquipmentComponent.cs
@@ -4,6 +4,7 @@ namespace GameCore.Player;
 
 public class EquipmentComponent : IComponent
 {
+    private const int NoWeaponIndex = -1;
     public List<string> EquippableWeaponItemIds { get; set; } = [];
-    public int CurrentWeaponIndex { get; set; } = -1; // -1 indicates no weapon equipped
+    public int CurrentWeaponIndex { get; set; } = NoWeaponIndex;
 }
\ No newline at end of file