diff --git a/src/resources/objects/weapon/WeaponObject.java b/src/resources/objects/weapon/WeaponObject.java
index 1ff97a03..2d0fa6ba 100644
--- a/src/resources/objects/weapon/WeaponObject.java
+++ b/src/resources/objects/weapon/WeaponObject.java
@@ -21,6 +21,7 @@
  ******************************************************************************/
 package resources.objects.weapon;
 
+import resources.datatables.WeaponType;
 import resources.objects.tangible.TangibleObject;
 
 import com.sleepycat.persist.model.NotPersistent;
@@ -196,7 +197,7 @@ public class WeaponObject extends TangibleObject {
 		
 		int weaponType = getWeaponType();
 		
-		if(weaponType == 4 || weaponType == 5 || weaponType == 6 || weaponType == 7 || weaponType == 9 || weaponType == 10 || weaponType == 11)
+		if(weaponType == WeaponType.ONEHANDEDMELEE || weaponType == WeaponType.TWOHANDEDMELEE || weaponType == WeaponType.UNARMED || weaponType == WeaponType.POLEARMMELEE || weaponType == WeaponType.ONEHANDEDSABER || weaponType == WeaponType.TWOHANDEDSABER || weaponType == WeaponType.POLEARMSABER)
 			return true;
 		
 		return false;
@@ -207,7 +208,7 @@ public class WeaponObject extends TangibleObject {
 		
 		int weaponType = getWeaponType();
 		
-		if(weaponType == 0 || weaponType == 1 || weaponType == 2 || weaponType == 3)
+		if(weaponType == WeaponType.RIFLE || weaponType == WeaponType.CARBINE || weaponType == WeaponType.PISTOL || weaponType == WeaponType.FLAMETHROWER || weaponType == WeaponType.HEAVYWEAPON)
 			return true;
 		
 		return false;