Menu
▾
▴
[crawl-ref-commits] master branch updated: 0.11-a0-2527-gef7677e
|
From: <gi...@cr...> - 2012-06-28 13:18:15
|
via ef7677ed97de235e485d5e05242fba8ea283ec91 (commit)
from 3e1acce2f8b765b75e93370763f265d5f6390485 (commit)
-----------------------------------------------------------------------
commit ef7677ed97de235e485d5e05242fba8ea283ec91
Author: Adam Borowski <kil...@an...>
Date: Thu Jun 28 15:15:37 2012 +0200
Actually format the diagrams in tut1, remove blank lines causes by tiles stuff.
I did not notice the code for old diagrams is still present and enabled in .des,
so no wonders it worked right in the first try :p
-----------------------------------------------------------------------
Summary of changes:
.../source/dat/des/tutorial/tutorial_lesson1.des | 59 +-------------------
crawl-ref/source/dat/descript/tutorial.txt | 28 +++++-----
2 files changed, 17 insertions(+), 70 deletions(-)
diff --git a/crawl-ref/source/dat/des/tutorial/tutorial_lesson1.des b/crawl-ref/source/dat/des/tutorial/tutorial_lesson1.des
index d790dcf..aae036d 100644
--- a/crawl-ref/source/dat/des/tutorial/tutorial_lesson1.des
+++ b/crawl-ref/source/dat/des/tutorial/tutorial_lesson1.des
@@ -14,65 +14,12 @@ require("dlua/tutorial.lua")
tutorial1 = {}
-function tutorial1.diagonal ()
- local text = "You can move diagonally by way of the <white>[number pad]</white> (try Numlock on/off) or by using the <white>[vi keys]</white>.\n"
- .. " Numpad: <white>7 8 9</white> " .. "vi-keys: " .. tutorial_get_cmd("CMD_MOVE_UP_LEFT") .. " "
- .. tutorial_get_cmd("CMD_MOVE_UP") .. " " .. tutorial_get_cmd("CMD_MOVE_UP_RIGHT") .. "\n"
- .. " \\|/ " .. "\\|/\n"
- .. " <w>4</w>-<w>.</w>-<w>6</w> "
- .. tutorial_get_cmd("CMD_MOVE_LEFT") .. "-<w>.</w>-" .. tutorial_get_cmd("CMD_MOVE_RIGHT") .. "\n"
- .. " /|\\ " .. "/|\\\n"
- .. " <white>1 2 3</white> " .. tutorial_get_cmd("CMD_MOVE_DOWN_LEFT") .. " "
- .. tutorial_get_cmd("CMD_MOVE_DOWN") .. " " .. tutorial_get_cmd("CMD_MOVE_DOWN_RIGHT") .. "\n"
- if crawl.is_tiles() and not crawl.is_webtiles() then
- text = text .. "You can also move using <white>[Mouse clicks]</white>"
- end
- text = text .. "."
- return tutorial_message(text)
-end
-
function tutorial1.msg(text)
return tutorial_msg("tutorial1 " .. text)
end
-function tutorial1.exit ()
- -- A single screen recapping all commands.
-
- local text = "<yellow>Movement commands</yellow>\n\n"
- .. " Numpad: <white>7 8 9</white> " .. "vi-keys: " .. tutorial_get_cmd("CMD_MOVE_UP_LEFT") .. " "
- .. tutorial_get_cmd("CMD_MOVE_UP") .. " " .. tutorial_get_cmd("CMD_MOVE_UP_RIGHT") .. "\n"
- .. " \\|/ " .. "\\|/\n"
- .. " <w>4</w>-<w>.</w>-<w>6</w> "
- .. tutorial_get_cmd("CMD_MOVE_LEFT") .. "-<w>.</w>-" .. tutorial_get_cmd("CMD_MOVE_RIGHT") .. "\n"
- .. " /|\\ " .. "/|\\\n"
- .. " <white>1 2 3</white> " .. tutorial_get_cmd("CMD_MOVE_DOWN_LEFT") .. " "
- .. tutorial_get_cmd("CMD_MOVE_DOWN") .. " " .. tutorial_get_cmd("CMD_MOVE_DOWN_RIGHT") .. "\n\n"
- .. "<white>Shift + direction</white> moves you several squares into this direction.\n"
-
- if crawl.is_tiles() and not crawl.is_webtiles() then
- text = text .. "You also can move by <white>clicking</white> somewhere in sight or on the <white>minimap</white>.\n"
- end
-
- text = text .. "\n<yellow>Staircases</yellow>\n"
- .. " " .. tutorial_get_cmd("CMD_GO_UPSTAIRS") .. " go back to the previous level\n"
- .. " " .. tutorial_get_cmd("CMD_GO_DOWNSTAIRS") .. " enter the next level\n"
- .. " " .. tutorial_get_cmd("CMD_DISPLAY_MAP") .. "<w><<</w>/<w>></w>" .. " travel to the nearest up/downstairs\n"
-
- text = text .. "\n<yellow>Doors</yellow>\n"
- .. " can be opened by walking into them\n"
- .. " " .. tutorial_get_cmd("CMD_CLOSE_DOOR") .. " close an open door\n"
- .. " " .. tutorial_get_cmd("CMD_REST") .. " search for secret doors\n"
-
- text = text .. "\n<yellow>Travel</yellow>\n"
- if crawl.is_tiles() and not crawl.is_webtiles() then
- text = text .. " mouseclick on the <white>minimap</white>\n"
- else
- text = text .. " " .. tutorial_get_cmd("CMD_DISPLAY_MAP") .. " enter the level map, travel with <white>Enter</white>\n"
- end
- text = text .. " " .. tutorial_get_cmd("CMD_EXPLORE") .. " autoexplore\n"
- .. " <cyan>Press <white>any key</white> to clear this screen...</cyan>\n"
-
- return crawl.endgame(text)
+function tutorial1.exit()
+ crawl.tutorial_msg("tutorial1 exit", true)
end
function tutorial1.win()
@@ -92,7 +39,7 @@ COLOUR: ' = brown
FTILE: G'[ = floor_swamp, t = floor_grass
FTILE: ABCDEFHI$ = tutorial_pad
MARKER: A = lua:tutorial1.msg("go_on")
-MARKER: B = lua:tutorial1.diagonal()
+MARKER: B = lua:tutorial1.msg("diagonal")
MARKER: C = lua:tutorial1.msg("shiftmove")
MARKER: ) = lua:tutorial1.msg("downstairs")
MARKER: } = lua:tutorial1.msg("levelmap")
diff --git a/crawl-ref/source/dat/descript/tutorial.txt b/crawl-ref/source/dat/descript/tutorial.txt
index f1ac1e1..25dccfe 100644
--- a/crawl-ref/source/dat/descript/tutorial.txt
+++ b/crawl-ref/source/dat/descript/tutorial.txt
@@ -19,15 +19,15 @@ tutorial1 diagonal
You can move diagonally by way of the <w>[number pad]</w> (try Numlock on/off) or by using the <w>[vi keys]</w>.
- 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></w> 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></w> \|/ \|/
- <w>4</w>-<w>.</w>-<w>6</w> <w>$cmd[CMD_MOVE_LEFT]</w>-<w>.</w>-<w>$cmd[CMD_MOVE_RIGHT]</w>
+<w></w> <w>4</w>-<w>.</w>-<w>6</w> <w>$cmd[CMD_MOVE_LEFT]</w>-<w>.</w>-<w>$cmd[CMD_MOVE_RIGHT]</w>
- /|\ /|\
+<w></w> /|\ /|\
- <w>1 2 3</w> <w>$cmd[CMD_MOVE_DOWN_LEFT] $cmd[CMD_MOVE_DOWN] $cmd[CMD_MOVE_DOWN_RIGHT]</w>
+<w></w> <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>
%%%%
@@ -90,20 +90,20 @@ tutorial1 upstairs
When standing on a staircase leading upwards, you can enter the previous level with <w>[$cmd[CMD_GO_UPSTAIRS]]</w><localtiles> or by <w>[Shift-clicking]</w> on your character</localtiles>.
%%%%
-function tutorial1.exit
+tutorial1 exit
# A single screen recapping all commands.
<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>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>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.
@@ -130,13 +130,13 @@ function tutorial1.exit
<yellow>Travel</yellow>
- <localtiles>mouseclick on the <w>minimap</w></localtiles>
+ <localtiles>mouseclick on the <w>minimap</w>
- <webtiles><w>$cmd[CMD_DISPLAY_MAP]</w> enter the level map, travel with <w>Enter</w></webtiles>
+ </localtiles><webtiles><w>$cmd[CMD_DISPLAY_MAP]</w> enter the level map, travel with <w>Enter</w>
- <console><w>$cmd[CMD_DISPLAY_MAP]</w> enter the level map, travel with <w>Enter</w></console>
+ </webtiles><console><w>$cmd[CMD_DISPLAY_MAP]</w> enter the level map, travel with <w>Enter</w>
- <w>$cmd[CMD_EXPLORE]</w> autoexplore
+ </console><w>$cmd[CMD_EXPLORE]</w> autoexplore
<cyan>Press <w>any key</w> to clear this screen...</cyan>
--
Dungeon Crawl Stone Soup
|