Remove darts from vaults.

Most vaults (including the tutorial) get tomahawks or stones instead,
except for one or two which were removed.

14 files changed, 56 insertions, 75 deletions

diff --git a/crawl-ref/source/dat/des/altar/overflow.des b/crawl-ref/source/dat/des/altar/overflow.des
index b910e59d3b..de7d86735b 100644
--- a/crawl-ref/source/dat/des/altar/overflow.des
+++ b/crawl-ref/source/dat/des/altar/overflow.des
@@ -1339,8 +1339,8 @@ NAME:  okawaru_altar_gauntlet_db
 TAGS:  uniq_altar_okawaru temple_overflow_1 temple_overflow_okawaru
 DEPTH: D:2-9
 KFEAT: _ = altar_okawaru
-MONS:  goblin; dart q:5 / hobgoblin; dart q:5 / gnoll; dart q:5 /\
-       orc; dart q:5 / kobold; dart q:5
+MONS:  goblin; stone q:5 / hobgoblin; stone q:5 / gnoll; stone q:5 /\
+       orc; stone q:5 / kobold; stone q:5
 MAP
   xxx
 xxx_xxx
diff --git a/crawl-ref/source/dat/des/arrival/large.des b/crawl-ref/source/dat/des/arrival/large.des
index d015ffd28b..9a1a1e094f 100644
--- a/crawl-ref/source/dat/des/arrival/large.des
+++ b/crawl-ref/source/dat/des/arrival/large.des
@@ -255,7 +255,7 @@ TAGS:    arrival no_rotate no_monster_gen
 ORIENT:  float
 MONS:    goblin ; stone
 MONS:    hobgoblin ; stone
-MONS:    kobold ; dart . mace
+MONS:    kobold ; mace
 SHUFFLE: ABCD
 NSUBST:  X = 1:+ / *:x
 NSUBST:  Y = 1:+ / *:x
@@ -367,7 +367,7 @@ WEIGHT: 3
 ORIENT: float
 NSUBST: . = 1:d / *:.
 NSUBST: = = 3:+ / *:x
-ITEM:   stone / dart
+ITEM:   stone
 MAP
           xxxxxxxx.@.xx
        xxxx......=....xxxx
@@ -399,7 +399,7 @@ TAGS:   arrival no_monster_gen no_rotate
 WEIGHT: 1
 ORIENT: float
 NSUBST: . = 1:d / *:.
-ITEM:   stone / dart
+ITEM:   stone
 MAP
           xxxxxxxxxxxxx
        xxxx......x....xxxx
@@ -435,7 +435,7 @@ SHUFFLE: ab, cd, ef, gh, ij, kl, mn
 SUBST:   a=., c=., e=., g=., i=., k=., m=.
 SUBST:   b=x, d=x, f=x, h=x, j=x, l=x, n=x
 NSUBST:  . = 1:d / *:.
-ITEM:    stone / dart
+ITEM:    stone
 MAP
           xxxxxxxxxxxxx
        xxxx.....h.....xxxx
diff --git a/crawl-ref/source/dat/des/arrival/simple.des b/crawl-ref/source/dat/des/arrival/simple.des
index 47e8a8bdd5..1cbb68cce3 100644
--- a/crawl-ref/source/dat/des/arrival/simple.des
+++ b/crawl-ref/source/dat/des/arrival/simple.des
@@ -260,7 +260,7 @@ NAME:    lemuel_arrival_cross
 TAGS:    arrival no_monster_gen
 ORIENT:  float
 SHUFFLE: >d
