Options changes in branch.

This time I only applied my changes to source and changed
the most important points (missing options, wrong defaults
listed) in init.txt and crawl_options.txt.


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

9 files changed, 113 insertions, 75 deletions

diff --git a/crawl-ref/docs/crawl_options.txt b/crawl-ref/docs/crawl_options.txt
index 63e9f0eefe..7ff415d19c 100644
--- a/crawl-ref/docs/crawl_options.txt
+++ b/crawl-ref/docs/crawl_options.txt
@@ -170,12 +170,12 @@ chaos_knight = (Xom | Makhleb | random)
 
 death_knight = (necromancy | Yredelemnul | random)
 
-priest       = (Zin | Yredelemnul | random)
+priest       = (Zin | Yredelemnul | Beogh | random)
         The above three make in advance the additional choices for 
-        Chaos Knights, Death Knights, and Priests.
+        Chaos Knights, Death Knights, and Priests (Beogh for HO only).
 
 race = (Human |...| Merfolk | random)
-        The usual abbreviations (Hu, El, HE, etc.) work.
+        The usual abbreviations (Hu, HE, etc.) work.
 
 class = (Fighter |...| Wanderer | random)
         Here again the abbreviations (Fi, Wi, Pr, etc.) can be used.
@@ -189,15 +189,15 @@ random_pick = false
 2-  File System.
 ================
 
-crawl_dir= <path>
+crawl_dir = <path>
         Directory for reading macro.txt and init.txt, and dumping characters.
         It should end with the path delimiter.
 
-morgue_dir = <path>
+morgue_dir = morgue
         Directory where morgue dumps (morgue*.txt and morgue*.lst) files are
         written.
 
-save_dir = <path>
+save_dir = saves
         Directory where saves and bones are stored. This option may be ignored
         depending on the settings used to compile Crawl, but should be
         honoured for the official Crawl binaries.
@@ -352,9 +352,10 @@ drop_mode = (multi | single)
         multiple items to be dropped. (You can also switch to multidrop from
         the classic drop menu using the '@' key).
 
-        Multidrop can be very convenient, but be aware that every item dropped
-        takes one turn. (This is different from picking up.) When selecting
-        multidrops, the top right corner shows the estimated number of turns.
+        Multidrop is the default and can be very convenient, but be aware that 
+	every item dropped takes one turn. (This is different from picking up.) 
+	When selecting multidrops, the top right corner shows the estimated 
+	number of turns.
 
         The order in which items get dropped is from top to bottom in the 
         inventory listing, but equipped items will be dropped last, and may be 
@@ -437,13 +438,11 @@ target_unshifted_dirs = false
 4-c     Passive Sightings (via detection and remembrance).
 -----------------------------------------------------------
 
-detected_monster_colour = darkgrey
-        Monsters found by detect creatures will be coloured this colour; e.g.
-          detected_monster_colour = lightred
+detected_monster_colour = lightred
+        Monsters found by detect creatures will be coloured this colour.
 
-detected_item_colour = darkgrey
-        Items found by detect items will be given this colour, for example
-          detected_item_colour = green
+detected_item_colour = green
+        Items found by detect items will be given this colour.
 
 colour_map = true
         Colours out of sight map features on the playing screen.
@@ -473,9 +472,8 @@ See part Technical (6-) for dos_use_background_intensity under Windows and DOS.
 
 By default, no brands are active apart from stair_item_brand.
 
-heap_brand = none
-        Brand heaps of items (more than one item or stack). For example
-          heap_brand = reverse
+heap_brand = reverse
+        Brand heaps of items (more than one item or stack).
 
 friend_brand = none
         Brand friends in some way. This is very helpful for summoners. E.g.
@@ -684,13 +682,15 @@ trapwalk_safe_hp = <trap_name>:<minimum_hp>, ...
         possible. Defaults to none. For example,
               trapwalk_safe_hp = dart:15, needle:25, spear:50
 
-tc_reachable = blue
-tc_dangerous = cyan
-tc_excluded = lightmagenta
+tc_reachable      = blue
+tc_dangerous      = cyan
+tc_disconnected   = darkgrey
+tc_excluded       = lightmagenta
 tc_exclude_circle = red
