Bandit Quest and fixes to peter, mikhail

Bandit quest changes, fixes to peter and mikhail, 011-6 mobs

12 files changed, 208 insertions, 6 deletions

diff --git a/data/012-4.wlk b/data/012-4.wlk
index c5a61ec4..affeafe9 100644
--- a/data/012-4.wlk
+++ b/data/012-4.wlk
diff --git a/db/mob_db.txt b/db/mob_db.txt
index 500a74d1..955fa961 100644
--- a/db/mob_db.txt
+++ b/db/mob_db.txt
@@ -60,8 +60,8 @@
 1060,	Archant,	Archant,	30,	400,	0,	0,	200,	1,	20,	30,	4,	6,	10,	5,	1,	0,	12,	10,	1,	1,	1,	0,	25,	133,	1000,	1500,	672,	480,	537,	300,		535,	100,		640,	40,		0,	0,		0,	0,		0,	0,		0,	0,		0,	0,		0,	0,	0,	0,	,	,	,	,	,	,	2,		40
 1061,	Moggun,		Moggun,		60,	800,	0,	0,	100,	1,	70,	90,	20,	10,	50,	40,	10,	10,	10,	10,	1,	1,	1,	0,	25,	137,	600,	1500,	672,	480,	611,	600,		4001,	1000,		4002,	20,		0,	0,		0,	0,		0,	0,		0,	0,		0,	0,		0,	0,	0,	0,	,	,	,	,	,	,	2,		40
 1062,	Terranite,	Terranite,	110,	6000,	0,	0,	1000,	1,	200,	300,	20,	40,	60,	40,	40,	30,	60,	40,	1,	1,	1,	0,	29,	133,	400,	872,	672,	900,	4001,	600,		4004,	20,		4005,	20,		4007,	20,		763,	500,		640,	500,		0,	0,		0,	0,		0,	0,	0,	0,	,	,	,	,	,	,	2,		30
-1063,	Bandit,		Bandit,		30,	500,	0,	0,	100,	1,	50,	50,	5,	0,	10,	10,	10,	10,	10,	10,	1,	1,	1,	0,	29,	135,	500,	872,	672,	900,	4016,	800,		521,	200,		526,	200,		535,	200,		0,	0,		0,	0,		0,	0,		0,	0,		0,	0,	0,	0,	,	,	,	,	,	,	2,		30
-1064,	BanditLord,	Bandit Lord,	60,	3000,	0,	0,	120,	5,	60,	60,	15,	15,	15,	15,	15,	15,	15,	15,	1,	1,	1,	0,	29,	135,	400,	872,	672,	900,	0,	0,		0,	0,		0,	0,		0,	0,		0,	0,		0,	0,		0,	0,		0,	0,		0,	0,	0,	0,	,	,	,	,	,	,	2,		30
+1063,	Bandit,		Bandit,		20,	400,	0,	0,	100,	1,	40,	40,	5,	0,	10,	10,	10,	10,	10,	10,	1,	1,	1,	0,	29,	135,	500,	1500,	672,	900,	4016,	800,		521,	200,		526,	200,		535,	200,		0,	0,		0,	0,		0,	0,		0,	0,		0,	0,	0,	0,	,	,	,	,	,	,	2,		30
+1064,	BanditLord,	Bandit Lord,	40,	2000,	0,	0,	120,	5,	50,	50,	15,	15,	15,	15,	15,	15,	15,	15,	1,	1,	1,	0,	29,	135,	400,	1500,	672,	900,	0,	0,		0,	0,		0,	0,		0,	0,		0,	0,		0,	0,		0,	0,		0,	0,		0,	0,	0,	0,	,	,	,	,	,	,	2,		30
 1065,	TheLost,	The Lost,	30,	5000,	0,	0,	1000,	5,	260,	375,	10,	70,	5,	40,	10,	70,	70,	40,	4,	9,	1,	1,	69,	141,	500,	2000,	672,	300,	0,	0,		0,	0,		0,	0,		0,	0,		0,	0,		0,	0,		0,	0,		0,	0,		0,	0,	0,	0,	,	,	,	,	,	,	0,		0
 1111,	Reaper,		Reaper,		50,	55500,	0,	0,	10000,	12,	444,	555,	30,	80,	100,	200,	70,	120,	150,	80,	1,	50,	1,	1,	89,	165,	500,	1200,	800,	300,	777,	1000,		775,	500,		776,	100,		1221,	10,		0,	0,		0,	0,		0,	0,		0,	0,		0,	0,	0,	0,	,	,	,	,	,	,	0,		0
 1112,	Scythe,		Scythe,		40,	3000,	0,	0,	500,	1,	200,	350,	30,	10,	100,	250,	1,	1,	150,	90,	1,	50,	1,	0,	40,	133,	220,	700,	672,	500,	0,	0,		0,	0,		0,	0,		0,	0,		0,	0,		0,	0,		0,	0,		0,	0,		0,	0,	0,	0,	,	,	,	,	,	,	0,		0
