* Temperory resolved issues on Juperos until I get the exact description on the behaviour in retail servers.

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

Changelog-Trunk.txt

@@ -4,6 +4,10 @@ AS OF SVN REV. 5091, WE ARE NOW USING TRUNK.  ALL UNTESTED BUGFIXES/FEATURES GO
 IF YOU HAVE A WORKING AND TESTED BUGFIX PUT IT INTO STABLE AS WELL AS TRUNK.  EVERYTHING ELSE
 GOES INTO TRUNK AND WILL BE MERGED INTO STABLE BY VALARIS AND WIZPUTER. -- VALARIS
 
+2006/03/17
+	* Temperory resolved issues on Juperos until I get the exact description on the behaviour
+	  in retail servers. [Lance]
+
 2006/03/16
 	* Changed NJ_ZENYNAGE according to this weeks patch to deal a random [MasterOfMuppets]
 	  ammount of damage depending on the skill lvl.

npc/warps/dungeons/juperos.txt

@@ -5,13 +5,14 @@
 //===== Current Version: =====================================
 //= 1.2
 //===== Compatible With: =====================================
-//= Any Athena Version; RO Episode 8+
+//= eAthena with independant npctimer support; RO Episode 8+
 //===== Description: =========================================
 //= Warp Points for Juperos Dungeon
 //===== Additional Comments: =================================
 //= 1.0 Converted by Dr.Evil [Lupus]
 //= 1.1 More temp warps to Juperos by Justin84 [Lupus]
 //= 1.2 Justin84's fixed elevator scripts
+//= 1.3 Fixed getting stuck when player relogs in. [Lance]
 //============================================================
 	
 yuno_fild07.gat,207,175,0	warp	jupwrp01	1,1,jupe_cave.gat,143,52
@@ -51,88 +52,78 @@ 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 to enter?";
+	mes "Are you sure you want to enter?";
 	next;
-	menu "Yes",-,"No",J_CLOSE;
-	if(getmapusers("jupe_ele.gat") > 0)goto J_WAIT;
-	initnpctimer;
-	warp "jupe_ele.gat",41,45;
-	end;
-
-J_CLOSE:
+	if(select("Yes","No") == 1){
+		close2;
+		set jupe_destination$, "jupe_ele.gat";
+		set jupe_destination_x, 50;
+		set jupe_destination_y, 94;
+		warp "jupe_ele.gat",41,45;
+		end;
+	}
 	close;
+}
 
-J_WAIT:
-	mes "Sorry, the elevator is in use,";
-	mes "please wait for a while.";
-	close;
+jupe_ele.gat,41,45,0	script	detectionUnit	-1,10,10{
+	if(@jupe_ele_timer == 0){
+		set @jupe_ele_timer, 1;
+		initnpctimer;
+	}
+	end;
 
 OnTimer1000:
-	mapannounce "jupe_ele.gat","Wait a moment.",16;
+	announce "Please wait for a moment.", bc_self|bc_blue;
 	soundeffect "jupe_warp.wav",0;
 	end;
 
 OnTimer15000:
 	stopnpctimer;
 	setnpctimer 0;
-	warp "jupe_ele_r.gat",50,94;
+	set jupe_ele_timer, 0;
+	set jupe_destination$, "";
+	set jupe_destination_x, 0;
+	set jupe_destination_y, 0;
+	warp jupe_destination$,jupe_destination_x,jupe_destination_y;
 	end;
 }
 
 jupe_ele_r.gat,50,98,0	script	Juperos Elevator	111,{
-	mes "Are you sure want to go up?";
+	mes "Are you sure you want to go up?";
 	next;
-	menu "Yes",-,"No",J_CLOSE;
-	if(getmapusers("jupe_ele.gat") > 0)goto J_WAIT;
-	initnpctimer;
-	warp "jupe_ele.gat",41,45;
-	end;
-
-J_CLOSE:
+	if(select("Yes","No") == 1){
+		close2;
+		set jupe_destination$, "juperos_02.gat";
+		set jupe_destination_x, 129;
+		set jupe_destination_y, 147;
+		warp "jupe_ele.gat",41,45;
+	}
 	close;
-
-J_WAIT:
-	mes "Sorry, the elevator is in use,";
-	mes "please wait for a while.";
-	close;
-
-OnTimer1000:
-	mapannounce "jupe_ele.gat","Wait a moment.",16;
-	soundeffect "jupe_warp.wav",0;
-	end;
-
-OnTimer15000:
-	stopnpctimer;
-	setnpctimer 0;
-	warp "juperos_02.gat",129,147;
-	end;
 }
 
 jupe_gate.gat,49,168,0	script	Juperos Guard	111,{
-	mes "Are you sure to enter Juperos Core?";
+	mes "Are you sure you want to enter the Juperos Core?";
 	next;
-	menu "Yes",-,"No",J_CLOSE;
-	initnpctimer;
-	soundeffect "jupe_warning.wav",0;
-	end;
+	if(select("Yes","No") == 1){
+		initnpctimer;
+		soundeffect "jupe_warning.wav",0;
+	}
+	close;
 
 OnTimer5000:
 	stopnpctimer;
 	setnpctimer 0;
 	warp "jupe_core.gat",150,20;
 	end;
-
-J_CLOSE:
-	close;
 }
 
 jupe_core.gat,150,17,0	script	Juperos Guard#2	111,{
 	mes "Leave Juperos Core?";
 	next;
-	menu "Yes",-,"No",J_CLOSE;
-	warp "jupe_gate.gat",49,165;
-	end;
-
-J_CLOSE:
+	if(select("Yes", "No") == 1){
+		close2;
+		warp "jupe_gate.gat",49,165;
+		end;
+	}
 	close;
-}
+}