diff options
Diffstat (limited to 'crawl-ref/source')
| -rw-r--r-- | crawl-ref/source/dat/splev.des | 2 | ||||
| -rw-r--r-- | crawl-ref/source/dat/vaults.des | 2 | ||||
| -rw-r--r-- | crawl-ref/source/mapdef.cc | 5 | ||||
| -rw-r--r-- | crawl-ref/source/newgame.cc | 4 |
4 files changed, 11 insertions, 2 deletions
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 |