diff --git a/npc/009-2_Hurnscald/_import.txt b/npc/009-2_Hurnscald/_import.txt
index 25d4868d..1ee969c2 100644
--- a/npc/009-2_Hurnscald/_import.txt
+++ b/npc/009-2_Hurnscald/_import.txt
@@ -7,6 +7,7 @@ npc: npc/009-2_Hurnscald/doctor.txt
 npc: npc/009-2_Hurnscald/drunks.txt
 npc: npc/009-2_Hurnscald/inspector.txt
 npc: npc/009-2_Hurnscald/kfahr.txt
+npc: npc/009-2_Hurnscald/lena.txt
 npc: npc/009-2_Hurnscald/mapflags.txt
 npc: npc/009-2_Hurnscald/misc.txt
 npc: npc/009-2_Hurnscald/nicholas.txt
diff --git a/npc/009-2_Hurnscald/lena.txt b/npc/009-2_Hurnscald/lena.txt
new file mode 100644
index 00000000..a88da8da
--- /dev/null
+++ b/npc/009-2_Hurnscald/lena.txt
@@ -0,0 +1,105 @@
+// Quest for Fairy Hat and Forest Armor
+
+009-2.gat,146,43,0	script	Lena	182,{
+
+	if (TMW_Quest >= 46) goto L_Lena_Done;
+	if (TMW_Quest == 45) goto L_Lena_Success;
+	if (TMW_Quest == 44) goto L_Lena_Bandit_Leader_Fail;
+	if (TMW_Quest == 43) goto L_Lena_Bandit_Leader_Fail;
+	if (TMW_Quest == 42) goto L_Lena_Bandit_Leader;
+	if (TMW_Quest == 41) goto L_Lena_Fairy_Hat;
+	if (TMW_Quest == 40) && (baselevel >= 30) goto L_Lena_Start;
+
+	mes "[Lena]";
+	mes "\"I got ambushed by a group of bandits and one of them stabbed me pretty good.  Hopefully I heal up soon so I can fight this menace.\"";
+	close;
+
+L_Lena_Start:
+	mes "[Lena]";
+	mes "\"While wandering through the forest, I was ambushed by bandits.  Though I got them all, one of them stabbed me pretty good.  I'm still healing from that encounter.  I'm worried that the bandit threat may spread.\"";
+	menu
+		"Don't worry, I can take out some of these scumbags.", L_Lena_Approves,
+		"I think I left my courage in another pair of pants.  See you later!", L_Lena_No_Fan;
+	close;
+
+L_Lena_Approves:
+	set TMW_Quest, 41;
+	mes "[Lena]";
+	mes "\"You look like you can handle yourself in a fight.  If you can take on this scourge I'll reward you with a hat like mine.  In order to prove your mettle, bring me 10 [Bandit Hood]s so I know they've met their match.\"";
+	areamonster "008-1.gat",25,60,40,65,"Bandit",1063,3, "::";
+	areamonster "011-1.gat",35,40,65,60,"Bandit",1063,3, "::";
+	close;
+
+L_Lena_No_Fan:
+	mes "[Lena]";
+	mes "\"What will Hurnscald do if these bandits overrun the town?  I hope you reconsider.\"";
+	close;
+
+L_Lena_Fairy_Hat:
+	if (countitem("BanditHood") < 10) goto L_Lena_NotEnough;
+	getinventorylist;
+	if (@inventorylist_count - (countitem("BanditHood")== 10) > 99) goto L_TooMany;
+	set TMW_Quest, 42;
+	delitem "BanditHood", 10;
+	getitem "FairyHat", 1;
+	mes "[Lena]";
+	mes "\"Ah, you've brought me the [Bandit Hood]s.  As promised, here is a hat like mine.\"";
+	next;
+	mes "\"Unfortunately, I feel this bandit threat may of grown.  Perhaps they are being lead?  I noticed many of them seem to hang around a cave just west of Hurnscald.  If you could defeat their leader I know they will become less of a threat to Hurnscald.  I'll reward you with armor like mine if you do.  Sound like something you could do?\"";
+	menu
+		"Consider it done!", L_Lena_Bandit_Leader_Yes,
+		"Woah there, that sounds a bit harder than what I can suceed at.", L_Lena_NoWay;
+	close;
+
+L_Lena_NotEnough:
+	mes "[Lena]";
+	mes "\"You don't have enough [Bandit Hood]s to prove you are taking care of this threat.  Please come back with 10 [Bandit Hood]s to show you are taking care of these bandits.\"";
+	close;
+
+L_Lena_Bandit_Leader:
+	mes "[Lena]";
+	mes "\"I feel this bandit threat may of grown.  Perhaps they are being lead?  I noticed many of them seem to hang around a cave just west of Hurnscald.  If you could defeat their leader I know they will become less of a threat to Hurnscald.  I'll reward you with armor like mine if you do.  Sound like something you could do?\"";
+	menu
+		"Consider it done!", L_Lena_Bandit_Leader_Yes,
+		"Woah there, that sounds a bit harder than what I can succeed at.", L_Lena_NoWay;
+	close;
+
+L_Lena_Bandit_Leader_Yes:
+	set TMW_Quest, 43;
+	areamonster "008-1.gat",25,60,40,65,"Bandit",1063,3, "::";
+	areamonster "011-1.gat",35,40,65,60,"Bandit",1063,3, "::";
+	mes "[Lena]";
+	mes "\"You have a brave heart.  Though I know you can suceed on your own, I recommend finding others to help you defeat the bandit leader.  I believe he could pose a significant threat to solitary individuals seeking to challenge him.  Good luck!\"";
+	close;
+
+L_Lena_NoWay:
+	mes "[Lena]";
+	mes "\"That is too bad.  Feel free to return at any time.  This bandit threat needs to be pushed back.\"";
+	close;
+
+L_Lena_Bandit_Leader_Fail:
+	set TMW_Quest, 43;
+	mes "[Lena]";
+	mes "\"You haven't killed the bandit leader yet.  This is a big problem.  Please be careful.\"";
+	close;
+
+L_Lena_Success:
+	getinventorylist;
+	if (@inventorylist_count == 100) goto L_TooMany;
+	set TMW_Quest, 46;
+	getitem "ForestArmor", 1;
+	mes "[Lena]";
+	mes "\"Excellent!  You killed the bandit leader.  Here is the armor as I promised you.  Safe journeys!\"";
+	close;
+
+L_Lena_Done:
+	mes "[Lena]";
+	mes "\"Thank you for all your help.  With your efforts, we can only hope this scourge doesn't see a resurgence.\"";
+	close;
+
+L_TooMany:
+	mes "[Lena]";
+	mes "\"You have too many items in your inventory.  Please get rid of something so I can reward you.\"";
+	close;
+
+}
diff --git a/npc/009-2_Hurnscald/peter.txt b/npc/009-2_Hurnscald/peter.txt
index 85e31dc9..995bfc31 100644
--- a/npc/009-2_Hurnscald/peter.txt
+++ b/npc/009-2_Hurnscald/peter.txt
@@ -30,26 +30,28 @@ L_Peter_Chain_Mail:
 	close;
 
 L_Peter_Light_Plate:
