From 31d689b8a618f671f7ef6bf3e3270d471853c26f Mon Sep 17 00:00:00 2001
From: j-p-e-g <j-p-e-g@c06c8d41-db1a-0410-9941-cceddc491573>
Date: Thu, 20 Mar 2008 14:48:57 +0000
Subject: Outsource more speech: * Beogh's rants on destroying one of his idols
 * orcs converting to you * holy beings becoming neutral

git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@3745 c06c8d41-db1a-0410-9941-cceddc491573
---
 crawl-ref/source/randart.cc | 17 +++++++++++------
 1 file changed, 11 insertions(+), 6 deletions(-)

(limited to 'crawl-ref/source/randart.cc')

diff --git a/crawl-ref/source/randart.cc b/crawl-ref/source/randart.cc
index a687e6ffa1..71c9f96a11 100644
--- a/crawl-ref/source/randart.cc
+++ b/crawl-ref/source/randart.cc
@@ -130,9 +130,10 @@ static std::string replace_name_parts(const std::string name_in,
             god_gift = static_cast<god_type>(help);
     }
 
-    // Don't allow "player's Doom" type names for god gifts (except Xom!)
-    if (name.find("@player_name@'s", 0) != std::string::npos
-        && god_gift != GOD_NO_GOD && god_gift != GOD_XOM)
+    // Don't allow "player's Death" type names for god gifts (except Xom!)
+    if (god_gift != GOD_NO_GOD && god_gift != GOD_XOM
+        && name.find("@player_name@'s", 0) != std::string::npos
+        && name.find("Death", 0) != std::string::npos)
     {
         // simply overwrite the name with one of type "god's Favour"
         name = "of ";
@@ -153,7 +154,7 @@ static std::string replace_name_parts(const std::string name_in,
         std::string place;
         if (one_chance_in(5))
         {
-            switch(random2(6))
+            switch(random2(8))
             {
             case 0:
             case 1:
@@ -165,9 +166,13 @@ static std::string replace_name_parts(const std::string name_in,
                place = "Pandemonium";
                break;
             case 4:
+            case 5:
+               place = "the Realm of Zot";
+               break;
+            case 6:
                place = "the Labyrinth";
                break;
-            case 5:
+            case 7:
                place = "the Portal Chambers";
                break;
             }
@@ -175,7 +180,7 @@ static std::string replace_name_parts(const std::string name_in,
         else
         {
             const branch_type branch =
-                     static_cast<branch_type>(random2(BRANCH_INFERNO));
+                     static_cast<branch_type>(random2(BRANCH_TARTARUS));
             place = place_name( get_packed_place(branch, 1, LEVEL_DUNGEON),
                                 true, false );
         }
-- 
cgit v1.2.3-54-g00ecf