From f72697dec6280512b42b74cb58669090e07735cd Mon Sep 17 00:00:00 2001
From: Darshan Shaligram <dshaligram@users.sourceforge.net>
Date: Sun, 3 Jan 2010 16:27:33 +0530
Subject: Give vanilla merfolk throwing spears instead of javelins.

---
 crawl-ref/source/mon-gear.cc | 16 ++++------------
 1 file 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;
             }
-- 
cgit v1.2.3-54-g00ecf