-        The above four settle the colouring of the level map ('X'). They are
+        The above five settle the colouring of the level map ('X'). They are
         reachable: all squares safely reachable (without leaving the level)
         dangerous: squares which are only connected to you via traps, etc.
+	disconnected: squares which cannot be reached without leaving the level
         excluded: the colour for the centre of travel exclusions (Ctrl-X)
         excluded_circle: the colour for travel exclusions apart from centre 
 
@@ -721,6 +721,16 @@ stash_tracking = (all | explicit | dropped)
         something becomes a stash, and the game keeps track of all such 
         squares. You can still use Ctrl-S and Ctrl-E as above.
 
+stash_filter = <list of numbers>
+        This option allows filtering certain classes of items when searching
+	stashes. For example,
+	     stash_filter = 14, 4:21
+	filters corpses (14) as well as food of the subtype chunks (4:21).
+
+annotate_item_class = false
+        This only works if stash.lua has been sourced already in init.txt.
+	If set to true, automatically annotates items with their object class
+	(e.g. weapon or wand) for stash searching.
 
 4-i     Command Enhancements.
 -----------------------------
@@ -1029,23 +1039,23 @@ item_stack_summary_minimum = 5
 fire_items_start = c
         Sets the first inventory item to consider. Default is c.
 
-fire_order = launcher, dart / stone / dagger, spear, handaxe, club
-        The list should be on one line of items, with commas between items.
-        Items that appear first get higher priority.
+fire_order  = launcher, return, 
+fire_order += javelin / dart / stone / rock / spear / net / handaxe
+        Controls the order of items autoselected for firing. Items should
+	be separated by commas and items that appear first get higher priority.
+	You can use multiple fire_order lines - all lines but the first must
+	use fire_order +=
 
         Items in any position may be slash-separated to indicate that these
-        are of equal priority. In the example, darts, stones and daggers are
-        at the same priority, so the first item in your inventory that is
-        one of these will be picked for firing.
+        are of equal priority. If this is the case, the first item in your 
+	inventory that fits one of these will be picked for firing.
         
         'launcher' refers to firing the appropriate missile for the wielded 
         weapon (ie crossbow, bow, sling, blowgun). You'll almost certainly 
         want it first, as it'll be ignored when you're not wielding a ranged 
-        weapon. The default is
-        
-          fire_order = launcher, javelin / dart / stone / spear          
+        weapon. 'return' refers to (identified) weapons of returning.
 
-<See also pickup_thrown in A.4a.>
+(See also pickup_thrown in 4-a.)
 
 4-l     Message Channels.
 -------------------------
@@ -1191,7 +1201,7 @@ dump_item_origins = artifacts, rods
         If you don't want any items to be annotated, set dump_item_origins to 
         none, and set dump_item_origin_price to -1.
 
-dump_item_origin_price = 100
+dump_item_origin_price = -1
         Item origins are dumped if the price of the item is greater than or 
         equal to this amount. Set this to -1 to prevent selection by price.
 
@@ -1224,7 +1234,7 @@ use_notes = true
         - Memorizing a spell of higher level than any learned before
         - Becoming a worshipper of a god
         - Abandoning a god
-	- Being put under penance and being forgiven
+        - Being put under penance and being forgiven
         - Receiving a gift from a god (except Xom)
         - Being able to invoke a godly power for the first time
         - Identifying items (see below)
@@ -1232,7 +1242,7 @@ use_notes = true
         - Reaching critical HP levels (see below)
         - Gaining or losing mutations
         - Reaching significant levels in a skill (see below)
-	- Dying
+        - Dying
         You can use the command ':' for manually adding notes.
 
 user_note_prefix = <string>
@@ -1525,3 +1535,11 @@ autopickup = $?+"/
 : else
 autopickup = $?+"/!%
 : end
+
+  or
+
+: if you.race() == "Hill Orc" then
+priest = Beogh
+: else
+priest = Yredelemnul
+:end
diff --git a/crawl-ref/init.txt b/crawl-ref/init.txt
index 66f39d8f8f..d3058c3b07 100644
--- a/crawl-ref/init.txt
+++ b/crawl-ref/init.txt
@@ -34,19 +34,19 @@
 ##### 1- Starting Screen ############################################
 #
 # name = Delilah
