Added quest to obtain helmets and map fixes by QOAL.

12 files changed, 127 insertions, 9 deletions

diff --git a/changelog.txt b/changelog.txt
index 984ce2d7..51811ae4 100644
--- a/changelog.txt
+++ b/changelog.txt
@@ -80,4 +80,7 @@
 08.02.08: * Crush: Added server files for Dimonds Cove Restaurant
 
 13.02.08: * Crush: Added new headgears by QOAL (item_db only, no way to
-                   get them yet)
\ No newline at end of file
+                   get them yet)
+                   
+23.02.08: * Crush: Added quest to obtain helmets by QOAL.
+            Crush: Map fixes by QOAL.
\ No newline at end of file
diff --git a/conf/map_athena.conf b/conf/map_athena.conf
index a6608db3..8199f67d 100644
--- a/conf/map_athena.conf
+++ b/conf/map_athena.conf
@@ -88,6 +88,7 @@ npc: npc/western-desert/passages.txt
 // Eastern desert 7-1
 npc: npc/eastern-desert/monsters.txt
 npc: npc/eastern-desert/passages.txt
+npc: npc/eastern-desert/npcs.txt
 
 // Woodland 9-1
 npc: npc/woodland/alchemist.txt
@@ -155,6 +156,7 @@ npc: npc/woodland-village/villagers.txt
 npc: npc/woodland-village/shops.txt
 npc: npc/woodland-village/forestbowquest.txt
 npc: npc/woodland-village/scythequest.txt
+npc: npc/woodland-village/ironore.txt
 
 //Dimonds Cove
 npc: npc/dimonds-cove/passages.txt
diff --git a/data/new_10-1.wlk b/data/new_10-1.wlk
index 79ba07b2..fe4f0296 100644
--- a/data/new_10-1.wlk
+++ b/data/new_10-1.wlk
diff --git a/data/new_11-1.wlk b/data/new_11-1.wlk
index ebbf2737..f3119594 100644
--- a/data/new_11-1.wlk
+++ b/data/new_11-1.wlk
diff --git a/data/new_12-1.wlk b/data/new_12-1.wlk
index ab7c41f8..7b7f6c25 100644
--- a/data/new_12-1.wlk
+++ b/data/new_12-1.wlk
diff --git a/data/new_21-1.wlk b/data/new_21-1.wlk
index 1b81c28a..e2a1852c 100644
--- a/data/new_21-1.wlk
+++ b/data/new_21-1.wlk
diff --git a/data/new_22-1.wlk b/data/new_22-1.wlk
index c76eca74..0185afad 100644
--- a/data/new_22-1.wlk
+++ b/data/new_22-1.wlk
diff --git a/db/item_db.txt b/db/item_db.txt
index ae90f68d..c4cb9526 100644
--- a/db/item_db.txt
+++ b/db/item_db.txt
@@ -112,10 +112,11 @@
 633,	XmaselfHat,		XmaselfHat,		5,	3000,	1500,	10,	,	18,	,	0,	10477567,	2,	256,	,	0,	36,	{},					{}
 634,	WoodenMask,		WoodenMask,		5,	2500,	1250,	10,	,	15,	,	0,	10477567,	2,	256,	,	0,	35,	{},					{}
 635,	Santacookie,		Santacookie,		3,	1,	1,	1,	,	,	,	,	,		,	,	,	,	,	{},					{}
