From 5905735af39d2205847ecf14d5416bbdfecbe7d4 Mon Sep 17 00:00:00 2001
From: Chris Oelmueller <chris.oelmueller@gmail.com>
Date: Sun, 13 Apr 2014 03:25:21 +0200
Subject: [PATCH] Rename "bow" to "shortbow"

For a clear distinction of "bows" the skill, and from "longbow" the weapon.
---
 crawl-ref/source/art-data.txt                          |   2 +-
 crawl-ref/source/dat/des/branches/abyss.des            |   2 +-
 crawl-ref/source/dat/des/branches/crypt.des            |   2 +-
 crawl-ref/source/dat/des/branches/depths_encompass.des |   2 +-
 crawl-ref/source/dat/des/branches/elf.des              |   4 ++--
 crawl-ref/source/dat/des/branches/orc.des              |   2 +-
 crawl-ref/source/dat/des/branches/zot.des              |   4 ++--
 crawl-ref/source/dat/des/portals/lab.des               |   2 +-
 crawl-ref/source/dat/des/portals/trove.des             |   2 +-
 crawl-ref/source/dat/des/portals/volcano.des           |   4 ++--
 crawl-ref/source/dat/des/sprint/fedhas.des             |   2 +-
 crawl-ref/source/dat/des/sprint/zigsprint.des          |   4 ++--
 crawl-ref/source/dat/des/tutorial/lesson2.des          |   2 +-
 crawl-ref/source/dat/des/variable/arcadia.des          |   2 +-
 crawl-ref/source/dat/descript/items.txt                |  12 ++++++------
 crawl-ref/source/dat/descript/quotes.txt               |  10 +++++-----
 crawl-ref/source/dat/descript/tutorial.txt             |   4 ++--
 crawl-ref/source/dat/descript/unrand.txt               |   6 +++---
 crawl-ref/source/hints.cc                              |  17 +++++++++--------
 crawl-ref/source/initfile.cc                           |   8 ++++----
 crawl-ref/source/itemprop-enum.h                       |   2 +-
 crawl-ref/source/itemprop.cc                           |   4 ++--
 crawl-ref/source/makeitem.cc                           |   2 +-
 crawl-ref/source/mon-gear.cc                           |  12 ++++++------
 crawl-ref/source/newgame.cc                            |   2 +-
 crawl-ref/source/ng-restr.cc                           |   2 +-
 crawl-ref/source/ng-setup.cc                           |   4 ++--
 crawl-ref/source/ng-wanderer.cc                        |   4 ++--
 crawl-ref/source/quiver.cc                             |   2 +-
 crawl-ref/source/rltiles/dc-item.txt                   |   6 +++---
 crawl-ref/source/rltiles/dc-player.txt                 |   8 ++++----
 crawl-ref/source/rltiles/item/weapon/ranged/bow1.png   | Bin 750 -> 0 bytes
 crawl-ref/source/rltiles/item/weapon/ranged/bow2.png   | Bin 871 -> 0 bytes
 crawl-ref/source/rltiles/item/weapon/ranged/bow3.png   | Bin 832 -> 0 bytes
 .../source/rltiles/item/weapon/ranged/shortbow1.png    | Bin 0 -> 750 bytes
 .../source/rltiles/item/weapon/ranged/shortbow2.png    | Bin 0 -> 871 bytes
 .../source/rltiles/item/weapon/ranged/shortbow3.png    | Bin 0 -> 832 bytes
 crawl-ref/source/rltiles/player/hand1/bow.png          | Bin 172 -> 0 bytes
 crawl-ref/source/rltiles/player/hand1/bow_blue.png     | Bin 185 -> 0 bytes
 crawl-ref/source/rltiles/player/hand1/bow_three.png    | Bin 162 -> 0 bytes
 crawl-ref/source/rltiles/player/hand1/bow_two.png      | Bin 143 -> 0 bytes
 crawl-ref/source/rltiles/player/hand1/shortbow.png     | Bin 0 -> 172 bytes
 .../source/rltiles/player/hand1/shortbow_three.png     | Bin 0 -> 162 bytes
 crawl-ref/source/rltiles/player/hand1/shortbow_two.png | Bin 0 -> 143 bytes
 crawl-ref/source/rltiles/player/hand1/storm_bow.png    | Bin 0 -> 185 bytes
 crawl-ref/source/shopping.cc                           |   2 +-
 crawl-ref/source/throw.cc                              |   4 ++--
 crawl-ref/source/tilepick-p.cc                         |   2 +-
 crawl-ref/source/tilepick.cc                           |   4 ++--
 crawl-ref/source/xom.cc                                |   2 +-
 50 files changed, 78 insertions(+), 77 deletions(-)
 delete mode 100644 crawl-ref/source/rltiles/item/weapon/ranged/bow1.png
 delete mode 100644 crawl-ref/source/rltiles/item/weapon/ranged/bow2.png
 delete mode 100644 crawl-ref/source/rltiles/item/weapon/ranged/bow3.png
 create mode 100644 crawl-ref/source/rltiles/item/weapon/ranged/shortbow1.png
 create mode 100644 crawl-ref/source/rltiles/item/weapon/ranged/shortbow2.png
 create mode 100644 crawl-ref/source/rltiles/item/weapon/ranged/shortbow3.png
 delete mode 100644 crawl-ref/source/rltiles/player/hand1/bow.png
 delete mode 100644 crawl-ref/source/rltiles/player/hand1/bow_blue.png
 delete mode 100644 crawl-ref/source/rltiles/player/hand1/bow_three.png
 delete mode 100644 crawl-ref/source/rltiles/player/hand1/bow_two.png
 create mode 100644 crawl-ref/source/rltiles/player/hand1/shortbow.png
 create mode 100644 crawl-ref/source/rltiles/player/hand1/shortbow_three.png
 create mode 100644 crawl-ref/source/rltiles/player/hand1/shortbow_two.png
 create mode 100644 crawl-ref/source/rltiles/player/hand1/storm_bow.png

diff --git a/crawl-ref/source/art-data.txt b/crawl-ref/source/art-data.txt
index 86b2a67..0f247cd 100644
--- a/crawl-ref/source/art-data.txt
+++ b/crawl-ref/source/art-data.txt
@@ -640,7 +640,7 @@ OBJ:      OBJ_WEAPONS/WPN_LONGBOW
 PLUS:     +8/+8
 COLOUR:   BLUE
 TILE:     urand_storm_bow
-TILE_EQ:  bow_blue
+TILE_EQ:  storm_bow
 BRAND:    SPWPN_ELECTROCUTION
 
 NAME:    large shield of Ignorance
diff --git a/crawl-ref/source/dat/des/branches/abyss.des b/crawl-ref/source/dat/des/branches/abyss.des
index 590ea93..933f84f 100644
--- a/crawl-ref/source/dat/des/branches/abyss.des
+++ b/crawl-ref/source/dat/des/branches/abyss.des
@@ -1994,7 +1994,7 @@ ENDMAP
 NAME:  evilmike_abyss_exit_disperse
 TAGS:  abyss_exit
 SUBST: . = .:100 2
-MONS:  centaur; bow . arrow ego:dispersal, plant
+MONS:  centaur; shortbow . arrow ego:dispersal, plant
 : init_abyss_exit(_G, "O")
 MAP
      xxx xxx xxx
diff --git a/crawl-ref/source/dat/des/branches/crypt.des b/crawl-ref/source/dat/des/branches/crypt.des
index 937c76f..2b7e5c7 100644
--- a/crawl-ref/source/dat/des/branches/crypt.des
+++ b/crawl-ref/source/dat/des/branches/crypt.des
@@ -719,7 +719,7 @@ DEPTH: Crypt, Tar
 KMONS: 1 = skeletal warrior name:skeletal_archer n_rpl n_des n_spe col:magenta \
            spells:. ; longbow . arrow q:30
 KMONS: 2 = skeletal warrior name:skeletal_archer n_rpl n_des n_spe col:magenta \
