summaryrefslogtreecommitdiffstats
path: root/crawl-ref/source/tile1.cc
diff options
context:
space:
mode:
authorj-p-e-g <j-p-e-g@c06c8d41-db1a-0410-9941-cceddc491573>2008-04-23 09:42:33 +0000
committerj-p-e-g <j-p-e-g@c06c8d41-db1a-0410-9941-cceddc491573>2008-04-23 09:42:33 +0000
commit70d644194b4b010383b4a5a264370e2cb291b693 (patch)
tree7aa9a9bb56bc7d4b8f1690eb57313cde45c43712 /crawl-ref/source/tile1.cc
parent974643d2eec4610d68ed781b91a01ecd461969f5 (diff)
downloadcrawl-ref-70d644194b4b010383b4a5a264370e2cb291b693.tar.gz
crawl-ref-70d644194b4b010383b4a5a264370e2cb291b693.zip
Replace the dire lajatang with the cloak of Starlight (rElec, rC+, EV+4,
Stlth-). I already added a new tile, which looks rather atrocious, I think. The dire lajatang tile is now used for any branded lajatang. Also renamed a few tile files. git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@4527 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref/source/tile1.cc')
-rw-r--r--crawl-ref/source/tile1.cc13
1 files changed, 6 insertions, 7 deletions
diff --git a/crawl-ref/source/tile1.cc b/crawl-ref/source/tile1.cc
index 25259f1b38..1d02b745d9 100644
--- a/crawl-ref/source/tile1.cc
+++ b/crawl-ref/source/tile1.cc
@@ -916,7 +916,7 @@ static int _tileidx_unrand_artefact(int idx)
case 34: return TILE_URAND_EOS;
case 35: return TILE_URAND_SHAOLIN;
case 36: return TILE_URAND_ROBUSTNESS;
- case 37: return TILE_URAND_EDISON;
+ case 37: return TILE_URAND_MAXWELL;
case 38: return TILE_URAND_VOO_DOO;
case 39: return TILE_URAND_OCTOPUS_KING;
case 40: return TILE_URAND_DRAGONMASK;
@@ -934,7 +934,7 @@ static int _tileidx_unrand_artefact(int idx)
case 52: return TILE_URAND_BLOWGUN;
case 53: return TILE_URAND_WYRMBANE;
case 54: return TILE_URAND_SPRIGGANS_KNIFE;
- case 55: return TILE_URAND_DIRE_LAJATANG;
+ case 55: return TILE_URAND_STARLIGHT;
case 56: return TILE_URAND_BROOCH_OF_SHIELDING;
case 57: return TILE_URAND_SERPENT_SCOURGE;
default: return TILE_TODO;
@@ -1126,7 +1126,7 @@ static int _tileidx_weapon(const item_def &item)
return TILE_WPN_LONGBOW;
case WPN_LAJATANG:
- return TILE_WPN_LAJATANG;
+ return TILE_WPN_LAJATANG + etable[1][etype];
case WPN_BARDICHE:
return TILE_WPN_LOCHABER_AXE;
@@ -2968,7 +2968,6 @@ int tilep_equ_weapon(const item_def &item)
case 53: return TILEP_HAND1_BLOWGUN_ASSASSIN;
case 54: return TILEP_HAND1_WYRMBANE;
case 55: return TILEP_HAND1_SPRIGGANS_KNIFE;
- case 56: return TILEP_HAND1_DIRE_LAJATANG;
case 58: return TILEP_HAND1_SERPENT_SCOURGE;
}
}
@@ -3032,7 +3031,7 @@ int tilep_equ_weapon(const item_def &item)
case WPN_HAMMER: return TILEP_HAND1_HAMMER;
case WPN_DEMON_TRIDENT: return TILEP_HAND1_DEMON_TRIDENT;
case WPN_TRIDENT: return TILEP_HAND1_TRIDENT2;
- case WPN_LAJATANG: return TILEP_HAND1_D_GLAIVE;
+ case WPN_LAJATANG: return TILEP_HAND1_DIRE_LAJATANG;;
// Ranged
case WPN_SLING: return TILEP_HAND1_SLING;
@@ -3067,8 +3066,8 @@ int tilep_equ_armour(const item_def &item)
case 29: return TILEP_BODY_LEATHER_RED;
// robe of Folly
case 33: return TILEP_BODY_ROBE_RED2;
- // Edison's patent armour
- case 38: return TILEP_BODY_EDISON;
+ // Maxwell's patent armour
+ case 38: return TILEP_BODY_MAXWELL;
// robe of Night
case 46: return TILEP_BODY_ROBE_OF_NIGHT;
// armour of the Dragon King