-ITEM:    stone / dart
+ITEM:    stone
 MAP
       xxx
       x{x
@@ -974,7 +974,7 @@ NAME:   dpeg_arrival_snail
 TAGS:   arrival no_monster_gen no_rotate
 ORIENT: float
 NSUBST: . = 1:d / *:.
-ITEM:   stone / dart
+ITEM:   stone
 MAP
          xxxxxxxxxxxxxxxxx
       xxxxxxxx.......xxxxxxx
diff --git a/crawl-ref/source/dat/des/arrival/small.des b/crawl-ref/source/dat/des/arrival/small.des
index b6a1f3babd..9209138909 100644
--- a/crawl-ref/source/dat/des/arrival/small.des
+++ b/crawl-ref/source/dat/des/arrival/small.des
@@ -207,7 +207,7 @@ ORIENT: float
 NSUBST: s = 1:+ / *:x, p = 1:+ / *:x, q = 1:+ / *:x, r = 1:+ / *:x
 NSUBST: _ = 1:w / *:., ' = 1:w / *:., ` = 1:w / 1:d / *:.
 SUBST:  w:wlxm, x:xccv, +=+++.
-ITEM:   stone / dart
+ITEM:   stone
 MAP
    ...........
   ..rrrrrrrrr..
@@ -239,7 +239,7 @@ SHUFFLE: d'
 : end
 SUBST:   '=.
 MONS:    worm
-ITEM:    stone / dart
+ITEM:    stone
 MAP
 xxxxxxxxxxxxxxxxx
 x%1.+d....{....'+
@@ -392,24 +392,6 @@ MAP
 ENDMAP
 
 ##############################################################
-# A gimmicky, but cute vault.
-NAME:   minmay_arrival_blink_away
-TAGS:   arrival generate_awake
-WEIGHT: 2
-ORIENT: float
-MONS:   kobold; dart ego:dispersal q:3
-MAP
-.............
-.x+xxxxxxx+x.
-.x.llllll{.l@
-.x.llllll>.l.
-.x.xxxxxxx+x.
-.x1x.........
-.xxx.........
-.............
-ENDMAP
-
-##############################################################
 NAME:    minmay_arrival_semitransparent
 TAGS:    arrival
 ORIENT:  float
@@ -777,7 +759,7 @@ ENDMAP
 NAME:   dpeg_arrival_chase
 TAGS:   arrival no_monster_gen no_pool_fixup no_rotate
 MONS:   kobold, hobgoblin / goblin / bat
-ITEM:   stone, dart
+ITEM:   stone
 ORIENT: float
 SUBST:  w : w l:1
 MAP
@@ -790,7 +772,7 @@ xwwww...........wwww...x
 xwwwwww.................
 xwwwwwwwwwwwwwww.......@
 x1wwwwwwwwwwwwwwww......
-x1e1...wwwwwwwwwwwwwww.x
+x1d1...wwwwwwwwwwwwwww.x
 x1d1...........wwwwwwwwx
 x>...................wwx
 xxxxxxxxxxxxxxxxxxxxxxxx
@@ -802,7 +784,7 @@ TAGS:    arrival no_monster_gen
 ORIENT:  float
 SHUFFLE: cvb
 NSUBST:  . = 1:d / *:.
-ITEM:    stone / dart
+ITEM:    stone
 MAP
 xxxxxxxxxxxxxxx
 xcccccccx.....x
@@ -867,7 +849,7 @@ ORIENT:  float
 SHUFFLE: cxxx
 NSUBST:  . = 1:d / *:.
 SUBST:   T = TVVVV
-ITEM:    stone / dart
+ITEM:    stone
 MAP
         ccccccc@ccccccc
     ccccc.............ccccc
@@ -890,7 +872,7 @@ TAGS:    arrival no_monster_gen no_rotate
 ORIENT:  float
 SHUFFLE: cxxx
 NSUBST:  . = 1:d / *:.
-ITEM:    stone / dart
+ITEM:    stone
 SUBST:   T = TVVVV
 MAP
      ccccccccccc
@@ -916,7 +898,7 @@ TAGS:    arrival no_monster_gen no_rotate
 ORIENT:  float
 SHUFFLE: cxxx
 NSUBST:  . = 1:d / *:.
-ITEM:    stone / dart
+ITEM:    stone
 SUBST:   T = TVVVV
 MAP
          ccccc
@@ -970,7 +952,7 @@ TAGS:    arrival no_monster_gen no_rotate
 ORIENT:  float
 SHUFFLE: cxxx
 NSUBST:  . = 1:d / *:.
-ITEM:    stone / dart
+ITEM:    stone
 SUBST:   T = TVVVV
 MAP
    ccccccccccccccccc
@@ -998,7 +980,7 @@ ORIENT: float
 SUBST:  ' = .x
 SUBST:  G : GTVt
 NSUBST: d = 1:d / *:'
-ITEM:   stone / dart
+ITEM:   stone
 MAP
                xxxxx
              xxx...xxx
@@ -1208,7 +1190,7 @@ NAME:   dpeg_arrival_simpleton_a
 TAGS:   arrival  no_monster_gen
 ORIENT: float
 NSUBST: . = 1:d / *:.
-ITEM:   stone / dart
+ITEM:   stone
 MAP
 @xx           xx@
 x.xxxx     xxxx.x
@@ -1277,7 +1259,7 @@ SHUFFLE: ABCDEFGH
 SUBST:   A={, B=', C=', D=', E=', F=', G=', H=d
 SUBST:   ' = .:70 1 w:2
 SUBST:   . = .:60 2:1 3:1
-ITEM:    stone / dart
+ITEM:    stone
 MONS:    fungus, rat, giant cockroach
 MAP
 xxxxxxxxxxxxxxxxx
@@ -1377,7 +1359,7 @@ NAME:   zaba_arrival_water
 TAGS:   arrival no_monster_gen no_item_gen no_rotate
 ORIENT: float
 SUBST:  T = TV, ? = wW, > = >d
-ITEM:   dart / stone
+ITEM:   stone
 MAP
 xxx@xxx@xxx@xxx
 x.............x
@@ -1560,7 +1542,7 @@ SUBST:  0 = 0 .
 SUBST:  ' = w'
 NSUBST: . = 1:d / *:.
 NSUBST: " = 1:@ / *:.
-ITEM:   stone / dart
+ITEM:   stone
 MAP
 ".0.0....0."
 xxwwwwwwwxxx
@@ -1582,7 +1564,7 @@ SUBST:   {=., [=.
 SUBST:   Z=x, Y=x, W=@, C=+x
 SUBST:   z=@, y=+, w=x
 NSUBST:  . = 1:d / *:.
-ITEM:    stone / dart
+ITEM:    stone
 ORIENT:  float
 MAP
   xZxxx
@@ -1606,7 +1588,7 @@ ENDMAP
 NAME:    dpeg_arrival_sounds_slurp
 TAGS:    arrival no_monster_gen
 MONS:    generate_awake jelly / kobold
-ITEM:    dart
+ITEM:    club
 ORIENT:  float
 KPROP:   1d> = no_rtele_into
 SHUFFLE: {[(
@@ -1696,7 +1678,7 @@ ORIENT:  float
 SUBST:   ' : . x ':40, '=.x
 NSUBST:  . = 1:d / *:.
 NSUBST:  { = 1:{ / *:.
-ITEM:    stone / dart
+ITEM:    stone
 MAP
     xxxxxxxxxxxxxxxxx
    xx''xx''''''xx''xx
@@ -1998,7 +1980,7 @@ SHUFFLE: DX'/CY"
 SUBST:   D = c, XC" = x, 'Y = .
 SHUFFLE: cvb
 NSUBST:  . = 1:d / *:.
-ITEM:    stone / dart
+ITEM:    stone
 MAP
           xxxxxxxxxxx
      xxxxxx...xxxx..xx
diff --git a/crawl-ref/source/dat/des/arrival/twisted.des b/crawl-ref/source/dat/des/arrival/twisted.des
index b1681dfe72..f35a871c78 100644
--- a/crawl-ref/source/dat/des/arrival/twisted.des
+++ b/crawl-ref/source/dat/des/arrival/twisted.des
@@ -297,7 +297,7 @@ SUBST:   C=., !=@
 SHUFFLE: B(' / zzz, V[" / yyy
 SUBST:   z=x, y=x, B=., '=+, V=., "=+
 NSUBST:  . = 1:d / *:.
-ITEM:    stone / dart
+ITEM:    stone
 MAP
 xxxxxxxxxxxxxxxxxxx....@
 xxxxxxxCCCCCCCxxxxx.....
diff --git a/crawl-ref/source/dat/des/branches/abyss.des b/crawl-ref/source/dat/des/branches/abyss.des
index f861309b1c..1ddb927001 100644
--- a/crawl-ref/source/dat/des/branches/abyss.des
+++ b/crawl-ref/source/dat/des/branches/abyss.des
@@ -72,7 +72,7 @@ ENDMAP
 NAME:  marbit_kobold_abyss_entry
 TAGS:  no_monster_gen nolayout_encompass
 WEIGHT: 5
-MONS:  big kobold ; dart ego:dispersal, kobold demonologist
+MONS:  big kobold ; tomahawk ego:dispersal, kobold demonologist
 : abyss_entry(_G, '_')
 MAP
 xxxxxxxxxxxxxxx
@@ -904,7 +904,7 @@ MONS:    bone dragon / tentacled starspawn / starcursed mass / \
          apocalypse crab / dancing weapon / tentacled monstrosity / \
          glowing shapeshifter
 ITEM:    superb_item, royal jelly q:2
-ITEM:    dart good_item q:100, any magical staff
+ITEM:    bolt good_item q:40 / arrow good_item q:40, any magical staff
 ITEM:    scroll of magic mapping q:4 / scroll of random uselessness q:4
 ITEM:    ring mail randart / scale mail randart / chain mail randart w:20
 ITEM:    demon blade ego:chaos good_item ident:type / \
@@ -1370,10 +1370,9 @@ KMONS:   34 = guardian serpent perm_ench:shapeshifter
 KMONS:   e = crystal guardian
 # Note: if anything in these two item sets becomes useful for more then a tiny
 # fraction of characters finding the abyssal rune, remove or replace them.
-KITEM:   24d = scroll of random uselessness w:15 q:1 / mundane robe w:5 / \
-         club w:5 / hammer w:5 / stone q:1 / mundane dart q:1 / \
-         needle q:1 ego:confusion / mundane animal skin / \
-         mundane ring mail / gold q:1
+KITEM:   24d = scroll of random uselessness w:15 q:1 / fruit q:1 w:5 / \
+         club w:5 / hammer w:5 / stone q:1 / needle q:1 ego:confusion / \
+         mundane animal skin / mundane ring mail / gold q:1
 KITEM:   13e = wand of slowing / wand of confusion / wand of magic darts / \
          wand of flame w:5 / wand of frost w:5 / plain deck w:5 / \
          whip not_cursed w:2 / hat not_cursed mundane w:5
diff --git a/crawl-ref/source/dat/des/builder/shops.des b/crawl-ref/source/dat/des/builder/shops.des
index 18d92534e7..1e593749da 100644
--- a/crawl-ref/source/dat/des/builder/shops.des
+++ b/crawl-ref/source/dat/des/builder/shops.des
@@ -285,7 +285,7 @@ MONS:    ball python w:5 / adder / water moccasin, place:Snake:1
 KFEAT:   v = general shop type:Serpentskin suffix:Sales count:7 ; \
          w:25 potion of poison | w:5 potion of strong poison | \
          w:8 blowgun | w:8 needle ego:poisoned | w:4 needle ego:curare | \
-         w:14 arrow ego:poisoned | w:14 dart ego:poisoned | \
+         w:14 arrow ego:poisoned | w:14 tomahawk ego:poisoned | \
          w:3 ring of poison resistance | w:6 randbook disc:poison | \
          w:2 staff of poison | w:4 any weapon ego:venom | \
          w:4 any armour ego:poison_resistance | w:1 swamp dragon hide
@@ -412,7 +412,7 @@ TAGS: no_monster_gen no_trap_gen
 SHUFFLE: _s
 KFEAT: s = general shop type:Hallowed suffix:Reliquary ; \
    potion of heal wounds | potion of curing | potion of restore abilities | \
-   wand of heal wounds | dart ego:silver w:2 | javelin ego:silver w:2 | \
+   wand of heal wounds | tomahawk ego:silver w:2 | javelin ego:silver w:2 | \
    bolt ego:silver w:2 | any weapon ego:holy_wrath | scroll of holy word | \
    sling bullet ego:silver w:2 | amulet of faith w:2 | potion of cure mutation | \
    ring of positive energy w:5 | any armour ego:positive_energy w:5
@@ -466,7 +466,7 @@ KFEAT: s = general shop type:Demolitions suffix:Depot ; \
    wand of fire | wand of fireball | wand of flame | wand of disintegration | \
    wand of frost | wand of cold | wand of lightning | wand of magic darts | \
    staff of conjuration | lightning rod | rod of inaccuracy | \
-   rod of destruction | rod of striking | dart ego:exploding | \
+   rod of destruction | rod of striking | large rock ego:exploding | \
    arrow ego:exploding | bolt ego:exploding | tome of destruction | \
    sling bullet ego:exploding | scroll of immolation | book of flames | \
    book of fire | book of air | manual of conjurations
diff --git a/crawl-ref/source/dat/des/portals/lab.des b/crawl-ref/source/dat/des/portals/lab.des
index b8560052c7..31035f9cf2 100644
--- a/crawl-ref/source/dat/des/portals/lab.des
+++ b/crawl-ref/source/dat/des/portals/lab.des
@@ -277,7 +277,7 @@ dgn.delayed_decay_extra(_G, 'K', 'dwarf skeleton', 'plate armour, '
    .. 'ring of wizardry / any jewellery / nothing w:20' )
 
  -- Halfling warper. 4-5 items.
-dgn.delayed_decay_extra(_G, 'L', 'halfling skeleton', 'dart ego:dispersal / dart, '
+dgn.delayed_decay_extra(_G, 'L', 'halfling skeleton', 'tomahawk ego:dispersal / sling bullet, '
    .. 'randbook disc:translocation / any book, scroll of blinking / '
    .. 'scroll of teleportation / ring of teleportation / '
    .. 'ring of teleport control w:5 / nothing w:30, robe / leather armour, '
diff --git a/crawl-ref/source/dat/des/portals/trove.des b/crawl-ref/source/dat/des/portals/trove.des
index ee5e143b11..12993b9793 100644
--- a/crawl-ref/source/dat/des/portals/trove.des
+++ b/crawl-ref/source/dat/des/portals/trove.des
@@ -759,8 +759,8 @@ MONS:    golden dragon zombie
 MONS:    fire dragon skeleton
 ITEM:    animal skin good_item / any armour good_item
 ITEM:    gold dragon hide / storm dragon hide / fire dragon hide / troll hide / any useful armour good_item
-ITEM:    arrow good_item / dart good_item / bolt good_item / any missile good_item
-ITEM:    shortbow good_item / crossbow good_item / any useful weapon good_item
+ITEM:    arrow good_item / bolt good_item
+ITEM:    longbow good_item / crossbow good_item / any useful weapon good_item
 SHUFFLE: 123
 SHUFFLE: defg
 : trove.setup_features(_G)
diff --git a/crawl-ref/source/dat/des/portals/wizlab.des b/crawl-ref/source/dat/des/portals/wizlab.des
index f4a266a299..6a0edadb8e 100644
--- a/crawl-ref/source/dat/des/portals/wizlab.des
+++ b/crawl-ref/source/dat/des/portals/wizlab.des
@@ -1579,19 +1579,19 @@ NAME:    wizlab_golubria
 TAGS:    no_pool_fixup
 LFLAGS:  no_tele_control
 KMONS:   1 = spatial vortex w:7 / blink frog / insubstantial wisp w:3 / nothing w:5
-KMONS:   2 = deep elf summoner w:5 ; dart ego:dispersal w:20 | dart w:5 | nothing . robe / \
-             rakshasa w:5 ; dart ego:dispersal w:20 | dart w:5 | nothing / \
-             boggart ; dart ego:dispersal w:20 | dart w:5 | nothing /  \
-             wizard ; dart ego:dispersal w:20 | dart w:5 | nothing . robe
+KMONS:   2 = deep elf summoner w:5 ; tomahawk ego:dispersal w:20 | tomahawk w:5 | nothing / \
+             rakshasa w:5 ; tomahawk ego:dispersal w:20 | tomahawk w:5 | nothing / \
+             boggart ; tomahawk ego:dispersal w:20 | tomahawk w:5 | nothing /  \
+             wizard ; tomahawk ego:dispersal w:20 | tomahawk w:5 | nothing
 KMONS:   3 = rakshasa w:5 ; whip ego:distortion | whip ego:vorpal w:6 | dagger \
              ego:distortion | dagger ego:vorpal w:6 | spear ego:distortion | \
-             spear ego:vorpal w:6 . dart ego:dispersal / \
+             spear ego:vorpal w:6 . tomahawk ego:dispersal / \
              boggart w:5 ; whip ego:distortion | whip ego:vorpal w:6 | dagger \
              ego:distortion | dagger ego:vorpal w:6 | spear ego:distortion | \
-             spear ego:vorpal w:6 . dart ego:dispersal / \
+             spear ego:vorpal w:6 . tomahawk ego:dispersal / \
              wizard ; whip ego:distortion | whip ego:vorpal w:6 | dagger \
              ego:distortion | dagger ego:vorpal w:6 | spear ego:distortion | \
-             spear ego:vorpal w:6 . dart ego:dispersal . robe
+             spear ego:vorpal w:6 . tomahawk ego:dispersal . robe
 KMONS:   04 = large abomination w:15 / small abomination w:15 / unseen horror w:5 / \
               thrashing horror w:30 / skeleton w:30 / freezing wraith w:5 /  \
               hellwing / chaos spawn w:5 / orange demon / blue devil /  \
diff --git a/crawl-ref/source/dat/des/serial/gnoll_camp.des b/crawl-ref/source/dat/des/serial/gnoll_camp.des
index da17b8c37f..7265deb587 100644
--- a/crawl-ref/source/dat/des/serial/gnoll_camp.des
+++ b/crawl-ref/source/dat/des/serial/gnoll_camp.des
@@ -29,7 +29,7 @@ TAGS:   serial_gnoll_camp patrolling no_pool_fixup
 WEIGHT: 8
 KMASK:  w = no_monster_gen
 MONS:   gnoll
-MONS:   gnoll ; stone q:10 | dart q:10 | spear q:3 | throwing net q:3 / nothing
+MONS:   gnoll ; stone q:10 | spear q:3 | throwing net q:3 / nothing
 MONS:   gnoll shaman
 MONS:   gnoll sergeant
 MONS:   jackal / hound / wolf w:1
@@ -56,7 +56,7 @@ NAME:   gnoll_camp_medium_02
 TAGS:   serial_gnoll_camp patrolling
 WEIGHT: 8
 MONS:   gnoll
-MONS:   gnoll ; stone q:10 | dart q:10 | spear q:3 | throwing net q:3
+MONS:   gnoll ; stone q:10 | spear q:3 | throwing net q:3
 MONS:   gnoll shaman
 MONS:   gnoll sergeant
 MONS:   jackal w:20 / hound / wolf w:1 / nothing w:5
@@ -141,7 +141,7 @@ MONS:   gnoll
 MONS:   gnoll shaman
 MONS:   gnoll sergeant
 MONS:   jackal / hound / wolf w:1
-MONS:   gnoll ; stone q:10 | dart q:10 | spear q:3 | throwing net q:3
+MONS:   gnoll ; stone q:10 | spear q:3 | throwing net q:3
 MAP
     .......
     .41.14.
diff --git a/crawl-ref/source/dat/des/tutorial/lesson2.des b/crawl-ref/source/dat/des/tutorial/lesson2.des
index b7cac91717..febabfaab5 100644
--- a/crawl-ref/source/dat/des/tutorial/lesson2.des
+++ b/crawl-ref/source/dat/des/tutorial/lesson2.des
@@ -100,10 +100,10 @@ FTILE:   deABCDEF = tutorial_pad
 MONS:    training dummy hp:2 ; stone q:10
 MONS:    rat always_corpse
 MONS:    worm
-ITEM:    dart mundane q:30
+ITEM:    tomahawk mundane q:10
 ITEM:    shortbow mundane not_cursed
 ITEM:    arrow mundane q:30
-MARKER:  d = lua:tutorial2.msg("darts")
+MARKER:  d = lua:tutorial2.msg("tomahawks")
 MARKER:  A = lua:tutorial2.msg("throwing")
 MARKER:  B = lua:tutorial2.msg("resting_reminder")
 MARKER:  e = lua:tutorial2.msg("wield_bow")
diff --git a/crawl-ref/source/dat/des/variable/large_themed.des b/crawl-ref/source/dat/des/variable/large_themed.des
index f288b2a236..4ac7420aa5 100644
--- a/crawl-ref/source/dat/des/variable/large_themed.des
+++ b/crawl-ref/source/dat/des/variable/large_themed.des
@@ -20,7 +20,7 @@ ORIENT:  north
 DEPTH:   D:3-6
 MONS:    goblin; sling . stone / hobgoblin w:2; sling . sling bullet / nothing
 MONS:    goblin; club / hobgoblin; club / gnoll w:3; club | spear / nothing
-MONS:    kobold; dart / nothing
+MONS:    kobold; stone / nothing
 MONS:    kobold; club / big kobold w:1; club | short sword w:2 / nothing
 SUBST:   y : y:48 w:1 W:1, Y : Y:48 W:1 .:1, y = wWW, Y = WW.
 SUBST:   5 = 2 1:2 .:24
diff --git a/crawl-ref/source/dat/des/variable/mini_monsters.des b/crawl-ref/source/dat/des/variable/mini_monsters.des
index 4713fa67fa..7951cfdedb 100644
--- a/crawl-ref/source/dat/des/variable/mini_monsters.des
+++ b/crawl-ref/source/dat/des/variable/mini_monsters.des
@@ -894,7 +894,7 @@ ITEM:   Young Poisoner's Handbook / book of Changes / \
         randbook numspells:5 title:Nature \
         spells:beastly_appendage|sting|sticks_to_snakes|cure_poison|spider_form w:245
 : if crawl.coinflip() then
-KITEM:  f = arrow ego:poisoned / javelin ego:poisoned q:4-6 / dart ego:poisoned
+ITEM:   f = arrow ego:poisoned / javelin ego:poisoned q:4-6 / tomahawk ego:poisoned
 : else
 KITEM:  f = blowgun / w:5 nothing, needle ego:poisoned / needle ego:curare / needle ego:paralysis
 : end
@@ -950,7 +950,7 @@ ITEM:   Young Poisoner's Handbook / book of Changes / \
         randbook numspells:5 title:Nature \
         spells:beastly_appendage|sting|sticks_to_snakes|cure_poison|spider_form w:245
 : if crawl.coinflip() then
-KITEM:  f = arrow ego:poisoned / javelin ego:poisoned q:4-6 / dart ego:poisoned
+ITEM:   arrow ego:poisoned / javelin ego:poisoned q:4-6 / tomahawk ego:poisoned
 : else
 KITEM:  f = blowgun / w:5 nothing, needle ego:poisoned / needle ego:curare / needle ego:paralysis
 : end
@@ -1234,8 +1234,8 @@ ENDMAP
 # Very unpleasant kobold minivaults
 NAME:   minmay_unpleasant_kobolds
 DEPTH:  D:6-
-MONS:   kobold ; dart ego:dispersal q:2 / w:3 big kobold ; dart ego:dispersal q:4
-MONS:   kobold ; dart ego:exploding q:2 / w:3 big kobold ; dart ego:exploding q:4
+MONS:   kobold ; tomahawk ego:dispersal q:2 / w:3 big kobold ; tomahawk ego:dispersal q:4
+MONS:   kobold ; tomahawk ego:exploding q:2 / w:3 big kobold ; tomahawk ego:exploding q:4
 MONS:   kobold ; blowgun . needle ego:curare q:1 / \
         w:3 big kobold ; blowgun . needle ego:curare q:2
 : if you.absdepth() > 13 then
@@ -1320,7 +1320,7 @@ TAGS:    no_monster_gen
 KPROP:   56' = no_rtele_into
 MONS:    kobold, plant, bush
 : if you.absdepth() < 4 then
-MONS:    kobold ; dagger . dart
+MONS:    kobold ; dagger . stone
 : else
 MONS:    big kobold ; dagger . throwing net q:2
 : end