summaryrefslogtreecommitdiffstats
path: root/crawl-ref/settings
diff options
context:
space:
mode:
authorShmuale Mark <shm.mark@gmail.com>2014-05-19 22:07:47 -0400
committerShmuale Mark <shm.mark@gmail.com>2014-05-20 08:14:44 -0400
commitf34309edb6f513156322d6a38c355bad10983b4b (patch)
treef2e236944d56e3bd8508ead58f150773636782cd /crawl-ref/settings
parent2f857d4d6532dfa3567c7ef5f659bdbc23d06bd1 (diff)
downloadcrawl-ref-f34309edb6f513156322d6a38c355bad10983b4b.tar.gz
crawl-ref-f34309edb6f513156322d6a38c355bad10983b4b.zip
Synchronize headers of options_guide.txt and init.txt (#6627).
Also some miscellaneous shuffling around.
Diffstat (limited to 'crawl-ref/settings')
-rw-r--r--crawl-ref/settings/init.txt32
1 files changed, 16 insertions, 16 deletions
diff --git a/crawl-ref/settings/init.txt b/crawl-ref/settings/init.txt
index 9bcc3f1809..569ecd4364 100644
--- a/crawl-ref/settings/init.txt
+++ b/crawl-ref/settings/init.txt
@@ -192,8 +192,8 @@
# autofight_stop = 30
# automagic_enable = false
-# automagic_stop = 0
# automagic_fight = false
+# automagic_stop = 0
##### 3-i Messages and Display Enhancements #####
#
@@ -204,26 +204,32 @@
# stat_colour = 1:lightred, 3:red
# status_caption_colour = yellow
-# mlist_min_height = 4
-# msg_min_height = 7
-# msg_max_height = 10
-# mlist_allow_alternate_layout = true
-# messages_at_top = true
-# mlist_targeting = true
-# show_gold_turns = false
-# show_game_turns = false
-# show_newturn_mark = false
# clear_messages = true
# small_more = true
# show_more = false
# show_inventory_weights = (drop_pickup | true | false)
+# show_newturn_mark = false
+# show_gold_turns = false
+# show_game_turns = false
# item_stack_summary_minimum = 4
+# mlist_min_height = 4
+# mlist_allow_alternate_layout = true
+# mlist_targeting = true
+# msg_min_height = 7
+# msg_max_height = 10
+# messages_at_top = true
# msg_condense_repeats = false
# msg_condense_short = false
# skill_focus = false
# show_travel_trail = false (true for online)
# view_delay = 600
+# You can also enforce a --more-- prompt for messages
+
+## Avoid wasting turns with aborted actions:
+# force_more_message += There are no visible monsters within range
+# force_more_message += This wand has no charges
+
##### 3-j Colours (messages and menus) ##########
#
# Food is colour coded by default as follows:
@@ -263,12 +269,6 @@
# message_colour ^= mute:(HP|Magic) restored
# message_colour ^= mute:warning:Not with.*(in view|monsters around)
-# You can also enforce a --more-- prompt for messages
-
-## Avoid wasting turns with aborted actions:
-# force_more_message += There are no visible monsters within range
-# force_more_message += This wand has no charges
-
##### 3-k Firing Commands #######################
#
# fire_items_start = a