Blah blah.

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

npc/Changelog.txt

@@ -28,6 +28,8 @@ Nexon
 Date		Added
 ======
 04/12
+	* Implemented the Juperos quest partially. [MasterOfMuppets]
+	- Also fixed the spawns there and in biolabs a bit.
 	* Fixed a few warps warping you back (they've been there for long =X). [erKURITA]
 	* Corrected some errors in cities/hugel.txt and guides/guides_hu.txt
 	  [Foruken]

npc/airports/airships.txt

@@ -112,13 +112,13 @@ OnTimer130000:
 	donpcevent "#AirshipWarp-2::OnHide";
 	disablenpc "#AirshipWarp-1";
 	disablenpc "#AirshipWarp-2";
-	mapannounce "airplane.gat","The Airship is leaving the ground. Our next destination is Lighthalzen.",1,0xFF6347;
+	mapannounce "airplane.gat","The Airship is leaving the ground. Our next destination is Lighthalzen.",1,0xFF8600;
 	end;
 OnTimer145000:
-	mapannounce "airplane.gat","We are heading to Lighthalzen.",1,0xFF6347;
+	mapannounce "airplane.gat","We are heading to Lighthalzen.",1,0xFF8600;
 	end;
 OnTimer160000:
-	mapannounce "airplane.gat","We will arrive in Lighthalzen shortly.",1,0xFF6347;
+	mapannounce "airplane.gat","We will arrive in Lighthalzen shortly.",1,0xFF8600;
 	end;
 OnTimer175000:
 	set $airplanelocation,3;
@@ -126,10 +126,10 @@ OnTimer175000:
 	enablenpc "#AirshipWarp-2";
 	donpcevent "#AirshipWarp-1::OnUnhide";
 	donpcevent "#AirshipWarp-2::OnUnhide";
-	mapannounce "airplane.gat","Welcome to Lighthalzen. Have a safe trip.",1,0xFF6347;
+	mapannounce "airplane.gat","Welcome to Lighthalzen. Have a safe trip.",1,0xFF8600;
 	end;
 OnTimer185000:
-	mapannounce "airplane.gat","Currently we are in Lighthalzen. The Airship will leave shortly.",1,0xFF6347;
+	mapannounce "airplane.gat","Currently we are in Lighthalzen. The Airship will leave shortly.",1,0xFF8600;
 	end;
 OnTimer195000:
 	set $airplanelocation,0;

npc/mobs/dungeons/jupedun.txt

@@ -12,36 +12,44 @@
 //===== Additional Comments: =================================
 //= 08/24/05 : Added 1st version. [Muad_Dib]
 //= 01/29/05 : Updated the spawns according to current info [MasterOfMuppets]
+//= 04/12/06 : Updated the spawns according to own info from iRO [MasterOfMuppets]
 //============================================================
 
-//==================================================
-// juperos_01 - The Ruins of Juperos F1
-//==================================================
-juperos_01.gat,0,0,0,0	monster	Venatu	1676,35,0,0,0
-juperos_01.gat,0,0,0,0	monster	Venatu	1677,35,0,0,0
-juperos_01.gat,0,0,0,0	monster	Venatu	1678,35,0,0,0
-juperos_01.gat,0,0,0,0	monster	Venatu	1679,35,0,0,0
+//========================================================================================
+// - Juperos 01
+//========================================================================================
 
-//==================================================
-// juperos_02 - The Ruins of Juperos F2
-//==================================================
+juperos_01.gat,0,0,0,0	monster	Venatu	1676,60,0,0,0
+juperos_01.gat,0,0,0,0	monster	Venatu	1677,60,0,0,0
+juperos_01.gat,0,0,0,0	monster	Venatu	1678,60,0,0,0
+juperos_01.gat,0,0,0,0	monster	Venatu	1679,60,0,0,0
+
+//========================================================================================
+// - Juperos 02
+//========================================================================================
+
+juperos_02.gat,75,91,200,212	monster	Venatu	1676,40,0,0,0
+juperos_02.gat,75,91,200,212	monster	Venatu	1677,40,0,0,0
+juperos_02.gat,75,91,200,212	monster	Venatu	1678,40,0,0,0
+juperos_02.gat,75,91,200,212	monster	Venatu	1679,40,0,0,0
 juperos_02.gat,0,0,0,0	monster	Venatu	1676,20,0,0,0
 juperos_02.gat,0,0,0,0	monster	Venatu	1677,20,0,0,0
 juperos_02.gat,0,0,0,0	monster	Venatu	1678,20,0,0,0
 juperos_02.gat,0,0,0,0	monster	Venatu	1679,20,0,0,0
-juperos_02.gat,0,0,0,0	monster	Apocalypse	1365,40,0,0,0
+juperos_02.gat,0,0,0,0	monster	Apocalypse	1365,25,0,0,0
+
+//========================================================================================
+// - Juperos Core
+//========================================================================================
 
-//==================================================
-// juperos_core - Juperos Dungeon Entrance
-//==================================================
 jupe_core.gat,0,0,0,0	monster	Archdam	1668,20,0,0,0
-jupe_core.gat,0,0,0,0	monster	Dimik	1670,12,0,0,0
-jupe_core.gat,0,0,0,0	monster	Dimik	1671,12,0,0,0
-jupe_core.gat,0,0,0,0	monster	Dimik	1672,12,0,0,0
-jupe_core.gat,0,0,0,0	monster	Dimik	1673,12,0,0,0
+jupe_core.gat,0,0,0,0	monster	Dimik	1670,15,0,0,0
+jupe_core.gat,0,0,0,0	monster	Dimik	1671,15,0,0,0
+jupe_core.gat,0,0,0,0	monster	Dimik	1672,15,0,0,0
+jupe_core.gat,0,0,0,0	monster	Dimik	1673,15,0,0,0
 jupe_core.gat,0,0,0,0	monster	Venatu	1676,5,0,0,0
 jupe_core.gat,0,0,0,0	monster	Venatu	1677,5,0,0,0
 jupe_core.gat,0,0,0,0	monster	Venatu	1678,5,0,0,0
 jupe_core.gat,0,0,0,0	monster	Venatu	1679,5,0,0,0
-jupe_core.gat,0,0,0,0	monster	Apocalypse	1365,20,0,0,0
+jupe_core.gat,0,0,0,0	monster	Apocalypse	1365,15,0,0,0
 jupe_core.gat,0,0,0,0	monster	Vesper	1685,1,3600000,1800000,1

npc/mobs/dungeons/lhzdun.txt

@@ -15,39 +15,44 @@
 //=      MasterofMuppets. [Skotlex]
 //= 1.3: Some fixes based on kRO's "RO Map" [Poki#3]
 //=	 I also made the place more Moby ^^
+//= 1.4: Adjusted spawns according to own info from iRO [MasterOfMuppets]
 //============================================================
 
-//==================================================
-// lhz_dun01 - Somatology Laboratory F1
-//==================================================
-lhz_dun01.gat,0,0,0,0	monster	Metaling	1613,50,0,0,0
-lhz_dun01.gat,0,0,0,0	monster	Anopheles	1627,25,0,0,0
-lhz_dun01.gat,0,0,0,0	monster	Removal	1682,35,0,0,0
+
+//========================================================================================
+// - Bio-life Labs 1F
+//========================================================================================
+
+lhz_dun01.gat,0,0,0,0	monster	Metaling	1613,20,0,0,0
+lhz_dun01.gat,0,0,0,0	monster	Anopheles	1627,30,0,0,0
+lhz_dun01.gat,0,0,0,0	monster	Removal	1682,40,0,0,0
 lhz_dun01.gat,0,0,0,0	monster	Ygnizem	1652,5,0,0,0
 lhz_dun01.gat,0,0,0,0	monster	Whikebain	1653,5,0,0,0
 lhz_dun01.gat,0,0,0,0	monster	Armaia	1654,5,0,0,0
 lhz_dun01.gat,0,0,0,0	monster	Erend	1655,5,0,0,0
 lhz_dun01.gat,0,0,0,0	monster	Kavac	1656,5,0,0,0
-lhz_dun01.gat,0,0,0,0	monster	Rawrel	1657,5,0,0,0
+lhz_dun01.gat,0,0,0,0	monster	Rawrell	1657,5,0,0,0
 lhz_dun01.gat,0,0,0,0	monster	Gemini S58	1681,1,1800000,900000,1
 
-//==================================================
-// lhz_dun02 - Somatology Laboratory F2
-//==================================================
-lhz_dun02.gat,0,0,0,0	monster	Removal	1682,25,0,0,0
+//========================================================================================
+// - Bio-life Labs 2F
+//========================================================================================
+
+lhz_dun02.gat,0,0,0,0	monster	Removal	1682,20,0,0,0
 lhz_dun02.gat,0,0,0,0	monster	Anopheles	1627,10,0,0,0
-lhz_dun02.gat,0,0,0,0	monster	Ygnizem	1652,15,0,0,0
-lhz_dun02.gat,0,0,0,0	monster	Whikebain	1653,15,0,0,0
-lhz_dun02.gat,0,0,0,0	monster	Armaia	1654,15,0,0,0
-lhz_dun02.gat,0,0,0,0	monster	Erend	1655,15,0,0,0
-lhz_dun02.gat,0,0,0,0	monster	Kavac	1656,15,0,0,0
-lhz_dun02.gat,0,0,0,0	monster	Rawrel	1657,15,0,0,0
-lhz_dun02.gat,0,0,0,0	monster	Gemini S58	1681,1,1800000,900000,1
+lhz_dun02.gat,0,0,0,0	monster	Ygnizem	1652,40,0,0,0
+lhz_dun02.gat,0,0,0,0	monster	Whikebain	1653,40,0,0,0
+lhz_dun02.gat,0,0,0,0	monster	Armaia	1654,40,0,0,0
+lhz_dun02.gat,0,0,0,0	monster	Erend	1655,40,0,0,0
+lhz_dun02.gat,0,0,0,0	monster	Kavac	1656,40,0,0,0
+lhz_dun02.gat,0,0,0,0	monster	Rawrell	1657,40,0,0,0
+lhz_dun01.gat,0,0,0,0	monster	Gemini S58	1681,5,600000,300000,1
 lhz_dun02.gat,0,0,0,0	monster	General Ygnizem	1658,1,7200000,3600000,1
 
-//==================================================
-// lhz_dun03 - Somatology Laboratory F3
-//==================================================
+//========================================================================================
+// - Bio-life Labs 3F
+//========================================================================================
+
 lhz_dun03.gat,0,0,0,0	monster	Seyren	1634,25,0,0,0
 lhz_dun03.gat,0,0,0,0	monster	Eremes	1635,25,0,0,0
 lhz_dun03.gat,0,0,0,0	monster	Harword	1636,25,0,0,0

npc/quests/juperos.txt

@@ -0,0 +1,132 @@
+//===== Athena Script =====================================
+//= Juperos Dungeon Quests
+//===== By ================================================
+//= MasterOfMuppets
+//===== Version ===========================================
+//= 1.0
+//===== Compatible With ===================================
+//= eAthena 1.0
+//===== Description =======================================
+//= 
+//===== Comments ==========================================
+//= 1.0 First version, partly implemented [MasterOfMuppets]
+//=========================================================
+
+juperos_01.gat,79,91,1	script	Sculpture#Juperos1	111,{
+
+	mes "^3131FFIt's a sculpture that";
+	mes "looks familiar to you.";
+	close;
+
+}
+
+juperos_01.gat,100,71,1	script	Bronze Statue#Juperos2	111,{
+
+	mes "^3131FFIt's an elaborate";
+	mes "bronze statue that";
+	mes "is twice the height of";
+	mes "a normal human being.";
+	close;
+
+}
+
+juperos_01.gat,124,92,1	script	Stone Statue#Juperos3	111,{
+
+	mes "^3131FFIt's an old";
+	mes "statue sculpted";
+	mes "out of stone.";
+	close;
+
+}
+
+//Quest related?
+//juperos_01.gat,x,y,1	script	Bronze Statue#Juperos4	111,{
+//
+//	mes "^3131FFThere's a peculiar";
+//	mes "engraving on the";
+//	mes "Bronze Statue's rod.";
+//	next;
+//	menu "Investigate",s_Invest,"Ignore it",-;
+//
+//	close;
+//
+//s_Invest:
+//
+//	mes "^3131FFIt's an inscription that's";
+//	mes "written in an old language";
+//	mes "that you can't understand,";
+//	mes "but have no problem reading";
+//	mes "and making out the sounds";
+//	mes "for some weird reason.";
+//	next;
+//	mes "[" + strcharinfo(0) + "]";
+//	mes "This is creepy!";
+//	mes "I know that I'm not";
+//	mes "supposed to be able";
+//	mes "to read this, but here";
+//	mes "I am. I know what sounds";
+//	mes "all of these letters make...";
+//	next;
+//	mes "[" + strcharinfo(0) + "]";
+//	mes "Huh. Only a scholar,";
+//	mes "maybe someone even in";
+//	mes "Juno, could make sense";
+//	mes "of what this stuff says.";
+//	close;
+//
+//}
+
+juperos_02.gat,1,1,1	script	JuperosLvl2QuestInit	-1,{
+OnInit:
+while(1)
+	{
+
+		monster "juperos_02.gat",24,276,"1st Gate Switch",1674,1,"JuperosLvl2QuestInit::OnGate1Dead";
+		monster "juperos_02.gat",240,29,"2nd Gate Switch",1674,1,"JuperosLvl2QuestInit::OnGate2Dead";
+		monster "juperos_02.gat",282,183,"3d Gate Switch",1674,1,"JuperosLvl2QuestInit::OnGate3Dead";
+		end;
+
+OnGate1Dead:
+
+	mapannounce "juperos_02.gat","Have you come seeking Juperos?! It no longer exists...",1,0xFF0000;
+	set $JupeGate1,1;
+	if($JupeGate1 && $JupeGate2 && $JupeGate3)goto s_WarpOpen;
+	end;
+
+OnGate2Dead:
+
+	mapannounce "juperos_02.gat","Who are you to come here?",1,0xFF0000;
+	set $JupeGate2,1;
+	if($JupeGate1 && $JupeGate2 && $JupeGate3)goto s_WarpOpen;
+	end;
+
+OnGate3Dead:
+
+	mapannounce "juperos_02.gat","Have you come to see me? Fine! Find me first!",1,0xFF0000;
+	set $JupeGate3,1;
+	if($JupeGate1 && $JupeGate2 && $JupeGate3)goto s_WarpOpen;
+	end;
+
+s_WarpOpen:
+	attachnpctimer;
+	initnpctimer;
+		end;
+	OnTimer3000:
+		mapannounce "juperos_02.gat","Vroom! Vroom!",1,0xBA55D3;
+		end;
+	OnTimer6000:
+		mapannounce "juperos_02.gat","Attention, visitors.",1,0xBA55D3;
+		end;
+	OnTimer9000:
+		mapannounce "juperos_02.gat","You are allowed to enter the next zone for a short period of time. Please use the portal in the center of the map.",1,0xBA55D3;
+		enablenpc "JupeWarp2";
+		end;
+	OnTimer309000:
+		mapannounce "juperos_02.gat","The portal has now closed.",1,0xBA55D3;
+		disablenpc "JupeWarp2";
+		set $JupeGate1,0;
+		set $JupeGate2,0;
+		set $JupeGate3,0;
+	stopnpctimer;
+	}
+}

