fixed some warps, changed some dialogue, changed position of hasan and kaan, hasan offers to bring to bazaar after saving him

6 files changed, 61 insertions, 18 deletions

diff --git a/npc/001-1_Tulimshar/guide.txt b/npc/001-1_Tulimshar/guide.txt
index 4b0d8a25..be04e307 100644
--- a/npc/001-1_Tulimshar/guide.txt
+++ b/npc/001-1_Tulimshar/guide.txt
@@ -40,7 +40,7 @@ L_Fight:
 L_Items:
 	mes "[Ian the Guide]";
 	mes "\"There are three types of items.";
-	mes "They can be Consumables, Equipment, or Miscellaneous\"";
+	mes "They can be Consumables, Equipment or Miscellaneous\"";
 	next;
 	mes "[Ian the Guide]";
 	mes "\"Consumable items such as Potions, can be used only once.";
diff --git a/npc/042-1/hasan.txt b/npc/042-1/hasan.txt
index 2dbf0386..8ea59f65 100644
--- a/npc/042-1/hasan.txt
+++ b/npc/042-1/hasan.txt
@@ -1,10 +1,13 @@
-042-1.gat,110,74,0	script	Hasan	189,{
+042-1.gat,111,68,0	script	Hasan	189,{
 
 	set @toll, 10000;
+	set @x, getx(0);
+	set @y, gety(0);
 
-	if ($scorp) goto L_Fear;
+	if ($@scorp) goto L_Fear;
 
 	if (FLAGS & FLAG_TUTORIAL_DONE) goto L_Tut_Done;
+	if ( (@y < 64)&&(@x < 110) || (@x < 107) ) goto L_Cliff_Up;
 	if (hasan == 4) goto L_Thank;
 	if (hasan == 3) goto L_Trick;
 	if (hasan > 0) goto L_Toll;
@@ -76,8 +79,8 @@ L_Trick:
 		"I don't have so much money!",L_NoPay,
 		"No. (Scratch your head.)",-;
 	mes "While you're scratching your head, you see Kaan coming nearer to the cliff above you.";
-	monster "042-1.gat",110,74,"Scorpion",1003,1, "Hasan::onScorpionDeath";
-	set $scorp, 1;
+	monster "042-1.gat",110,70,"Scorpion",1003,1, "Hasan::onScorpionDeath";
+	set $@scorp, 1;
 	close;
 
 L_Thank:
@@ -92,12 +95,34 @@ L_Thank:
 	mes "\"I tell you something: Cool persons are allowed to pass for free.";
 	mes "And you can have this.\"";
 	getitem "SharpKnife", 1;
+	next;
 	set hasan, 0;
 	set kaan, 0;
 	set sorfina, 0;
 	set tanisha, 0;
 	set maggot, 0;
 	set FLAGS, FLAGS | FLAG_TUTORIAL_DONE;
+	mes "\"You want to go to the bazaar, right? Shall I bring you there?\"";
+	next;
+	menu
+		"Sure, thanks.",-,
+		"I'll try to find the way myself.",L_Explore,
+		"Could you just explain me the way?",L_Directions;
+	warp "001-1.gat", 44, 40;
+	close;
+
+L_Explore:
+	mes "[Hasan]";
+	mes "\"Alright. Take care!\"";
+	close;
+
+L_Directions:
+	mes "[Hasan]";
+	mes "\"Ok, when you leave here follow the road past the docks until you reach the old city gates.\"";
+	next;
+	mes "\"Pass through them and at the crossway, just go west and then south until you reach some other gateway.\"";
+	next;
+	mes "\"Behind it there is the bazaar of Tulimshar.\"";
 	close;
 
 L_Fear:
@@ -114,8 +139,16 @@ L_Tut_Done:
 		mes "\"Bah, nothing interesting is happening here.\"";
 	close;
 
+L_Distance:
+	mes "There is a person in some distance. He doesn't seem to notice you, maybe you should go closer.";
+	close;
+
+L_Cliff_Up:
+	mes "You see a guy in shaby clothes when you look down the cliff.";
+	close;
+
 onScorpionDeath:
-	set $scorp, 0;
+	set $@scorp, 0;
 	if (hasan != 3)
 		close;
 	set hasan, 4;
@@ -123,14 +156,23 @@ onScorpionDeath:
 	end;
 }
 
+042-1.gat,112,66,0	script	#barrier	127,1,0{
+	if ((FLAGS & FLAG_TUTORIAL_DONE) || $@scorp)
+		end;
+	warp "042-1.gat", 112, 64;
+	if (!$@scorp)
+		message strcharinfo(0), "Hasan: \"Stop!\"";
+	end;
+}
+
 042-1.gat,117,76,0	script	#barrier	127,0,2{
 	if (FLAGS & FLAG_TUTORIAL_DONE)
 		goto L_Tut;
