Added a mention of option alises to crawl_options.txt.

Documented generate_awake tag for maps.

Allow w:X as an alias for weight:X in map item and monster specifications.

Tell the player that they can use '.' to be prompted for a character name
later.

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

5 files changed, 18 insertions, 2 deletions

diff --git a/crawl-ref/docs/crawl_options.txt b/crawl-ref/docs/crawl_options.txt
index 6860d2d1da..110cb929cd 100644
--- a/crawl-ref/docs/crawl_options.txt
+++ b/crawl-ref/docs/crawl_options.txt
@@ -94,6 +94,13 @@ suitable for your system. Other options accept regular expressions (regexes):
 here you can simply use ordinary strings, adapt the suggested regexes to your
 needs or search the internet for regex syntax.
 
+For long option names, you can define option aliases by doing:
+    alias := long_option_name
+For instance, you can use:
+    ae := autopickup_exceptions
+and thereafter use "ae" instead of "autopickup_exceptions":
+    ae = >decay, >degeneration
+
 If you get stuck or some things just won't seem to work properly, please ask 
 for help on the newsgroup rec.games.roguelike.misc. Please flag queries with 
 '-crawl-', as other roguelikes are also discussed there.
diff --git a/crawl-ref/source/dat/splev.des b/crawl-ref/source/dat/splev.des
index 5bb100f83c..dd2eb5a49b 100644
--- a/crawl-ref/source/dat/splev.des
+++ b/crawl-ref/source/dat/splev.des
@@ -140,6 +140,8 @@
 #  ----
 #  Tags go an a TAGS: line and are space-separated. Valid tags are:
 #  "entry": this tag MUST be there for a vault to be pickable as an entry vault.
+#  "generate_awake": Monsters placed (using MONS, KMONS) in this vault will be
+#                    generated awake.
 #  "no_item_gen":   Prevents random item generation in the vault. Items 
 #                   explicitly placed by the vault are not affected.
 #  "no_monster_gen": Prevents random monster generation at the time of
diff --git a/crawl-ref/source/dat/vaults.des b/crawl-ref/source/dat/vaults.des
index 39dc997185..35421b35bd 100644
--- a/crawl-ref/source/dat/vaults.des
+++ b/crawl-ref/source/dat/vaults.des
@@ -140,6 +140,8 @@
 #  ----
 #  Tags go an a TAGS: line and are space-separated. Valid tags are:
 #  "entry": this tag MUST be there for a vault to be pickable as an entry vault.
+#  "generate_awake": Monsters placed (using MONS, KMONS) in this vault will be
+#                    generated awake.
 #  "no_item_gen":   Prevents random item generation in the vault. Items 
 #                   explicitly placed by the vault are not affected.
 #  "no_monster_gen": Prevents random monster generation at the time of
diff --git a/crawl-ref/source/mapdef.cc b/crawl-ref/source/mapdef.cc
index acd7dc4dbf..b97ec2ea87 100644
--- a/crawl-ref/source/mapdef.cc
+++ b/crawl-ref/source/mapdef.cc
@@ -85,7 +85,10 @@ int strip_number_tag(std::string &s, const std::string &tagprefix)
 
 static int find_weight(std::string &s)
 {
-    return strip_number_tag(s, "weight:");
+    int weight = strip_number_tag(s, "weight:");
+    if (weight == TAG_UNFOUND)
+        weight = strip_number_tag(s, "w:");
+    return (weight);
 }
 
 static std::string split_key_item(const std::string &s,
diff --git a/crawl-ref/source/newgame.cc b/crawl-ref/source/newgame.cc
index ab6060876a..2cd451824e 100644
--- a/crawl-ref/source/newgame.cc
+++ b/crawl-ref/source/newgame.cc
@@ -1989,7 +1989,9 @@ static void show_name_prompt(int where, bool blankOK,
     if (blankOK)
     {
         if (Options.prev_name.length() && Options.remember_name)
-            cprintf(EOL "Press <Enter> for \"%s\"." EOL,
+            cprintf(EOL
+                    "Press <Enter> for \"%s\", or . to be prompted later."
+                    EOL,
                     Options.prev_name.c_str());
         else
             cprintf(EOL