diff options
| author | j-p-e-g <j-p-e-g@c06c8d41-db1a-0410-9941-cceddc491573> | 2008-04-22 22:43:16 +0000 |
|---|---|---|
| committer | j-p-e-g <j-p-e-g@c06c8d41-db1a-0410-9941-cceddc491573> | 2008-04-22 22:43:16 +0000 |
| commit | 71add343cda32960c69fe5ec6d2d46f216c88b53 (patch) | |
| tree | 84fad97387e3fd9d913b6dfc9ed0ba1272c9d6ee /crawl-ref/source/tile1.cc | |
| parent | e4867cc9e9177abd5c949228568f4e3d993dade2 (diff) | |
| download | crawl-ref-71add343cda32960c69fe5ec6d2d46f216c88b53.tar.gz crawl-ref-71add343cda32960c69fe5ec6d2d46f216c88b53.zip | |
Change colouring of sacrifice messages to colour the entire message
rather than only a portion of it. Also tidy up Ely's destruction code
and print the evil weapon destruction message *in addition to* the
normal one, so you know which one Ely was so happy about.
And use the non-blessed weapon tiles for the blessed blade also for
building the player doll.
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@4497 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref/source/tile1.cc')
| -rw-r--r-- | crawl-ref/source/tile1.cc | 37 |
1 files changed, 23 insertions, 14 deletions
diff --git a/crawl-ref/source/tile1.cc b/crawl-ref/source/tile1.cc index 8ddd15e5d7..a5cf5f2e72 100644 --- a/crawl-ref/source/tile1.cc +++ b/crawl-ref/source/tile1.cc @@ -2971,20 +2971,29 @@ int tilep_equ_weapon(const item_def &item) case WPN_DEMON_WHIP: return TILEP_HAND1_BLACK_WHIP; // Edge - case WPN_KNIFE: return TILEP_HAND1_DAGGER_SLANT; - case WPN_DAGGER: return TILEP_HAND1_DAGGER_SLANT; - case WPN_SHORT_SWORD: return TILEP_HAND1_SHORT_SWORD_SLANT; - case WPN_LONG_SWORD: return TILEP_HAND1_LONG_SWORD_SLANT; - case WPN_GREAT_SWORD: return TILEP_HAND1_GREAT_SWORD_SLANT; - case WPN_SCIMITAR: return TILEP_HAND1_SCIMITAR; - case WPN_FALCHION: return TILEP_HAND1_FALCHION; - case WPN_SABRE: return TILEP_HAND1_SABRE; - case WPN_DEMON_BLADE: return TILEP_HAND1_SWORD_BLACK; - case WPN_QUICK_BLADE: return TILEP_HAND1_DAGGER; - case WPN_KATANA: return TILEP_HAND1_KATANA_SLANT; - case WPN_DOUBLE_SWORD: return TILEP_HAND1_DOUBLE_SWORD; - case WPN_TRIPLE_SWORD: return TILEP_HAND1_TRIPLE_SWORD; - case WPN_BLESSED_BLADE: return TILEP_HAND1_BLESSED_BLADE; + case WPN_KNIFE: return TILEP_HAND1_DAGGER_SLANT; + case WPN_DAGGER: return TILEP_HAND1_DAGGER_SLANT; + case WPN_SHORT_SWORD: return TILEP_HAND1_SHORT_SWORD_SLANT; + case WPN_LONG_SWORD: return TILEP_HAND1_LONG_SWORD_SLANT; + case WPN_GREAT_SWORD: return TILEP_HAND1_GREAT_SWORD_SLANT; + case WPN_SCIMITAR: return TILEP_HAND1_SCIMITAR; + case WPN_FALCHION: return TILEP_HAND1_FALCHION; + case WPN_SABRE: return TILEP_HAND1_SABRE; + case WPN_DEMON_BLADE: return TILEP_HAND1_SWORD_BLACK; + case WPN_QUICK_BLADE: return TILEP_HAND1_DAGGER; + case WPN_KATANA: return TILEP_HAND1_KATANA_SLANT; + case WPN_DOUBLE_SWORD: return TILEP_HAND1_DOUBLE_SWORD; + case WPN_TRIPLE_SWORD: return TILEP_HAND1_TRIPLE_SWORD; + case WPN_BLESSED_BLADE: return TILEP_HAND1_BLESSED_BLADE; + // new blessed blades + case WPN_BLESSED_LONG_SWORD: return TILEP_HAND1_LONG_SWORD_SLANT; + case WPN_BLESSED_GREAT_SWORD: return TILEP_HAND1_GREAT_SWORD_SLANT; + case WPN_BLESSED_SCIMITAR: return TILEP_HAND1_SCIMITAR; + case WPN_BLESSED_FALCHION: return TILEP_HAND1_FALCHION; + case WPN_BLESSED_KATANA: return TILEP_HAND1_KATANA_SLANT; + case WPN_BLESSED_DOUBLE_SWORD: return TILEP_HAND1_DOUBLE_SWORD; + case WPN_BLESSED_TRIPLE_SWORD: return TILEP_HAND1_TRIPLE_SWORD; + // Axe case WPN_HAND_AXE: return TILEP_HAND1_HAND_AXE; |