Time out friendly bribed monsters like neutral bribed monsters (dpeg).

Yes, this means they don't demand payment now and again, and stop
following you when the initial bribe expires.

1 files changed, 1 insertions, 39 deletions

diff --git a/crawl-ref/source/mon-ench.cc b/crawl-ref/source/mon-ench.cc
index c42622a37f..497b6bb994 100644
--- a/crawl-ref/source/mon-ench.cc
+++ b/crawl-ref/source/mon-ench.cc
@@ -623,42 +623,8 @@ void monster::remove_enchantment_effect(const mon_enchant &me, bool quiet)
         behaviour_event(this, ME_EVAL);
         break;
 
-    case ENCH_PERMA_BRIBED:
-        // Only demand further payment if you can see the player.
-        if (you_worship(GOD_GOZAG) && !props.exists(GOZAG_BRIBE_BROKEN_KEY))
-        {
-            if (!you.can_see(this))
-            {
-                add_ench(mon_enchant(ENCH_PERMA_BRIBED, 1, NULL,
-                                     20 * BASELINE_DELAY));
-                break;
-            }
-            else
-            {
-                string monname = name(DESC_THE);
-                const int cost =
-                    max(1, fuzz_value(exper_value(this), 15, 15) / 10);
-                mprf("%s demands further payment of %d gold.", monname.c_str(),
-                     cost);
-                if (you.gold >= cost)
-                {
-                    string prompt = make_stringf("Pay %s demand of %d gold?",
-                                                 apostrophise(monname).c_str(),
-                                                 cost);
-                    if (yesno(prompt.c_str(), false, 0))
-                    {
-                        mprf("%s seems mollified.", monname.c_str());
-                        you.gold -= cost;
-                        add_ench(ENCH_PERMA_BRIBED);
-                        break;
-                    }
-                }
-                else
-                    mpr("You cannot afford to meet that demand!");
-            }
-        }
-        // deliberate fall-through
     case ENCH_BRIBED:
+    case ENCH_PERMA_BRIBED:
         if (!quiet)
             simple_monster_message(this, " is no longer bribed.");
 
@@ -1345,7 +1311,6 @@ void monster::apply_enchantment(const mon_enchant &me)
     case ENCH_FROZEN:
     case ENCH_EPHEMERAL_INFUSION:
     case ENCH_SAP_MAGIC:
-    case ENCH_PERMA_BRIBED:
     case ENCH_CORROSION:
     case ENCH_GOLD_LUST:
     // case ENCH_ROLLING:
@@ -2502,9 +2467,6 @@ int mon_enchant::calc_duration(const monster* mons,
     case ENCH_FROZEN:
         cturn = 3 * BASELINE_DELAY;
         break;
-    case ENCH_PERMA_BRIBED:
-        cturn = 10000 / _mod_speed(25, mons->speed);
-        break;
     default:
         break;
     }