Add files documenting option changes from 0.4.5 -> 0.5 and 0.5 -> 0.5.1.

Also update options guide and settings.


git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/branches/stone_soup-0.5@10419 c06c8d41-db1a-0410-9941-cceddc491573

6 files changed, 281 insertions, 7 deletions

diff --git a/crawl-ref/docs/changelog.txt b/crawl-ref/docs/changelog.txt
index 76d445b9bd..1c597c35f2 100644
--- a/crawl-ref/docs/changelog.txt
+++ b/crawl-ref/docs/changelog.txt
@@ -48,6 +48,7 @@ Disclaimer: These are merely the highlights, not an exhaustive list of changes.
 * Allow players to reroll already named random character combinations.
 * Improved error messages when trying to load pre-0.5 save files or ghosts.
 * Some new vaults.
+* Add new milestones for the CAO tournament.
 * Tiles: Re-allow selection of player dolls ('-' command).
 * Add missing tiles options to the options guide (docs/, '?&' command).
 * Use clearer tiles for disturbances in shallow water.
diff --git a/crawl-ref/docs/crawl-0.5.0-options.txt b/crawl-ref/docs/crawl-0.5.0-options.txt
new file mode 100644
index 0000000000..6f00886361
--- /dev/null
+++ b/crawl-ref/docs/crawl-0.5.0-options.txt
@@ -0,0 +1,241 @@
+ Option Changes from DCSS 0.4.5 to DCSS 0.5
+
+1- Starting Screen:
+Changed settings:
+  'race' setting is now named 'species'
+  'class' setting is now named 'job'
+
+Added settings:
+  wand, for Artificers
+
+Add to your config file:
+# species = (Human |...| Vampire | random)
+# job     = (Fighter |...| Wanderer | random)
+# wand = (enslavement | confusion | magic darts | frost | flame | striking | random)
+
+
+3- Lua files:
+
+Removed files:
+  lua/eat.lua
+
+
+4-a Picking up and Dropping
+
+Changed defaults settings:
+  drop_filter
+  default_friendly_pickup, added new mode 'player'
+
+Add to your config file:
+drop_filter = useless_item
+# default_friendly_pickup = (none | friend | player | all)
+
+
+4-f Viewport options:
+
+Added settings:
+  verbose_monster_pane
+
+Add to your config file:
+# verbose_monster_pane = false
+
+
+4-g Travel:
+Added settings:
+  auto_exclude
+
+Add to your config file:
+auto_exclude = oklob plant,silver statue,orange crystal statue,ice statue
+auto_exclude = curse skull,roxanne
+
+
+4-h Stashes:
+Removed settings:
+  stash_tracking
+
+Add to your config file:
+# 14 filters out corpses
+# stash_filter = 14
+
+stash_filter = scroll of curse armour, scroll of curse weapon, scroll of noise
+stash_filter = scroll of immolation, scroll of random uselessness
+stash_filter = scroll of paper
+
+stash_filter = ring of hunger, amulet of inaccuracy
+
+
+4-i Command Enhancements:
+Added settings:
+  prefer_safe_chunks
+  easy_eat_chunks
+  easy_eat_gourmand
+  easy_eat_contaminated
+
+Add to your config file:
+# prefer_safe_chunks     = false
+# easy_eat_chunks        = true
+# easy_eat_gourmand      = true
+# easy_eat_contaminated  = true
+
+Changed settings:
+  equip_unequip, now defaults to false
+  sort_menus, new mode 'charged'
+
+Add to your config file:
+# sort_menus = pickup: true : art, ego, basename, qualname, curse, qty
+sort_menus = inv: true : equipped, freshness, charged
+
+
+4-j Message and Display Improvements:
+Removed settings:
+  menu_colour_prefix_id
+
+Added settings:
+  stat_colour
+  menu_colour_shops
+  zap_evoke_reminder
+
+Add to your config file:
+# stat_colour = 1:lightred, 3:red
+# menu_colour_shops = false
+# Set the following to false to get rid of the "evoke wands" reminder.
+# zap_evoke_reminder = false
+
+Changed settings:
+  menu_colour_prefix_class, now defaults to true
+
+Changed some of the standard colours:
+#   lightred   = causes rot                        ($rot-inducing)
+#   magenta    = dangerous to use, mutagenic       ($dangerous, $mutagenic)
+#   red        = considered "evil" by your deity   ($evil)
+
+
+4-m Inscriptions:
+Added settings:
+  autoinscribe_randarts
+
+Add to your config file:
+# autoinscribe_randarts = false
+# autoinscribe = royal jell:=g
+autoinscribe = distortion:!w
+
+
+4-o Tiles Options:
+Changed settings:
+  'title_screen' is now named 'tile_title_screen'
+
+Added settings:
+  tile_menu_icons
+  tile_window_col
+  tile_key_repeat
+  tile_tooltip_ms
+  tile_window_width
+  tile_window_height
+  tile_map_pixels
+  tile_full_screen
+  tile_tag_pref
+  tile_font_crt_file
+  tile_font_crt_size
+  tile_font_stat_file
+  tile_font_stat_size
+  tile_font_msg_file
+  tile_font_msg_size
+  tile_font_tip_file
+  tile_font_tip_size
+  tile_font_lbl_file
+  tile_font_lbl_size
+
+Add to tiles_options.txt:
+# tile_window_col       = yellow
+# tile_menu_icons   = false
+# tile_tag_pref = enemy
+# tile_key_repeat = false
+# tile_tooltip_ms = 500
+
+### Note: setting window, map or font sizes to '0' implies auto-sizing.
+
+# tile_full_screen    = true
+# tile_window_width   = 1024
+# tile_window_height  = 768
+# tile_map_pixels     = 4
+
+# tile_font_crt_file = VeraMono.ttf
+# tile_font_crt_size = 15
+# tile_font_stat_file = VeraMono.ttf
+# tile_font_stat_size = 16
+# tile_font_msg_file = VeraMono.ttf
+# tile_font_msg_size = 14
+# tile_font_tip_file = VeraMono.ttf
+# tile_font_tip_size = 15
+# tile_font_lbl_file = Vera.ttf
+# tile_font_lbl_size = 14
+
+
+
+5-a Items and Kills:
+Added settings:
+  dump_book_spells
+
+Add to your config file:
+# dump_book_spells = false
+
+
+5-b Notes:
+Added settings:
+  note_xom_effects
+
+Add to your config file:
+#note_xom_effects = false
+
+Changed settings:
+  note_all_skill_levels, defaults to false
+  note_skill_max, defaults to true
+  note_all_spells, defaults to true
+  note_xom_effects, defaults to true
+
+
+6-a Miscellaneous (All OS):
+Added settings (used to be a command-line option):
+  pizza
+
+Add to your config file:
+# pizza            = Sausage
+
+
+6-c Unix settings:
+  use_fake_cursor, now defaults to true
+
+
+Changes in other settings files
+-------------------------------
+(~ = changed, + = added, - = removed)
+
+034_command_keys.txt:
+bindkey = [t]  CMD_FIRE instead of CMD_THROW_ITEM_NO_QUIVER
+
+
+034_monster_glyphs.txt:
++ mon_glyph = small simulacrum : white
++ mon_glyph = large simulacrum : white
+
+
+autopickup_exceptions.txt:
+- ae = inedible (removed since inedible are part of useless_item now)
+
+menu_colours.txt:
++ menu = darkgrey:(melded)
+- : elseif options.menu_colour_prefix_class then
+~ menu = $dangerous:.*dangerous_item.*
+~ menu = red: cursed
+
+
+messages.txt:
+~ multiple replacements of:
+  lightred with $danger
+  yellow with $warning
+  darkgrey with $boring
+
+
+standard_colours.txt:
+~ changes in accordance with message colouring comments from init.txt
+
diff --git a/crawl-ref/docs/crawl-0.5.1-options.txt b/crawl-ref/docs/crawl-0.5.1-options.txt
new file mode 100644
index 0000000000..178613065c
--- /dev/null
+++ b/crawl-ref/docs/crawl-0.5.1-options.txt
@@ -0,0 +1,27 @@
+ Option Changes from DCSS 0.5 to DCSS 0.5.1
+
+4-d     Branding
+
+Changed settings:
+  New defaults for
+  friend_brand = hi:green
+  neutral_brand = hi:lightgrey
+  stab_brand = hi:blue
+  may_stab_brand = hi:yellow
+  trap_item_brand = reverse
+
+
+4-o Tiles Options:
+Changed settings:
+  'tile_key_repeat' (boolean) is now named 'tile_key_repeat_delay' (number)
+
+Added settings:
+  tile_update_rate
+
+Add to tiles_options.txt:
+# If Crawl's response rate is too slow, try increasing the update rate.
+# tile_update_rate      = 1000
+# tile_key_repeat_delay = 200
+
+Many tiles options were lacking explanations in options_guide.txt, that has
+been fixed.
diff --git a/crawl-ref/docs/options_guide.txt b/crawl-ref/docs/options_guide.txt
index fde2d1b59e..41badf56e8 100644
--- a/crawl-ref/docs/options_guide.txt
+++ b/crawl-ref/docs/options_guide.txt
@@ -14,13 +14,13 @@ The contents of this text are:
 0-c     Aliases and variables.
 1-  Starting Screen.
                 name, remember_name, use_old_selection_order,
