Autoprayer is gone.

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

12 files changed, 3 insertions, 105 deletions

diff --git a/crawl-ref/docs/changes.stone_soup b/crawl-ref/docs/changes.stone_soup
index a68e96171d..e546bd93d5 100644
--- a/crawl-ref/docs/changes.stone_soup
+++ b/crawl-ref/docs/changes.stone_soup
@@ -29,6 +29,7 @@ Interface
 * Refuse to eat rotten meat for non-saprovorous characters.
 * Evaporate can now be cancelled during potion/direction choice.
 * greedy_explore now defaults to true.
+* Autoprayer is gone.
 
 Gods
 ----
diff --git a/crawl-ref/docs/options_guide.txt b/crawl-ref/docs/options_guide.txt
index e7d6130b5e..02608f1020 100644
--- a/crawl-ref/docs/options_guide.txt
+++ b/crawl-ref/docs/options_guide.txt
@@ -56,7 +56,7 @@ The contents of this text are:
                 auto_list, easy_open, easy_unequip, easy_confirm, 
                 easy_butcher, always_confirm_butcher,
                 easy_quit_item_prompts, easy_exit_menu, 
-                default_autoprayer, sort_menus
+                sort_menus
 4-j     Message and Display Improvements.
                 hp_warning, mp_warning, hp_colour, mp_colour,
                 status_caption_colour, delay_message_clear,
@@ -766,7 +766,6 @@ runrest_ignore_message = <string>
         run. E.g.
              runrest_ignore_message = offer a prayer,prayer is over
              runrest_ignore_message = pleased with you,exalted
-        (useful in conjunction with autoprayer.)
 
         Note that monster talk and dungeon noises already do not 
         interrupt running or resting, by default. 
@@ -914,22 +913,6 @@ easy_exit_menu = true
         In multidrop (and pickup) menus, paging past the end will drop 
         out of the menu if easy_exit_menu is true.
 
-default_autoprayer = false
-        When set to true, the game will start with automatic prayers. 
-        This option can be toggled in-game with Ctrl-V.
-
-        Automatic prayers take a turn like manual prayers and happen 
-        only if
-        - there is no hostile monster in sight
-        - some further conditions (like not standing at an altar)
-        Note that even when you're praying, you can renew prayer 
-        anytime. Also note the option safe_zero_exp (see 4-a) decides 
-        whether zero experience monsters (like plants) are considered 
-        hostile.
-        If you use autoprayer, you might want to set 
-        runrest_ignore_message to ignore the prayer messages (see the
-        documentation for runrest_ignore_message).
-
 sort_menus = [menu:](true | false | auto:X)[:sort_order]
         Controls if and how items are sorted in inventory and pickup
         menus.
diff --git a/crawl-ref/settings/init.txt b/crawl-ref/settings/init.txt
index dd80b3a3c2..8b5da68ea9 100644
--- a/crawl-ref/settings/init.txt
+++ b/crawl-ref/settings/init.txt
@@ -208,7 +208,6 @@ include = travel_stoppers.txt
 # chunks_autopickup      = true
 # easy_quit_item_prompts = false
 # easy_exit_menu         = false
-# default_autoprayer = true
 # sort_menus = pickup: true : basename, qualname, curse, qty
 
 ##### 4-j	Messages and Display Enhancements #####
diff --git a/crawl-ref/settings/messages.txt b/crawl-ref/settings/messages.txt
index d9dcae46c5..91220a39cd 100644
--- a/crawl-ref/settings/messages.txt
+++ b/crawl-ref/settings/messages.txt
@@ -36,6 +36,3 @@ message_colour = darkgrey:disappears in a puff of smoke
 #
 message_colour = darkgrey:miss(es)? (the|you|it)
 message_colour = darkgrey:but (do no|doesn't do any) damage
-
-# Uncomment to Reduce auto-prayer spam
-#msc = mute:pray:(You offer a prayer|with you\.|your worship\.|noncommittal\.)
diff --git a/crawl-ref/source/acr.cc b/crawl-ref/source/acr.cc
index d0f1ea51eb..dad3f3faf6 100644
--- a/crawl-ref/source/acr.cc
+++ b/crawl-ref/source/acr.cc
@@ -1264,7 +1264,6 @@ static bool _cmd_is_repeatable(command_type cmd, bool is_again = false)
     case CMD_FIX_WAYPOINT:
     case CMD_CLEAR_MAP:
     case CMD_INSCRIBE_ITEM:
-    case CMD_TOGGLE_AUTOPRAYER:
     case CMD_MAKE_NOTE:
     case CMD_CYCLE_QUIVER_FORWARD:
         mpr("You can't repeat that command.");
@@ -1426,8 +1425,6 @@ static void _input()
         return;
     }
 
