diff options
-rw-r--r-- | crawl-ref/CREDITS | 16 | ||||
-rw-r--r-- | crawl-ref/docs/crawl_options.txt | 22 |
2 files changed, 19 insertions, 19 deletions
diff --git a/crawl-ref/CREDITS b/crawl-ref/CREDITS index a0ad5fdd85..e14462d1d0 100644 --- a/crawl-ref/CREDITS +++ b/crawl-ref/CREDITS @@ -23,11 +23,11 @@ Peter Borgmann Kornel Kisielewicz Sebastian Salman Rachel Elizabeth Dillon Ryan Kusnery Brett Scarborough Dylan O'Donnell Jukka Kuusisto Roman Sêk Jesse Luehrs Jordan Lewis Sigurd -Mike Drinen Icy Lich Solf -Kieron Dunbar Arien Malec Johan Strandell -Elethiomel Shawn M Moore Marc H. Thoben -Christopher Evenstar Eva Myers Matt Titus -Ben Goetter Onia Ninara Steven Wheeler -Ciaran Hamilton Erkki Nurmi Jeremey Wilson -Chris Hamons nyra Zooko -R. Dan Henry Yuuma Oohara +Mike Drinen Icy Lich Edgar Simo +Kieron Dunbar Arien Malec Solf +Elethiomel Shawn M Moore Johan Strandell +Christopher Evenstar Eva Myers Marc H. Thoben +Ben Goetter Onia Ninara Matt Titus +Ciaran Hamilton Erkki Nurmi Steven Wheeler +Chris Hamons nyra Jeremey Wilson +R. Dan Henry Yuuma Oohara Zooko diff --git a/crawl-ref/docs/crawl_options.txt b/crawl-ref/docs/crawl_options.txt index 2f305b38fd..ab01af2387 100644 --- a/crawl-ref/docs/crawl_options.txt +++ b/crawl-ref/docs/crawl_options.txt @@ -504,8 +504,8 @@ stair_item_brand = reverse trap_item_brand = none Brands traps that would otherwise be hidden by items. If you - use this brand, the items on the square are hidden by the trap - symbol (^) and the trap symbol is branded. + use this brand, the items on the square are hidden by the trap + symbol (^) and the trap symbol is branded. 4-e Level Map Functions. ---------------------------- @@ -637,8 +637,7 @@ explore_greedy = false explore behaviour is used). Greedy explore is also best with pickup_dropped = false. Explore greed is disabled if you're temporarily unable to pick up items (from uncontrolled levitation, - for instance). Default is false (no greedy explore) and using greedy - explore may slow down the performance. + for instance). explore_stop = items,stairs,shops,altars,gates Explore will stop for one of these conditions. Whatever you set this @@ -665,13 +664,14 @@ runrest_ignore_poison = <poison damage>:<minimum hp> runrest_ignore_monster = <string>:<distance> This only works if runrest.lua has been sourced already in init.txt. - Any monster containing the string will only interrupt your activity - if the distance between you and the monster is less than the - specified number. E.g. with - runrest_ingore_monster = fish:3 - all of big fish, jellyfish, giant goldfish and lavafish will be - considered safe for travel, explore and resting as long as the distance - is at least 3. + + Any monster containing the string will only interrupt your + activity if the distance between you and the monster is + less than the specified number. E.g. with + runrest_ingore_monster = fish:3 + all of big fish, jellyfish, giant goldfish and lavafish will be + considered safe for travel, explore and resting as long as the distance + is at least 3. trapwalk_safe_hp = <trap_name>:<minimum_hp>, ... This only works if trapwalk.lua has been sourced already in init.txt. |