-636,	WarlordHelm,		Warlord Helmet,		5,	4000,	1750,	10,	,	21,	,	0,	10477567,	2,	256,	,	0,	39,	{},					{}
-637,	KnightHelm,		Knight Helmet,		5,	4000,	1750,	10,	,	21,	,	0,	10477567,	2,	256,	,	0,	40,	{},					{}
-638,	InfantryHelm,		Infantry Helmet,	5,	4000,	1750,	10,	,	21,	,	0,	10477567,	2,	256,	,	0,	41,	{},					{}
-639,	CrusadeHelm,		Crusade Helmet,		5,	4000,	1750,	10,	,	21,	,	0,	10477567,	2,	256,	,	0,	42,	{},					{}
+636,	WarlordHelm,		Warlord Helmet,		5,	30000,	3000,	10,	,	25,	,	0,	10477567,	2,	256,	,	0,	39,	{},					{}
+637,	KnightHelm,		Knight Helmet,		5,	20000,	2000,	10,	,	20,	,	0,	10477567,	2,	256,	,	0,	40,	{},					{}
+638,	InfantryHelm,		Infantry Helmet,	5,	15000,	1500,	10,	,	20,	,	0,	10477567,	2,	256,	,	0,	41,	{},					{}
+639,	CrusadeHelm,		Crusade Helmet,		5,	25000,	2500,	10,	,	25,	,	0,	10477567,	2,	256,	,	0,	42,	{},					{}
+640,	IronOre,		Iron Ore,		3,	250,	100,	40,	,	,	,	,	,		,	,	,	,	,	{},					{}
 1199,	Arrow,			Arrow,			10,	3,	1,	1,	25,	0,	0,	0,	10477567,	2,	32768,	,	,	,	{},					{}
 1200,	Bow,			Bow,			4,	1000,	500,	200,	20,	,	5,	0,	10477567,	2,	34,	1,	4,	11,	{},					{}
 1201,	Knife,			Knife,			4,	50,	25,	100,	5,	,	1,	0,	10477567,	2,	2,	1,	1,	1,	{},					{}
diff --git a/db/mob_db.txt b/db/mob_db.txt
index 60b9b155..6226173c 100644
--- a/db/mob_db.txt
+++ b/db/mob_db.txt
@@ -4,10 +4,10 @@
 1004,	RedScorpion,	Red Scorpion,		90,	550,	0,	180,	145,	1,	50,	55,	4,	6,	10,	10,	10,	10,	30,	10,	1,	1,	1,	0,	20,		129,	1000,	1872,	672,		480,		517,		2000,		509,		100,		518,		500,		1200,		10,		1199,		760,		1201,		540,		524,		5,		0,		0,		0,	0,	0,	0,	,	,		,	,		,
 1005,	GreenSlime,	Green Slime,		40,	300,	0,	60,	8,	1,	25,	30,	2,	7,	1,	30,	1,	0,	30,	30,	1,	1,	1,	0,	20,		131,	1500,	1872,	672,		480,		502,		200,		513,		100,		501,		100,		521,		100,		522,		190,		526,		10,		503,		500,		535,		750,		0,	0,	0,	0,	,	,		,	,		,
 1006,	GiantMaggot,	Giant Maggot,		80,	500,	0,	160,	16,	2,	45,	50,	2,	7,	10,	8,	2,	1,	22,	1,	2,	2,	1,	0,	20,		129,	2000,	1872,	672,		480,		1199,		900,		519,		100,		518,		750,		501,		5000,		502,		3000,		503,		11,		526,		10,		0,		0,		0,	0,	0,	0,	,	,		,	,		,
-1007,	YellowSlime,	Yellow Slime,		60,	400,	0,	120,	2,	1,	35,	40,	2,	7,	10,	8,	2,	1,	34,	1,	1,	1,	1,	0,	20,		131,	1400,	1800,	672,		480,		534,		200,		519,		100,		501,		350,		502,		250,		522,		10,		0,		0,		0,		0,		0,		0,		0,	0,	0,	0,	,	,		,	,		,
+1007,	YellowSlime,	Yellow Slime,		60,	400,	0,	120,	2,	1,	35,	40,	2,	7,	10,	8,	2,	1,	34,	1,	1,	1,	1,	0,	20,		131,	1400,	1800,	672,		480,		534,		200,		519,		100,		501,		350,		502,		250,		522,		10,		640,		25,		0,		0,		0,		0,		0,	0,	0,	0,	,	,		,	,		,
 1008,	RedSlime,	Red Slime,		70,	450,	0,	140,	56,	1,	40,	45,	2,	7,	15,	10,	2,	1,	25,	1,	1,	1,	1,	0,	20,		135,	1300,	1500,	672,		480,		1201,		300,		509,		110,		521,		200,		523,		40,		525,		80,		535,		750,		528,		250,		531,		150,		0,	0,	0,	0,	,	,		,	,		,
 1009,	BlackScorpion,	Black Scorpion,		100,	600,	0,	250,	70,	1,	60,	65,	4,	6,	20,	20,	10,	10,	35,	10,	1,	1,	1,	0,	20,		133,	1000,	1500,	672,		480,		523,		150,		509,		100,		518,		800,		0,		0,		0,		0,		0,		0,		0,		0,		0,		0,		0,	0,	0,	0,	,	,		,	,		,