-           spells:. ; bow . arrow q:30
+           spells:. ; shortbow . arrow q:30
 KITEM: 2 = |
 MAP
 xxxxxxxxxxxxxxx
diff --git a/crawl-ref/source/dat/des/branches/depths_encompass.des b/crawl-ref/source/dat/des/branches/depths_encompass.des
index 55d4f99..f264c4d 100644
--- a/crawl-ref/source/dat/des/branches/depths_encompass.des
+++ b/crawl-ref/source/dat/des/branches/depths_encompass.des
@@ -960,7 +960,7 @@ NAME:    hangedman_crystal_crosses_colossus
 TAGS:    no_monster_gen no_item_gen no_pool_fixup uniq_d_encompass
 ORIENT:  encompass
 MONS:    deep elf conjurer / deep elf knight w:7 / wizard / ogre mage / \
-         centaur warrior w:8 ; bow ego:flame | bow ego:frost . arrow / \
+         centaur warrior w:8 ; shortbow ego:flame | shortbow ego:frost . arrow / \
          two-headed ogre w:5 ; great mace ego:freezing ident:type . \
          great mace ego:flaming ident:type / efreet w:5 / \
          rakshasa w:5 ; wand of flame | wand of frost . whip . robe
diff --git a/crawl-ref/source/dat/des/branches/elf.des b/crawl-ref/source/dat/des/branches/elf.des
index 72b0c3c..7c4cc2e 100644
--- a/crawl-ref/source/dat/des/branches/elf.des
+++ b/crawl-ref/source/dat/des/branches/elf.des
@@ -569,7 +569,7 @@ ENDMAP
 NAME:   minmay_elf_archery
 DEPTH:  Elf:2-
 ORIENT: float
-MONS:   deep elf fighter; bow | longbow . arrow / nothing w:15
+MONS:   deep elf fighter; shortbow | longbow . arrow / nothing w:15
 MONS:   deep elf master archer
 MONS:   training dummy tile:mons_training_dummy
 MAP
@@ -765,7 +765,7 @@ MONS:  deep elf conjurer / deep elf mage / deep elf summoner
 MONS:  deep elf annihilator / deep elf death mage / deep elf demonologist
 KFEAT: v = general shop type:Elven suffix:Fire count:7 ; \
        w:10 ring of fire | w:5 scroll of immolation | w:10 ring of protection from fire | \
-       w:4 any weapon ego:flaming | w:4 bow ego:flame | w:12 arrow ego:flame | \
+       w:4 any weapon ego:flaming | w:4 shortbow ego:flame | w:12 arrow ego:flame | \
        w:7 wand of flame | w:5 wand of fire | w:3 wand of fireball | \
        w:4 staff of fire | w:17 randbook disc:fire | w:6 robe ego:fire_resistance | \
        w:9 any armour ego:fire_resistance
diff --git a/crawl-ref/source/dat/des/branches/orc.des b/crawl-ref/source/dat/des/branches/orc.des
index 65f3dbf..861d9d6 100644
--- a/crawl-ref/source/dat/des/branches/orc.des
+++ b/crawl-ref/source/dat/des/branches/orc.des
@@ -886,7 +886,7 @@ NAME:   mines_bat_river
 TAGS:   no_item_gen no_monster_gen no_pool_fixup
 DEPTH:  Orc
 MONS:   bat
-MONS:   generate_awake orc ; bow ego:flame | bow ego:frost | bow ego:vorpal . arrow q:10
+MONS:   generate_awake orc ; shortbow ego:flame | shortbow ego:frost | shortbow ego:vorpal . arrow q:10
 NSUBST: . = 2:2 / 2:c
 NSUBST: c = *: 2 .
 KITEM:  d = arrow q:1
diff --git a/crawl-ref/source/dat/des/branches/zot.des b/crawl-ref/source/dat/des/branches/zot.des
index 6b63b16..2eecfa8 100644
--- a/crawl-ref/source/dat/des/branches/zot.des
+++ b/crawl-ref/source/dat/des/branches/zot.des
@@ -1082,8 +1082,8 @@ KMONS:   1357 = guardian mummy ; randart dire flail ego:chaos | \
         scythe ego:chaos w:5 | any weapon ego:chaos w:2 | dire flail w:30 | \
         great mace w:30 | battleaxe w:30 | great sword w:30 | \
         scythe w:30 | glaive w:30 | any weapon w:12 . \
-        randart sling ego:chaos | randart bow ego:chaos | \
-        randart crossbow ego:chaos | sling | bow | crossbow | \
+        randart sling ego:chaos | randart shortbow ego:chaos | \
+        randart crossbow ego:chaos | sling | shortbow | crossbow | \
         nothing w:15 . sling bullet | arrow | bolt . \
         lightning rod w:6 | rod of shadows w:4 | rod of the swarm w:4 | \
         rod of destruction w:2 | rod of striking w:6 | wand of hasting w:16 | \
diff --git a/crawl-ref/source/dat/des/portals/lab.des b/crawl-ref/source/dat/des/portals/lab.des
index c3247e6..4bccc10 100644
--- a/crawl-ref/source/dat/des/portals/lab.des
+++ b/crawl-ref/source/dat/des/portals/lab.des
@@ -250,7 +250,7 @@ dgn.delayed_decay_extra(_G, 'C', 'spriggan skeleton', 'dagger good_item / '
    .. 'quick blade w:1, bread ration, cloak, randbook disc:hexes / any book' )
 
  -- Centaur hunter of Fedhas. 3-4 (stacks of) items.