-                weapon, book, chaos_knight, death_knight, priest,
+                weapon, book, wand, chaos_knight, death_knight, priest,
                 species, job, random_pick, good_random
 2-  File System and Sound.
                 crawl_dir, morgue_dir, save_dir, macro_dir, sound
 3-  Lua files.
                 stash.lua, wield.lua, kills.lua, runrest.lua,
-                gearset.lua, eat.lua, pickup.lua, trapwalk.lua
+                gearset.lua, pickup.lua, trapwalk.lua
 4-  Interface.
 4-a     Dropping and Picking up.
                 autopickup, autopickup_exceptions, default_autopickup,
@@ -267,6 +267,11 @@ book = (flame | fire | ice | cold | summ | summoning | random)
         Several spellcasting jobs can choose their starting
         spellbook. Note flame=fire and ice=cold and summ=summoning.
 
+wand = (enslavement | confusion | magic darts | frost | flame | striking | random)
+        Artificers can start with either a wand of random effects and another
+        wand out of enslavement, confusion, magic darts, frost, or flame, or
+        with a rod of striking.
+
 chaos_knight = (Xom | Makhleb | random)
 
 death_knight = (necromancy | Yredelemnul | random)
@@ -353,7 +358,6 @@ The available stock Lua scripts are
   gearset.lua   -- provides commands for switching of complete sets via
                    macro.
                    New macroable functions: rememberkit, swapkit
