Merge gitorious.org:~jenalya/tmw-eathena-data/wip-serverdata

Conflicts:
	db/const.txt
	npc/022-1_Tulimshar/_import.txt
	npc/_import.txt

7 files changed, 500 insertions, 0 deletions

diff --git a/npc/042-1/_import.txt b/npc/042-1/_import.txt
new file mode 100644
index 00000000..d3e2c8b2
--- /dev/null
+++ b/npc/042-1/_import.txt
@@ -0,0 +1,8 @@
+// This file is generated automatically. All manually changes will be removed when running the Converter.
+map: 042-1.gat
+npc: npc/042-1/_mobs.txt
+npc: npc/042-1/_warps.txt
+npc: npc/042-1/hasan.txt
+npc: npc/042-1/kaan.txt
+npc: npc/042-1/malik.txt
+npc: npc/042-1/valon.txt
diff --git a/npc/042-1/_mobs.txt b/npc/042-1/_mobs.txt
new file mode 100644
index 00000000..f439ba03
--- /dev/null
+++ b/npc/042-1/_mobs.txt
@@ -0,0 +1,8 @@
+// This file is generated automatically. All manually changes will be removed when running the Converter.
+// 042-1 mobs
+
+
+
+042-1.gat,0,0,0	script	Mob042-1	-1,{
+	end;
+}
diff --git a/npc/042-1/_warps.txt b/npc/042-1/_warps.txt
new file mode 100644
index 00000000..d1a7aa3d
--- /dev/null
+++ b/npc/042-1/_warps.txt
@@ -0,0 +1,7 @@
+// This file is generated automatically. All manually changes will be removed when running the Converter.
+// 042-1 warps
+
+042-1.gat,87,76	warp	toStorehouse	-1,-1,042-2.gat,44,91
+042-1.gat,77,76	warp	toStorehouse	-1,-1,042-2.gat,22,91
+042-1.gat,62,62	warp	toInside	-1,-1,042-2.gat,29,60
+042-1.gat,37,56	warp	toInside	-1,-1,042-2.gat,44,29
diff --git a/npc/042-1/hasan.txt b/npc/042-1/hasan.txt
new file mode 100644
index 00000000..db32179d
--- /dev/null
+++ b/npc/042-1/hasan.txt
@@ -0,0 +1,259 @@
+// This file is part of the Tutorial
+// Authors: Jenalya, alastrim
+
+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 (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;
+
+	mes "[Unfriendly Guy]";
+	mes "\"Hey! You can't pass here.\"";
+	next;
+	menu
+		"Why not?",-,
+		"Who says that?",-;
+	mes "[Unfriendly Guy]";
+	mes "\"Me, Hasan the mighty, decided to put a toll on this way.\"";
+	next;
+L_Toll:
+	mes "[Hasan]";
+	mes "\"Give me " + @toll + "GP, and I may let you pass.\"";
+	if (hasan == 0)
+		set hasan, 1;
+	next;
+	if (zeny >= @toll)
+		menu
+			"Ok, here you go.",L_Pay,
+			"What? I don't have so much money!",L_NoPay,
+			"We'll see if you can stop me!",L_Fight;
+	menu
+		"What? I don't have so much money!",L_NoPay,
+		"We'll see if you can stop me!",L_Fight;
+	close;
+
+L_NoPay:
+	mes "[Hasan]";
+	mes "\"That's not my problem. You have to stay here then.\"";
+	close;
+
+L_Fight:
+	mes "He laughs derisively.";
+	mes "[Hasan]";
+	mes "\"Do you really think you can beat me?\"";
+	mes "He pulls out a nasty looking dagger and stabs it in your direction.";
+	set hp, 1;
+	mes "That hurt! You begin to think searching for a different solution might be healthier.";
+	close;
+
+L_Pay:
+	if (zeny < @toll)
+		goto L_Cheat;
+	set zeny, zeny - @toll;
+	mes "He grins gloatingly.";
+	mes "[Hasan]";
+	mes "\"Very well. You may pass.\"";
+	set hasan, 0;
+	set kaan, 0;
+	set sorfina, 0;
+	set tanisha, 0;
+	set maggot, 0;
+	set FLAGS, FLAGS | FLAG_TUTORIAL_DONE;
+	close;
+
+L_Cheat:
+	mes "[Hasan]";
+	mes "\"Don't dare to cheat on me!\"";
+	close;
+
+L_Trick:
+	mes "[Hasan]";
+	mes "\"Are you going to pay now? " + @toll + "GP, and I may let you pass.\"";
+	next;
+	menu
+		"I don't have so much money!",L_NoPay,
+		"No. (Scratch your head.)",-;
+	if ($@scorp == 1) goto L_Wait;
+	mes "While you're scratching your head, you see Kaan coming nearer to the cliff above you.";
+	close2;
+	monster "042-1.gat",110,70,"Scorpion",1003,1, "Hasan::onScorpionDeath";
+	set $@ScorpionFighter$, strcharinfo(0);
+	set $@scorp, 1;
+	set $@ScorpDeath, PC_DIE_COUNTER;
+	startnpctimer;
+	end;
+
+L_Thank:
+	mes "[Hasan]";
+	mes "\"You - you saved me!";
+	mes "I tried to get your money and you saved me!\"";
+	next;
+	mes "\"Hey, you're a really cool person.";
+	mes "I mean, how you finished that ghastly scorpion!";
+	mes "Amazing!\"";
+	next;
+	mes "\"I tell you something: Cool persons are allowed to pass for free.";
+	mes "And you can have my Sharp Knife.\"";
+	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:
+	mes "[Hasan]";
+	mes "\"Sc-sc-sco-scorpion!\"";
+	mes "He seems close to tears.";
+	close;
+
+L_Tut_Done:
+	mes "[Hasan]";
+	if (baselevel >= 40)
+		mes "\"Welcome to the suburbs of Tulimshar. I wonder what an experienced adventurer like you is doing here.\"";
+	if (baselevel < 40)
+		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;
+
+L_SummonAgain:
+	message strcharinfo(0), "Kaan is mad with your interference! He comes near the cliff and throws a rock on the top of your head, and let another scorpion run just near Hasan!";
+	percentheal -100, 0;
+	attachrid(getcharid(3,$@ScorpionFighter$));
+	message strcharinfo(0), "Kaan: \"Just go while he is distracted and no one is interfering!\"";
+	monster "042-1.gat",110,70,"Scorpion",1003,1, "Hasan::onScorpionDeath";
+	end;
+
+L_Clean:
+	killmonster "042-1.gat", "Hasan::onScorpionDeath";
+	set $@ScorpionTimer, 0;
+	set $@scorp, 0;
+	stopnpctimer;
+	setnpctimer 0;
+	if (isloggedin(getcharid(3,$@ScorpionFighter$))==0) end;
+	attachrid(getcharid(3,$@ScorpionFighter$));
+	if (PC_DIE_COUNTER > $@ScorpDeath) goto L_MessageDeath;
+	message strcharinfo(0), "Hasan, with his eyes almost closed, trembling with fear, runs toward the scorpion and stabs it with all his strenght! Seems like it took too long and the plan didn't work this time.";
+	warp "042-1.gat", 112, 64;
+	message strcharinfo(0), "Hasan: \"Hey you! I told you you cannot pass!\"";
+	set $@ScorpionFighter$, "";
+	end;
+
+L_MessageDeath:
+	message strcharinfo(0), "Ouch... I should be more careful when fighting these monsters.";
+	end;
+
+L_Wait:
+	mes "There is a scorpion near Hasan already. I think Kaan is helping someone else... Maybe I should try the plan later.";
+	close;
+
+OnTimer5000:
+	if(isloggedin(getcharid(3,$@ScorpionFighter$))==0) goto L_Clean;
+	set $@ScorpionTimer, $@ScorpionTimer + 5;
+	if ($@ScorpionTimer >= 300) goto L_Clean;
+	attachrid(getcharid(3,$@ScorpionFighter$));
+	if (PC_DIE_COUNTER > $@ScorpDeath) goto L_Clean;
+	setnpctimer 0;
+	end;
+
+onScorpionDeath:
+	if (strcharinfo(0) != $@ScorpionFighter$) goto L_SummonAgain;
+	set $@scorp, 0;
+	if (hasan != 3)
+		close;
+	set hasan, 4;
+	message strcharinfo(0), "You saved Hasan.";
+	set $@ScorpionTimer, 0;
+	set $@ScorpionFighter$, "";
+	stopnpctimer;
+	setnpctimer 0;
+	end;
+
+OnInit:
+	initnpctimer;
+	stopnpctimer;
+
+}
+
+042-1.gat,111,68,0	script	#Toll	45,2,2,{
+
+	end;
+
+OnTouch:
+	if ($@scorp && $@ScorpionFighter$ == strcharinfo(0)) 
+		end;
+	if ((FLAGS & FLAG_TUTORIAL_DONE) || (hasan == 4))
+		end;
+	if ($@scorp && $@ScorpionFighter$ != strcharinfo(0)) 
+		goto L_Scared;
+
+L_Normal:
+	warp "042-1.gat", 112, 64;
+	message strcharinfo(0), "Hasan: \"Stop!\"";
+	end;
+
+L_Scared:
+	warp "042-1.gat", 112, 64;
+	message strcharinfo(0), "Hasan seems to be completely irrational. He waves his sharp knife in the air with his eyes closed and hits you. Maybe you shoudn't get too close or you are going to get hurt.";
+	percentheal -10, 0;
+	end;
+
+}
+
+042-1.gat,117,76,0	script	#barrier	45,0,2{
+	end;
+OnTouch:
+	if (FLAGS & FLAG_TUTORIAL_DONE)
+		goto L_Tut;
+	warp "042-1.gat", 115, 76;
+	if ($@scorp && $@ScorpionFighter$ == strcharinfo(0))
+		message strcharinfo(0), "Hasan: \" " + strcharinfo(0) + "! Please help me!\"";
+	if ($@scorp && $@ScorpionFighter$ != strcharinfo(0))
+		message strcharinfo(0), "Hasan: \"Hey! Stop right there!\"";
+	if (!$@scorp && hasan == 4)
+		message strcharinfo(0), "Hasan: \"Please wait a moment!\"";
+	end;
+L_Tut:
+	warp "022-1.gat", 23, 38;
+	end;
+
+
+}
diff --git a/npc/042-1/kaan.txt b/npc/042-1/kaan.txt
new file mode 100644
index 00000000..494dc874
--- /dev/null
+++ b/npc/042-1/kaan.txt
@@ -0,0 +1,159 @@
+// This file is part of the Tutorial
+// Author: Jenalya
+
+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;
+	if ($@ScorpionFighter$ == strcharinfo(0)) goto L_Run;
+	if (kaan == 4) goto L_Plan;
+	if (kaan == 3) goto L_Trick;
+	if (kaan == 2) goto L_Out;
+	if (kaan == 1) goto L_Tanisha;
+
+	mes "[Young Man]";
+	mes "\"You're the person Tanisha brought here, right?";
+	mes "My name is Kaan, I'm her brother.\"";
+	next;
+	mes "\"She was babbling at me about it all the morning until I sent her to take care of the maggots in the storehouse.\"";
+	next;
+	mes "Kaan grins mischievous";
+	mes "[Kaan]";
+	mes "\"She hates maggots.\"";
+	next;
+	mes "\"Maybe you should go to see her, she was really upset about what happened with you.\"";
+	set kaan, 1;
+	if (tanisha >= 3)
+		goto L_Tanisha2;
+	close;
+
+L_Tanisha2:
+	menu
+		"I already did and helped her with the maggots.",L_Tanisha3,
+		"I talked to her, and she's done with the maggots.",L_Tanisha3;
+
+L_Tanisha:
+	mes "[Kaan]";
+	mes "\"Did you already talk to Tanisha?\"";
+	if (tanisha < 3)
+		close;
+	next;
+	menu
+		"Yes, I helped her with the maggots.",-,
+		"Yeah, and she's done with the maggots.",-;
+L_Tanisha3:
+	mes "[Kaan]";
+	mes "\"Ah, that are good news.";
+	mes "You know, we have a lot of problems with bugs here.\"";
+	next;
+	mes "\"If we don't watch out the maggots will eat all of our stocks.";
+	mes "And the desert is crawling with scorpions.";
+	mes "They also come here and you need to watch out not to step on them.\"";
+	next;
+	mes "\"But I took care about that problem.\"";
+	mes "He looks very proud.";
+	next;
+	mes "\"I build this fence to keep them out.\"";
+	next;
+	menu
+		"Impressive! Just a bit... skew.",-,
+		"Wow, it looks very - ahm, unconventional.",-;
+	mes "[Kaan]";
+	mes "\"Well, it keeps the scorpions out. That's all that matters.\"";
+	next;
+	mes "\"Are you going to visit main Tulimshar?";
+	mes "The bazaar there is a wondeful place! Traders, entertainers, adventurers - it's very exciting there.\"";
+	next;
+	mes "\"And Ian the trainer is hanging around there often. You should talk to him, he's a smart guy.\"";
+	set kaan, 2;
+	if (hasan)
+		menu
+			"A guy named Hasan doesn't let me enter main Tulimshar.",L_Hasan,
+			"Thanks for the advice.",L_Close;
+	close;
+
+L_Out:
+	mes "[Kaan]";
+	mes "\"Hello! How are you? Did you already visit main Tulimshar?\"";
+	next;
+	if (hasan)
+		menu
+			"A guy named Hasan doesn't let me enter main Tulimshar.",L_Hasan,
+			"Not yet.",L_Close;
+	menu
+		"Not yet.",L_Close;
+	close;
+
+L_Hasan:
+	mes "[Kaan]";
+	mes "\"Hasan! That's crazy. He becomes more cheekily with every day.";
+	mes "I'd like to help you, but - I won't risk an open confrontation with him.\"";
+	next;
+	mes "\"Sometimes he just freaks out and then he's dangerous.";
+	mes "We should think about some trick. Ah, if I'd now what's his weak point.\"";
+	next;
+	mes "\"He might listen to one of the adult men, but they're all off to work in main Tulimshar during the day.\"";
+	set kaan, 3;
+	next;
+L_Trick:
+	mes "[Kaan]";
+	mes "\"Do you have an idea what Hasans weakness could be?";
+	if (hasan < 2)
+		close;
+	next;
+	menu
+		"He's afraid of scorpions.",-,
+		"No idea.",L_Close;
+	mes "[Kaan]";
+	mes "\"Scorpions?! Right! How could I forget?";
+	mes "When he was a child, he nearly died because he felt in a scorpion nest.\"";
+	next;
+L_Explain:
+	mes "\"Ok, then here's the plan:";
+	mes "I will catch one of the scorpions that's coming to the fence from the desert.\"";
+	next;
+	mes "\"You'll go to Hasan and give me a sign when you're ready.";
+	mes "Let's say the sign is that you're scratching your head.";
+	mes "I'll watch you from this point.\"";
+	next;
+	mes "\"When you give me the sign, I'll throw the scorpion down on him.";
+	mes "While he's distracted with the scorpion, you can pass.\"";
+	next;
+	mes "\"How's that? We can start as soon as you're ready.\"";
+	if (kaan == 3)
+		set kaan, 4;
+		set hasan, 3;
+	close;
+
+L_Plan:
+	mes "[Kaan]";
+	mes "\"I'm ready. Just give me the sign when you're down there.";
+	mes "Or do you want me to explain the plan again?\"";
+	next;
+	menu
+		"Yes please.",L_Explain,
+		"No, everything's alright.",-;
+	close;
+
+L_Hasan_Saved:
+	mes "[Kaan]";
+	mes "\"I told you to pass when he's distracted, not to fight the scorpion!";
+	mes "But maybe Hasan is thankful now?\"";
+	next;
+	mes "\"Maybe you should talk to him again.\"";
+	close;
+
+L_Tut_Done:
+	mes "[Kaan]";
+	mes "\"Hi there. I hope you enjoy your time in Tulimshar.";
+	mes "Hasan is a real troublemaker, but it seems he calmed down now.\"";
+	close;
+
+L_Run:
+	mes "[Kaan]";
+	mes "\"He's distracted! What are you waiting for?\"";
+	close;
+
+L_Close:
+	close;
+}
diff --git a/npc/042-1/malik.txt b/npc/042-1/malik.txt
new file mode 100644
index 00000000..389d3233
--- /dev/null
+++ b/npc/042-1/malik.txt
@@ -0,0 +1,21 @@
+042-1.gat,105,60,0	script	Malik	162,{
+
+	menu
+		"Reset",-,
+		"Test Scorpion Fight", L_Scorp,
+		"close",L_Close;
+	set hasan, 0;
+	set kaan, 0;
+	set sorfina, 0;
+	set tanisha, 0;
+	set maggot, 0;
+	set FLAGS, FLAGS & ~FLAG_TUTORIAL_DONE;
+L_Close:
+	close;
+
+L_Scorp:
+	set sorfina, 4;
+	set kaan, 4;
+	set hasan, 3;
+	close;
+}
diff --git a/npc/042-1/valon.txt b/npc/042-1/valon.txt
new file mode 100644
index 00000000..6ca6ff6a
--- /dev/null
+++ b/npc/042-1/valon.txt
@@ -0,0 +1,38 @@
+// This file is part of the Tutorial
+// Author: Jenalya
+
+042-1.gat,17,82,0	script	Valon	156,1,0{
+
+	if (FLAGS & FLAG_TUTORIAL_DONE) goto L_Tut_Done;
+
+	mes "[Valon]";
+	mes "\"Hello!";
+	mes "You're looking for adventures, right?\"";
+	next;
+	mes "\"But you shouldn't underestimate this desert, it is dangerous.\"";
+	next;
+	mes "\"It's crawling with scorpions, and the heat has overcome men tougher than you are.\"";
+	next;
+	mes "\"If you really want to challenge the desert go to main Tulimshar first to prepare yourself.\"";
+	close;
+
+L_Tut_Done:
+	mes "[Valon]";
+	mes "\"Hello!";
+	mes "You're an adventurer, right?\"";
+	next;
+	mes "\"Be careful in the desert.\"";
+	close;
+
+OnTouch:
+	if (FLAGS & FLAG_TUTORIAL_DONE)
+		goto L_Tut;
+	warp "042-1.gat", 17, 81;
+	mes "[Valon]";
+	mes "\"The desert is merciless.";
+	mes "I can't let you leave like this.\"";
+	close;
+L_Tut:
+	warp "041-1.gat", 33, 8;
+	end;
+}