-# remember_name = true
+# remember_name = false
 # weapon = (random | short sword | hand axe | spear | mace | trident)
 # chaos_knight = (Xom | Makhleb | random)
 # death_knight = (necromancy | Yredelemnul | random)
-# priest       = (Zin | Yredelemnul | random)
-# race = (Human |...| Merfolk | random)
-# class = (Fighter |...| Wanderer | random)
+# priest = (Zin | Yredelemnul | Beogh | random)
+# race   = (Human |...| Merfolk | random)
+# class  = (Fighter |...| Wanderer | random)
 # random_pick = true
 
 ##### 2-  File System ###############################################
 #
 # crawl_dir= <path>
-# morgue_dir = morgues
+# morgue_dir = morgue
 # save_dir = saves
 # sound = <regex>:<path to sound file>
 
@@ -92,19 +92,19 @@ lua_file = lua/pickup.lua
 
 ##### 4-c	Passive Sightings #####################
 #
-detected_monster_colour = lightred
-detected_item_colour = green
+# detected_monster_colour = lightred
+# detected_item_colour = green
 # colour_map = false
 # clean_map = true
 
 ##### 4-d	Branding ##############################
 #
-heap_brand = reverse
 friend_brand = hi:green
 stab_brand = hi:blue
 # may_stab_brand = hi:yellow
+# heap_brand = reverse
 # stair_item_brand = reverse
-# trap_item_brand = reverse
+# trap_item_brand = none
 
 ##### 4-e	Level Map Functions ###################
 #
@@ -128,9 +128,10 @@ stab_brand = hi:blue
 # explore_greedy = true
 # explore_stop = items,stairs,shops,altars,gates
 
-# tc_reachable = blue
-# tc_dangerous = cyan
-# tc_excluded = lightmagenta
+# tc_reachable      = blue
+# tc_dangerous      = cyan
+# tc_disconnected   = darkgrey
+# tc_excluded       = lightmagenta
 # tc_exclude_circle = red
 
 # The following options are not default. Uncommenting activates them.
@@ -147,6 +148,7 @@ stab_brand = hi:blue
 #
 # stash_tracking = (all | explicit | dropped)
 # stash_filter = 14, 4:21
+# annotate_item_class = true
 
 ##### 4-i	Command Enhancements ##################
 #
@@ -212,7 +214,8 @@ message_colour = lightcyan:LOW MAGIC WARNING
 ##### 4-k	Firing Commands #######################
 #
 # fire_items_start = c
-# fire_order = launcher, dart / stone / javelin, dagger, spear, handaxe, club
+# fire_order  = launcher, return, dart / stone / javelin, 
+# fire_order += dagger, spear, handaxe, club
 
 ##### 4-l	Channels ##############################
 #
@@ -235,7 +238,7 @@ message_colour = lightcyan:LOW MAGIC WARNING
 # kill_map = friend:you, other:you
 # dump_kill_places = (single | all | none)
 # dump_item_origins = all,artifacts,ego_arm,ego_weap,jewellery,runes
-# dump_item_origin_price = 100
+# dump_item_origin_price = -1
 # dump_message_count = 7
 # dump_order  = header,hiscore,stats,misc,notes,inventory,turns_by_place,
 # dump_order += skills,spells,overview,mutations,messages,screenshot
@@ -246,10 +249,13 @@ message_colour = lightcyan:LOW MAGIC WARNING
 # use_notes = false
 # user_note_prefix=@@@
 # note_items = rod,book,rune
+# note_monsters = orb of fire
 # ood_interesting = 8
 # note_hp_percent = 5
 # note_skill_levels = 1,5,10,15,27
-# note_skill_max = true
+# note_all_skill_levels = true
+# note_skill_max  = true
+# note_all_spells = true
 
 # The following takes a note whenever the Abyss is left: 
 # note_messages = You pass through the gate 
@@ -265,7 +271,7 @@ message_colour = lightcyan:LOW MAGIC WARNING
 # colour.lightcyan = cyan
 # colour.yellow    = brown
 #
-# use_ascii = ascii
+# char_set = ascii
 # wiz_mode = no
 #
 # classic_item_colours = true
