Reworked weapon properties. This is not an exact rip-off of 4.0, because 4.0 is just as broken as 4.1, only in different ways.

git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/branches/stone_soup@154 c06c8d41-db1a-0410-9941-cceddc491573

1 files changed, 23 insertions, 23 deletions

diff --git a/crawl-ref/source/itemprop.cc b/crawl-ref/source/itemprop.cc
index 36bcc0b249..562d863771 100644
--- a/crawl-ref/source/itemprop.cc
+++ b/crawl-ref/source/itemprop.cc
@@ -186,28 +186,28 @@ static weapon_def Weapon_prop[NUM_WEAPONS] =
     { WPN_ANCUS,             "ancus",               9,  2, 14, 120,  8, 
         SK_MACES_FLAILS, HANDS_ONE,    SIZE_MEDIUM, MI_NONE, false,
         DAMV_CRUSHING },
-    { WPN_MORNINGSTAR,       "morningstar",        10, -2, 15, 140,  8, 
+    { WPN_MORNINGSTAR,       "morningstar",        10, -1, 15, 140,  8, 
         SK_MACES_FLAILS, HANDS_ONE,    SIZE_MEDIUM, MI_NONE, false,
         DAMV_PIERCING | DAM_BLUDGEON },
-    { WPN_DEMON_WHIP,        "demon whip",         10,  2, 13,  30,  2,
+    { WPN_DEMON_WHIP,        "demon whip",         10,  1, 13,  30,  2,
         SK_MACES_FLAILS, HANDS_ONE,    SIZE_MEDIUM, MI_NONE, false,
         DAMV_SLASHING },
-    { WPN_SPIKED_FLAIL,      "spiked flail",       12, -3, 16, 190,  8, 
+    { WPN_SPIKED_FLAIL,      "spiked flail",       12, -2, 16, 190,  8, 
         SK_MACES_FLAILS, HANDS_ONE,    SIZE_MEDIUM, MI_NONE, false,
         DAMV_PIERCING | DAM_BLUDGEON },
-    { WPN_EVENINGSTAR,       "eveningstar",        12, -2, 15, 180,  8, 
+    { WPN_EVENINGSTAR,       "eveningstar",        12, -1, 15, 180,  8, 
         SK_MACES_FLAILS, HANDS_ONE,    SIZE_MEDIUM, MI_NONE, false,
         DAMV_PIERCING | DAM_BLUDGEON },
-    { WPN_DIRE_FLAIL,        "dire flail",         13, -6, 14, 240,  9, 
+    { WPN_DIRE_FLAIL,        "dire flail",         13, -3, 14, 240,  9, 
         SK_MACES_FLAILS, HANDS_DOUBLE, SIZE_MEDIUM, MI_NONE, false,
         DAMV_PIERCING | DAM_BLUDGEON },
-    { WPN_GREAT_MACE,        "great mace",         18, -5, 19, 270,  9, 
+    { WPN_GREAT_MACE,        "great mace",         16, -4, 18, 270,  9, 
         SK_MACES_FLAILS, HANDS_TWO,    SIZE_LARGE,  MI_NONE, false,
         DAMV_CRUSHING },
-    { WPN_GIANT_CLUB,        "giant club",         19, -8, 20, 330, 10,
+    { WPN_GIANT_CLUB,        "giant club",         18, -6, 19, 330, 10,
         SK_MACES_FLAILS, HANDS_TWO,    SIZE_BIG,    MI_NONE, false,
         DAMV_CRUSHING },
-    { WPN_GIANT_SPIKED_CLUB, "giant spiked club",  20, -9, 21, 350, 10,
+    { WPN_GIANT_SPIKED_CLUB, "giant spiked club",  20, -7, 20, 350, 10,
         SK_MACES_FLAILS, HANDS_TWO,    SIZE_BIG,    MI_NONE, false,
         DAMV_PIERCING | DAM_BLUDGEON },
 
@@ -218,13 +218,13 @@ static weapon_def Weapon_prop[NUM_WEAPONS] =
     { WPN_DAGGER,            "dagger",              4,  6, 10,  20,  1,
         SK_SHORT_BLADES, HANDS_ONE,    SIZE_LITTLE, MI_NONE, true,
         DAMV_STABBING | DAM_SLICE },
-    { WPN_QUICK_BLADE,       "quick blade",         5,  6,  8,  50,  0, 
+    { WPN_QUICK_BLADE,       "quick blade",         5,  6,  7,  50,  0, 
         SK_SHORT_BLADES, HANDS_ONE,    SIZE_LITTLE, MI_NONE, false,
         DAMV_STABBING | DAM_SLICE },
     { WPN_SHORT_SWORD,       "short sword",         6,  4, 11,  80,  2,
         SK_SHORT_BLADES, HANDS_ONE,    SIZE_SMALL,  MI_NONE, false,
         DAMV_SLICING | DAM_PIERCE },
-    { WPN_SABRE,             "sabre",               7,  4, 11,  90,  2,
+    { WPN_SABRE,             "sabre",               7,  4, 12,  90,  2,
         SK_SHORT_BLADES, HANDS_ONE,    SIZE_SMALL,  MI_NONE, false,
         DAMV_SLICING | DAM_PIERCE },
 
@@ -232,28 +232,28 @@ static weapon_def Weapon_prop[NUM_WEAPONS] =
     { WPN_FALCHION,          "falchion",            8,  2, 13, 170,  4,
         SK_LONG_SWORDS,  HANDS_ONE,    SIZE_MEDIUM, MI_NONE, false,
         DAMV_SLICING },  // or perhaps DAMV_CHOPPING is more apt?
-    { WPN_LONG_SWORD,        "long sword",         10, -2, 14, 160,  3,
+    { WPN_LONG_SWORD,        "long sword",         10, 1, 14, 160,  3,
         SK_LONG_SWORDS,  HANDS_ONE,    SIZE_MEDIUM, MI_NONE, false,
         DAMV_SLICING },
-    { WPN_SCIMITAR,          "scimitar",           11, -2, 14, 170,  3,
+    { WPN_SCIMITAR,          "scimitar",           11, -1, 14, 170,  3,
         SK_LONG_SWORDS,  HANDS_ONE,    SIZE_MEDIUM, MI_NONE, false,
         DAMV_SLICING },
-    { WPN_KATANA,            "katana",             13, -1, 13, 160,  3,
+    { WPN_KATANA,            "katana",             13, 2, 13, 160,  3,
         SK_LONG_SWORDS,  HANDS_HALF,   SIZE_MEDIUM, MI_NONE, false,
         DAMV_SLICING },
-    { WPN_DEMON_BLADE,       "demon blade",        13, -3, 15, 200,  4,
+    { WPN_DEMON_BLADE,       "demon blade",        13, -1, 15, 200,  4,
         SK_LONG_SWORDS,  HANDS_ONE,    SIZE_MEDIUM, MI_NONE, false,
         DAMV_SLICING },
-    { WPN_BLESSED_BLADE,     "blessed blade",      14, -3, 14, 200,  4,
+    { WPN_BLESSED_BLADE,     "blessed blade",      14, 0, 14, 200,  4,
         SK_LONG_SWORDS,  HANDS_ONE,    SIZE_MEDIUM, MI_NONE, false,
         DAMV_SLICING },
-    { WPN_DOUBLE_SWORD,      "double sword",       15, -5, 16, 220,  5,
+    { WPN_DOUBLE_SWORD,      "double sword",       15, -2, 16, 220,  5,
         SK_LONG_SWORDS,  HANDS_HALF,   SIZE_MEDIUM, MI_NONE, false,
         DAMV_SLICING },
-    { WPN_GREAT_SWORD,       "great sword",        16, -5, 17, 250,  6,
+    { WPN_GREAT_SWORD,       "great sword",        16, -3, 17, 250,  6,
         SK_LONG_SWORDS,  HANDS_TWO,    SIZE_LARGE,  MI_NONE, false,
         DAMV_SLICING },
-    { WPN_TRIPLE_SWORD,      "triple sword",       17, -5, 17, 260,  6,
+    { WPN_TRIPLE_SWORD,      "triple sword",       19, -4, 19, 260,  6,
         SK_LONG_SWORDS,  HANDS_TWO,    SIZE_LARGE,  MI_NONE, false,
         DAMV_SLICING },
 
@@ -261,16 +261,16 @@ static weapon_def Weapon_prop[NUM_WEAPONS] =
     { WPN_HAND_AXE,          "hand axe",            7,  3, 13,  80,  6, 
         SK_AXES,         HANDS_ONE,    SIZE_SMALL,  MI_NONE, true,
         DAMV_CHOPPING },
-    { WPN_WAR_AXE,           "war axe",            11, -3, 16, 180,  7, 
+    { WPN_WAR_AXE,           "war axe",            11, 0, 16, 180,  7, 
         SK_AXES,         HANDS_ONE,    SIZE_MEDIUM, MI_NONE, false,
         DAMV_CHOPPING },
-    { WPN_BROAD_AXE,         "broad axe",          14, -6, 17, 230,  8, 
+    { WPN_BROAD_AXE,         "broad axe",          14, -2, 17, 230,  8, 
         SK_AXES,         HANDS_HALF,   SIZE_MEDIUM, MI_NONE, false,
         DAMV_CHOPPING },
-    { WPN_BATTLEAXE,         "battleaxe",          16, -7, 18, 250,  8, 
+    { WPN_BATTLEAXE,         "battleaxe",          17, -4, 18, 250,  8, 
         SK_AXES,         HANDS_TWO,    SIZE_LARGE,  MI_NONE, false,
         DAMV_CHOPPING },
-    { WPN_EXECUTIONERS_AXE,  "executioner\'s axe", 18, -8, 18, 280,  9, 
+    { WPN_EXECUTIONERS_AXE,  "executioner\'s axe", 20, -6, 20, 280,  9, 
         SK_AXES,         HANDS_TWO,    SIZE_LARGE,  MI_NONE, false,
         DAMV_CHOPPING },
 
@@ -281,7 +281,7 @@ static weapon_def Weapon_prop[NUM_WEAPONS] =
     { WPN_TRIDENT,           "trident",             9,  2, 14, 160,  4,
         SK_POLEARMS,     HANDS_HALF,   SIZE_MEDIUM, MI_NONE, false,
         DAMV_PIERCING },
-    { WPN_DEMON_TRIDENT,     "demon trident",      13,  2, 14, 160,  4,
+    { WPN_DEMON_TRIDENT,     "demon trident",      13,  0, 14, 160,  4,
         SK_POLEARMS,     HANDS_HALF,   SIZE_MEDIUM, MI_NONE, false,
         DAMV_PIERCING },
     { WPN_HALBERD,           "halberd",            13, -3, 16, 200,  5,