-    do_autopray();              // this might set you.turn_is_over
-
     if ( you.turn_is_over )
     {
         _world_reacts();
@@ -1886,16 +1883,6 @@ void process_command( command_type cmd )
         _toggle_flag( &Options.autopickup_on, "Autopickup");
         break;
 
-    case CMD_TOGGLE_AUTOPRAYER:
-        if (you.religion == GOD_NEMELEX_XOBEH)
-        {
-            mpr("Those worshipping Nemelex Xobeh don't need to autopray.");
-            Options.autoprayer_on = false;
-        }
-        else
-            _toggle_flag( &Options.autoprayer_on, "Autoprayer" );
-        break;
-
     case CMD_TOGGLE_FRIENDLY_PICKUP:
     {
         // Toggle pickup mode for friendlies.
@@ -3428,7 +3415,6 @@ static command_type _keycode_to_command( keycode_type key )
     case CONTROL('R'): return CMD_REDRAW_SCREEN;
     case CONTROL('S'): return CMD_MARK_STASH;
     case CONTROL('T'): return CMD_TOGGLE_FRIENDLY_PICKUP;
-    case CONTROL('V'): return CMD_TOGGLE_AUTOPRAYER;
     case CONTROL('W'): return CMD_FIX_WAYPOINT;
     case CONTROL('X'): return CMD_SAVE_GAME_NOW;
     case CONTROL('Z'): return CMD_SUSPEND_GAME;
diff --git a/crawl-ref/source/delay.cc b/crawl-ref/source/delay.cc
index 29be88c450..b0605fb4ff 100644
--- a/crawl-ref/source/delay.cc
+++ b/crawl-ref/source/delay.cc
@@ -678,10 +678,6 @@ void handle_delay( void )
     // Run delays and Lua delays don't have a specific end time.
     if (is_run_delay(delay.type))
     {
-        // Hack - allow autoprayer to trigger during run delays
-        if ( do_autopray() )
-            return;
-
         handle_run_delays(delay);
         return;
     }
@@ -790,12 +786,6 @@ void handle_delay( void )
             // switches back to their main weapon if necessary.
             delay.duration = 0;
         }
-
-        if (delay.type == DELAY_OFFER_CORPSE && !you.duration[DUR_PRAYER]
-            && do_autopray())
-        {
-            return;
-        }
     }
     else if (delay.type == DELAY_MULTIDROP)
     {
@@ -1138,7 +1128,7 @@ static void finish_delay(const delay_queue_item &delay)
 
     case DELAY_OFFER_CORPSE:
     {
-        if (!you.duration[DUR_PRAYER] && !do_autopray())
+        if (!you.duration[DUR_PRAYER])
         {
             stop_delay();
             return;
@@ -1652,12 +1642,6 @@ static void paranoid_option_disable( activity_interrupt_type ai,
         {
             std::vector<std::string> deactivatees;
             std::vector<std::string> restart;
-            if (Options.autoprayer_on)
-            {
-                deactivatees.push_back("autoprayer");
-                Options.autoprayer_on = false;
-                restart.push_back("Ctrl+V");
-            }
 
             if (Options.autopickup_on)
             {
diff --git a/crawl-ref/source/enum.h b/crawl-ref/source/enum.h
index f5a60d8ed7..3e242deec1 100644
--- a/crawl-ref/source/enum.h
+++ b/crawl-ref/source/enum.h
@@ -500,7 +500,6 @@ enum command_type
 
     CMD_CLEAR_MAP,
     CMD_INSCRIBE_ITEM,
-    CMD_TOGGLE_AUTOPRAYER,
     CMD_MAKE_NOTE,
     CMD_RESISTS_SCREEN,
 
diff --git a/crawl-ref/source/externs.h b/crawl-ref/source/externs.h
index ccf8d5c8bb..d05fcff2ea 100644
--- a/crawl-ref/source/externs.h
+++ b/crawl-ref/source/externs.h
@@ -555,7 +555,6 @@ public:
 
   std::vector<int> beheld_by; // monsters beholding player
 
-  bool just_autoprayed;       // autopray just kicked in
   int  friendly_pickup;       // pickup setting for allies
 
   unsigned short prev_targ;
@@ -1620,7 +1619,6 @@ public:
     int         scroll_margin_y;
 
     bool        autopickup_on;
-    bool        autoprayer_on;
     int         default_friendly_pickup;
     bool        show_more_prompt;
 
diff --git a/crawl-ref/source/initfile.cc b/crawl-ref/source/initfile.cc
index f6be423732..a21f306a7c 100644
--- a/crawl-ref/source/initfile.cc
+++ b/crawl-ref/source/initfile.cc
@@ -628,7 +628,6 @@ void game_options::reset_options()
     scroll_margin_y  = 2;
 
     autopickup_on = true;
-    autoprayer_on = false;
     default_friendly_pickup = FRIENDLY_PICKUP_FRIEND;
     show_more_prompt = true;
 
@@ -1847,7 +1846,6 @@ void game_options::read_option_line(const std::string &str, bool runscript)
 #endif
     else BOOL_OPTION(use_old_selection_order);
     else BOOL_OPTION_NAMED("default_autopickup", autopickup_on);
-    else BOOL_OPTION_NAMED("default_autoprayer", autoprayer_on);
     else if (key == "default_friendly_pickup")
     {
         if (field == "none")
diff --git a/crawl-ref/source/misc.cc b/crawl-ref/source/misc.cc
index 039d908e2c..7cd5763454 100644
--- a/crawl-ref/source/misc.cc
+++ b/crawl-ref/source/misc.cc
@@ -2681,50 +2681,6 @@ int str_to_shoptype(const std::string &s)
     return (-1);
 }
 
-/* Decides whether autoprayer Right Now is a good idea. */
-static bool should_autopray()
-{
-    if ( Options.autoprayer_on == false
-         || you.religion == GOD_NO_GOD
-         || you.religion == GOD_NEMELEX_XOBEH
-         || you.duration[DUR_PRAYER]
-         || grid_altar_god( grd[you.x_pos][you.y_pos] ) != GOD_NO_GOD
-         || !i_feel_safe() )
-    {
-        return false;
-    }
-
-    // We already know that we're not praying now. So if you
-    // just autoprayed, there's a problem.
-    if ( you.just_autoprayed )
-    {
-        mpr("Autoprayer failed, deactivating.", MSGCH_WARN);
-        Options.autoprayer_on = false;
-        return false;
-    }
-
-    return true;
-}
-
-// Actually performs autoprayer.
-bool do_autopray()
-{
-    if ( you.turn_is_over )     // can happen with autopickup, I think
-        return false;
-
-    if ( should_autopray() )
-    {
-        pray();
-        you.just_autoprayed = true;
-        return true;
-    }
-    else
-    {
-        you.just_autoprayed = false;
-        return false;
-    }
-}
-
 // general threat = sum_of_logexpervalues_of_nearby_unfriendly_monsters
 // highest threat = highest_logexpervalue_of_nearby_unfriendly_monsters
 void monster_threat_values(double *general, double *highest)
diff --git a/crawl-ref/source/misc.h b/crawl-ref/source/misc.h
index 137e2d1849..7c919859f8 100644
--- a/crawl-ref/source/misc.h
+++ b/crawl-ref/source/misc.h
@@ -130,8 +130,6 @@ void run_environment_effects();
 
 int str_to_shoptype(const std::string &s);
 
-bool do_autopray();
-
 bool player_in_a_dangerous_place();
 
 coord_def pick_adjacent_free_square(int x, int y);
diff --git a/crawl-ref/source/player.cc b/crawl-ref/source/player.cc
index ceda047d63..aa385ae644 100644
--- a/crawl-ref/source/player.cc
+++ b/crawl-ref/source/player.cc
@@ -5407,7 +5407,6 @@ void player::init()
     entering_level = false;
     transit_stair  = DNGN_UNSEEN;
 
-    just_autoprayed = false;
     berserk_penalty = 0;
     disease         = 0;
     elapsed_time    = 0;