-dgn.delayed_decay_extra(_G, 'D', 'centaur skeleton', 'bow good_item / longbow w:2, '
+dgn.delayed_decay_extra(_G, 'D', 'centaur skeleton', 'shortbow good_item / longbow w:2, '
    .. 'arrow good_item, apple / orange / pear / apricot / lemon / nothing, '
    .. 'helmet / centaur barding / pair of gloves' )
 
diff --git a/crawl-ref/source/dat/des/portals/trove.des b/crawl-ref/source/dat/des/portals/trove.des
index 32a2644..c6c34f1 100644
--- a/crawl-ref/source/dat/des/portals/trove.des
+++ b/crawl-ref/source/dat/des/portals/trove.des
@@ -761,7 +761,7 @@ 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:    bow good_item / crossbow good_item / any useful weapon good_item
+ITEM:    shortbow 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/volcano.des b/crawl-ref/source/dat/des/portals/volcano.des
index 17ce7d2..fbcb30b 100644
--- a/crawl-ref/source/dat/des/portals/volcano.des
+++ b/crawl-ref/source/dat/des/portals/volcano.des
@@ -248,9 +248,9 @@ function fiery_guardians (e, intelligent, village)
                           .. " | whip " .. flame
                           .. " . robe " .. res
         local ogrestuff = "great mace " .. flame .. " | giant club " .. flame
-        local centaur = "centaur ; bow ego:none . arrow ego:flame"
+        local centaur = "centaur ; shortbow ego:none . arrow ego:flame"
         local centaurstuff = "robe " .. res
-                             .. " . bow ego:flame ident:type . arrow"
+                             .. " . shortbow ego:flame ident:type . arrow"
         local elfstuff = "long sword " .. flame
                          .. " | short sword " .. flame
                          .. " . leather armour " .. res
diff --git a/crawl-ref/source/dat/des/sprint/fedhas.des b/crawl-ref/source/dat/des/sprint/fedhas.des
index cb68e21..f0cdcb6 100644
--- a/crawl-ref/source/dat/des/sprint/fedhas.des
+++ b/crawl-ref/source/dat/des/sprint/fedhas.des
@@ -25,7 +25,7 @@ KMONS:  T = spriggan
 KMONS:  U = spriggan berserker
 KMONS:  V = Agnes
 KMONS:  W = spriggan defender
-KMONS:  X = spriggan rider ; bow unrand:storm_bow . arrow
+KMONS:  X = spriggan rider ; longbow unrand:storm_bow . arrow
 KMONS:  Y = bush
 KMONS:  a = yellow wasp
 KMONS:  b = ghost moth
diff --git a/crawl-ref/source/dat/des/sprint/zigsprint.des b/crawl-ref/source/dat/des/sprint/zigsprint.des
index 8c7bd36..ba3fabe 100644
--- a/crawl-ref/source/dat/des/sprint/zigsprint.des
+++ b/crawl-ref/source/dat/des/sprint/zigsprint.des
@@ -739,8 +739,8 @@ KITEM:    H = demon blade mundane not_cursed ident:all plus:5 plus2:5, \
 KITEM:    I = lajatang mundane not_cursed ident:all plus:5 plus2:5
 KITEM:    J = crossbow mundane not_cursed ident:all plus:5 plus2:5, \
               bolt q:1000 mundane ident:all, \
-              bow mundane not_cursed ident:all plus:5 plus2:5, \
-          arrow q:1000 mundane ident:all, \
+              shortbow mundane not_cursed ident:all plus:5 plus2:5, \
+              arrow q:1000 mundane ident:all, \
               longbow mundane not_cursed ident:all plus:5 plus2:5, \
               sling mundane not_cursed ident:all plus:5 plus2:5, \
               sling bullet q:1000 mundane ident:all
diff --git a/crawl-ref/source/dat/des/tutorial/lesson2.des b/crawl-ref/source/dat/des/tutorial/lesson2.des
index e9d1cc1..b7cac91 100644
--- a/crawl-ref/source/dat/des/tutorial/lesson2.des
+++ b/crawl-ref/source/dat/des/tutorial/lesson2.des
@@ -101,7 +101,7 @@ MONS:    training dummy hp:2 ; stone q:10
 MONS:    rat always_corpse
 MONS:    worm
 ITEM:    dart mundane q:30
-ITEM:    bow mundane not_cursed
+ITEM:    shortbow mundane not_cursed
 ITEM:    arrow mundane q:30
 MARKER:  d = lua:tutorial2.msg("darts")
 MARKER:  A = lua:tutorial2.msg("throwing")
diff --git a/crawl-ref/source/dat/des/variable/arcadia.des b/crawl-ref/source/dat/des/variable/arcadia.des
index 758f5c9..5bf27f1 100644
--- a/crawl-ref/source/dat/des/variable/arcadia.des
+++ b/crawl-ref/source/dat/des/variable/arcadia.des
@@ -36,7 +36,7 @@ KMONS:   N = spriggan ; robe . quarterstaff
 KMONS:   O = dire elephant / death yak / emperor scorpion / anaconda w:5
 KMONS:   Q = bush
 KMONS:   R = plant
-ITEM:    dagger / short sword / cutlass / flail / whip / blowgun / bow
+ITEM:    dagger / short sword / cutlass / flail / whip / blowgun / shortbow
 ITEM:    robe / cloak / hat / buckler / steam dragon armour w:1
 ITEM:    bread ration q:2, cheese q:3
 KFEAT:   _ = altar_trog
diff --git a/crawl-ref/source/dat/descript/items.txt b/crawl-ref/source/dat/descript/items.txt
index f7c0b65..1aea4131 100644
--- a/crawl-ref/source/dat/descript/items.txt
+++ b/crawl-ref/source/dat/descript/items.txt
@@ -75,7 +75,7 @@ A succulent yellow-orange fruit, prunus armeniaca.
 %%%%
 arrow
 
-A long shafted projectile intended to be shot with a bow or longbow, fletched
+A long shafted projectile intended to be shot with a short- or longbow, fletched
 with feathers at one end and a point at the other.
 %%%%
 banana
@@ -375,11 +375,6 @@ spellcaster. Mages of a scholarly nature consider it a point of pride to have
 contributed in some way to this work, though more than a few of them have been
 slain by jealous rivals using their own spells against them.
 %%%%
-bow
-
-A curved piece of wood and string, for shooting arrows. It does good damage in
-combat, and a skilled user can use it to great effect.
-%%%%
 box of beasts
 
 A box filled with the bizarre leftovers of a depraved wizard's magical
@@ -1366,6 +1361,11 @@ A piece of wood and metal, to be strapped on one arm for defence. It is
 cumbersome to wear, and, without training, slows the rate at which a warrior
 attacks.
 %%%%
+shortbow
+
+A curved piece of wood and string, for shooting arrows. It does good damage in
+combat, and a skilled user can use it to great effect.
+%%%%
 short sword
 
 A small, double-edged blade with a short grip.
diff --git a/crawl-ref/source/dat/descript/quotes.txt b/crawl-ref/source/dat/descript/quotes.txt
index ffecb0d..451d1a0 100644
--- a/crawl-ref/source/dat/descript/quotes.txt
+++ b/crawl-ref/source/dat/descript/quotes.txt
@@ -872,11 +872,6 @@ book
  And lo! the Press was found at last!”
     -John Greenleaf Whittier, _The Library_, st. 4.
 %%%%
-bow
-
-“You are the bows from which your children as living arrows are sent forth.”
-    -Khalil Ghibran, _The Prophet_, “On Children”. 1923.
-%%%%
 bread ration
 
 “It is further reported that in the provinces [Caesar] gave banquets constantly
@@ -2544,6 +2539,11 @@ shield
 
 <buckler>
 %%%%
+shortbow
+
+“You are the bows from which your children as living arrows are sent forth.”
+    -Khalil Ghibran, _The Prophet_, “On Children”. 1923.
+%%%%
 short sword
 
 “Who was the first that forged the deadly blade?
diff --git a/crawl-ref/source/dat/descript/tutorial.txt b/crawl-ref/source/dat/descript/tutorial.txt
index 985df42..5312476 100644
--- a/crawl-ref/source/dat/descript/tutorial.txt
+++ b/crawl-ref/source/dat/descript/tutorial.txt
@@ -227,13 +227,13 @@ panel</localtiles>. To confirm the auto-targeted monster, press
 %%%%
 tutorial2 wield_bow
 
-Pick up this bow and wield it with <input>$cmd[CMD_WIELD_WEAPON]</input>
+Pick up this shortbow and wield it with <input>$cmd[CMD_WIELD_WEAPON]</input>
 <localtiles> or by <input>mouseclick</input></localtiles>.
 %%%%
 tutorial2 firing
 
 # FIXME: Lengthy because of the hint for choosing target.
-Firing arrows from your wielded bow works exactly the same as throwing darts:
+Firing arrows from your wielded shortbow works exactly the same as throwing darts:
 via <input>$cmd[CMD_FIRE]</input><localtiles> or <input>mouseclick</input>
 </localtiles>. You can change the targeted monster by pressing
 <input>$cmd[CMD_TARGET_CYCLE_FORWARD]</input> while in target mode. The worm is
diff --git a/crawl-ref/source/dat/descript/unrand.txt b/crawl-ref/source/dat/descript/unrand.txt
index b92db23..5e17d5e 100644
--- a/crawl-ref/source/dat/descript/unrand.txt
+++ b/crawl-ref/source/dat/descript/unrand.txt
@@ -130,8 +130,8 @@ A sling made of weird blue leather.
 %%%%
 bow of Krishna "Sharnga"
 
-A wonderful golden bow that once belonged to a foreign god. It works best with
-special arrows which are not generally available.
+A wonderful golden longbow that once belonged to a foreign god. It works best
+with special arrows which are not generally available.
 %%%%
 giant club "Skullcrusher"
 
@@ -248,7 +248,7 @@ have proof to the contrary in your very hands.
 %%%%
 storm bow
 
-This bow has the colour of dark rain clouds, and the smell of wet ozone.
+This longbow has the colour of dark rain clouds, and the smell of wet ozone.
 %%%%
 large shield of Ignorance
 
diff --git a/crawl-ref/source/hints.cc b/crawl-ref/source/hints.cc
index be5dc9d..c55496a 100644
--- a/crawl-ref/source/hints.cc
+++ b/crawl-ref/source/hints.cc
@@ -207,8 +207,9 @@ void pick_hints(newgame_def* choice)
             Hints.hints_type = keyn - 'a';
             choice->species  = _get_hints_species(Hints.hints_type);
             choice->job = _get_hints_job(Hints.hints_type);
-            choice->weapon = choice->job == JOB_HUNTER ? WPN_BOW
-                                                       : WPN_HAND_AXE; // easiest choice for fighters
+            // easiest choice for fighters
+            choice->weapon = choice->job == JOB_HUNTER ? WPN_SHORTBOW
+                                                       : WPN_HAND_AXE;
 
             return;
         }