npc/scripts_athena.conf

@@ -80,6 +80,7 @@ npc: npc/quests/doomed_swords.txt
 npc: npc/quests/bongunsword.txt
 npc: npc/quests/monstertamers.txt
 npc: npc/quests/Lvl4_weapon_quest.txt
+npc: npc/quests/juperos.txt
 npc: npc/quests/newgears/arjen.txt
 npc: npc/quests/newgears/back_ribbon.txt
 npc: npc/quests/newgears/bear_hat.txt

npc/warps/dungeons/juperos.txt

@@ -14,13 +14,46 @@
 //= 1.2 Justin84's fixed elevator scripts
 //= 1.3 Fixed getting stuck when player relogs in. [Lance]
 //= 1.4 Added attachnpctimer to the initnpctimer calls. [Skotlex]
+//= 1.5 Implemented a part of the Juperos quest [MasterOfMuppets]
 //============================================================
 	
 yuno_fild07.gat,207,175,0	warp	jupwrp01	1,1,jupe_cave.gat,143,52
 jupe_cave.gat,148,52,0	warp	jupwrp02	1,1,yuno_fild07.gat,212,175
 jupe_cave.gat,26,52,0	warp	jupwrp03	1,1,juperos_01.gat,53,247
 juperos_01.gat,50,250,0	warp	jupwrp04	1,1,jupe_cave.gat,29,52
