via ffd1c9cfd1894f06a94382219155495b0924cab5 (commit)
from 0483a414693465a8363db11abc5b904b2ba97749 (commit)
-----------------------------------------------------------------------
commit ffd1c9cfd1894f06a94382219155495b0924cab5
Author: Johanna Ploog <j-p-...@users.sourceforge.net>
Date: Wed Feb 16 22:12:15 2011 +0100
Two small tutorial tweaks.
1. Hand out a stack of 2 potions of healing, so the player can easily
check the item type after quaffing.
2. Move the spellbook destruction message onto a trigger field. The
message on entering the level doesn't get read.
-----------------------------------------------------------------------
Summary of changes:
.../source/dat/des/tutorial/tutorial_lesson3.des | 2 +-
.../source/dat/des/tutorial/tutorial_lesson4.des | 37
+++++++++-----------
2 files changed, 18 insertions(+), 21 deletions(-)
diff --git a/crawl-ref/source/dat/des/tutorial/tutorial_lesson3.des
b/crawl-ref/source/dat/des/tutorial/tutorial_lesson3.des
index b271496..67a0c09 100644
--- a/crawl-ref/source/dat/des/tutorial/tutorial_lesson3.des
+++ b/crawl-ref/source/dat/des/tutorial/tutorial_lesson3.des
@@ -440,7 +440,7 @@ COLOUR: ABCDdefg = blue
COLOUR: .1234h = brown
FTILE: .{})^1234h = floor_swamp, t = floor_grass
FTILE: ABCDdefg = tutorial_pad
-ITEM: potion of healing q:1
+ITEM: potion of healing q:2
ITEM: meat ration q:50
ITEM: ring of levitation
ITEM: cloak unrand:ratskin_cloak
diff --git a/crawl-ref/source/dat/des/tutorial/tutorial_lesson4.des
b/crawl-ref/source/dat/des/tutorial/tutorial_lesson4.des
index c421937..2f7d6fe 100644
--- a/crawl-ref/source/dat/des/tutorial/tutorial_lesson4.des
+++ b/crawl-ref/source/dat/des/tutorial/tutorial_lesson4.des
@@ -144,8 +144,7 @@ function tutorial_msg4.forget_spell ()
.. "the book will be destroyed, so you'll need other
spellbooks "
.. "to learn new spells."
- crawl.mesclr(true)
- crawl.mpr(text, "tutorial")
+ return tutorial_message(text)
end
function tutorial_msg4.memorise2 ()
@@ -304,17 +303,18 @@ PLACE: D:2
BFLAGS: islanded
ORIENT: encompass
KFEAT: T = fountain_blood
-KFEAT: A = +
-KFEAT: B = .
-COLOUR: dB = blue
-FTILE: dB = tutorial_pad
+KFEAT: AC = .
+KFEAT: B = +
+COLOUR: dAC = blue
+FTILE: dAC = tutorial_pad
ITEM: randbook numspells:1 spells:summon_small_mammals
title:Simple_Steps_to_Summoning owner:player
MONS: hobgoblin ; shield not_cursed . ring mail race:none not_cursed
MONS: rat
MONS: goblin
+MARKER: A = lua:tutorial_msg4.forget_spell()
MARKER: d = lua:tutorial_msg4.memorise2()
-MARKER: A = lua:tutorial_msg4.order_allies()
-MARKER: B = lua:tutorial_msg4.heavy_armour()
+MARKER: B = lua:tutorial_msg4.order_allies()
+MARKER: C = lua:tutorial_msg4.heavy_armour()
MARKER: } = lua:tutorial_msg4.tutorial_end()
MARKER: ) = lua:tutorial_msg4.tutorial_end()
MARKER: ] = lua:tutorial_msg4.tutorial_end()
@@ -327,9 +327,6 @@ MARKER: ) = lua:one_way_stair { dst =
"tutorial_lesson4", \
MARKER: ] = lua:one_way_stair { dst = "tutorial_lesson4", \
desc = "exit from the tutorial", \
onclimb = "tutorial_msg4.win" }
-epilogue{{
- tutorial_msg4.forget_spell()
-}}
MAP
xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
@@ -339,16 +336,16 @@ xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
xxxxxxxxxxxxxxxxxxxxxxxx..xxxxxxxxxxxxxxxxxxxx
xxxxxxxxxxxxxx.....xxxx.T..xxxxxxxxxxxxxxxxxxx
-xxxxxxxxxxxxx.xxxxx.xx.....[xxxxxxxxxxxxxxxxxx
-xxxxxxxxxxxx.xxxxxxx.+..d..{xxxxxxxxxxxxxxxxxx
-xxxxxxxxxxxxAxxxxxxxxx.....(xxxxxxxxxxxxxxxxxx
-xxxxxxxxxx.....xxxxxxxx.T..xxxxxxxxxxxxxxxxxxx
-xxxxxxxxxx.....xxxxxxxxx..xxxxxxxxxxxxxxxxxxxx
-xxxxxxxxxx.....xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
-xxxxxxxxxx.....xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
-xxxxxxxxxx.....xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
+xxxxxxxxxxxxx.xxxxx.xx.....xxxxxxxxxxxxxxxxxxx
+xxxxxxxxxxxx.xxxxxxx.+..d......xxxxxxxxxxxxxxx
+xxxxxxxxxxxxBxxxxxxxxx.....xxxx.Axxxxxxxxxxxxx
+xxxxxxxxxx.....xxxxxxxx.T..xxxxxx.xxxxxxxxxxxx
+xxxxxxxxxx.....xxxxxxxxx..xxxxxxxx.xxxxxxxxxxx
+xxxxxxxxxx.....xxxxxxxxxxxxxxxxxxx.xxxxxxxxxxx
+xxxxxxxxxx.....xxxxxxxxxxxxxxxxxx...xxxxxxxxxx
+xxxxxxxxxx.....xxxxxxxxxxxxxxxxxx{([xxxxxxxxxx
xxxxxxxxxx..1..xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
-xxxxxxxxxxxxBxxxxxxxxx...xxxxxxxxxxxxxxxxxxxxx
+xxxxxxxxxxxxCxxxxxxxxx...xxxxxxxxxxxxxxxxxxxxx
xxxxxxxxxxxx.xxxxxxx....3.]xxxxxxxxxxxxxxxxxxx
xxxxxxxxxxxx.xxxxxx..2.....3xxxxxxxxxxxxxxxxxx
xxxxxxxxxxxx......+......2.)xxxxxxxxxxxxxxxxxx
------------------------------------------------------------------------------
The ultimate all-in-one performance toolkit: Intel(R) Parallel Studio XE:
Pinpoint memory and threading errors before they happen.
Find and fix more than 250 security defects in the development cycle.
Locate bottlenecks in serial and parallel code that limit performance.
http://p.sf.net/sfu/intel-dev2devfeb
_______________________________________________
Crawl-ref-discuss mailing list
Crawl-ref-discuss@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/crawl-ref-discuss