-	warp "042-1.gat", 110, 73;
-	if ($scorp)
+	warp "042-1.gat", 115, 76;
+	if ($@scorp)
 		message strcharinfo(0), "Hasan: \"Please help me!\"";
-	if (!$scorp)
-		message strcharinfo(0), "Hasan: \"Stop!\"";
+	if (!$@scorp)
+		message strcharinfo(0), "Hasan: \"Please wait a moment!\"";
 	end;
 L_Tut:
 	warp "022-1.gat", 23, 38;
diff --git a/npc/042-1/kaan.txt b/npc/042-1/kaan.txt
index e0aeacc3..b7ccc44e 100644
--- a/npc/042-1/kaan.txt
+++ b/npc/042-1/kaan.txt
@@ -1,4 +1,4 @@
-042-1.gat,105,72,0	script	Kaan	160,{
+042-1.gat,106,70,0	script	Kaan	160,{
 
 	if (FLAGS & FLAG_TUTORIAL_DONE) goto L_Tut_Done;
 	if (hasan == 4) goto L_Hasan_Saved;
diff --git a/npc/042-1/valon.txt b/npc/042-1/valon.txt
index 9170223a..3e2cd791 100644
--- a/npc/042-1/valon.txt
+++ b/npc/042-1/valon.txt
@@ -24,7 +24,7 @@ L_Tut_Done:
 OnTouch:
 	if (FLAGS & FLAG_TUTORIAL_DONE)
 		goto L_Tut;
-	warp "042-1.gat", 17, 78;
+	warp "042-1.gat", 17, 81;
 	mes "[Valon]";
 	mes "\"The desert is merciless.";
 	mes "I can't let you leave like this.\"";
diff --git a/npc/042-2/mapflags.txt b/npc/042-2/mapflags.txt
index b21135a4..4ed80f8e 100644
--- a/npc/042-2/mapflags.txt
+++ b/npc/042-2/mapflags.txt
@@ -1 +1 @@
-042-2.gat mapflag nosave 042-2,33,27;
+042-2.gat mapflag nosave 042-2,40,34;
diff --git a/npc/042-2/sorfina.txt b/npc/042-2/sorfina.txt
index f157a908..90f06cb9 100644
--- a/npc/042-2/sorfina.txt
+++ b/npc/042-2/sorfina.txt
@@ -9,10 +9,11 @@ L_Start:
 	mes "You open your eyes.";
 	mes "";
 	mes "[Old Woman]";
-	mes "\"Ah, you woke up. It seems you collapsed after you left the boat that brought you to Tulimshar.\"";
+	mes "\"Ah, you woke up. It seems you collapsed after you left the boat that brought you to Tulimshar.";
+	mes "A group of ragtags immediatly took advantage of that and stole all your stuff!\"";
 	next;
-	mes "\"My little granddaughter Tanisha found you lying next to the road, with all your clothes gone.";
-	mes "It seems you were robbed!\"";
+	mes "\"My little granddaughter Tanisha saw that, but couldn't do anything to stop them.";
+	mes "She hurried to get someone to help. It was too late to catch the thieves, but at least the helpers brought you here to recover.\"";
 	next;
 	mes "\"This area of the town is full of shady people, so I don't think there's a chance to get back your stuff.\"";
 	mes "She has a sad look on her face, but then she shakes her head and smiles.";
@@ -52,7 +53,7 @@ L_Shirt:
 	mes "\"Very good! I'm glad you're recovering.";
 	mes "Now you should get dressed again. I gave you an old shirt from my son.\"";
 	next;
-	mes "\"Press F3 or click at the button for your equipment in the bar at the upper right corner to open your inventory.\"";
+	mes "\"You can open your inventory with pressing F3 or clicking at the button 'Equipment' in the bar at the upper right corner.\"";
 	next;
 	mes "\"After we finished talking click on the shirt and press the equip button.\"";
 	set sorfina, 2;
@@ -130,7 +131,7 @@ L_Talk:
 L_Items:
 	mes "[Sorfina]";
 	mes "\"There are three types of items.";
-	mes "They can be Consumables, Equipment, or Miscellaneous.\"";
+	mes "They can be Consumables, Equipment or Miscellaneous.\"";
 	next;
 	mes "\"Consumable items such as Potions, can be used only once.";
 	mes "After use, they will disappear from your inventory.";