-juperos_01.gat,99,92,0	warp	jupwrp05	1,1,juperos_02.gat,36,60
+
+juperos_01.gat,99,92,1	script	jupwrp05	-1,0,0,{
+OnTouch:
+
+	mes "^666666[" + strcharinfo(0) + "]";
+	mes "^000000This light...";
+	mes "It feels like...";
+	mes "Its warmth is...";
+	mes "Wrapping all over me...";
+	next;
+	menu "Ah, it's so nice...",s_Nice,"No! This is wrong!",-;
+
+	mes "^666666[" + strcharinfo(0) + "]";
+	mes "^000000N-No! This is";
+	mes "wrong! Something";
+	mes "weird's happening!";
+	mes "I gotta get away!";
+	close2;
+	warp "juperos_01.gat",96,91;
+	end;
+
+s_Nice:
+	specialeffect 309;
+	mes "^666666[" + strcharinfo(0) + "]";
+	mes "^000000Ahhhh...";
+	mes "It feels like";
+	mes "I'm floating...";
+	close2;
+	warp "juperos_02.gat",128,278;
+	end;
+
+}
+
 juperos_02.gat,33,60,0	warp	jupwrp06	1,1,juperos_01.gat,99,88
 jupe_ele_r.gat,49,27,0	warp	jupwrp07	1,1,jupe_gate.gat,49,52
 jupe_gate.gat,49,55,0	warp	jupwrp08	1,1,jupe_ele_r.gat,49,30
