Implemented the second entrance to biolabs and added some crap NPCs. The sewer pipe does no longer require a lab passport, but it requires completion of the cube quest. The second entrance to biolabs does not require completion of the cube quest, but it does require a lab passport.

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

npc/Changelog.txt

@@ -31,6 +31,10 @@ Evera
 Date		Added
 ======
 05/27
+	* Implemented the second entrance to biolabs and added some crap NPCs [MasterOfMuppets]
+	- The sewer pipe does no longer REQUIRE a lab passport, but it requires completion of the cube quest
+	- The second entrance to biolabs does not REQUIRE completion of the cube quest, but it does require
+	  a lab passport.
 	* Updated DTS Warper; Now uses 3 global vars, 2 are vote #, 1 is etc in binary values. [Evera]
 	* Implemented the friendship quest. *finally* [MasterOfMuppets]
 05/26

npc/cities/lighthalzen.txt

@@ -15,6 +15,7 @@
 //= 0.4 More Town NPCs. [Musashiden]
 //= 0.5 Added a BIG load of Lighthalzen NPCs. [musashiden]
 //= 0.6 Fixed some typos+Coordinates. [Musashiden]
+//= 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;}
@@ -1821,3 +1822,236 @@ lhz_in03.gat,184,38,2	script	Loudmouth	55,{
 	close;
 
 }