-	if (zeny < 20000) goto L_Peter_NotEnough_Zeny;
+	if (zeny < 50000) goto L_Peter_NotEnough_Zeny;
 	if (countitem("IngotIron") < 10) goto L_Peter_NotEnough_Ingot;
 	if (countitem("Coal") < 20) goto L_Peter_NotEnough_Coal;
 	getinventorylist;
 	if (@inventorylist_count == 100) goto L_Peter_TooMany;
 	set zeny, zeny - 50000;
 	delitem "IngotIron", 10;
+	delitem "Coal", 20;
 	getitem "LightPlatemail", 1;
 	mes "[Peter]";
 	mes "\"Here you go!\"";
 	close;
 
 L_Peter_Warlord_Plate:
-	if (zeny < 20000) goto L_Peter_NotEnough_Zeny;
+	if (zeny < 100000) goto L_Peter_NotEnough_Zeny;
 	if (countitem("IngotIron") < 15) goto L_Peter_NotEnough_Ingot;
 	if (countitem("Coal") < 30) goto L_Peter_NotEnough_Coal;
 	getinventorylist;
 	if (@inventorylist_count == 100) goto L_Peter_TooMany;
 	set zeny, zeny - 100000;
 	delitem "IngotIron", 15;
+	delitem "Coal", 30;
 	getitem "WarlordPlate", 1;
 	mes "[Peter]";
 	mes "\"Here you go!\"";