-1010,	Snake,		Snake,			150,	850,	0,	375,	100,	1,	85,	90,	4,	6,	20,	20,	10,	10,	35,	10,	1,	1,	1,	0,	20,		133,	1000,	1500,	672,		480,		524,		300,		0,		0,		0,		0,		0,		0,		0,		0,		0,		0,		0,		0,		0,		0,		0,	0,	0,	0,	,	,		,	,		,
+1010,	Snake,		Snake,			150,	850,	0,	375,	100,	1,	85,	90,	4,	6,	20,	20,	10,	10,	35,	10,	1,	1,	1,	0,	20,		133,	1000,	1500,	672,		480,		524,		300,		638,		5,		0,		0,		0,		0,		0,		0,		0,		0,		0,		0,		0,		0,		0,	0,	0,	0,	,	,		,	,		,
 1011,	FireGoblin,	Fire Goblin,		20,	200,	0,	30,	2,	1,	15,	20,	0,	5,	1,	1,	1,	0,	6,	30,	1,	1,	1,	3,	21,		129,	800,	1872,	672,		480,		505,		800,		501,		150,		518,		800,		502,		150,		521,		70,		522,		1,		0,		0,		0,		0,		0,	0,	0,	0,	,	,		,	,		,
 1012,	Spider,		Spider,			140,	800,	0,	350,	280,	1,	80,	85,	4,	6,	20,	20,	10,	10,	35,	10,	1,	1,	1,	0,	25,		175,	1000,	1500,	672,		480,		537,		500,		535,		100,		0,		0,		0,		0,		0,		0,		0,		0,		0,		0,		0,		0,		0,	0,	0,	0,	,	,		,	,		,
 1013,	EvilMushroom,	Evil Mushroom,		110,	650,	0,	275,	110,	1,	65,	70,	4,	6,	20,	20,	10,	10,	35,	10,	1,	1,	1,	3,	25,		137,	800,	1800,	672,		480,		535,		500,		540,		5,		534,		100,		566,		500,		0,		0,		0,		0,		0,		0,		0,		0,		0,	0,	0,	0,	,	,		,	,		,
diff --git a/npc/eastern-desert/npcs.txt b/npc/eastern-desert/npcs.txt
new file mode 100644
index 00000000..f2d77368
--- /dev/null
+++ b/npc/eastern-desert/npcs.txt
@@ -0,0 +1,15 @@
+new_7-1.gat,69,76,0	shop	George	115,530:3000,1199:3,529:5,539:175,562:500
+
+new_7-1.gat,66,75,0	script	Kieron	132,{
+    mes "[Kieron]";
+    mes "Be carful if you're going in that cave.";
+    mes "It's packed full of monsters.";
+    close;
+}
+
+new_7-1.gat,91,23,0	script	William	131,{
+    mes "[William]";
+    mes "Going in the cave?";
+    mes "You better watch your step, last time I checked it was full of monsters!";
+    close;
+}
\ No newline at end of file
diff --git a/npc/snow-village/passages.txt b/npc/snow-village/passages.txt
index 470e3df9..cb5f9b32 100644
--- a/npc/snow-village/passages.txt
+++ b/npc/snow-village/passages.txt
@@ -8,7 +8,7 @@ new_13-1.gat,64,25	warp	outside2	1,1,new_11-1.gat,55,90
 // INN -> outside
 new_13-1.gat,111,33	warp	outside3	0,0,new_11-1.gat,64,84
 // Weapons shop -> outside
-new_13-1.gat,32,74	warp	outside4	0,0,new_11-1.gat,84,48
+new_13-1.gat,32,74	warp	outside4	0,0,new_11-1.gat,86,48
 // House -> outside
 new_13-1.gat,72,71	warp	outside5	0,0,new_11-1.gat,66,54
 
@@ -19,6 +19,6 @@ new_11-1.gat,57,90	warp	inside2	0,0,new_13-1.gat,66,25
 // outside -> INN
 new_11-1.gat,64,83	warp	inside3	0,0,new_13-1.gat,111,30
 // outside -> Weapons shop