@@ -948,23 +949,23 @@ void hints_monster_seen(const monster& mon)
     if (Hints.hints_type == HINT_RANGER_CHAR)
     {
         text =  "However, as a hunter you will want to deal with it using your "
-                "bow. If you have a look at your bow from your "
+                "bow. If you have a look at your shortbow from your "
                 "<w>i</w>nventory, you'll find an explanation of how to do "
                 "this. ";
 
         if (!you.weapon()
             || you.weapon()->base_type != OBJ_WEAPONS
-            || you.weapon()->sub_type != WPN_BOW)
+            || you.weapon()->sub_type != WPN_SHORTBOW)
         {
             text += "First <w>w</w>ield it, then follow the instructions."
                 "<tiles>\nAs a short-cut you can also <w>right-click</w> on your "
-                "bow to read its description, and <w>left-click</w> to wield "
+                "shortbow to read its description, and <w>left-click</w> to wield "
                 "it.</tiles>";
         }
         else
         {
-            text += "<tiles>Clicking with your <w>right mouse button</w> on your bow "
-                    "will also let you read its description.</tiles>";
+            text += "<tiles>Clicking with your <w>right mouse button</w> on your "
+                    "shortbow will also let you read its description.</tiles>";
         }
 
         mprf(MSGCH_TUTORIAL, "%s", untag_tiles_console(text).c_str());
