[crawl-ref-commits] master branch updated: 0.11-a0-2525-gf01614a

[<gi...@cr...>]

       via  f01614af80611b4e984bb651e4c456999c7566e6 (commit)
       via  efb79217ca3ec3ded5c9057dd980d93bbc67ce02 (commit)
       via  5b7668b20daaa8d4d2991d8c357bb5ee1748d66a (commit)
      from  f8d6c006d11912f1cf85253633210be2f15a5040 (commit)

-----------------------------------------------------------------------
commit f01614af80611b4e984bb651e4c456999c7566e6
Author: Adam Borowski <kil...@an...>
Date:   Thu Jun 28 15:01:48 2012 +0200

    Format the diagrams in tut1.
    
    The rule is: a newline merely wraps text, a pair of newlines separates
    paragraphs or mpr() calls.  Technically, you can use a literal \n but I'm
    not sure if Transifex supports that.

commit efb79217ca3ec3ded5c9057dd980d93bbc67ce02
Author: Adam Borowski <kil...@an...>
Date:   Thu Jun 28 14:44:40 2012 +0200

    Fix a misplaced . vs '
    
    They could be argued to be in the old American style (details:
    https://en.wikipedia.org/wiki/Logical_quotes), yet 1. it's especially wrong
    for technical reasons (looks like the key ends with a dot), and 2. we use
    the Commonwealth style anyway.

commit 5b7668b20daaa8d4d2991d8c357bb5ee1748d66a
Author: Adam Borowski <kil...@an...>
Date:   Thu Jun 28 13:27:50 2012 +0200

    Don't raise a disintegrated grate in pan_captured_pigsty.

-----------------------------------------------------------------------

Summary of changes:
 crawl-ref/source/dat/des/branches/pan.des  |    3 +++
 crawl-ref/source/dat/descript/tutorial.txt |   20 ++++++++++++++++----
 crawl-ref/source/hints.cc                  |    2 +-
 3 files changed, 20 insertions(+), 5 deletions(-)

diff --git a/crawl-ref/source/dat/des/branches/pan.des b/crawl-ref/source/dat/des/branches/pan.des
index 372b55d..a44d1e2 100644
--- a/crawl-ref/source/dat/des/branches/pan.des
+++ b/crawl-ref/source/dat/des/branches/pan.des
@@ -1635,6 +1635,9 @@ local function swineherd_die(monster, killer_type, killer_index, silent, wizard)
     crawl.mpr("Error: someone stolen the pigsty gate!")
     return
   end
+  if dgn.grid(p.x, p.y) ~= dgn.fnum("iron_grate") then
+    return
+  end
   dgn.grid(p.x, p.y, "floor")
   if (you.see_cell(p.x, p.y)) then
     crawl.mpr("The grate goes up!")
diff --git a/crawl-ref/source/dat/descript/tutorial.txt b/crawl-ref/source/dat/descript/tutorial.txt
index c42de16..426cfaa 100644
--- a/crawl-ref/source/dat/descript/tutorial.txt
+++ b/crawl-ref/source/dat/descript/tutorial.txt
@@ -29,7 +29,6 @@ You can move diagonally by way of the <w>[number pad]</w> (try Numlock on/off) o
 
                 <w>1 2 3</w>                       <w>$cmd[CMD_MOVE_DOWN_LEFT] $cmd[CMD_MOVE_DOWN] $cmd[CMD_MOVE_DOWN_RIGHT]</w>
 
-
 <localtiles>You can also move using <w>[Mouse clicks]</w>.</localtiles>
 %%%%
 tutorial1 shiftmove
@@ -38,7 +37,7 @@ A quicker way to 'run' through a corridor is to press <w>[Shift]</w> along with
 %%%%
 tutorial1 downstairs
 
-When standing on a staircase leading downwards, you can enter the next level with <w>[$cmd[CMD_GO_DOWNSTAIRS]</w><localtiles> or with <w>[Shift-Click]</w> on your character</localtiles>.
+When standing on a staircase leading downwards, you can enter the next level with <w>$cmd[CMD_GO_DOWNSTAIRS]</w><localtiles> or with <w>[Shift-Click]</w> on your character</localtiles>.
 %%%%
 tutorial1 levelmap
 
@@ -97,9 +96,13 @@ function tutorial1.exit
 <yellow>Movement commands</yellow>
 
    Numpad:       <w>7 8 9</w>           vi-keys:    <w>$cmd[CMD_MOVE_UP_LEFT] $cmd[CMD_MOVE_UP] $cmd[CMD_MOVE_UP_RIGHT]</w>
-                   \\|/                         \\|/
+
+                   \|/                         \|/
+
                 <w>4</w>-<w>.</w>-<w>6</w>                       <w>$cmd[CMD_MOVE_LEFT]</w>-<w>.</w>-<w>$cmd[CMD_MOVE_RIGHT]</w>
-                   /|\\                         /|\\
+
+                   /|\                         /|\
+
                 <w>1 2 3</w>                       <w>$cmd[CMD_MOVE_DOWN_LEFT] $cmd[CMD_MOVE_DOWN] $cmd[CMD_MOVE_DOWN_RIGHT]</w>
 
   <w>Shift + direction</w> moves you several squares into this direction.
@@ -110,24 +113,32 @@ function tutorial1.exit
 <yellow>Staircases</yellow>
 
   <w>$cmd[CMD_GO_UPSTAIRS]</w>  go back to the previous level
+
   <w>$cmd[CMD_GO_DOWNSTAIRS]</w>  enter the next level
+
   <w>$cmd[CMD_DISPLAY_MAP] <<</w>/<w>></w>  travel to the nearest up/downstairs
 
 
 <yellow>Doors</yellow>
 
   can be opened by walking into them
+
   <w>$cmd[CMD_CLOSE_DOOR]</w>  close an open door
+
   <w>$cmd[CMD_REST]</w>  search for secret doors
 
 
 <yellow>Travel</yellow>
 
   <localtiles>mouseclick on the <w>minimap</w></localtiles>
+
   <webtiles><w>$cmd[CMD_DISPLAY_MAP]</w>  enter the level map, travel with <w>Enter</w></webtiles>
+
   <console><w>$cmd[CMD_DISPLAY_MAP]</w>  enter the level map, travel with <w>Enter</w></console>
+
   <w>$cmd[CMD_EXPLORE]</w>  autoexplore
 
+
                                  <cyan>Press <w>any key</w> to clear this screen...</cyan>
 %%%%
 ##############################################
@@ -252,5 +263,6 @@ up the religion screen.</localtiles>
 
   $cmd[CMD_DISPLAY_COMMANDS]<w>/</w>  search the description database
 
+
                                  <cyan>Press <w>any key</w> to clear this screen...</cyan>
 %%%%
diff --git a/crawl-ref/source/hints.cc b/crawl-ref/source/hints.cc
index 8c7759b..93e782d 100644
--- a/crawl-ref/source/hints.cc
+++ b/crawl-ref/source/hints.cc
@@ -422,7 +422,7 @@ static void _print_hint(std::string key, const std::string arg1 = "",
 {
     std::string text = getHintString(key);
     if (text.empty())
-        return mprf(MSGCH_ERROR, "Error, no hint for '%s.'", key.c_str());
+        return mprf(MSGCH_ERROR, "Error, no hint for '%s'.", key.c_str());
 
     _replace_static_tags(text);
     text = untag_tiles_console(text);


-- 
Dungeon Crawl Stone Soup