@@ -278,7 +284,7 @@ message_colour = lightcyan:LOW MAGIC WARNING
 ##### 6-b	DOS and Windows #######################
 #
 # dos_use_background_intensity = true
-
+# background = black
 
 ##### 6-c   Unix ##################################
 #
diff --git a/crawl-ref/source/chardump.h b/crawl-ref/source/chardump.h
index b6ce4b9fd0..93bcd29a15 100644
--- a/crawl-ref/source/chardump.h
+++ b/crawl-ref/source/chardump.h
@@ -8,7 +8,7 @@
  *  Change History (most recent first):
  *
  *               <1>     4/20/99        JDJ             Reformatted, uses string objects, split out
- *                                                                      7 functions from dump_char, dumps artifact info.
+ *                                                      7 functions from dump_char, dumps artefact info.
  */
 
 
diff --git a/crawl-ref/source/externs.h b/crawl-ref/source/externs.h
index 4ea85d15d9..f937f71c5f 100644
--- a/crawl-ref/source/externs.h
+++ b/crawl-ref/source/externs.h
@@ -1689,7 +1689,7 @@ private:
                                 const std::string &interrupt_names,
                                 bool append_interrupts,
                                 bool remove_interrupts);
-    void set_fire_order(const std::string &full);
+    void set_fire_order(const std::string &full, bool add);
     void add_fire_order_slot(const std::string &s);
     void set_menu_sort(std::string field);
     void new_dump_fields(const std::string &text, bool add = true);
diff --git a/crawl-ref/source/initfile.cc b/crawl-ref/source/initfile.cc
index 8381108260..e6bc768a53 100644
--- a/crawl-ref/source/initfile.cc
+++ b/crawl-ref/source/initfile.cc
@@ -274,6 +274,8 @@ static fire_type str_to_fire_types( const std::string &str )
         return (FIRE_JAVELIN);
     else if (str == "net")
         return (FIRE_NET);
+    else if (str == "return" || str == "returning")
+        return (FIRE_RETURNING);
 
     return (FIRE_NONE);
 }
@@ -647,7 +649,7 @@ void game_options::reset_options()
     item_colour            = true;
 
     // [ds] Default to jazzy colours.
-    detected_item_colour   = LIGHTGREEN;
+    detected_item_colour   = GREEN;
     detected_monster_colour= LIGHTRED;
 
     classic_item_colours   = false;
@@ -706,8 +708,9 @@ void game_options::reset_options()
     fire_items_start       = 2;           // start at slot 'c'
 
     // Clear fire_order and set up the defaults.
-    set_fire_order("launcher, "
-                   "javelin / dart / stone / rock / spear / net / handaxe");
+    set_fire_order("launcher, return, "
+                   "javelin / dart / stone / rock / spear / net / handaxe",
+                   false);
 
     item_stack_summary_minimum = 5;
 
@@ -725,16 +728,16 @@ void game_options::reset_options()
     sc_format              = -1;
 
     friend_brand     = CHATTR_NORMAL;
-    heap_brand       = CHATTR_NORMAL;
     stab_brand       = CHATTR_NORMAL;
     may_stab_brand   = CHATTR_NORMAL;
+    heap_brand       = CHATTR_REVERSE;
     stair_item_brand = CHATTR_REVERSE;
     trap_item_brand  = CHATTR_NORMAL;
 
     no_dark_brand    = true;
 
 #ifdef WIZARD
-    wiz_mode      = WIZ_NO;
+    wiz_mode         = WIZ_NO;
 #endif
 
     // map each colour to itself as default
@@ -829,9 +832,10 @@ static unsigned read_symbol(std::string s)
     return (strtoul(s.c_str(), &tail, base));
 }
 
