Tiles changes somewhat untested, would appreciate someone looking over those as well.
0001-Rename-bow-to-shortbow.patch [^] (35,339 bytes) 2014-04-13 22:27 [Show Content] [Hide Content]From 3a123b3bb46ac83050b9cbf69bca37eefeb4c4c5 Mon Sep 17 00:00:00 2001
From: Chris Oelmueller <chris.oelmueller@gmail.com>
Date: Sun, 13 Apr 2014 03:25:21 +0200
Subject: 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 ++++----
.../item/weapon/ranged/{bow1.png => shortbow1.png} | Bin
.../item/weapon/ranged/{bow2.png => shortbow2.png} | Bin
.../item/weapon/ranged/{bow3.png => shortbow3.png} | Bin
.../rltiles/player/hand1/{bow.png => shortbow.png} | Bin
.../player/hand1/{bow_three.png => shortbow_three.png} | Bin
.../player/hand1/{bow_two.png => shortbow_two.png} | Bin
.../player/hand1/{bow_blue.png => storm_bow.png} | Bin
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 +-
43 files changed, 78 insertions(+), 77 deletions(-)
rename crawl-ref/source/rltiles/item/weapon/ranged/{bow1.png => shortbow1.png} (100%)
rename crawl-ref/source/rltiles/item/weapon/ranged/{bow2.png => shortbow2.png} (100%)
rename crawl-ref/source/rltiles/item/weapon/ranged/{bow3.png => shortbow3.png} (100%)
rename crawl-ref/source/rltiles/player/hand1/{bow.png => shortbow.png} (100%)
rename crawl-ref/source/rltiles/player/hand1/{bow_three.png => shortbow_three.png} (100%)
rename crawl-ref/source/rltiles/player/hand1/{bow_two.png => shortbow_two.png} (100%)
rename crawl-ref/source/rltiles/player/hand1/{bow_blue.png => storm_bow.png} (100%)
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 7b41fc0..8594272 100644
--- a/crawl-ref/source/dat/des/branches/abyss.des
+++ b/crawl-ref/source/dat/des/branches/abyss.des
@@ -1995,7 +1995,7 @@ NAME: evilmike_abyss_exit_smiterflies
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 @@ NAME: kb_skeletal_archery
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 cf9c29f..a0256ad 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 @@ NAME: minmay_elf_demonology
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 @@ NAME: guppyfry_elf_lava
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 88950dc..51af8c3 100644
--- a/crawl-ref/source/dat/des/branches/zot.des
+++ b/crawl-ref/source/dat/des/branches/zot.des
@@ -1108,8 +1108,8 @@ NAME: hangedman_xom_zot_hilarity
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 @@ NAME: nicolae_lab_dead_adventurers
.. '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 @@ NAME: trove_hunter_1
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 @@
.. " | 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 @@ NAME: dungeon_sprint_fedhas
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 @@ NAME: room_start
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 @@ NAME: tutorial_lesson2_level2
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 2196be6..b4fd8c4 100644
--- a/crawl-ref/source/dat/des/variable/arcadia.des
+++ b/crawl-ref/source/dat/des/variable/arcadia.des
@@ -36,7 +36,7 @@ NAME: spriggan_forest
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 83e25db..dca1a0e 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 090f93e..c50e1ea 100644
--- a/crawl-ref/source/itemprop.cc
+++ b/crawl-ref/source/itemprop.cc
@@ -346,7 +346,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,
@@ -1144,7 +1144,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 e5f1778..3f20652 100644
--- a/crawl-ref/source/mon-gear.cc
+++ b/crawl-ref/source/mon-gear.cc
@@ -505,7 +505,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;
@@ -573,7 +573,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);
}
@@ -875,7 +875,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;
@@ -942,7 +942,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;
@@ -1248,7 +1248,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))
@@ -1447,7 +1447,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 d000029..679d2d1 100644
--- a/crawl-ref/source/ng-restr.cc
+++ b/crawl-ref/source/ng-restr.cc
@@ -1031,7 +1031,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 0af4a8c..6cc44be 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 3893776..84a8337 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/shortbow1.png
similarity index 100%
rename from crawl-ref/source/rltiles/item/weapon/ranged/bow1.png
rename to crawl-ref/source/rltiles/item/weapon/ranged/shortbow1.png
diff --git a/crawl-ref/source/rltiles/item/weapon/ranged/bow2.png b/crawl-ref/source/rltiles/item/weapon/ranged/shortbow2.png
similarity index 100%
rename from crawl-ref/source/rltiles/item/weapon/ranged/bow2.png
rename to crawl-ref/source/rltiles/item/weapon/ranged/shortbow2.png
diff --git a/crawl-ref/source/rltiles/item/weapon/ranged/bow3.png b/crawl-ref/source/rltiles/item/weapon/ranged/shortbow3.png
similarity index 100%
rename from crawl-ref/source/rltiles/item/weapon/ranged/bow3.png
rename to crawl-ref/source/rltiles/item/weapon/ranged/shortbow3.png
diff --git a/crawl-ref/source/rltiles/player/hand1/bow.png b/crawl-ref/source/rltiles/player/hand1/shortbow.png
similarity index 100%
rename from crawl-ref/source/rltiles/player/hand1/bow.png
rename to crawl-ref/source/rltiles/player/hand1/shortbow.png
diff --git a/crawl-ref/source/rltiles/player/hand1/bow_three.png b/crawl-ref/source/rltiles/player/hand1/shortbow_three.png
similarity index 100%
rename from crawl-ref/source/rltiles/player/hand1/bow_three.png
rename to crawl-ref/source/rltiles/player/hand1/shortbow_three.png
diff --git a/crawl-ref/source/rltiles/player/hand1/bow_two.png b/crawl-ref/source/rltiles/player/hand1/shortbow_two.png
similarity index 100%
rename from crawl-ref/source/rltiles/player/hand1/bow_two.png
rename to crawl-ref/source/rltiles/player/hand1/shortbow_two.png
diff --git a/crawl-ref/source/rltiles/player/hand1/bow_blue.png b/crawl-ref/source/rltiles/player/hand1/storm_bow.png
similarity index 100%
rename from crawl-ref/source/rltiles/player/hand1/bow_blue.png
rename to crawl-ref/source/rltiles/player/hand1/storm_bow.png
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 450bd2b..96366a8 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 a3fdf9e..407a5e2 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;
@@ -3110,7 +3110,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 bf5b551..a839c11 100644
--- a/crawl-ref/source/xom.cc
+++ b/crawl-ref/source/xom.cc
@@ -1598,7 +1598,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.2
