Implemented the Lighthalzen guides, added some missing warps and a tool dealer.

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@6846 54d463be-8e91-2dee-dedb-b68131a5f0ec

npc/Changelog.txt

@@ -32,6 +32,8 @@ Evera
 Date		Added
 ======
 05/30
+	* Implemented the Lighthalzen guides, added some missing warps [MasterOfMuppets]
+	  and a tool dealer.
 	* Re-made some quest to use 1 variable instead of 2 or 3... [Lupus]
 	- Juice Maker, Morgenstein+Alchemist Job Quest, Tempestra
 		Make a habbit to clean your global_reg_value table from event vars & old garbage

npc/cities/lighthalzen.txt

@@ -18,10 +18,6 @@
 //= 0.7 Implemented some more crap NPCs and the second entrance to biolabs [MasterOfMuppets]
 //=============================================================
 
-lighthalzen.gat,154,100,5	script	Lighthalzen Guard#1	852,{end;}
-lighthalzen.gat,207,310,5	script	Lighthalzen Guard#2	852,{end;}
-
-
 lighthalzen.gat,198,285,5	script	Jiwon	862,{
 
 	mes "[Jiwon]";

npc/guides/guides_lhz.txt

@@ -0,0 +1,361 @@
+//===== eAthena Script ======================================= 
+//= Lighthalzen Guides
+//===== By: ================================================== 
+//= MasterOfMuppets
+//===== Current Version: ===================================== 
+//= 1.0
+//===== Compatible With: ===================================== 
+//=
+//===== Description: ========================================= 
+//= Lighthalzen Guide NPCs
+//===== Additional Comments: ================================= 
+//= 1.0 First Version [MasterOfMuppets]
+//============================================================
+
+lighthalzen.gat,220,311,3	script	Guide::LhzSlum	852,{
+
+	mes "[Lighthalzen Guide]";
+	mes "welcome to Lighthalzen,";
+	mes "the Coropration City-State.";
+	mes "If you need any guidance";
+	mes "around the city, feel free.";
+	mes "to ask me and I'll do my";
+	mes "very best to help you.";
+	next;
+loopback:
+	menu "City Guide",s_Guide,"Remove Marks from Mini-Map",s_Remove,"Notice.",s_Notice,"Cancel",-;
+
+	mes "[Lighthalzen Guide]";
+	mes "Lighthalzen is divided";
+	mes "into the East and West";
+	mes "districts by a railroad that";
+	mes "runs right through the middle.";
+	mes "There are always guards on";
+	mes "watch to protect the peace.";
+	next;
+	mes "[Lighthalzen Guide]";
+	mes "Please don't hesitate";
+	mes "to report and suspicious";
+	mes "activity or persons to us.";
+	mes "We hope that you enjoy";
+	mes "our fair city, adventurer.";
+	close;
+
+s_Guide:
+	mes "[Lighthalzen Guide]";
+	mes "Please be aware that I'm";
+	mes "in charge of providing info";
+	mes "regarding the East District,";
+	mes "more commonly known as the";
+	mes "Slums. Select the location that";
+	mes "you'd like know more about.";
+	next;
+	mes "[Lighthalzen Guide]";
+	mes "But before that,";
+	mes "would you like me";
+	mes "to mark locations";
+	mes "on your Mini-Map?";
+	next;
+	Menu "Yes",s_Yes,"No",-;
+
+	goto s_Cont;
+s_Yes:
+	set @tempguide,1;
+s_Cont:
+	menu "Tool Shop",s_Tool,"Mill",s_Mill,"Pub",s_Pub,"Cancel",-;
+
+	mes "[Lighthalzen Guide]";
+	mes "Please ask me to \"Remove";
+	mes "Marks from Mini-Map\" if you";
+	mes "no longer wish to have the";
+	mes "location marks displayed";
+	mes "on your Mini-Map.";
+	next;
+	goto loopback;
+
+s_Tool:
+	mes "[Lighthalzen Guide]";
+	mes "The Tool Shop is";
+	mes "located in the 11 o'clock";
+	mes "direction from the center";
+	mes "of the East District.";
+	if(@tempguide)viewpoint 1,324,301,1,0xFF0000;
+	next;
+	goto s_Cont;
+
+s_Mill:
+	mes "[Lighthalzen Guide]";
+	mes "On your Mini-Map,";
+	mes "the Mill can be found in";
+	mes "the 1 o'clock direction";
+	mes "in the East District.";
+	if(@tempguide)viewpoint 1,365,301,2,0xFF00FF;
+	next;
+	goto s_Cont;
+
+s_Pub:
+	mes "[Lighthalzen Guide]";
+	mes "The Pub is located";
+	mes "in the southern part";
+	mes "of the East District.";
+	if(@tempguide)viewpoint 1,346,232,3,0xCCFFFF;
+	next;
+	goto s_Cont;
+
+s_Remove:
+	viewpoint 2,324,301,1,0xFF0000;
+	viewpoint 2,365,301,2,0xFF00FF;
+	viewpoint 2,346,232,3,0xCCFFFF;
+	mes "[Lighthalzen Guide]";
+	mes "Okay, the marks from your Mini-Map have been removed.";
+	mes "If you need any guidance around Lighthalzen, please let me or one of the other Lighthalzen Guides know.";
+	next;
+	goto loopback;
+
+s_Notice:
+	mes "[Lighthalzen Guide]";
+	mes "Advances in sorcery and";
+	mes "techonlogy have allowed";
+	mes "us to update our information";
+	mes "system, enabling up to mark";
+	mes "locations on your Mini-Map";
+	mes "for easier navigation.";
+	next;
+	mes "[Lighthalzen Guide]";
+	mes "Your Mini-Map is located";
+	mes "in the upper right cornern";
+	mes "of the screen. If you can't";
+	mes "see it, press the Ctrl + Tab";
+	mes "keys or click the \"Map\" button";
+	mes "in your Basic Info Window.";
+	next;
+	mes "[Lighthalzen Guide]";
+	mes "On your Mini-Map,";
+	mes "click on the \"+\" and \"-\"";
+	mes "symbols to zoom in and";
+	mes "out of your Mini-Map. We";
+	mes "hope you enjoy your travels";
+	mes "here in Lighthalzen.";
+	next;
+	goto loopback;
+
+}
+
+lighthalzen.gat,207,311,3	script	Guide::LhzWest	852,{
+
+	mes "[Lighthalzen Guide]";
+	mes "welcome to Lighthalzen,";
+	mes "the Coropration City-State.";
+	mes "If you need any guidance";
+	mes "around the city, feel free.";
+	mes "to ask me and I'll do my";
+	mes "very best to help you.";
+	next;
+loopback:
+	menu "City Guide",s_Guide,"Remove Marks from Mini-Map",s_Remove,"Notice.",s_Notice,"Cancel",-;
+
+	mes "[Lighthalzen Guide]";
+	mes "Lighthalzen is divided";
+	mes "into the East and West";
+	mes "districts by a railroad that";
+	mes "runs right through the middle.";
+	mes "There are always guards on";
+	mes "watch to protect the peace.";
+	next;
+	mes "[Lighthalzen Guide]";
+	mes "Please don't hesitate";
+	mes "to report and suspicious";
+	mes "activity or persons to us.";
+	mes "We hope that you enjoy";
+	mes "our fair city, adventurer.";
+	close;
+
+s_Guide:
+	mes "[Lighthalzen Guide]";
+	mes "Please be aware that I'm";
+	mes "in charge of providing info";
+	mes "regarding the West District,";
+	mes "of Lighthalzen. Now, please";
+	mes "select the location that you'd";
+	mes "like to learn more about.";
+	next;
+	mes "[Lighthalzen Guide]";
+	mes "But before that,";
+	mes "would you like me";
+	mes "to mark locations";
+	mes "on your Mini-Map?";
+	next;
+	Menu "Yes",s_Yes,"No",-;
+
+	goto s_Cont;
+s_Yes:
+	set @tempguide,1;
+s_Cont:
+	menu "^FF0000Rekenber Corporation",s_Rekenber,"^000000Train Station",s_Train,"Police Station",s_Police,"Bank",s_Bank,"Hotel",s_Hotel,"Airport",s_Airport,"Merchant Guild",s_Merchant,"Jewel Shop",s_Jewel,"Weapon Shop",s_Weap,"Department Store",s_Store,"Cancel",-;
+
+	mes "[Lighthalzen Guide]";
+	mes "Please ask me to \"Remove";
+	mes "Marks from Mini-Map\" if you";
+	mes "no longer wish to have the";
+	mes "location marks displayed";
+	mes "on your Mini-Map.";
+	next;
+	goto loopback;
+
+s_Rekenber:
+	mes "[Lighthalzen Guide]";
+	mes "Rekenber Corporation,";
+	mes "the largest company in";
+	mes "the Schwartzwald Republic,";
+	mes "is located in the northwestern";
+	mes "Lighthalzen. You can't miss";
+	mes "the headquarters building.";
+	if(@tempguide)viewpoint 1,103,244,1,0xFF0000;
+	next;
+	goto s_Cont;
+
+s_Train:
+	mes "[Lighthalzen Guide]";
+	mes "The Train Station is";
+	mes "located in the center of";
+	mes "the city, where we have";
+	mes "a direct railroad to Einbroch.";
+	if(@tempguide)viewpoint 1,240,163,2,0xFF00FF;
+	next;
+	goto s_Cont;
+
+s_Police:
+	mes "[Lighthalzen Guide]";
+	mes "Our Police Station is just";
+	mes "north of the city's center.";
+	mes "Please don't hesitate to report";
+	mes "any suspicious persons and";
+	mes "activity, or if you have any";
+	mes "problems whatsoever.";
+	if(@tempguide)viewpoint 1,236,276,3,0xCCFFFF;
+	next;
+	goto s_Cont;
+
+s_Bank:
+	mes "[Lighthalzen Guide]";
+	mes "The Bank is located";
+	mes "just opposite to the";
+	mes "Lighthalzen Police Station,";
+	mes "which is a pretety good idea";
+	mes "when I think about it, actually.";
+	if(@tempguide)viewpoint 1,199,257,4,0x0000FF;
+	next;
+	goto s_Cont;
+
+s_Hotel:
+	mes "[Lighthalzen Guide]";
+	mes "Our Hotel is located in";
+	mes "the middle of the South Plaza.";
+	mes "Due to its quality of services and";
+	mes "luxurious accomodations, this";
+	mes "hotel is extremely popular.";
+	if(@tempguide)viewpoint 1,159,133,5,0x0FFF00;
+	next;
+	goto s_Cont;
+
+s_Airport:
+	mes "[Lighthalzen Guide]";
+	mes "The Airport is to the far";
+	mes "west of the Central Promenade";
+	mes "You can travel anywhere within";
+	mes "the Schwartzwald Republic by";
+	mes "riding one of the Airships.";
+	if(@tempguide)viewpoint 1,266,76,6,0x00FF00;
+	next;
+	goto s_Cont;
+
+s_Merchant:
+	mes "[Lighthalzen Guide]";
+	mes "The Merchant Guild can be";
+	mes "found in the southwestern";
+	mes "part of Lighthalzen.";
+	if(@tempguide)viewpoint 1,74,52,7,0xEFAEBD;
+	next;
+	goto s_Cont;
+
+s_Jewel:
+	mes "[Lighthalzen Guide]";
+	mes "The Jewelry Shop is";
+	mes "located just west of";
+	mes "the South Plaza.";
+	if(@tempguide)viewpoint 1,92,110,8,0xFF9500;
+	next;
+	goto s_Cont;
+
+s_Weap:
+	mes "[Lighthalzen Guide]";
+	mes "The Weapon Shop is";
+	mes "located at the end of";
+	mes "the Central Promenade.";
+	mes "It's at least worth a look";
+	mes "if you're serious about";
+	mes "adventuring around here.";
+	if(@tempguide)viewpoint 1,196,46,9,0x330033;
+	next;
+	goto s_Cont;
+
+s_Store:
+	mes "[Lighthalzen Guide]";
+	mes "The Department Store is";
+	mes "located in the middle of";
+	mes "Lighthalzen and is the biggest";
+	mes "and most convenient place for";
+	mes "shopping for almost everything.";
+	if(@tempguide)viewpoint 1,199,163,10,0xFFFF00;
+	next;
+	goto s_Cont;
+
+s_Remove:
+	viewpoint 2,103,244,1,0xFF0000;
+	viewpoint 2,240,163,2,0xFF00FF;
+	viewpoint 2,236,276,3,0xCCFFFF;
+	viewpoint 2,199,257,4,0x0000FF;
+	viewpoint 2,159,133,5,0x0FFF00;
+	viewpoint 2,266,76,6,0x00FF00;
+	viewpoint 2,74,52,7,0xEFAEBD;
+	viewpoint 2,92,110,8,0xFF9500;
+	viewpoint 2,196,46,9,0x330033;
+	viewpoint 2,199,163,10,0xFFFF00;
+	mes "[Lighthalzen Guide]";
+	mes "Okay, the marks from your Mini-Map have been removed.";
+	mes "If you need any guidance around Lighthalzen, please let me or one of the other Lighthalzen Guides know.";
+	next;
+	goto loopback;
+
+s_Notice:
+	mes "[Lighthalzen Guide]";
+	mes "Advances in sorcery and";
+	mes "techonlogy have allowed";
+	mes "us to update our information";
+	mes "system, enabling up to mark";
+	mes "locations on your Mini-Map";
+	mes "for easier navigation.";
+	next;
+	mes "[Lighthalzen Guide]";
+	mes "Your Mini-Map is located";
+	mes "in the upper right cornern";
+	mes "of the screen. If you can't";
+	mes "see it, press the Ctrl + Tab";
+	mes "keys or click the \"Map\" button";
+	mes "in your Basic Info Window.";
+	next;
+	mes "[Lighthalzen Guide]";
+	mes "On your Mini-Map,";
+	mes "click on the \"+\" and \"-\"";
+	mes "symbols to zoom in and";
+	mes "out of your Mini-Map. We";
+	mes "hope you enjoy your travels";
+	mes "here in Lighthalzen.";
+	next;
+	goto loopback;
+
+}
+
+lighthalzen.gat,154,100,5	duplicate(LhzWest)	Guide	852
+
+lighthalzen.gat,319,243,5	duplicate(LhzSlum)	Guide	852

npc/merchants/shops.txt

@@ -3,7 +3,7 @@
 //===== By: ================================================== 
 //= eAthena Dev Team
 //===== Current Version: ===================================== 
-//= 1.4b
+//= 1.6
 //===== Compatible With: ===================================== 
 //= eAthena 7.15 +
 //===== Description: ========================================= 
@@ -19,6 +19,7 @@
 //= 1.5 Removed Temp gunslinger shops and moved up the official ones. [erKURITA]
 //=	  Added Official Ninja shops in their correct location and commented a few
 //=	  shops. Thanks to RockmanEXE and Muad_Dib [erKURITA]
+//= 1.6 Implemented a missing Tool Shop in Lighthalzen [MasterOfMuppets]
 //============================================================ 
 
 
@@ -177,6 +178,7 @@ lhz_in02.gat,47,148,5	shop	Wedding Goods Merchant	71,744:-1,745:-1,2338:-1,2206:
 lhz_in02.gat,31,145,4	shop	Tool Dealer	90,611:-1,503:-1,504:-1,506:-1,656:-1,601:-1,602:-1,1065:-1,610:-1,1750:-1
 lhz_in02.gat,85,215,4	shop	Doll Merchant	91,740:-1,741:-1,742:-1
 lhz_in02.gat,87,208,2	shop	Eyewear Merchant	715,2243:-1,2212:-1,2242:-1,2241:-1
+lhz_in03.gat,239,106,4	shop	Tool Dealer	850,501:-1,502:-1,506:-1,645:-1,656:-1,601:-1,602:-1,1065:-1,611:-1
 
 //=======================================================
 //LUTIE

npc/scripts_athena.conf

@@ -114,6 +114,7 @@ npc: npc/guides/guides_einbe.txt
 npc: npc/guides/guides_einbr.txt
 npc: npc/guides/guides_gef.txt
 npc: npc/guides/guides_izl.txt
+npc: npc/guides/guides_lhz.txt
 npc: npc/guides/guides_mor.txt
 npc: npc/guides/guides_pay.txt
 npc: npc/guides/guides_pron.txt

npc/warps/cities/lighthalzen.txt

@@ -15,6 +15,7 @@
 //= 1.4a Corrected warp for 'lhz013a' [Zephiris]
 //= 1.5 Added a few missing warps, thanks to Kargha [MasterOfMuppets]
 //= 1.6 Added a few more missing warps. [MasterOfMuppets]
+//= 1.7 Yet more missing warps implemented :P [MasterOfMuppets]
 //============================================================
 
 lighthalzen.gat,196,46,0	warp	lhz010	1,1,lhz_in02.gat,282,83
@@ -132,4 +133,10 @@ lhz_in01.gat,58,130,0	warp	lhz047	1,1,lhz_in01.gat,193,127
 lhz_in01.gat,191,127,0	warp	lhz047a	1,1,lhz_in01.gat,56,130
 
 lhz_in01.gat,43,115,0	warp	lhz048	1,1,lhz_in01.gat,278,130
-lhz_in01.gat,278,132,0	warp	lhz048a	1,1,lhz_in01.gat,43,117
+lhz_in01.gat,278,132,0	warp	lhz048a	1,1,lhz_in01.gat,43,117
+
+lighthalzen.gat,324,301,0	warp	lhz049	1,1,lhz_in03.gat,239,101
+lhz_in03.gat,237,101,0	warp	lhz049a	1,1,lighthalzen.gat,324,299
+
+lighthalzen.gat,323,322,0	warp	lhz050	1,1,lhz_in03.gat,15,162
+lhz_in03.gat,13,162,0	warp	lhz050a	1,1,lighthalzen.gat,321,322