diff options
| -rw-r--r-- | crawl-ref/source/itemprop.cc | 6 | ||||
| -rw-r--r-- | crawl-ref/source/itemprop.h | 4 | ||||
| -rw-r--r-- | crawl-ref/source/makeitem.cc | 7 |
3 files changed, 10 insertions, 7 deletions
diff --git a/crawl-ref/source/itemprop.cc b/crawl-ref/source/itemprop.cc index 58b421ab80..134e9fb544 100644 --- a/crawl-ref/source/itemprop.cc +++ b/crawl-ref/source/itemprop.cc @@ -172,12 +172,12 @@ static int Weapon_index[NUM_WEAPONS]; static weapon_def Weapon_prop[NUM_WEAPONS] = { // Maces & Flails - { WPN_WHIP, "whip", 4, 2, 11, 30, 2, - SK_MACES_FLAILS, HANDS_ONE, SIZE_MEDIUM, MI_NONE, false, - DAMV_SLASHING, 0 }, { WPN_CLUB, "club", 5, 3, 13, 50, 7, SK_MACES_FLAILS, HANDS_ONE, SIZE_SMALL, MI_NONE, true, DAMV_CRUSHING, 0 }, + { WPN_WHIP, "whip", 6, 2, 11, 30, 2, + SK_MACES_FLAILS, HANDS_ONE, SIZE_MEDIUM, MI_NONE, false, + DAMV_SLASHING, 0 }, { WPN_HAMMER, "hammer", 7, 3, 13, 90, 7, SK_MACES_FLAILS, HANDS_ONE, SIZE_SMALL, MI_NONE, false, DAMV_CRUSHING, 0 }, diff --git a/crawl-ref/source/itemprop.h b/crawl-ref/source/itemprop.h index 6c511fc484..f98131427f 100644 --- a/crawl-ref/source/itemprop.h +++ b/crawl-ref/source/itemprop.h @@ -398,8 +398,8 @@ enum stave_type enum weapon_type { - WPN_WHIP, // 0 - WPN_CLUB, + WPN_CLUB, // 0 + WPN_WHIP, WPN_HAMMER, WPN_MACE, WPN_FLAIL, diff --git a/crawl-ref/source/makeitem.cc b/crawl-ref/source/makeitem.cc index c717e64a2d..82fd6aecde 100644 --- a/crawl-ref/source/makeitem.cc +++ b/crawl-ref/source/makeitem.cc @@ -1345,6 +1345,9 @@ static brand_type _determine_weapon_brand(const item_def& item, int item_level) break; case WPN_WHIP: + if (one_chance_in(10)) + rc = SPWPN_PAIN; + if (_got_distortion_roll(item_level)) rc = SPWPN_DISTORTION; @@ -1354,7 +1357,7 @@ static brand_type _determine_weapon_brand(const item_def& item, int item_level) if (one_chance_in(6)) rc = SPWPN_VENOM; - if (coinflip()) + if (one_chance_in(3)) rc = SPWPN_REACHING; if (one_chance_in(5)) @@ -3208,7 +3211,7 @@ static item_make_species_type _give_weapon(monsters *mon, int level, item.base_type = OBJ_WEAPONS; item.sub_type = random_choose(WPN_DAGGER, WPN_DAGGER, WPN_SHORT_SWORD, WPN_SHORT_SWORD, - WPN_CLUB, -1); + WPN_CLUB, WPN_WHIP, -1); } else return (item_race); |