Added weapon skill system and leveling system.

3 files changed, 13 insertions, 18 deletions

diff --git a/src/resources/itemdb.cpp b/src/resources/itemdb.cpp
index c03e42a2..5f6846ba 100644
--- a/src/resources/itemdb.cpp
+++ b/src/resources/itemdb.cpp
@@ -79,16 +79,14 @@ WeaponType weaponTypeFromString (std::string name, int id = 0)
     if      (name=="knife")      return WPNTYPE_KNIFE;
     else if (name=="sword")      return WPNTYPE_SWORD;
     else if (name=="polearm")    return WPNTYPE_POLEARM;
-    else if (name=="javelin")    return WPNTYPE_JAVELIN;
     else if (name=="staff")      return WPNTYPE_STAFF;
     else if (name=="whip")       return WPNTYPE_WHIP;
-    else if (name=="boomerang")  return WPNTYPE_BOOMERANG;
     else if (name=="bow")        return WPNTYPE_BOW;
-    else if (name=="sickle")     return WPNTYPE_SICKLE;
-    else if (name=="crossbow")   return WPNTYPE_CROSSBOW;
+    else if (name=="shooting")   return WPNTYPE_SHOOTING;
     else if (name=="mace")       return WPNTYPE_MACE;
     else if (name=="axe")        return WPNTYPE_AXE;
     else if (name=="thrown")     return WPNTYPE_THROWN;
+
     else return WPNTYPE_NONE;
 }
 
diff --git a/src/resources/iteminfo.cpp b/src/resources/iteminfo.cpp
index ade7f685..ad4c9797 100644
--- a/src/resources/iteminfo.cpp
+++ b/src/resources/iteminfo.cpp
@@ -60,7 +60,7 @@ void ItemInfo::setWeaponType(int type)
         case WPNTYPE_BOW:
             mAttackType = ACTION_ATTACK_BOW;
             break;
-        case WPNTYPE_SICKLE:
+        case WPNTYPE_POLEARM:
             mAttackType = ACTION_ATTACK_SWING;
             break;
         default:
diff --git a/src/resources/iteminfo.h b/src/resources/iteminfo.h
index c637b010..90675a17 100644
--- a/src/resources/iteminfo.h
+++ b/src/resources/iteminfo.h
@@ -62,19 +62,16 @@ enum ItemType
 enum WeaponType
 {
     WPNTYPE_NONE = 0,
-    WPNTYPE_KNIFE,//        1
-    WPNTYPE_SWORD,//        2
-    WPNTYPE_POLEARM,//      3
-    WPNTYPE_JAVELIN,//      4
-    WPNTYPE_STAFF,//        5
-    WPNTYPE_WHIP,//         6
-    WPNTYPE_BOOMERANG,//    7
-    WPNTYPE_BOW,//          8
-    WPNTYPE_SICKLE,//       9
-    WPNTYPE_CROSSBOW,//    10
-    WPNTYPE_MACE,//        11
-    WPNTYPE_AXE,//         12
-    WPNTYPE_THROWN//       13
+    WPNTYPE_KNIFE,
+    WPNTYPE_SWORD,
+    WPNTYPE_POLEARM,
+    WPNTYPE_STAFF,
+    WPNTYPE_WHIP,
+    WPNTYPE_BOW,
+    WPNTYPE_SHOOTING,
+    WPNTYPE_MACE,
+    WPNTYPE_AXE,
+    WPNTYPE_THROWN
 };
 
 /**