Added Lemuel's randart names with some editing.

git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@1600 c06c8d41-db1a-0410-9941-cceddc491573

1 files changed, 172 insertions, 11 deletions

diff --git a/crawl-ref/source/randart.cc b/crawl-ref/source/randart.cc
index 47d46955a8..bb0588a83a 100644
--- a/crawl-ref/source/randart.cc
+++ b/crawl-ref/source/randart.cc
@@ -463,6 +463,27 @@ const char *rand_wpn_names[] = {
     " \"Leviticus\"",
 /* 390: */
     " of Joyful Slaughter"
+
+    // Lemuel's new names
+    " \"Eviscerator\"",
+    " \"Undertaker\"",
+    " \"Embalmer\"",
+    " of Sudden Death",
+    " of Slow Death",
+    " of Certain Death",
+    " of Uncertain Death",
+    " \"Trog's Wrath\"",
+    " \"Ogre's Foe\"",
+    " \"Dragon's Doom\"",
+    " \"Hellblazer\"",
+    " \"Hell-Harrower\"",
+    " of Hacking and Slashing",
+    " of Anger",
+    " of Fury",
+    " of Righteous Fury",
+    " of the Warrior",
+    " of the Doomed Warrior",
+    " of the Warrior-Mage"
 };
 
 const char *rand_armour_names[] = {
@@ -477,7 +498,6 @@ const char *rand_armour_names[] = {
     " of Eternal Vigilance",
     " of Fun",
     " of Joy",
-/* 10: */
     " of Death's Door",
     " of the Gate",
     " of Watchfulness",
@@ -488,7 +508,6 @@ const char *rand_armour_names[] = {
     " of Grot",
     " of Grottiness",
     " of Filth",
-/* 20: */
     " of Wonder",
     " of Wondrous Power",
     " of Power",
@@ -499,7 +518,6 @@ const char *rand_armour_names[] = {
     " of the Mouse",
     " of the Saviour",
     " of Plasticity",
-/* 30: */
     " of Baldness",
     " of Terror",
     " of the Arcane",
@@ -510,7 +528,6 @@ const char *rand_armour_names[] = {
     " of the Tortoise",
     " of the Turtle",
     " of the Armadillo",
-/* 40: */
     " of the Echidna",
     " of the Armoured One",
     " of Weirdness",
@@ -521,7 +538,6 @@ const char *rand_armour_names[] = {
     " of Indemnity",
     " of Limitation",
     " of Exclusion",
-/* 50: */
     " of Repulsion",
     " of Untold Secrets",
     " of the Earth",
@@ -532,7 +548,6 @@ const char *rand_armour_names[] = {
     " of Glory",
     " of Preservation",
     " of Conservation",
-/* 60: */
     " of Protective Custody",
     " of the Clam",
     " of the Barnacle",
@@ -543,9 +558,157 @@ const char *rand_armour_names[] = {
     " of the Vacuum",
     " of Compression",
     " of Decompression",
+    " of the Loofah",
 
-/* 70: */
-    " of the Loofah"
+    // Lemuel's new names
+    " of the Sun",
+    " of the Moon",
+    " of the Stars",
+    " of the Planets",
+    " of the Pleiades",
+    " of the Morning Star",
+    " of the Evening Star",
+    " of the Seven Stars",
+    " of the Seventy-Seven Stars",
+    " of the Seven Hundred Seventy-Seven Stars",
+    " of Departure",
+    " of Arrival",
+    " of Change",
+    " of Stasis",
+    " of Doubt",
+    " of Uncertainty",
+    " of the Elephant",
+    " of the Donkey",
+    " of the Zebra",
+    " of the Hippo",
+    " of the Giraffe",
+    " of the Monkey",
+    " of the Monkey's Uncle",
+    " of Shadows and Fog",
+    " of Love and Death",
+    " of Crimes and Misdemeanours",
+    " of Courage",
+    " of Cowardice",
+    " of Valour",
+    " of the Extremes",
+    " of the Middle",
+    " of the Median",
+    " of Optimism",
+    " of Pessimism",
+    " of the Man with No Name",
+    " of Crawling",
+    " of Zot",
+    " of the Orb",
+    " of the Orb Guardian",
+    " of the Dragon",
+    " of the Komodo Dragon",
+    " of the Swamp",
+    " of the Islands",
+    " of the Lair",
+    " of the Beasts",
+    " of the Vault",
+    " of the Hive",
+    " of the Beekeeper",
+    " of the Garden",
+    " of the Gardener",
+    " of the Assistant Gardener",
+    " of War",
+    " of Peace",
+    " of Xom",
+    " of Xom's Laughter",
+    " of Xom's Questionable Humour",
+    " of Zin's Displeasure",
+    " of the Gods",
+    " of Atheism",
+    " of Agnosticism",
+    " of Heresy",
+    " of the Nightingale",
+    " of the Meadowlark",
+    " of Analysis",
+    " of the Ego",
+    " of the Id",
+    " of the Empty Set",
+    " with No Name",
+    " with an Unpronounceable Name",
+    " with a Strange-Sounding Name",
+    " of Trumpets",
+    " of the Kettle-Drum",
+    " of the Accordion",
+    " of the Hangman",
+    " of the Hanged Man",
+    " of Insatiable Hunger",
+    " of the Devil",
+    " of Demons",
+    " of Lesser Demons",
+    " of Greater Demons",
+    " of the Iron Devil",
+    " of Terror",
+    " of Annoyance",
+    " of Minor Irritation",
+    " of Boredom",
+    " of Ennui",
+    " of the Springtime",
+    " of Midsummer",
+    " of the Harvest",
+    " of First Snow",
+    " of Boiling Hail",
+    " of Perpetual Drought",
+    " of the Poles",
+    " of the Tropics",
+    " of the Equator",
+    " of the Flat Earth",
+    " of Premature Burial",
+    " of False Imprisonment",
+    " of Moderation",
+    " of Extremism",
+    " of Fun and Games",
+    " of the Great Game",
+    " of the Game of Life",
+    " of the King",
+    " of the Queen",
+    " of Royalty",
+    " of Nobility",
+    " of the Republic",
+    " of the Empire",
+    " of Commoners",
+    " of Peasants",
+    " of Townfolk",
+    " of the City",
+    " of the Country",
+    " of the Suburbs",
+    " \"Hero's Friend\"",
+    " of Calculation",
+    " of Instinct",
+    " of Intuition",
+    " of Magic",
+    " of Sorcery",
+    " of Hedge Wizardry",
+    " of Doom",
+    " of Pride",
+    " of Honour",
+    " of Dishonour",
+    " of Shame",
+    " of Embarrassment",
+    " of Abstract Expressionism",
+    " of Free Expression",
+    " of the Guilds",
+    " of the Guild-Master",
+    " of the Apprentice",
+    " of the Blacksmith",
+    " of the Carpenter",
+    " of the Wheelwright",
+    " of the Cooper",
+    " of the Fisher",
+    " of the Hunter",
+    " of the Ditch-Digger",
+    " of Patience",
+    " of Impatience",
+    " of Anxiety",
+    " of Urgency",
+    " \"Forget-Me-Not\"",
+    " of Lilacs",
+    " of Daffodils",
+    " of the Rose"
 };
 
 // Remember: disallow unrandart creation in abyss/pan
@@ -709,8 +872,7 @@ void randart_wpn_properties( const item_def &item,
         return;
     }
 
-    // long seed = aclass * adam + atype * (aplus % 100) + aplus2 * 100;
-    long seed = calc_seed( item );
+    const long seed = calc_seed( item );
     push_rng_state();
     seed_rng( seed );
 
@@ -1253,7 +1415,6 @@ std::string randart_armour_name( const item_def &item )
     }
 
     const long seed = calc_seed( item );
-    
     push_rng_state();
     seed_rng( seed );