diff --git a/npc/011-4_Lake_cave/_import.txt b/npc/011-4_Lake_cave/_import.txt
index f2cfbc87..fe6c5cfd 100644
--- a/npc/011-4_Lake_cave/_import.txt
+++ b/npc/011-4_Lake_cave/_import.txt
@@ -1,4 +1,5 @@
 map: 011-4.gat
 npc: npc/011-4_Lake_cave/_mobs.txt
 npc: npc/011-4_Lake_cave/_warps.txt
+npc: npc/011-4_Lake_cave/bl_barrier.txt
 npc: npc/011-4_Lake_cave/monsters.txt
diff --git a/npc/011-4_Lake_cave/_warps.txt b/npc/011-4_Lake_cave/_warps.txt
index b3208950..7f1c1b2a 100644
--- a/npc/011-4_Lake_cave/_warps.txt
+++ b/npc/011-4_Lake_cave/_warps.txt
@@ -9,6 +9,5 @@
 011-4.gat,114,61	warp	warp	-1,-1,011-6.gat,122,213
 011-4.gat,86,75	warp	warp	-1,-1,011-6.gat,94,227
 011-4.gat,62,86	warp	warp	-1,-1,011-6.gat,68,233
-011-4.gat,111,121	warp	toBigCave	-1,-1,011-6.gat,251,275
 011-4.gat,32,5	warp	warp	0,-1,011-6.gat,186,180
 011-4.gat,45,118	warp	warp	-1,-1,011-6.gat,266,180
diff --git a/npc/011-4_Lake_cave/bl_barrier.txt b/npc/011-4_Lake_cave/bl_barrier.txt
new file mode 100644
index 00000000..07b44999
--- /dev/null
+++ b/npc/011-4_Lake_cave/bl_barrier.txt
@@ -0,0 +1,16 @@
+//bandit lord barrier
+
+011-4.gat,111,121,0	script	#BL_Barrier	127,0,0,{
+
+	if (TMW_Quest >= 44) goto L_Bandit_Lord_Barrier_Open;
+
+	message strcharinfo(0), "This entrance appears to be locked.";
+	end;
+
+
+L_Bandit_Lord_Barrier_Open:
+	message strcharinfo(0), "You insert the silver arrow key and unlock the entrance.";
+	warp "011-6.gat",251,275;
+	end;
+
+}
diff --git a/npc/011-6/_import.txt b/npc/011-6/_import.txt
index 10bf382d..ae38662c 100644
--- a/npc/011-6/_import.txt
+++ b/npc/011-6/_import.txt
@@ -1,3 +1,4 @@
 map: 011-6.gat
 npc: npc/011-6/_mobs.txt
 npc: npc/011-6/_warps.txt
+npc: npc/011-6/bryant.txt
diff --git a/npc/011-6/_mobs.txt b/npc/011-6/_mobs.txt
index dda63569..9b6fc0a5 100644
--- a/npc/011-6/_mobs.txt
+++ b/npc/011-6/_mobs.txt
@@ -1,7 +1,31 @@
 // 011-6 mobs
 