@@ -2534,7 +2535,7 @@ void learned_something_new(hints_event_type seen_what, coord_def gc)
 
         if (Hints.hints_type == HINT_RANGER_CHAR && wpn != -1
             && you.inv[wpn].base_type == OBJ_WEAPONS
-            && you.inv[wpn].sub_type == WPN_BOW)
+            && you.inv[wpn].sub_type == WPN_SHORTBOW)
         {
             text << "You can easily switch between weapons in slots a and "
                     "b by pressing <w>%</w>.";
diff --git a/crawl-ref/source/initfile.cc b/crawl-ref/source/initfile.cc
index 5f566ce..e89c203 100644
--- a/crawl-ref/source/initfile.cc
+++ b/crawl-ref/source/initfile.cc
@@ -224,8 +224,8 @@ weapon_type str_to_weapon(const string &str)
         return WPN_UNARMED;
     else if (str == "sling")
         return WPN_SLING;
-    else if (str == "bow")
-        return WPN_BOW;
+    else if (str == "shortbow" || str == "short bow")
+        return WPN_SHORTBOW;
     else if (str == "crossbow")
         return WPN_CROSSBOW;
     else if (str == "thrown"
@@ -273,8 +273,8 @@ static string _weapon_to_str(int weapon)
         return "claws";
     case WPN_SLING:
         return "sling";
-    case WPN_BOW:
-        return "bow";
+    case WPN_SHORTBOW:
+        return "shortbow";
     case WPN_CROSSBOW:
         return "crossbow";
     case WPN_THROWN:
diff --git a/crawl-ref/source/itemprop-enum.h b/crawl-ref/source/itemprop-enum.h
index edc2d90..d3a716f 100644
--- a/crawl-ref/source/itemprop-enum.h
+++ b/crawl-ref/source/itemprop-enum.h
@@ -476,7 +476,7 @@ enum weapon_type
 
     WPN_BLOWGUN,
     WPN_CROSSBOW,
-    WPN_BOW,
+    WPN_SHORTBOW,
     WPN_LONGBOW,
 
     WPN_DEMON_WHIP,
diff --git a/crawl-ref/source/itemprop.cc b/crawl-ref/source/itemprop.cc
index 0863cbd..3bc568f 100644
--- a/crawl-ref/source/itemprop.cc
+++ b/crawl-ref/source/itemprop.cc
@@ -347,7 +347,7 @@ static const weapon_def Weapon_prop[NUM_WEAPONS] =
     { WPN_CROSSBOW,          "crossbow",            5,  4, 15, 150,  8,
         SK_CROSSBOWS,    HANDS_TWO,    SIZE_MEDIUM, MI_BOLT,
         DAMV_NON_MELEE, 10 },
-    { WPN_BOW,               "bow",                 3,  1, 11,  90,  2,
+    { WPN_SHORTBOW,          "shortbow",            3,  1, 11,  90,  2,
         SK_BOWS,         HANDS_TWO,    SIZE_MEDIUM, MI_ARROW,
         DAMV_NON_MELEE, 10 },
     { WPN_LONGBOW,           "longbow",             6,  0, 12, 120,  3,
@@ -1195,7 +1195,7 @@ int weapon_rarity(int w_type)
     case WPN_MACE:
         return 9;
 
-    case WPN_BOW:
+    case WPN_SHORTBOW:
     case WPN_FLAIL:
     case WPN_CUTLASS:
     case WPN_SHORT_SWORD:
diff --git a/crawl-ref/source/makeitem.cc b/crawl-ref/source/makeitem.cc
index 8e24d2d..402a934 100644
--- a/crawl-ref/source/makeitem.cc
+++ b/crawl-ref/source/makeitem.cc
@@ -1183,7 +1183,7 @@ static brand_type _determine_weapon_brand(const item_def& item, int item_level)
             if (coinflip())
                 break;
             // **** possible intentional fall through here ****
-        case WPN_BOW:
+        case WPN_SHORTBOW:
         case WPN_LONGBOW:
         case WPN_CROSSBOW:
         {
diff --git a/crawl-ref/source/mon-gear.cc b/crawl-ref/source/mon-gear.cc
index 9ddbe6b..d34db0b 100644
--- a/crawl-ref/source/mon-gear.cc
+++ b/crawl-ref/source/mon-gear.cc
@@ -514,7 +514,7 @@ static void _give_weapon(monster* mon, int level, bool melee_only = false,
         item.base_type = OBJ_WEAPONS;
         item.sub_type  = random_choose_weighted(
             22, WPN_LONG_SWORD, 22, WPN_SHORT_SWORD, 17, WPN_SCIMITAR,
-            17, WPN_BOW,        5,  WPN_LONGBOW,
+            17, WPN_SHORTBOW,   5,  WPN_LONGBOW,
             0);
         break;
 
@@ -582,7 +582,7 @@ static void _give_weapon(monster* mon, int level, bool melee_only = false,
             else
             {
                 item.sub_type = random_choose_weighted(3, WPN_CROSSBOW,
-                                                       2, WPN_BOW,
+                                                       2, WPN_SHORTBOW,
                                                        1, WPN_LONGBOW,
                                                        0);
             }
@@ -884,7 +884,7 @@ static void _give_weapon(monster* mon, int level, bool melee_only = false,
     case MONS_CENTAUR:
     case MONS_CENTAUR_WARRIOR:
         item.base_type = OBJ_WEAPONS;
-        item.sub_type  = WPN_BOW;
+        item.sub_type  = WPN_SHORTBOW;
         if (mon->type == MONS_CENTAUR_WARRIOR && one_chance_in(3))
             item.sub_type = WPN_LONGBOW;
         break;
@@ -951,7 +951,7 @@ static void _give_weapon(monster* mon, int level, bool melee_only = false,
         {
             item.base_type  = OBJ_WEAPONS;
             item.sub_type  = random_choose(WPN_SLING,
-                                           WPN_BOW,
+                                           WPN_SHORTBOW,
                                            WPN_LONGBOW,
                                            -1);
             break;
@@ -1257,7 +1257,7 @@ static void _give_weapon(monster* mon, int level, bool melee_only = false,
                                                 5, WPN_TRIDENT,
                                                 3, WPN_SPEAR,
                                                 2, WPN_GLAIVE,
-                                                5, WPN_BOW,
+                                                5, WPN_SHORTBOW,
                                                 0);
 
         if (is_range_weapon(item))
@@ -1456,7 +1456,7 @@ static void _give_weapon(monster* mon, int level, bool melee_only = false,
             item.sub_type = random2(NUM_WEAPONS);
         while ((melee_only && (item.sub_type == WPN_BLOWGUN
                                || item.sub_type == WPN_CROSSBOW
-                               || item.sub_type == WPN_BOW
+                               || item.sub_type == WPN_SHORTBOW
                                || item.sub_type == WPN_LONGBOW))
                || item.sub_type == WPN_STAFF
                || item.sub_type == WPN_ROD
diff --git a/crawl-ref/source/newgame.cc b/crawl-ref/source/newgame.cc
index ab3e0b2..88a80bb 100644
--- a/crawl-ref/source/newgame.cc
+++ b/crawl-ref/source/newgame.cc
@@ -1625,7 +1625,7 @@ static vector<weapon_choice> _get_weapons(const newgame_def* ng)
     vector<weapon_choice> weapons;
     if (ng->job == JOB_HUNTER || ng->job == JOB_ARCANE_MARKSMAN)
     {
-        weapon_type startwep[4] = { WPN_THROWN, WPN_SLING, WPN_BOW,
+        weapon_type startwep[4] = { WPN_THROWN, WPN_SLING, WPN_SHORTBOW,
                                     WPN_CROSSBOW };
 
         for (int i = 0; i < 4; i++)
diff --git a/crawl-ref/source/ng-restr.cc b/crawl-ref/source/ng-restr.cc
index b6e5c99..8ca61ea 100644
--- a/crawl-ref/source/ng-restr.cc
+++ b/crawl-ref/source/ng-restr.cc
@@ -1029,7 +1029,7 @@ char_choice_restriction weapon_restriction(weapon_type wpn,
             return CC_UNRESTRICTED;
         }
 
-    case WPN_BOW:
+    case WPN_SHORTBOW:
         switch (ng.species)
         {
         case SP_DEEP_DWARF:
diff --git a/crawl-ref/source/ng-setup.cc b/crawl-ref/source/ng-setup.cc
index e329523..1373c1e 100644
--- a/crawl-ref/source/ng-setup.cc
+++ b/crawl-ref/source/ng-setup.cc
@@ -488,8 +488,8 @@ static void _update_weapon(const newgame_def& ng)
             autopickup_starting_ammo(MI_THROWING_NET);
         }
         break;
-    case WPN_BOW:
-        newgame_make_item(1, EQ_NONE, OBJ_WEAPONS, WPN_BOW, -1, 1, plus, plus);
+    case WPN_SHORTBOW:
+        newgame_make_item(1, EQ_NONE, OBJ_WEAPONS, WPN_SHORTBOW, -1, 1, plus, plus);
         newgame_make_item(2, EQ_NONE, OBJ_MISSILES, MI_ARROW, -1, 20);
         autopickup_starting_ammo(MI_ARROW);
 
diff --git a/crawl-ref/source/ng-wanderer.cc b/crawl-ref/source/ng-wanderer.cc
index 3985a4a..88a0100 100644
--- a/crawl-ref/source/ng-wanderer.cc
+++ b/crawl-ref/source/ng-wanderer.cc
@@ -71,7 +71,7 @@ static bool _give_wanderer_weapon(int & slot, int wpn_skill, int plus)
         break;
 
     case SK_BOWS:
-        sub_type = WPN_BOW;
+        sub_type = WPN_SHORTBOW;
         break;
 
     case SK_CROSSBOWS:
@@ -790,7 +790,7 @@ static void _wanderer_cover_equip_holes(int & slot)
     for (int i = 0; i < slot; ++i)
     {
         if (you.inv[i].base_type == OBJ_WEAPONS
-            && you.inv[i].sub_type == WPN_BOW)
+            && you.inv[i].sub_type == WPN_SHORTBOW)
         {
             needs_arrows = true;
             break;
diff --git a/crawl-ref/source/quiver.cc b/crawl-ref/source/quiver.cc
index 1d5239f..c533a77 100644
--- a/crawl-ref/source/quiver.cc
+++ b/crawl-ref/source/quiver.cc
@@ -597,7 +597,7 @@ static ammo_t _get_weapon_ammo_type(const item_def* weapon)
             return AMMO_BLOWGUN;
         case WPN_SLING:
             return AMMO_SLING;
-        case WPN_BOW:
+        case WPN_SHORTBOW:
         case WPN_LONGBOW:
             return AMMO_BOW;
         case WPN_CROSSBOW:
diff --git a/crawl-ref/source/rltiles/dc-item.txt b/crawl-ref/source/rltiles/dc-item.txt
index a10b530..24607de 100644
--- a/crawl-ref/source/rltiles/dc-item.txt
+++ b/crawl-ref/source/rltiles/dc-item.txt
@@ -164,9 +164,9 @@ sling1 WPN_SLING
 sling2
 
 %rim 0
-bow1 WPN_BOW
-bow2
-bow3
+shortbow1 WPN_SHORTBOW
+shortbow2
+shortbow3
 crossbow1 WPN_CROSSBOW
 crossbow2
 crossbow3
diff --git a/crawl-ref/source/rltiles/dc-player.txt b/crawl-ref/source/rltiles/dc-player.txt
index 2ad1338..b431f01 100644
--- a/crawl-ref/source/rltiles/dc-player.txt
+++ b/crawl-ref/source/rltiles/dc-player.txt
@@ -716,11 +716,11 @@ axe_short AXE_SHORT
 
 ## launchers
 sling SLING
-bow BOW
-bow_two BOW2
-bow_three BOW3
+shortbow SHORTBOW
+shortbow_two SHORTBOW2
+shortbow_three SHORTBOW3
 great_bow GREAT_BOW
-bow_blue BOW_BLUE
+storm_bow STORM_BOW
 crossbow CROSSBOW
 crossbow_two CROSSBOW2
 crossbow_three CROSSBOW3
diff --git a/crawl-ref/source/rltiles/item/weapon/ranged/bow1.png b/crawl-ref/source/rltiles/item/weapon/ranged/bow1.png
deleted file mode 100644
index 9d5582af5481e7c5ddbea05d1268d2380649804d..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 750
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE3?yBabRA=0U^ETz32_B-t#rkJ<ZuN?Dj63i
zGWLctHpWS<&tY7g%*f2d(9n<&ZpyHyh;eE(qm4RKTNH<{1%HME<J<(s#!$|EC5)SM
z7@Na67XmegF;4U2C^BWtHezsBWSr{HnPbez`NJU>7+zi_L4Lsu92`ttn-mxFJYE0s
zPtU{SzrF^Xdu}-C?`{^o2X`cePJK^ow3GHe7PaMH!O9L*`KxS~vf{UPzZSo__sinu
z@*jup^WEF{sQ=yC-;=M!U-%1*7CBEB$B>F!Q!n2%V|El^dvHl{TH=vOKF6fo47MGS
zJF@RTTXTev^~1mNj#kH8yI0LyocG(he*U{vi}qh-FcLo}z}Qr*p}b=U&w3xG>*h-X
z?k}3c(r`&v<Jt|8=?<S`EBdE}ZSiba)4qU*`>m{yLWt9ixt;6s1gA8+2k=)-W>T;T
zb<kwb3}-sexMICLbF<BX)32p7G9+dSYCinS+~qd$Lxn-xd96EZdOu3=t9=Odp3!3O
zYBS?lxu^+q_B8fl%efQgyU(iFkno!2{73Q12YOfM@9dcxDyPDo{cG{HjgB@Nw`TuZ
zy>Y7OfwFb?bl$w-O307je*0svN<(vxoP^Az({ol!SzJ<XPfpVQZ@op`_45t!N6(I0
i_D0yg-+x+q=Rf<emHt65jQ@y((yOPdpUXO@geCw9YTN7p

diff --git a/crawl-ref/source/rltiles/item/weapon/ranged/bow2.png b/crawl-ref/source/rltiles/item/weapon/ranged/bow2.png
deleted file mode 100644
index 33670e2558c75052896e6a58bfe9fbb135bdd3f7..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 871
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE3?yBabRA=0U@Q;t32_B-AwY=}#u^qhBg_|e
zcDn0x`F7-S{rb>(aUDZ#lJ@#o_6`k(@7MK!YL3+NcBnJ>%W>@~=CKy%TvRMR$BBuD
zm1%mj_|!Dv=?+YpY8=5<{OjY{w=YxMSILv;EU-F?{r~?12M$bVXh_&lCfH}pz|PLT
zr+_<Cg=1T#V7CE-mpJ2*THa81eI_P`g&JxJg8Ze)&drMQ7HlksDtTt-O6|zuN~yfO
z8t6i=k|4iehQI$<7=JJ?lWmyXx8$w=onQTGFMdBfoKd)b_8#%r=Qet$Z{&JE`?HvZ
z<J?^5pQ{!<6=;q;xaF$-<0qHICV2?GYuk0yoT)M0)i3l#(d#H+#D;phIEGZ*nmai>
zoXJq2H9b5eAYjTO4W&ivlJYse-CM^S7F+#(Z+ZQm-I2ELcU#y$PdMqh&v@s|I}7hK
z3n@&lNT^CH%Zu|-nCZ2WyIaysal;Z_Wn=FOzle)ro6j!2J8|;sl8A<_rKN{c*L?cK
zxPx2gz_V-HwlObq;@@LeFBr-A=G{uI6%lR?s}to_EiQyGXz+ew<dTt-oj-@^!<3JV
zlg^#<RSG%Ben@=!EzuQB9U-?W89c9>Z&z5(b0ELA)$o31)rwVYQ)cZyVB3);FE{^-
zz*^>4x>EBZ+op%xnwTuo)MAKeOWU%c__b)_w1uWD>Vh9#wi!-*yJ?cTMhJUP`mqa=
zPnkcmXoraJs{Y}izt8LKtH(@#neWekD*J@Vxx#pVw4~g^z=??sM<V8AK8fZF($OgR
zx;rmQW8cS;ZSE;e8o7^mTsHOlbU0(L=k5KoujkbJ{Jry&<(gE|(pjI1cYzX?r>mdK
II;Vst0MA<s=Kufz

diff --git a/crawl-ref/source/rltiles/item/weapon/ranged/bow3.png b/crawl-ref/source/rltiles/item/weapon/ranged/bow3.png
deleted file mode 100644
index 236c9a672f38760747493c58113505c2670c32ef..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 832
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE3?yBabRA=0U~~!a32_B-hc{qkWMpCIU}Iww
z(KZuP(@~I<Qq;Cra`aR6OHvI;(g`j!G_*90Xt4C0ZWYmNZE0*1*KHf!V;A3VA3w>_
zCpE-PKQzcYt$1HXMp<TRY)O*yv?l4fb2hD9b8FjD?MoNm{{R2~aO0j@U?6&x1o;Is
zFfuW-uyF_oiHXaq>6zQuJG**#`}v1P#-?ZF7B)0CxApZ;nml{%qQy&=ty;fj*Peri
zkDfkv>FSL;4<A2y`t13Ox9@)Z{Pp|K-+xNq4?YLRQlh7eV@SoV+Q~1&4jBlvI<MTJ
z&?WtDN50029f~U&xN`Nmu3f9$o;CG*J;UvW<?hC&^=j(ht<5K&<oO)NptXQC)l$Qg
z(M>1jUc~(CvldS>Ivo7>RK?m8F{+L3myZQr2v1*ed+XC<W-{|<`yF9**l*z1^-gaa
z_W~1T2KimF+Yd&hGd|6!n$pQoa(hKnZ??xI%bG;F?`fh8*Q_!cRCS+=aXTc=V4LyF
z`N{4~g`%qTdCj>@GdCKr8eH|AtZKrL`BAjD%4*?%hJb1Rn9lbph2P7YD{zZRtVQPD
z&cml?3Rm@Q6#B%t<FL}VoqBPC5Bb(ss{EKa<B5uYkw<WnU29bP?=vE0P9_3pKRUfl
z+&z~q?V?WU#(tJte6y`i1*>f6YCl%4EgkE#Na~nTjIFugQ_C*h^qt?bPQ4b}n7J^;
zz2^44ZCNM22z8lTh<W|z?aSM}*!+Q@knNs(j@=IyGD)QDm)*yBP&fJBHdBQrP(JW<
L^>bP0l+XkKRY(8t

diff --git a/crawl-ref/source/rltiles/item/weapon/ranged/shortbow1.png b/crawl-ref/source/rltiles/item/weapon/ranged/shortbow1.png
new file mode 100644
index 0000000000000000000000000000000000000000..9d5582af5481e7c5ddbea05d1268d2380649804d
GIT binary patch
literal 750
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE3?yBabRA=0U^ETz32_B-t#rkJ<ZuN?Dj63i
zGWLctHpWS<&tY7g%*f2d(9n<&ZpyHyh;eE(qm4RKTNH<{1%HME<J<(s#!$|EC5)SM
z7@Na67XmegF;4U2C^BWtHezsBWSr{HnPbez`NJU>7+zi_L4Lsu92`ttn-mxFJYE0s
zPtU{SzrF^Xdu}-C?`{^o2X`cePJK^ow3GHe7PaMH!O9L*`KxS~vf{UPzZSo__sinu
z@*jup^WEF{sQ=yC-;=M!U-%1*7CBEB$B>F!Q!n2%V|El^dvHl{TH=vOKF6fo47MGS
zJF@RTTXTev^~1mNj#kH8yI0LyocG(he*U{vi}qh-FcLo}z}Qr*p}b=U&w3xG>*h-X
z?k}3c(r`&v<Jt|8=?<S`EBdE}ZSiba)4qU*`>m{yLWt9ixt;6s1gA8+2k=)-W>T;T
zb<kwb3}-sexMICLbF<BX)32p7G9+dSYCinS+~qd$Lxn-xd96EZdOu3=t9=Odp3!3O
zYBS?lxu^+q_B8fl%efQgyU(iFkno!2{73Q12YOfM@9dcxDyPDo{cG{HjgB@Nw`TuZ
zy>Y7OfwFb?bl$w-O307je*0svN<(vxoP^Az({ol!SzJ<XPfpVQZ@op`_45t!N6(I0
i_D0yg-+x+q=Rf<emHt65jQ@y((yOPdpUXO@geCw9YTN7p

literal 0
HcmV?d00001

diff --git a/crawl-ref/source/rltiles/item/weapon/ranged/shortbow2.png b/crawl-ref/source/rltiles/item/weapon/ranged/shortbow2.png
new file mode 100644
index 0000000000000000000000000000000000000000..33670e2558c75052896e6a58bfe9fbb135bdd3f7
GIT binary patch
literal 871
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE3?yBabRA=0U@Q;t32_B-AwY=}#u^qhBg_|e
zcDn0x`F7-S{rb>(aUDZ#lJ@#o_6`k(@7MK!YL3+NcBnJ>%W>@~=CKy%TvRMR$BBuD
zm1%mj_|!Dv=?+YpY8=5<{OjY{w=YxMSILv;EU-F?{r~?12M$bVXh_&lCfH}pz|PLT
zr+_<Cg=1T#V7CE-mpJ2*THa81eI_P`g&JxJg8Ze)&drMQ7HlksDtTt-O6|zuN~yfO
z8t6i=k|4iehQI$<7=JJ?lWmyXx8$w=onQTGFMdBfoKd)b_8#%r=Qet$Z{&JE`?HvZ
z<J?^5pQ{!<6=;q;xaF$-<0qHICV2?GYuk0yoT)M0)i3l#(d#H+#D;phIEGZ*nmai>
zoXJq2H9b5eAYjTO4W&ivlJYse-CM^S7F+#(Z+ZQm-I2ELcU#y$PdMqh&v@s|I}7hK
z3n@&lNT^CH%Zu|-nCZ2WyIaysal;Z_Wn=FOzle)ro6j!2J8|;sl8A<_rKN{c*L?cK
zxPx2gz_V-HwlObq;@@LeFBr-A=G{uI6%lR?s}to_EiQyGXz+ew<dTt-oj-@^!<3JV
zlg^#<RSG%Ben@=!EzuQB9U-?W89c9>Z&z5(b0ELA)$o31)rwVYQ)cZyVB3);FE{^-
zz*^>4x>EBZ+op%xnwTuo)MAKeOWU%c__b)_w1uWD>Vh9#wi!-*yJ?cTMhJUP`mqa=
zPnkcmXoraJs{Y}izt8LKtH(@#neWekD*J@Vxx#pVw4~g^z=??sM<V8AK8fZF($OgR
zx;rmQW8cS;ZSE;e8o7^mTsHOlbU0(L=k5KoujkbJ{Jry&<(gE|(pjI1cYzX?r>mdK
II;Vst0MA<s=Kufz

literal 0
HcmV?d00001

diff --git a/crawl-ref/source/rltiles/item/weapon/ranged/shortbow3.png b/crawl-ref/source/rltiles/item/weapon/ranged/shortbow3.png
new file mode 100644
index 0000000000000000000000000000000000000000..236c9a672f38760747493c58113505c2670c32ef
GIT binary patch
literal 832
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE3?yBabRA=0U~~!a32_B-hc{qkWMpCIU}Iww
z(KZuP(@~I<Qq;Cra`aR6OHvI;(g`j!G_*90Xt4C0ZWYmNZE0*1*KHf!V;A3VA3w>_
zCpE-PKQzcYt$1HXMp<TRY)O*yv?l4fb2hD9b8FjD?MoNm{{R2~aO0j@U?6&x1o;Is
zFfuW-uyF_oiHXaq>6zQuJG**#`}v1P#-?ZF7B)0CxApZ;nml{%qQy&=ty;fj*Peri
zkDfkv>FSL;4<A2y`t13Ox9@)Z{Pp|K-+xNq4?YLRQlh7eV@SoV+Q~1&4jBlvI<MTJ
z&?WtDN50029f~U&xN`Nmu3f9$o;CG*J;UvW<?hC&^=j(ht<5K&<oO)NptXQC)l$Qg
z(M>1jUc~(CvldS>Ivo7>RK?m8F{+L3myZQr2v1*ed+XC<W-{|<`yF9**l*z1^-gaa
z_W~1T2KimF+Yd&hGd|6!n$pQoa(hKnZ??xI%bG;F?`fh8*Q_!cRCS+=aXTc=V4LyF
z`N{4~g`%qTdCj>@GdCKr8eH|AtZKrL`BAjD%4*?%hJb1Rn9lbph2P7YD{zZRtVQPD
z&cml?3Rm@Q6#B%t<FL}VoqBPC5Bb(ss{EKa<B5uYkw<WnU29bP?=vE0P9_3pKRUfl
z+&z~q?V?WU#(tJte6y`i1*>f6YCl%4EgkE#Na~nTjIFugQ_C*h^qt?bPQ4b}n7J^;
zz2^44ZCNM22z8lTh<W|z?aSM}*!+Q@knNs(j@=IyGD)QDm)*yBP&fJBHdBQrP(JW<
L^>bP0l+XkKRY(8t

literal 0
HcmV?d00001

diff --git a/crawl-ref/source/rltiles/player/hand1/bow.png b/crawl-ref/source/rltiles/player/hand1/bow.png
deleted file mode 100644
index b48f183687726863eef194722938d6485b16eedf..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 172
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=ffJbWaz@kcif|*DeYkP~c$-IOl1#
zYw=Fbxd&#*H|>4Kt8k)S{X!I9D0{z;#Zgtihaqk0VjCU`-Iv>uz*yZlchb+sgvO<Q
zcA_gTac{{k+;zWE>o!yWZU@odOcU$>uq%D~|DfE<;_&P{+*56p?EV~QaR6G$;OXk;
Lvd$@?37HK5d9pt1

diff --git a/crawl-ref/source/rltiles/player/hand1/bow_blue.png b/crawl-ref/source/rltiles/player/hand1/bow_blue.png
deleted file mode 100644
index 4ab4699dd24cadfd22bf7e1b439c525f2790cb46..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 185
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=ffJ5>FS$kcif|(+=`B81OLjtG(*z
zx#5>$_d(hJk;mD++BY{{I&#6px5vokoJUO1tWJ)zmQPI-^=|Sk>2x<vP&NIvh*M=*
zK~0Bp=T<R><ev5A`;-3uR`u{*@PX&ehPH(-l$!4LU+gXwIC!Vy%M_=4^^z|0%sc1n
Y{I?vOf4L86KZB>MpUXO@geGJ*0Dh@Q%K!iX

diff --git a/crawl-ref/source/rltiles/player/hand1/bow_three.png b/crawl-ref/source/rltiles/player/hand1/bow_three.png
deleted file mode 100644
index 65e330bb80f8cf5da1a63e680935ec71078b5e0e..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 162
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE3?yBabR7dyLIFM@u0R?H3>X+37#J2*FdUe`
zAa$Ti8YskA666=m;PC858jxe>>EaktaqH-0Lp}xr4yJ|M{{Js>-)=O+J91~jl?Btj
zPCI>aKKlXTK2w%$i~X6o85llBGc5o2;oPaCi<OFg>zivcObpjZC<U6t;OXk;vd$@?
F2>{6WF_8cO

diff --git a/crawl-ref/source/rltiles/player/hand1/bow_two.png b/crawl-ref/source/rltiles/player/hand1/bow_two.png
deleted file mode 100644
index d1d3e4da76daf55883da49ecad5e191787700575..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 143
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnH3?%tPCZz)@o&cW^S0D`p2_6g$2@Ds*qLYCf
z#*!evU<QY0H`0I{Lr)jS5Q)pl2@0GW4oGY=VB5`X#jF?FG<zabvPY7^2L_*`nl3k5
iUxt{mmlQ`7L~=6R_|96fi~X(v$XriXKbLh*2~7ZHD<vNQ

diff --git a/crawl-ref/source/rltiles/player/hand1/shortbow.png b/crawl-ref/source/rltiles/player/hand1/shortbow.png
new file mode 100644
index 0000000000000000000000000000000000000000..b48f183687726863eef194722938d6485b16eedf
GIT binary patch
literal 172
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=ffJbWaz@kcif|*DeYkP~c$-IOl1#
zYw=Fbxd&#*H|>4Kt8k)S{X!I9D0{z;#Zgtihaqk0VjCU`-Iv>uz*yZlchb+sgvO<Q
zcA_gTac{{k+;zWE>o!yWZU@odOcU$>uq%D~|DfE<;_&P{+*56p?EV~QaR6G$;OXk;
Lvd$@?37HK5d9pt1

literal 0
HcmV?d00001

diff --git a/crawl-ref/source/rltiles/player/hand1/shortbow_three.png b/crawl-ref/source/rltiles/player/hand1/shortbow_three.png
new file mode 100644
index 0000000000000000000000000000000000000000..65e330bb80f8cf5da1a63e680935ec71078b5e0e
GIT binary patch
literal 162
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE3?yBabR7dyLIFM@u0R?H3>X+37#J2*FdUe`
zAa$Ti8YskA666=m;PC858jxe>>EaktaqH-0Lp}xr4yJ|M{{Js>-)=O+J91~jl?Btj
zPCI>aKKlXTK2w%$i~X6o85llBGc5o2;oPaCi<OFg>zivcObpjZC<U6t;OXk;vd$@?
F2>{6WF_8cO

literal 0
HcmV?d00001

diff --git a/crawl-ref/source/rltiles/player/hand1/shortbow_two.png b/crawl-ref/source/rltiles/player/hand1/shortbow_two.png
new file mode 100644
index 0000000000000000000000000000000000000000..d1d3e4da76daf55883da49ecad5e191787700575
GIT binary patch
literal 143
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnH3?%tPCZz)@o&cW^S0D`p2_6g$2@Ds*qLYCf
z#*!evU<QY0H`0I{Lr)jS5Q)pl2@0GW4oGY=VB5`X#jF?FG<zabvPY7^2L_*`nl3k5
iUxt{mmlQ`7L~=6R_|96fi~X(v$XriXKbLh*2~7ZHD<vNQ

literal 0
HcmV?d00001

diff --git a/crawl-ref/source/rltiles/player/hand1/storm_bow.png b/crawl-ref/source/rltiles/player/hand1/storm_bow.png
new file mode 100644
index 0000000000000000000000000000000000000000..4ab4699dd24cadfd22bf7e1b439c525f2790cb46
GIT binary patch
literal 185
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=ffJ5>FS$kcif|(+=`B81OLjtG(*z
zx#5>$_d(hJk;mD++BY{{I&#6px5vokoJUO1tWJ)zmQPI-^=|Sk>2x<vP&NIvh*M=*
zK~0Bp=T<R><ev5A`;-3uR`u{*@PX&ehPH(-l$!4LU+gXwIC!Vy%M_=4^^z|0%sc1n
Y{I?vOf4L86KZB>MpUXO@geGJ*0Dh@Q%K!iX

literal 0
HcmV?d00001

diff --git a/crawl-ref/source/shopping.cc b/crawl-ref/source/shopping.cc
index 4bc65d9..8dfc43a 100644
--- a/crawl-ref/source/shopping.cc
+++ b/crawl-ref/source/shopping.cc
@@ -980,7 +980,7 @@ unsigned int item_value(item_def item, bool ident)
             valued += 25;
             break;
 
-        case WPN_BOW:
+        case WPN_SHORTBOW:
         case WPN_HAND_AXE:
         case WPN_FALCHION:
         case WPN_MACE:
diff --git a/crawl-ref/source/throw.cc b/crawl-ref/source/throw.cc
index 6276d71..8ed2e0b 100644
--- a/crawl-ref/source/throw.cc
+++ b/crawl-ref/source/throw.cc
@@ -1359,7 +1359,7 @@ static void _throw_noise(actor* act, const bolt &pbolt, const item_def &ammo)
         level = 1;
         msg   = "You hear a whirring sound.";
         break;
-     case WPN_BOW:
+     case WPN_SHORTBOW:
         level = 5;
         msg   = "You hear a twanging sound.";
         break;
@@ -2186,7 +2186,7 @@ bool mons_throw(monster* mons, bolt &beam, int msl, bool teleport)
             damMult = 0;
             lnchDamBonus = 0;
             break;
-        case WPN_BOW:
+        case WPN_SHORTBOW:
         case WPN_LONGBOW:
             baseHit = 0;
             hitMult = 60;
diff --git a/crawl-ref/source/tilepick-p.cc b/crawl-ref/source/tilepick-p.cc
index 4d3e9dc..115f1d2 100644
--- a/crawl-ref/source/tilepick-p.cc
+++ b/crawl-ref/source/tilepick-p.cc
@@ -246,7 +246,7 @@ tileidx_t tilep_equ_weapon(const item_def &item)
     case WPN_SLING:
         tile = TILEP_HAND1_SLING;
         break;
-    case WPN_BOW:
+    case WPN_SHORTBOW:
         tile = TILEP_HAND1_BOW2;
         break;
     case WPN_CROSSBOW:
diff --git a/crawl-ref/source/tilepick.cc b/crawl-ref/source/tilepick.cc
index 4021384..e739169 100644
--- a/crawl-ref/source/tilepick.cc
+++ b/crawl-ref/source/tilepick.cc
@@ -987,7 +987,7 @@ static int _bow_offset(const monster_info& mon)
 
     switch (mon.inv[MSLOT_WEAPON]->sub_type)
     {
-    case WPN_BOW:
+    case WPN_SHORTBOW:
     case WPN_LONGBOW:
     case WPN_CROSSBOW:
         return 0;
@@ -3107,7 +3107,7 @@ static tileidx_t _tileidx_weapon_base(const item_def &item)
     case WPN_EXECUTIONERS_AXE:      return TILE_WPN_EXECUTIONERS_AXE;
     case WPN_BLOWGUN:               return TILE_WPN_BLOWGUN;
     case WPN_SLING:                 return TILE_WPN_SLING;
-    case WPN_BOW:                   return TILE_WPN_BOW;
+    case WPN_SHORTBOW:              return TILE_WPN_SHORTBOW;
     case WPN_CROSSBOW:              return TILE_WPN_CROSSBOW;
     case WPN_SPEAR:                 return TILE_WPN_SPEAR;
     case WPN_TRIDENT:               return TILE_WPN_TRIDENT;
diff --git a/crawl-ref/source/xom.cc b/crawl-ref/source/xom.cc
index 961ff78..7a91425 100644
--- a/crawl-ref/source/xom.cc
+++ b/crawl-ref/source/xom.cc
@@ -1599,7 +1599,7 @@ static int _xom_random_stickable(const int HD)
     {
         WPN_CLUB,    WPN_SPEAR,      WPN_TRIDENT,      WPN_HALBERD,
         WPN_SCYTHE,  WPN_GLAIVE,     WPN_QUARTERSTAFF,
-        WPN_BLOWGUN, WPN_BOW,        WPN_LONGBOW,      WPN_GIANT_CLUB,
+        WPN_BLOWGUN, WPN_SHORTBOW,   WPN_LONGBOW,      WPN_GIANT_CLUB,
         WPN_GIANT_SPIKED_CLUB
     };
 
-- 
1.9.1