From b6cb68c9ad611354a97d3c397846c82e6bc7b4ff Mon Sep 17 00:00:00 2001 From: Jessica Tölke Date: Sat, 3 Sep 2011 10:35:21 +0200 Subject: temporary fix for the tutorial until hasan can be enabled again --- world/map/npc/042-1/hasan.txt | 5 +++-- world/map/npc/042-2/tanisha.txt | 10 ++++++++++ 2 files changed, 13 insertions(+), 2 deletions(-) (limited to 'world/map') diff --git a/world/map/npc/042-1/hasan.txt b/world/map/npc/042-1/hasan.txt index 1d5a67fd..299d02de 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,6 +250,7 @@ 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 a4bbeb13..e11fb90a 100644 --- a/world/map/npc/042-2/tanisha.txt +++ b/world/map/npc/042-2/tanisha.txt @@ -114,6 +114,7 @@ L_Advice: emotion 3; if (tanisha == 3) set tanisha, 4; + goto L_TemporaryFix; close; L_Again: @@ -227,6 +228,15 @@ 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; -- cgit v1.2.3-60-g2f50