Tweak Trog's Berserk description - he doesn't routinely prevent

followers from passing out, though the chance eventually reaches 100%.


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

5 files changed, 10 insertions, 13 deletions

diff --git a/crawl-ref/source/acr.cc b/crawl-ref/source/acr.cc
index 58ce26362c..3b59ced864 100644
--- a/crawl-ref/source/acr.cc
+++ b/crawl-ref/source/acr.cc
@@ -2834,8 +2834,8 @@ static void _decrement_durations()
 
             // Note the beauty of Trog!  They get an extra save that's at
             // the very least 20% and goes up to 100%.
-            if ( you.religion == GOD_TROG && you.piety > random2(150)
-                 && !player_under_penance() )
+            if (you.religion == GOD_TROG && you.piety > random2(150)
+                && !player_under_penance())
             {
                 mpr("Trog's vigour flows through your veins.");
             }
diff --git a/crawl-ref/source/dat/descript/ability.txt b/crawl-ref/source/dat/descript/ability.txt
index 2907355bc4..5a6ba553a6 100644
--- a/crawl-ref/source/dat/descript/ability.txt
+++ b/crawl-ref/source/dat/descript/ability.txt
@@ -281,7 +281,8 @@ cannot perform a number of actions such as, for example, (un)wield a
 weapon, quaff something, zap wands, or evoke items.
 Such a rage is usually followed by deep exhaustion, a time during
 which you are slowed down, and cannot berserk again. Unlike other 
-sources of rage, Trog prevents you from passing out.
+sources of rage, depending on your piety Trog may occasionally 
+prevent you from passing out.
 %%%%
 Trog's Hand
 
diff --git a/crawl-ref/source/describe.cc b/crawl-ref/source/describe.cc
index 9581b778c0..502c609395 100644
--- a/crawl-ref/source/describe.cc
+++ b/crawl-ref/source/describe.cc
@@ -3063,7 +3063,10 @@ std::string get_skill_description(int skill, bool need_title)
             unarmed_attacks.push_back("kick your enemies");
         }
 
-        unarmed_attacks.push_back("punch monsters with your free hand");
+        if (you.equip[EQ_WEAPON] == -1)
+            unarmed_attacks.push_back("punch monsters");
+        else if (you.equip[EQ_SHIELD] == -1)
+            unarmed_attacks.push_back("punch monsters with your free hand");
 
         if (!unarmed_attacks.empty())
         {
diff --git a/crawl-ref/source/item_use.cc b/crawl-ref/source/item_use.cc
index 6390e5b743..0f9640d5fe 100644
--- a/crawl-ref/source/item_use.cc
+++ b/crawl-ref/source/item_use.cc
@@ -4825,14 +4825,6 @@ void tile_use_item(int idx, InvAction act)
 
     // Use it
     const int type = item.base_type;
-/*
-    if ((type == OBJ_ARMOUR || type == OBJ_JEWELLERY)
-        && you.attribute[ATTR_TRANSFORMATION] == TRAN_BAT)
-    {
-        canned_msg(MSG_PRESENT_FORM);
-        return;
-    }
-*/
     switch (type)
     {
         case OBJ_WEAPONS:
diff --git a/crawl-ref/source/transfor.cc b/crawl-ref/source/transfor.cc
index b27ad87854..f4152cb2ef 100644
--- a/crawl-ref/source/transfor.cc
+++ b/crawl-ref/source/transfor.cc
@@ -50,7 +50,8 @@ static void _init_equipment_removal(std::set<equipment_type> &rem_stuff,
         break;
 
     case TRAN_BAT:
-        // Bats can't wear rings.
+        // Bats can't wear rings, either. This means that the only equipment
+        // the player may keep wearing upon transformation is an amulet.
         rem_stuff.insert(EQ_LEFT_RING);
         rem_stuff.insert(EQ_RIGHT_RING);
         break;