-void game_options::set_fire_order(const std::string &s)
+void game_options::set_fire_order(const std::string &s, bool add)
 {
-    fire_order.clear();
+    if (!add)
+        fire_order.clear();
     std::vector<std::string> slots = split_string(",", s);
     for (int i = 0, size = slots.size(); i < size; ++i)
         add_fire_order_slot(slots[i]);
@@ -1875,7 +1879,7 @@ void game_options::read_option_line(const std::string &str, bool runscript)
     }
     else if (key == "fire_order")
     {
-        set_fire_order(field);
+        set_fire_order(field, plus_equal);
     }
     else if (key == "random_pick")
     {
diff --git a/crawl-ref/source/item_use.cc b/crawl-ref/source/item_use.cc
index 4ef8a166a7..c6e724b10a 100644
--- a/crawl-ref/source/item_use.cc
+++ b/crawl-ref/source/item_use.cc
@@ -1187,6 +1187,11 @@ static bool fire_item_matches(const item_def &item, unsigned fire_type)
     else if (item.base_type == OBJ_WEAPONS
              && is_throwable(item, you.body_size()))
     {
+        if ((fire_type & FIRE_RETURNING) && item.special == SPWPN_RETURNING
+             && item_ident(item, ISFLAG_KNOW_TYPE))
+        {
+            return (true);
+        }
         if ((fire_type & FIRE_DAGGER) && item.sub_type == WPN_DAGGER)
             return (true);
         if ((fire_type & FIRE_SPEAR) && item.sub_type == WPN_SPEAR)
@@ -2258,6 +2263,10 @@ bool throw_it(bolt &pbolt, int throw_2, bool teleport, int acc_bonus,
         
         msg::stream << item.name(DESC_CAP_THE) << " returns to your pack!"
                     << std::endl;
+                    
+        // Player saw the item return
+        if (!is_artefact(you.inv[throw_2]))
+            set_ident_flags(you.inv[throw_2], ISFLAG_KNOW_TYPE);
     }
     else
         dec_inv_item_quantity( throw_2, 1 );
diff --git a/crawl-ref/source/item_use.h b/crawl-ref/source/item_use.h
index 0f564ba452..b3c5063cfe 100644
--- a/crawl-ref/source/item_use.h
+++ b/crawl-ref/source/item_use.h
@@ -22,17 +22,18 @@
 
 enum fire_type
 {
-    FIRE_NONE     = 0x0000,
-    FIRE_LAUNCHER = 0x0001,
-    FIRE_DART     = 0x0002,
-    FIRE_STONE    = 0x0004,
-    FIRE_DAGGER   = 0x0008,
-    FIRE_JAVELIN  = 0x0010,
-    FIRE_SPEAR    = 0x0020,
-    FIRE_HAND_AXE = 0x0040,
-    FIRE_CLUB     = 0x0080,
-    FIRE_ROCK     = 0x0100,
-    FIRE_NET      = 0x0200
+    FIRE_NONE      = 0x0000,
+    FIRE_LAUNCHER  = 0x0001,
+    FIRE_DART      = 0x0002,
+    FIRE_STONE     = 0x0004,
+    FIRE_DAGGER    = 0x0008,
+    FIRE_JAVELIN   = 0x0010,
+    FIRE_SPEAR     = 0x0020,
+    FIRE_HAND_AXE  = 0x0040,
+    FIRE_CLUB      = 0x0080,
+    FIRE_ROCK      = 0x0100,
+    FIRE_NET       = 0x0200,
+    FIRE_RETURNING = 0x0400
 };
 
 struct bolt;
diff --git a/crawl-ref/source/items.cc b/crawl-ref/source/items.cc
index 7f93cb7796..2067fde798 100644
--- a/crawl-ref/source/items.cc
+++ b/crawl-ref/source/items.cc
@@ -585,7 +585,7 @@ void request_autopickup(bool do_pickup)
     will_autopickup = do_pickup;
 }
 
-// 2 - artifact, 1 - glowing/runed, 0 - mundane
+// 2 - artefact, 1 - glowing/runed, 0 - mundane
 static int item_name_specialness(const item_def& item)
 {
     // All jewellery is worth looking at.
diff --git a/crawl-ref/source/mstuff2.cc b/crawl-ref/source/mstuff2.cc
index a12aaf883b..587fde0faa 100644
--- a/crawl-ref/source/mstuff2.cc
+++ b/crawl-ref/source/mstuff2.cc
@@ -1365,7 +1365,7 @@ bool mons_throw(struct monsters *monster, struct bolt &pbolt, int hand_used)
                     << "!" << std::endl;
         
         // Player saw the item return
-        if (!is_artefact(mitm[hand_used]))
+        if (!is_artefact(item))
             set_ident_flags(mitm[hand_used], ISFLAG_KNOW_TYPE);
     }