+// ---------------------------------------------------------------------------
+
+lhz_in01.gat,114,181,3	script	Representative::LhzRep	71,{
+
+	mes "[Representative]";
+	mes "Greetings, and welcome";
+	mes "to the Rekenber Corporation.";
+	mes "How may I be of service today?";
+	next;
+	menu "Building Information.",-;
+
+loopback:
+	mes "[Representative]";
+	mes "Please tell me";
+	mes "which floor you'd like";
+	mes "to know more about.";
+	next;
+	menu "1F",s_1,"2F",s_2,"B1",s_B,"Cancel",-;
+
+	mes "[Representative]";
+	mes "We are always doing our";
+	mes "best to provide the best";
+	mes "services to our customers.";
+	mes "Remember that Rekenber";
+	mes "is the name you can trust.";
+	mes "Thank you and have a nice day.";
+	close;
+
+s_1:
+	mes "[Representative]";
+	mes "The ^3131FFRekenber Library^000000 can";
+	mes "be found at the end of the";
+	mes "left hallway. Our library is";
+	mes "a great resource of innovative";
+	mes "ideas and information for our";
+	mes "system development employees.";
+	next;
+	mes "[Representative]";
+	mes "The ^3131FFBall Room^000000, where";
+	mes "various official events are";
+	mes "usually held, can be accessed";
+	mes "through the right hallway.";
+	next;
+	goto loopback;
+
+s_2:
+	mes "[Representative]";
+	mes "Please use the stairs";
+	mes "located on both sides of";
+	mes "the Help Desk to go to the";
+	mes "Second Floor. The Second";
+	mes "Floor is mostly used for";
+	mes "administrative purposes.";
+	next;
+	mes "[Representative]";
+	mes "There, you can find";
+	mes "the ^3131FFConference Room^000000,";
+	mes "^3131FFSecretary Office^000000, the";
+	mes "^3131FFAuditorium^000000 and the";
+	mes "^3131FFChairman's Office^000000.";
+	next;
+	goto loopback;
+s_B:
+	mes "[Representative]";
+	mes "The first underground floor";
+	mes "is used by the ^3131FFRegenshirm^000000,";
+	mes "our laboratory affiliate. For";
+	mes "security reasons, this floor";
+	mes "is not accessible to visitors";
+	next;
+	goto loopback;
+	
+}
+
+lhz_in01.gat,26,247,2	duplicate(LhzRep)	Representative	71
+
+lhz_in01.gat,173,28,4	script	Guard::LhzRekGuard	868,{
+
+	mes "[Guard]";
+	mes "This is a";
+	mes "restricted area.";
+	mes "Please keep clear";
+	mes "if you do not have";
+	mes "special authorization.";
+	mes "Thank you for your cooperating.";
+	close;
+
+}
+
+lhz_in01.gat,180,28,4	duplicate(LhzRekGuard)	Guard	868
+
+lhz_in01.gat,72,209,4	script	Guide	862,{
+
+	mes "[Lasoei]";
+	mes "Oh phooey.";
+	mes "The same customers";
+	mes "are always coming in,";
+	mes "day after day. Can it";
+	mes "get any less exciting?";
+	next;
+	mes "[Lasoei]";
+	mes "Oh...!";
+	mes "W-welcome~";
+	mes "C-can I help you";
+	mes "with anything?";
+	close;
+
+}
+
+lhz_in01.gat,72,195,8	script	Guide	90,{
+
+	mes "[Geonuii]";
+	mes "Greetings. This path";
+	mes "leads to the Library and";
+	mes "the Laboratory. Please be";
+	mes "aware that these places";
+	mes "are restricted from access";
+	mes "by the general public.";
+	close;
+
+}
+
+lhz_in01.gat,73,188,4	script	Guide	862,{
+
+	mes "[Bonnie]";
+	mes "Oh no...";
+	mes "Where did I put it?";
+	close;
+
+}
+
+lhz_in01.gat,34,226,4	script	Rekenber Guard	867,{
+
+	if(getequipid(10) == 2241 && getequipid(9) == 2243)goto s_Staff;
+	mes "[Rekenber Guard]";
+	mes "This is a restricted";
+	mes "area! Please show";
+	mes "some ID immediately!";
+	next;
+	menu "ID?",s_ID,"Cancel",-;
+
+	mes "[Rekenber Guard]";
+	mes "Unless you have special";
+	mes "authorization, nobody is";
+	mes "allowed into the Underground";
+	mes "Laboratory for security reasons.";
+	close;
+
+s_ID:
+	mes "[Rekenber Guard]";
+	mes "I don't know how you";
+	mes "adventurers do things in";
+	mes "Rune-Midgard, but over here";
+	mes "we have laws about trespassing!";
+	close;
+
+s_Staff:
+	mes "[Rekenber Guard]";
+	mes "^3131FF(Whoa, it's a member";
+	mes "of the staff)^000000 Good day!";
+	close2;
+	warp "lhz_in01.gat",37,225;
+	end;
+
+}
+
+lhz_in01.gat,19,129,0	script	LhzHiddenTrg1::LhzTrig	-1,1,1{
+OnTouch:
+	if(getequipid(10) == 2241 && getequipid(9) == 2243)goto s_Staff;
+	mes "[Rekenber Guard]";
+	mes "This area is restricted";
+	mes "to the public! Who are you";
+	mes "and how did you get in here?!";
+	mes "Hey, I need backup right away!";
+	close2;
+	warp "lhz_in01.gat",34,224;
+	end;
+
+s_Staff:
+	mes "[Rekenber Guard]";
+	mes "Keep your eyes open.";
+	mes "I've heard rumors that some";
+	mes "adventurers from Rune-Midgard";
+	mes "are trying to sneak into here!";
+	mes "I know the security here is";
+	mes "pretty much failsafe, but...";
+	close;
+
+}
+
+lhz_in01.gat,23,137,0	duplicate(LhzTrig)	LhzHiddenTrg2	-1,1,1
+
+lhz_in01.gat,24,131,2	duplicate(LhzTrig)	Rekenber Guard	867
+
+lhz_in01.gat,25,141,4	script	Regenschirm Guard	868,{
+
+	if(getequipid(10) == 2241 && getequipid(9) == 2243)goto s_Staff;
+	mes "[Regenschirm Guard]";
+	mes "This area is restricted";
+	mes "to the public! Who are you";
+	mes "and how did you get in here?!";
+	mes "Hey, I need backup right away!";
+	close2;
+	warp "lhz_in01.gat",34,224;
+	end;
+
+s_Staff:
+	mes "[Regenschirm Guard]";
+	mes "Do you wish to";
+	mes "go underground?";
+	next;
+	menu "Yes",s_Yes,"No",-;
+
+	mes "[Regenschirm Guard]";
+	mes "Thank you and";
+	mes "have a nice day.";
+	close;
+
+s_Yes:
+	if(getequipid(7) == 2657 || getequipid(8) == 2657)goto s_Auth;
+	mes "[Regenschirm Guard]";
+	mes "I'm sorry but I can't let";
+	mes "staff without proper autorization";
+	mes "pass. Only staff memebers with";
+	mes "Laboratory Passports are allowed";
+	mes "to enter the underground.";
+	close;
+
+s_Auth:
+	warp "lhz_dun01.gat",150,288;
+	end;
+
+}