-  eat.lua       -- prompts to eat chunks in inventory.
   pickup.lua    -- allows autopickup of a butchering tool if you don't
                    already have one.
   trapwalk.lua  -- allows travel to cross certain traps if you have
diff --git a/crawl-ref/settings/init.txt b/crawl-ref/settings/init.txt
index 30863b3f39..edc2d0e356 100644
--- a/crawl-ref/settings/init.txt
+++ b/crawl-ref/settings/init.txt
@@ -110,7 +110,7 @@ drop_filter = useless_item
 # drop_mode = (multi | single)
 # pickup_mode = (single | multi | auto:5)
 # drop_filter = skeleton, rotting, corpse
-# default_friendly_pickup = (none | friend | all)
+# default_friendly_pickup = (none | friend | player | all)
 
 ##### 4-b	Targetting ############################
 #
diff --git a/crawl-ref/source/initfile.cc b/crawl-ref/source/initfile.cc
index 8c04d4c972..af96637427 100644
--- a/crawl-ref/source/initfile.cc
+++ b/crawl-ref/source/initfile.cc
@@ -645,9 +645,10 @@ void game_options::reset_options()
     reset_startup_options();
 
 #if defined(SAVE_DIR_PATH)
-    save_dir  = SAVE_DIR_PATH;
-#elif !defined(DOS)
-    save_dir = "saves/";
+    save_dir   = SAVE_DIR_PATH "/saves/";
+    morgue_dir = SAVE_DIR_PATH "/morgue/";
+ #elif !defined(DOS)
+    save_dir   = "saves/";
 #else
     save_dir.clear();
 #endif