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

11 files changed, 26 insertions, 24 deletions

diff --git a/crawl-ref/source/database.cc b/crawl-ref/source/database.cc
index 140051b4db..461e401d80 100644
--- a/crawl-ref/source/database.cc
+++ b/crawl-ref/source/database.cc
@@ -596,13 +596,16 @@ std::string getLongDescription(const std::string &key, bool noquote)
     if (!DescriptionDB.get())
         return ("");
 
+    std::string result = "";
     if (noquote)
     {
-        return _query_database(DescriptionDB.get(), key + " noquote",
-                               true, true);
+        result = _query_database(DescriptionDB.get(), key + " noquote",
+                                 true, true);
     }
+    if (result.empty())
+        result = _query_database(DescriptionDB.get(), key, true, true);
 
-    return _query_database(DescriptionDB.get(), key, true, true);
+    return result;
 }
 
 std::vector<std::string> getLongDescKeysByRegex(const std::string &regex,
diff --git a/crawl-ref/source/rltiles/dc-item.txt b/crawl-ref/source/rltiles/dc-item.txt
index 2492282abf..b296a26574 100644
--- a/crawl-ref/source/rltiles/dc-item.txt
+++ b/crawl-ref/source/rltiles/dc-item.txt
@@ -132,6 +132,7 @@ blessed_blade WPN_BLESSED_BLADE
 %rim 1

 longbow WPN_LONGBOW

 lajatang WPN_LAJATANG

+lajatang2 WPN_LAJATANG2

 lochaber_axe WPN_LOCHABER_AXE

 

 ######OBJ_MISSILES

@@ -251,7 +252,7 @@ ice_dragon_armour ARM_ICE_DRAGON_ARMOUR /* A9E-2 A magical armour, made from the
 silver_dragon_scales ARM_STEAM_DRAGON_HIDE /* A0E0 The soft and supple scaley skin of a steam dragon. I suppose you could wear it if you really wanted to. 

 silver_dragon_scale_mail ARM_STEAM_DRAGON_ARMOUR /* A3E0 A magical armour, made from the scales of a steam-breathing dragon. Although unlike the armour made from the scales of some larger dragons it does not provide its wearer with much in the way of special magical protection, it is extremely light and as supple as cloth.

 mottled_dragon_hide ARM_MOTTLED_DRAGON_HIDE /* A1E-1 The weirdly-patterned scaley skin of a mottled dragon. I suppose you could wear it if you really wanted to.

-mpttled_dragon_armour ARM_MOTTLED_DRAGON_ARMOUR /* A5E-1 A magical armour made from the scales of a mottled dragon. Although unlike the armour made from the scales of some larger dragons it does not provide its wearer with much in the way of special magical protection, it is as light and relatively uncumbersome as leather armour.

+mottled_dragon_armour ARM_MOTTLED_DRAGON_ARMOUR /* A5E-1 A magical armour made from the scales of a mottled dragon. Although unlike the armour made from the scales of some larger dragons it does not provide its wearer with much in the way of special magical protection, it is as light and relatively uncumbersome as leather armour.

 blue_dragon_scales ARM_STORM_DRAGON_HIDE /* A2E-5 The hide of a storm dragon, covered in extremely hard blue scales. I suppose you could wear it if you really wanted to.

 blue_dragon_scale_mail ARM_STORM_DRAGON_ARMOUR /* A10E-5 A magical armour made from the scales of a lightning-breathing dragon. It is heavier than most dragon scale armours, but gives its wearer great resistance to electrical discharges.

 gold_dragon_hide ARM_GOLD_DRAGON_HIDE /* A2E-10 The extremely tough and heavy skin of a golden dragon, covered in shimmering golden scales. I suppose you could wear it if you really wanted to.

diff --git a/crawl-ref/source/rltiles/dc-pl.txt b/crawl-ref/source/rltiles/dc-pl.txt
index 0152b79ac4..a3925c2b27 100644
--- a/crawl-ref/source/rltiles/dc-pl.txt
+++ b/crawl-ref/source/rltiles/dc-pl.txt
@@ -347,7 +347,7 @@ pj PJ
 sam SAM

 vanhel1

 

-edison EDISON

+maxwell MAXWELL

 lears_chain_mail LEARS_CHAIN_MAIL

 robe_of_night ROBE_OF_NIGHT

 %end

diff --git a/crawl-ref/source/rltiles/dc-urand.txt b/crawl-ref/source/rltiles/dc-urand.txt
index e177688dcb..e8de4b3c97 100644
--- a/crawl-ref/source/rltiles/dc-urand.txt
+++ b/crawl-ref/source/rltiles/dc-urand.txt
@@ -25,7 +25,6 @@ weapon/urand_undeadhunter URAND_UNDEADHUNTER
 %rim 1
 weapon/urand_blowgun URAND_BLOWGUN
 weapon/urand_serpent_scourge URAND_SERPENT_SCOURGE
-weapon/urand_dire_lajatang URAND_DIRE_LAJATANG
 weapon/urand_wyrmbane URAND_WYRMBANE
 weapon/urand_spriggans_knife URAND_SPRIGGANS_KNIFE
 %rim 0
@@ -43,12 +42,13 @@ armor/urand_salamander URAND_SALAMANDER
 armor/urand_war URAND_WAR
 armor/urand_resistance URAND_RESISTANCE
 armor/urand_folly URAND_FOLLY
-armor/urand_edison URAND_EDISON
+armor/urand_maxwell URAND_MAXWELL
 armor/urand_dragonmask URAND_DRAGONMASK
 armor/urand_night URAND_NIGHT
 armor/urand_dragon_king URAND_DRAGON_KING
 armor/urand_alchemist URAND_ALCHEMIST
 armor/urand_fencer URAND_FENCER
+armor/urand_starlight URAND_STARLIGHT
 ring/urand_shadows URAND_SHADOWS
 ring/urand_shaolin URAND_SHAOLIN
 ring/urand_robustness URAND_ROBUSTNESS
diff --git a/crawl-ref/source/rltiles/item/armor/mpttled_dragon_armour.bmp b/crawl-ref/source/rltiles/item/armor/mottled_dragon_armour.bmp
index 83b0385fb6..83b0385fb6 100644
--- a/crawl-ref/source/rltiles/item/armor/mpttled_dragon_armour.bmp
+++ b/crawl-ref/source/rltiles/item/armor/mottled_dragon_armour.bmp
diff --git a/crawl-ref/source/rltiles/item/armor/urand_edison.bmp b/crawl-ref/source/rltiles/item/armor/urand_maxwell.bmp
index 746b3fe55a..746b3fe55a 100644
--- a/crawl-ref/source/rltiles/item/armor/urand_edison.bmp
+++ b/crawl-ref/source/rltiles/item/armor/urand_maxwell.bmp
diff --git a/crawl-ref/source/rltiles/item/armor/urand_starlight.bmp b/crawl-ref/source/rltiles/item/armor/urand_starlight.bmp
new file mode 100644
index 0000000000..a6a345485c
--- /dev/null
+++ b/crawl-ref/source/rltiles/item/armor/urand_starlight.bmp
diff --git a/crawl-ref/source/rltiles/item/weapon/urand_dire_lajatang.bmp b/crawl-ref/source/rltiles/item/weapon/lajatang2.bmp
index b6807796bb..b6807796bb 100644
--- a/crawl-ref/source/rltiles/item/weapon/urand_dire_lajatang.bmp
+++ b/crawl-ref/source/rltiles/item/weapon/lajatang2.bmp
diff --git a/crawl-ref/source/rltiles/player/body/edison.bmp b/crawl-ref/source/rltiles/player/body/maxwell.bmp
index 7e4c19e824..7e4c19e824 100644
--- a/crawl-ref/source/rltiles/player/body/edison.bmp
+++ b/crawl-ref/source/rltiles/player/body/maxwell.bmp
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
diff --git a/crawl-ref/source/unrand.h b/crawl-ref/source/unrand.h
index b8f4df1d4f..ea1cec9f5b 100644
--- a/crawl-ref/source/unrand.h
+++ b/crawl-ref/source/unrand.h
@@ -362,7 +362,7 @@
         0, 0, 0, 0, 0, 0,
         0, 0, 0, 0, 0,
         0, 0, 0, 0, 0,
-        1, 0                                  // cursed
+        4, 0                                  // cursed
     }
     ,
         "",
@@ -768,7 +768,7 @@
         0, 0, 0, 0, 0, 0,
         0, 0, 0, 0, 0,
         1, 0, 0, 0, 3,          // force berserk, to dam
-        1, -20                  // cursed, stealth
+        3, -20                  // cursed, stealth
     }
     ,
         "",
@@ -1163,20 +1163,19 @@
 
 /* 56 */
 {
-    "dire lajatang", "double lajatang",
-        OBJ_WEAPONS, WPN_LAJATANG, -2, +9, RED,
+    "cloak of Starlight", "phosphorescent cloak",
+        OBJ_ARMOUR, ARM_CLOAK, 0, 0, WHITE,
     {
-        SPWPN_VORPAL, 0, 0, 0, 0, -3, // -Dex
-        0, 0, 0, 0, 0, 0,
+        0, 0, 4, 0, 0, 0,  // EV
+        0, 1, 1, 0, 0, 0,  // Cold, resElec
         0, 0, 0, 0, 0, 0,
         0, 0, 0, 0, 0,
         0, 0, 0, 0, 0,
-        0, 0
+        0, -30             // Stealth
     }
     ,
-        "Those who figure out how to use this exceedingly awkward weapon can "
-        "do great damage with its two pairs of razor-sharp blades.",
-        "A double lajatang.",
+        "A cloak woven of pure light beams.",
+        "A phosphorescent cloak.",
         ""
 },