summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDarshan Shaligram <dshaligram@users.sourceforge.net>2010-01-03 16:27:33 +0530
committerDarshan Shaligram <dshaligram@users.sourceforge.net>2010-01-03 16:27:33 +0530
commitf72697dec6280512b42b74cb58669090e07735cd (patch)
treed2219363379d54dddc78be3f3aefa1d384a114ae
parent3afcc226b588e53f707d61341d4a1b4d764278c5 (diff)
downloadcrawl-ref-f72697dec6280512b42b74cb58669090e07735cd.tar.gz
crawl-ref-f72697dec6280512b42b74cb58669090e07735cd.zip
Give vanilla merfolk throwing spears instead of javelins.
-rw-r--r--crawl-ref/source/mon-gear.cc16
1 files changed, 4 insertions, 12 deletions
diff --git a/crawl-ref/source/mon-gear.cc b/crawl-ref/source/mon-gear.cc
index e144b8e59a..5b793a94ee 100644
--- a/crawl-ref/source/mon-gear.cc
+++ b/crawl-ref/source/mon-gear.cc
@@ -1100,18 +1100,10 @@ static void _give_ammo(monsters *mon, int level,
if (!one_chance_in(3)
|| active_monster_band == BAND_MERFOLK_JAVELINEER)
{
- item_race = MAKE_ITEM_NO_RACE;
- if (coinflip())
- {
- weap_type = WPN_SPEAR;
- qty = 1 + random2(3);
- }
- else
- {
- weap_class = OBJ_MISSILES;
- weap_type = MI_JAVELIN;
- qty = 3 + random2(6);
- }
+ item_race = MAKE_ITEM_NO_RACE;
+ weap_class = OBJ_WEAPONS;
+ weap_type = WPN_SPEAR;
+ qty = random_range(4, 8);
if (active_monster_band == BAND_MERFOLK_JAVELINEER)
break;
}