summaryrefslogtreecommitdiff
path: root/npc/015-1_Woodland
diff options
context:
space:
mode:
authorFate <fate-tmw@googlemail.com>2009-01-12 08:02:59 -0700
committerFate <fate-tmw@googlemail.com>2009-01-12 08:02:59 -0700
commit03e7550003650cb5cf79eb0c8d470ce8bd24ae27 (patch)
tree437785d13b545d6562ba3b00513b8eb5a89c8f15 /npc/015-1_Woodland
parent647f4a35bf8831df4fe23754e824f4bdfb5dcf72 (diff)
parent5db6cb7d6c09dbb091edbdf21a3e0e3feae3175a (diff)
downloadserverdata-03e7550003650cb5cf79eb0c8d470ce8bd24ae27.tar.gz
serverdata-03e7550003650cb5cf79eb0c8d470ce8bd24ae27.tar.bz2
serverdata-03e7550003650cb5cf79eb0c8d470ce8bd24ae27.tar.xz
serverdata-03e7550003650cb5cf79eb0c8d470ce8bd24ae27.zip
Merge branch 'master' into magic
Conflicts: db/item_db.txt
Diffstat (limited to 'npc/015-1_Woodland')
-rw-r--r--npc/015-1_Woodland/_import.txt1
-rw-r--r--npc/015-1_Woodland/_warps.txt1
-rw-r--r--npc/015-1_Woodland/alice.txt51
-rw-r--r--npc/015-1_Woodland/barrier.txt7
4 files changed, 52 insertions, 8 deletions
diff --git a/npc/015-1_Woodland/_import.txt b/npc/015-1_Woodland/_import.txt
index fcefd199..4879bd5a 100644
--- a/npc/015-1_Woodland/_import.txt
+++ b/npc/015-1_Woodland/_import.txt
@@ -2,5 +2,6 @@ map: 015-1.gat
npc: npc/015-1_Woodland/_mobs.txt
npc: npc/015-1_Woodland/_warps.txt
npc: npc/015-1_Woodland/alice.txt
+npc: npc/015-1_Woodland/barrier.txt
npc: npc/015-1_Woodland/monsters.txt
npc: npc/015-1_Woodland/sword.txt
diff --git a/npc/015-1_Woodland/_warps.txt b/npc/015-1_Woodland/_warps.txt
index c6ca1856..cb9044e9 100644
--- a/npc/015-1_Woodland/_warps.txt
+++ b/npc/015-1_Woodland/_warps.txt
@@ -1,3 +1,4 @@
// 015-1 Woodland warps
015-1.gat,93,55 warp ToWoodland -1,0,010-1.gat,15,55
+015-1.gat,59,31 warp to 015_3 -1,-1,015-3.gat,31,36
diff --git a/npc/015-1_Woodland/alice.txt b/npc/015-1_Woodland/alice.txt
index b9ce5831..629cfed5 100644
--- a/npc/015-1_Woodland/alice.txt
+++ b/npc/015-1_Woodland/alice.txt
@@ -1,16 +1,23 @@
-//#################################################################################
-//# #
-//# A herb collector giving the players some hints about finding and brewing #
-//# herbs #
-//# #
-//#################################################################################
-
+// A herb collector giving the players some hints about finding and brewing
+// herbs.
015-1.gat,52,53,0 script Alice 106, {
mes "[Alice]";
mes "\"Greeting, fellow wanderer.";
mes "Are you collecting herbs, too?\"";
next;
+ if (LastHiss == 2 && Katze < 4)
+ menu
+ "Yes, sure.", L_findmany,
+ "Herbs?", L_herbs,
+ "Nope, just enjoying the scenery.", close,
+ "I saw the cat, but it doesn't like me.", L_cat;
+ if (LastHiss == 1)
+ menu
+ "Yes, sure.", L_findmany,
+ "Herbs?", L_herbs,
+ "Nope, just enjoying the scenery.", close,
+ "There is a monster in that cave!", L_cave;
menu
"Yes, sure.", L_findmany,
"Herbs?", L_herbs,
@@ -35,7 +42,6 @@ L_plenty:
mes "Good brewers get much better healing potions from them.";
mes "The most important characteristic of a good brewer is intelligence.\"";
close;
-
L_herbs:
mes "[Alice]";
@@ -43,4 +49,33 @@ L_herbs:
mes "Caul in Hurnscald found a way to brew magical healing potions from them, and I have heard a rumor that they may also be good for making colors.";
mes "Now everyone is running around in the woods to harvest the herbs.\"";
close;
+
+L_cave:
+ mes "[Alice]";
+ mes "\"Haha, that is no monster! It's just a sweet little cat.\"";
+ next;
+ menu
+ "But it wanted to kill me!", -,
+ "A cat!? I'll go and kill it!", -;
+ mes "[Alice]";
+ mes "\"No no, I'm sure it was only frightened. It gets upset when you've got clothes or weapons on you.\"";
+ next;
+ menu
+ "Ok, let's try it without clothes then", -,
+ "What a stupid cat!", -;
+ mes "[Alice]";
+ mes "\"Please don't do her any harm. See you later!\"";
+ next;
+ close;
+
+L_cat:
+ mes "[Alice]";
+ mes "\"You would have to tame her first. Maybe she's thirsty or hungry. Cats also tend to get bored without something to play with. Good luck!\"";
+ next;
+ menu "Thank you so much!", close,
+ "Are you crazy? Taming a cat?", -;
+ mes "[Alice]";
+ mes "\"Well, it's up to you.\"";
+ next;
+ close;
}
diff --git a/npc/015-1_Woodland/barrier.txt b/npc/015-1_Woodland/barrier.txt
new file mode 100644
index 00000000..beeeb976
--- /dev/null
+++ b/npc/015-1_Woodland/barrier.txt
@@ -0,0 +1,7 @@
+// This barrier is for checking whether the player went outside after
+// progressing with the cat quest.
+
+015-1.gat,59,32,0 script #CatOutsideBarrier 127,1,1,{
+ set KatzeBeenOutside, 1;
+ close;
+}