summaryrefslogtreecommitdiff
path: root/world
diff options
context:
space:
mode:
authorJessica Tölke <jtoelke@mail.upb.de>2011-09-08 20:34:48 +0200
committerJessica Tölke <jtoelke@mail.upb.de>2011-09-08 20:34:48 +0200
commit2629fa14c6f7e6a5a7a71f5c784424cf80189f17 (patch)
tree5816e9fe5a692f84fe247688520ebcf13ee6318b /world
parentb6cb68c9ad611354a97d3c397846c82e6bc7b4ff (diff)
downloadserverdata-2629fa14c6f7e6a5a7a71f5c784424cf80189f17.tar.gz
serverdata-2629fa14c6f7e6a5a7a71f5c784424cf80189f17.tar.bz2
serverdata-2629fa14c6f7e6a5a7a71f5c784424cf80189f17.tar.xz
serverdata-2629fa14c6f7e6a5a7a71f5c784424cf80189f17.zip
Revert "temporary fix for the tutorial until hasan can be enabled again"
This reverts commit b6cb68c9ad611354a97d3c397846c82e6bc7b4ff.
Diffstat (limited to 'world')
-rw-r--r--world/map/npc/042-1/hasan.txt5
-rw-r--r--world/map/npc/042-2/tanisha.txt10
2 files changed, 2 insertions, 13 deletions
diff --git a/world/map/npc/042-1/hasan.txt b/world/map/npc/042-1/hasan.txt
index 299d02de..1d5a67fd 100644
--- a/world/map/npc/042-1/hasan.txt
+++ b/world/map/npc/042-1/hasan.txt
@@ -224,11 +224,11 @@ OnInit:
OnTouch:
end;
- if ($@scorp && $@ScorpionFighter$ == strcharinfo(0))
+ if ($@scorp && $@ScorpionFighter$ == strcharinfo(0))
end;
if ((FLAGS & FLAG_TUTORIAL_DONE) || (hasan == 4))
end;
- if ($@scorp && $@ScorpionFighter$ != strcharinfo(0))
+ if ($@scorp && $@ScorpionFighter$ != strcharinfo(0))
goto L_Scared;
L_Normal:
@@ -250,7 +250,6 @@ OnTouch:
if (FLAGS & FLAG_TUTORIAL_DONE)
goto L_Tut;
warp "042-1.gat", 115, 76;
- message strcharinfo(0), "Maybe you should talk to Tanisha before you leave."; // TODO: remove later
if ($@scorp && $@ScorpionFighter$ == strcharinfo(0))
message strcharinfo(0), "Hasan: \" " + strcharinfo(0) + "! Please help me!\"";
if ($@scorp && $@ScorpionFighter$ != strcharinfo(0))
diff --git a/world/map/npc/042-2/tanisha.txt b/world/map/npc/042-2/tanisha.txt
index e11fb90a..a4bbeb13 100644
--- a/world/map/npc/042-2/tanisha.txt
+++ b/world/map/npc/042-2/tanisha.txt
@@ -114,7 +114,6 @@ L_Advice:
emotion 3;
if (tanisha == 3)
set tanisha, 4;
- goto L_TemporaryFix;
close;
L_Again:
@@ -228,15 +227,6 @@ L_Fail:
set $@TUT_MAGGOT, $@TUT_MAGGOT + 1;
close;
-L_TemporaryFix: // TODO: remove later
- set hasan, 0;
- set kaan, 0;
- set sorfina, 0;
- set tanisha, 0;
- set maggot, 0;
- set FLAGS, FLAGS | FLAG_TUTORIAL_DONE;
- close;
-
L_Fighting:
message strcharinfo(0), "Tanisha: I believe in you!";
end;