From 36858c63e3890d7b6a1476f9779aba5ca6a12fbf Mon Sep 17 00:00:00 2001 From: ontoclasm Date: Wed, 13 Aug 2014 14:29:13 +0100 Subject: Player doll tiles for the new ranged weapons --- crawl-ref/source/rltiles/dc-player.txt | 3 +++ crawl-ref/source/rltiles/player/hand1/greatsling.png | Bin 0 -> 159 bytes crawl-ref/source/rltiles/player/hand1/hand_crossbow.png | Bin 0 -> 163 bytes crawl-ref/source/rltiles/player/hand1/triple_crossbow.png | Bin 0 -> 204 bytes crawl-ref/source/tilepick-p.cc | 10 ++++++++-- 5 files changed, 11 insertions(+), 2 deletions(-) create mode 100644 crawl-ref/source/rltiles/player/hand1/greatsling.png create mode 100644 crawl-ref/source/rltiles/player/hand1/hand_crossbow.png create mode 100644 crawl-ref/source/rltiles/player/hand1/triple_crossbow.png diff --git a/crawl-ref/source/rltiles/dc-player.txt b/crawl-ref/source/rltiles/dc-player.txt index c1c802297c..c98b5f647f 100644 --- a/crawl-ref/source/rltiles/dc-player.txt +++ b/crawl-ref/source/rltiles/dc-player.txt @@ -718,15 +718,18 @@ axe_short AXE_SHORT ## launchers sling HUNTING_SLING +greatsling GREATSLING bow BOW bow_two BOW2 bow_three BOW3 great_bow GREAT_BOW storm_bow STORM_BOW +hand_crossbow HAND_CROSSBOW arbalest ARBALEST arbalest_two ARBALEST2 arbalest_three ARBALEST3 arbalest_four ARBALEST4 +triple_crossbow TRIPLE_CROSSBOW blowgun BLOWGUN ##missiles diff --git a/crawl-ref/source/rltiles/player/hand1/greatsling.png b/crawl-ref/source/rltiles/player/hand1/greatsling.png new file mode 100644 index 0000000000..48a31d92c4 Binary files /dev/null and b/crawl-ref/source/rltiles/player/hand1/greatsling.png differ diff --git a/crawl-ref/source/rltiles/player/hand1/hand_crossbow.png b/crawl-ref/source/rltiles/player/hand1/hand_crossbow.png new file mode 100644 index 0000000000..14a53e04ea Binary files /dev/null and b/crawl-ref/source/rltiles/player/hand1/hand_crossbow.png differ diff --git a/crawl-ref/source/rltiles/player/hand1/triple_crossbow.png b/crawl-ref/source/rltiles/player/hand1/triple_crossbow.png new file mode 100644 index 0000000000..5b286ebf98 Binary files /dev/null and b/crawl-ref/source/rltiles/player/hand1/triple_crossbow.png differ diff --git a/crawl-ref/source/tilepick-p.cc b/crawl-ref/source/tilepick-p.cc index cfa125a703..86c5b331ec 100644 --- a/crawl-ref/source/tilepick-p.cc +++ b/crawl-ref/source/tilepick-p.cc @@ -246,17 +246,23 @@ tileidx_t tilep_equ_weapon(const item_def &item) // Ranged case WPN_HUNTING_SLING: - case WPN_GREATSLING: tile = TILEP_HAND1_HUNTING_SLING; break; + case WPN_GREATSLING: + tile = TILEP_HAND1_GREATSLING; + break; case WPN_SHORTBOW: tile = TILEP_HAND1_BOW2; break; case WPN_HAND_CROSSBOW: + tile = TILEP_HAND1_HAND_CROSSBOW; + break; case WPN_ARBALEST: - case WPN_TRIPLE_CROSSBOW: tile = TILEP_HAND1_ARBALEST; break; + case WPN_TRIPLE_CROSSBOW: + tile = TILEP_HAND1_TRIPLE_CROSSBOW; + break; case WPN_BLOWGUN: tile = TILEP_HAND1_BLOWGUN; break; -- cgit v1.2.3-54-g00ecf