+011-6.gat,0,0,0,0	monster	Spiky Mushroom	1019,30,30000,100000,Mob011-6::On1019
+011-6.gat,0,0,0,0	monster	Evil Mushroom	1013,15,30000,100000,Mob011-6::On1013
+011-6.gat,115,79,191,110	monster	Bandit	1063,8,30000,100000,Mob011-6::On1063
+011-6.gat,0,0,0,0	monster	Bat	1017,30,30000,100000,Mob011-6::On1017
 
 
 011-6.gat,0,0,0	script	Mob011-6	-1,{
+On1013:
+	set @mobID, 1013;
+	callfunc "MobPoints";
+	break;
+
+On1017:
+	set @mobID, 1017;
+	callfunc "MobPoints";
+	break;
+
+On1019:
+	set @mobID, 1019;
+	callfunc "MobPoints";
+	break;
+
+On1063:
+	set @mobID, 1063;
+	callfunc "MobPoints";
+	break;
+
 	end;
 }
diff --git a/npc/011-6/_warps.txt b/npc/011-6/_warps.txt
index 7e3b6f5e..545bc386 100644
--- a/npc/011-6/_warps.txt
+++ b/npc/011-6/_warps.txt
@@ -22,4 +22,4 @@
 011-6.gat,186,182	warp	warp	-1,-1,011-4.gat,31,7
 011-6.gat,266,182	warp	warp	-1,-1,011-4.gat,45,120
 011-6.gat,174,256	warp	warp	-1,-1,011-6.gat,264,238
-011-6.gat,264,236	warp	warp	-2,-2,011-6.gat,174,253
+011-6.gat,264,236	warp	warp	-1,-1,011-6.gat,174,252
diff --git a/npc/011-6/bryant.txt b/npc/011-6/bryant.txt
new file mode 100644
index 00000000..07c5453d
--- /dev/null
+++ b/npc/011-6/bryant.txt
@@ -0,0 +1,53 @@
+//NPC to set the state for killing the bandit lord.
+
+011-6.gat,27,200,0	script	Bryant	126,{
+
+	if (TMW_Quest >= 45) goto L_Bryant_Quiet;
+	if (TMW_Quest == 44) goto L_Bryant_Waits;
+	if (TMW_Quest == 43) goto L_Bryant_Summon;
+
+	mes "[Bryant]";
+	mes "\"I'm looking everywhere for the bandit leader.  I can't seem to find him.\"";
+	close;
+
+L_Bryant_Summon:
+	mes "[Bryant]";
+	mes "\"I ran into that bandit lord and he got me good.  I'm going to stay here for a while and heal.  He dropped this key.  Take it.  You might be able to handle him better than I could.\"";
+	next;
+	mes "Bryant gives you a key, shaped to look like a small silver arrow.";
+	next;
+	mes "\"I believe I saw him run into a cave south and east of here.  There is a red carpet in front of the cave entrance.  Be careful and good luck.\"";
+	set TMW_Quest, 44;
+	monster "011-6.gat",260,250,"BanditLord",1064,1, "Bryant::onBanditLordDead";
+	close;
+
+onBanditLordDead:
+	set TMW_Quest, 45;
+	message strcharinfo(0), "You killed the bandit lord.";
+	end;
+
+L_Bryant_Waits:
+	mes "[Bryant]";
+	mes "\"I think the bandit lord is still around.  I fear this could be dangerous for the people of Hurnscald.  When you went to the cave with the red carpet in front of it, did you find him and kill him?\"";
+	menu
+		"No.", L_Bryant_No,
+		"Yes.", L_Bryant_Yes;
+	close;
+
+L_Bryant_No:
+	mes "[Bryant]";
+	mes "\"Well, maybe he ran off.  I'm pretty sure he should be there now.\"";
+	killmonster "011-6.gat", "Bryant::onBanditLordDead";
+	monster "011-6.gat",260,250,"BanditLord",1064,1, "Bryant::onBanditLordDead";
+	close;
+
+L_Bryant_Yes:
+	mes "[Bryant]";
+	mes "\"I don't think you killed him.  Please try to find and kill him.  He should be in the cave south and east of here with the red carpet in front of it.\"";
+	close;
+
+L_Bryant_Quiet:
+	mes "[Bryant]";
+	mes "\"Glad that bandit leader got what was coming to him.\"";
+	close;
+}