-new_11-1.gat,85,47	warp	inside4	0,0,new_13-1.gat,32,71
+new_11-1.gat,87,47	warp	inside4	0,0,new_13-1.gat,32,71
 // outside -> House
 new_11-1.gat,66,53	warp	inside5	0,0,new_13-1.gat,72,68
\ No newline at end of file
diff --git a/npc/woodland-village/ironore.txt b/npc/woodland-village/ironore.txt
new file mode 100644
index 00000000..1e0ffd94
--- /dev/null
+++ b/npc/woodland-village/ironore.txt
@@ -0,0 +1,97 @@
+new_20-1.gat,185,55,0	script	Nicholas	135,{

+mes "[Nicholas]";

+mes "Hello there,";

+mes "I'm an expert blacksmith.";

+mes "If you get me some Iron Ore";

+mes "I could make you a very valuable helmet.";

+next;

+L_M:

+menu "I have some Iron Ore!",L_Check,"Where can I get this Iron Ore?",L_Info,"I'm okay, thanks.",L_Pass;

+	L_Check:

+		mes "[Nicholas]";

+		mes "Let me take at look at how much you have...";

+		next;

+		if(countitem(640)<5) goto NoItem;

+		if(countitem(640)<10) goto StageA;

+		if(countitem(640)<15) goto StageB;

+		goto StageC;

+	L_Info:

+		mes "[Nicholas]";

+		mes "You can find Iron Ore in mines.";

+		mes "It is quite hard to come by though.";

+		close;

+	L_Pass:

+		mes "[Nicholas]";

+		mes "Oh, okay";

+		mes "Come back any time.";

+		close;

+	StageA:

+		mes "[Nicholas]";

+		mes "That's just enough for me to make you";

+		mes "a winged Knight's Helmet.";

+		mes "But it'll cost you 10,000GP";

+		mes "and 5 lumps of Iron Ore.";

+		next;

+		menu "Deal!",L_YesKnight,"I'll pass, thanks.",ComeBack;

+	StageB:

+		mes "[Nicholas]";

+		mes "Ahh, with that much Iron Ore I can";

+		mes "make you one of two helmets,";

+		mes "for only 10,000GP.";

+		mes "";

+		mes "Which one do you want?";

+		next;

+		menu "Crusade Helmet. (10 Iron Ore's)",L_YesCrusade,"Knight's Helmet. (5 Iron Ore's)",L_YesKnight,"I'll pass, thanks.",ComeBack;

+	StageC:

+		mes "[Nicholas]";

+		mes "Excellent, that's enough to make";

+		mes "three different types of helmet.";

+		mes "My fee is 10,000GP.";

+		mes "";

+		mes "Which helmet do you want?";

+		next;

+		menu "Warlord Helmet. (15 Iron Ore's)",L_YesWarlord,"Crusade Helmet. (10 Iron Ore's)",L_YesCrusade,"Knight's Helmet. (5 Iron Ore's)",L_YesKnight,"I'll pass, thanks.",ComeBack;

+	NoItem:

+		mes "[Nicholas]";

+		mes "It appears you don't have enough Iron Ore for me to work with.";

+		mes "Please do come back when you have more though.";

+		close;

+	ComeBack:

+		mes "[Nicholas]";

+		mes "Come back any time.";

+		close;

+	NoMoney:

+		mes "[Nicholas]";

+		mes "Oh dear, it seems you don't have enough money.";

+		close;

+	L_YesKnight:

+		if (zeny < 10000) goto NoMoney;

+		set zeny, zeny-10000;

+		delitem 640,5;

+		getitem 637,1;

+		mes "[Nicholas]";

+		mes "There you go!";

+		mes "";

+		mes "Come back any time.";

+		close;

+	L_YesCrusade:

+		if (zeny < 10000) goto NoMoney;

+		set zeny, zeny-10000;

+		delitem 640,10;

+		getitem 639,1;

+		mes "[Nicholas]";

+		mes "Hope you like it!";

+		mes "";

+		mes "Come back any time.";

+		close;

+	L_YesWarlord:

+		if (zeny < 10000) goto NoMoney;

+		set zeny, zeny-10000;

+		delitem 640,15;

+		getitem 636,1;

+		mes "[Nicholas]";

+		mes "Here you go!";

+		mes "";

+		mes "Come back any time.";

+		close;

+}
\ No newline at end of file