@@ -52,55 +85,22 @@ jupe_area2.gat,129,106,0	warp	jupwrp36	1,1,jupe_area2.gat,129,140
 jupe_area2.gat,105,54,0	warp	jupwrp37	1,1,jupe_area2.gat,77,158
 jupe_area2.gat,79,158,0	warp	jupwrp38	1,1,jupe_area2.gat,108,54
 
-juperos_02.gat,129,150,0	script	Juperos	111,{
-	mes "Are you sure you want to enter?";
-	next;
-	if(select("Yes","No") == 1){
-		set jupe_destination$, "jupe_ele_r.gat";
-		set jupe_destination_x, 50;
-		set jupe_destination_y, 94;
-		close2;
-		warp "jupe_ele.gat",41,45;
-		end;
-	}
-	close;
-}
-
-jupe_ele.gat,41,45,0	script	detectionUnit	-1,20,20{
-OnTouch:
-	attachnpctimer; //Attach player to this timer
-	initnpctimer;	
-	end;
-
-OnTimer1000:
-	announce "Please wait for a moment.", bc_self|bc_blue;
-	soundeffect "jupe_warp.wav",0;
+juperos_02.gat,129,150,0	script	JupeWarp2	-1,1,1{
+OnInit:
+	disablenpc "JupeWarp2";
 	end;
-
-OnTimer15000:
-	stopnpctimer;
-	setnpctimer 0;
-	warp jupe_destination$,jupe_destination_x,jupe_destination_y;
-	set jupe_destination$, "";
-	set jupe_destination_x, 0;
-	set jupe_destination_y, 0;
+OnTouch:
+	warp "jupe_gate.gat",49,162;
 	end;
 }
 
-jupe_ele_r.gat,50,98,0	script	Juperos Elevator	111,{
-	mes "Are you sure you want to go up?";
-	next;
-	if(select("Yes","No") == 1){
-		set jupe_destination$, "juperos_02.gat";
-		set jupe_destination_x, 129;
-		set jupe_destination_y, 147;
-		close2;
-		warp "jupe_ele.gat",41,45;
-	}
-	close;
+jupe_gate.gat,49,168,0	script	JupeWarp3	-1,1,1,{
+OnTouch:
+	warp "juperos_02.gat",129,147;
+	end;
 }
 
-jupe_gate.gat,49,168,0	script	Juperos Guard	111,{
+jupe_ele_r.gat,50,98,0	script	Juperos Guard	111,{
 	mes "Are you sure you want to enter the Juperos Core?";
 	next;
 	if(select("Yes","No") == 1){
@@ -122,7 +122,7 @@ jupe_core.gat,150,17,0	script	Juperos Guard#2	111,{
 	next;
 	if(select("Yes", "No") == 1){
 		close2;
-		warp "jupe_gate.gat",49,165;
+		warp "jupe_ele_r",50,94;
 		end;
 	}
 	close;