diff options
| -rw-r--r-- | crawl-ref/docs/develop/levels/syntax.txt | 12 | ||||
| -rw-r--r-- | crawl-ref/source/dat/crypt.des | 18 | ||||
| -rw-r--r-- | crawl-ref/source/mapdef.cc | 3 |
3 files changed, 15 insertions, 18 deletions
diff --git a/crawl-ref/docs/develop/levels/syntax.txt b/crawl-ref/docs/develop/levels/syntax.txt index 029591b133..c755b46b03 100644 --- a/crawl-ref/docs/develop/levels/syntax.txt +++ b/crawl-ref/docs/develop/levels/syntax.txt @@ -559,15 +559,15 @@ MONS: (list of monsters) You can override the displayed monster tile using the "tile:" specifier as follows: - MONS: rat tile:giant_bat + MONS: rat tile:mons_giant_bat In tiles version, this would create a monster that uses the - 'giant_bat' tile, but is otherwise identical to a rat. Obviously, this - substition of one monster onto another should never be used, but it - can be useful for customised vault monsters if an alternate tile - exists. In ASCII mode, this will do nothing. + 'monst_giant_bat' tile, but is otherwise identical to a rat. + Obviously, this substition of one monster onto another should + never be used, but it can be useful for customised vault monsters + if an alternate tile exists. In ASCII mode, this will do nothing. - You can set the monster's faction by specifying "att:" one of: + You can set the monster's faction by specifying "att:" one of: * att:hostile -- the default * att:friendly -- tame, will follow you * att:neutral -- hostile to both you and att:hostile monsters diff --git a/crawl-ref/source/dat/crypt.des b/crawl-ref/source/dat/crypt.des index ea6d28d293..c1b6ade7cf 100644 --- a/crawl-ref/source/dat/crypt.des +++ b/crawl-ref/source/dat/crypt.des @@ -76,9 +76,9 @@ DEPTH: Crypt MONS: death ooze KFEAT: f = . # "withered plant" instead of "plant" -KMONS: f = w:2 col:darkgrey plant name:withered name_adjective \ - tile:withered_plant / w:1 col:lightgrey plant name:withered \ - name_adjective tile:withered_plant +KMONS: f = w:2 col:darkgrey plant name:withered name_adjective \ + tile:mons_withered_plant / w:1 col:lightgrey plant name:withered \ + name_adjective tile:mons_withered_plant SUBST: p = f:2 .:1 SUBST: 1 = 1:3 .:1 MAP @@ -318,9 +318,9 @@ ORIENT: float TAGS: tomb_entry no_monster_gen KFEAT: f = . # "withered plant" instead of "plant" -KMONS: f = w:2 col:darkgrey plant name:withered name_adjective \ - tile:withered_plant / w:1 col:lightgrey plant name:withered \ - name_adjective tile:withered_plant +KMONS: f = w:2 col:darkgrey plant name:withered name_adjective \ + tile:mons_withered_plant / w:1 col:lightgrey plant name:withered \ + name_adjective tile:mons_withered_plant SUBST: p = f. MAP cccccccccc @@ -634,9 +634,9 @@ SUBST: F = f ? SUBST: f = p:1 .:1 KFEAT: p = . # "withered plant" instead of "plant" -KMONS: p = w:2 col:darkgrey plant name:withered name_adjective \ - tile:withered_plant / w:1 col:lightgrey plant name:withered \ - name_adjective tile:withered_plant +KMONS: p = w:2 col:darkgrey plant name:withered name_adjective \ + tile:mons_withered_plant / w:1 col:lightgrey plant name:withered \ + name_adjective tile:mons_withered_plant ####### hidden skeleton; sometimes good pain weapon, but draining short sword KFEAT: ! = . KMONS: ! = skeletal warrior ; w:2 dagger ego:pain | short sword ego:draining |\ diff --git a/crawl-ref/source/mapdef.cc b/crawl-ref/source/mapdef.cc index e548cf3389..493e79bb91 100644 --- a/crawl-ref/source/mapdef.cc +++ b/crawl-ref/source/mapdef.cc @@ -3180,9 +3180,6 @@ mons_list::mons_spec_slot mons_list::parse_mons_spec(std::string spec) #ifdef USE_TILE if (!tile.empty()) { - // Modify the string to prevent them from using non-mons tiles. - if (tile.find("mons_") == std::string::npos) - tile = std::string("mons_" + tile); unsigned int index; if (!tile_player_index(tile.c_str(), index)) { |