npc/warps/cities/lighthalzen.txt

@@ -14,6 +14,7 @@
 //= 1.4 Lighthalzen warp, taken from korean eA site [Vicious]
 //= 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]
 //============================================================
 
 lighthalzen.gat,196,46,0	warp	lhz010	1,1,lhz_in02.gat,282,83
@@ -122,4 +123,13 @@ lhz_in03.gat,191,35,0	warp	lhz044	1,1,lhz_in03.gat,190,103
 lhz_in03.gat,190,100,0	warp	lhz044a	1,1,lhz_in03.gat,189,34
 
 lighthalzen.gat,339,240,0	warp	lhz045	1,1,lhz_in03.gat,180,87
-lhz_in03.gat,180,90,0	warp	lhz045a	1,1,lighthalzen.gat,339,242
+lhz_in03.gat,180,90,0	warp	lhz045a	1,1,lighthalzen.gat,339,242
+
+lhz_in01.gat,40,224,0	warp	lhz046	1,1,lhz_in01.gat,19,129
+lhz_in01.gat,15,129,0	warp	lhz046a	1,1,lhz_in01.gat,34,224
+
+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

npc/warps/dungeons/lhalzen_dun.txt

@@ -22,6 +22,7 @@
 //= 1.6a Disabled the "Entrance" to lhz_dun01 [Poki#3]
 //= 1.6b Updated Sewer Pipe [Vicious]
 //= 1.7 Fixed a warp-back
+//= 1.8 Some small changes [MasterOfMuppets]
 //============================================================
 
 lhz_dun03.gat,140,139,0	warp	lhz003	1,1,lhz_dun02.gat,150,145
@@ -33,7 +34,7 @@ lhz_dun02.gat,148,18,0	warp	lhz006	1,1,lhz_dun01.gat,146,10
 lhz_dun01.gat,148,10,0	warp	lhz006a	1,1,lhz_dun02.gat,150,18
 
 //current entrance
-lhz_dun01.gat,150,290,0	warp	lhz007	1,1,lighthalzen.gat,73,54
+lhz_dun01.gat,150,290,0	warp	lhz007	1,1,lhz_in01.gat,23,137
 //lighthalzen.gat,73,52,0	warp	lhz007a	1,1,lhz_dun01.gat,150,288
 //This should be only an Exit. This warp doesn't exist on kRO.
 
@@ -41,8 +42,7 @@ lhz_dun01.gat,150,290,0	warp	lhz007	1,1,lighthalzen.gat,73,54
 
 lighthalzen.gat,313,301,0	script	Sewer Pipe	111,{
 	mes "You see some pipes for a sewage system.";
-	if(countitem(2657) == 0 && hzdun == 1)goto s_Find;
-	if(countitem(2657) != 0)goto s_Find;
+	if(hzdun == 1)goto s_Find;
 	close;
 s_Find:
 	mes "You found the way into the lab.";