From 57dff6a693955d56a8b316f78411a4f50e061a0d Mon Sep 17 00:00:00 2001 From: Vicious Date: Sun, 2 Apr 2006 18:19:56 +0000 Subject: fixed hidden temple spawn and sage script? git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@5873 54d463be-8e91-2dee-dedb-b68131a5f0ec --- npc/Changelog.txt | 2 ++ npc/jobs/2-2/sage.txt | 18 +++++++++--------- npc/omobs/dungeons/pront_maze.txt | 2 +- 3 files changed, 12 insertions(+), 10 deletions(-) (limited to 'npc') diff --git a/npc/Changelog.txt b/npc/Changelog.txt index c84def7c9..d17b4b2d9 100644 --- a/npc/Changelog.txt +++ b/npc/Changelog.txt @@ -27,6 +27,8 @@ Nexon Date Added 04/02 + * Fixed sage script? [Vicious] + * Fixed more of wrong female thief bug spawn [Vicious] * Umbala Bungee Jump - Warps you to Niff with 1HP no watter what [Lance] 03/30 * Fixed refiner full price display, thanks to S4Sly [Vicious] diff --git a/npc/jobs/2-2/sage.txt b/npc/jobs/2-2/sage.txt index 366f33e49..735f86c7b 100644 --- a/npc/jobs/2-2/sage.txt +++ b/npc/jobs/2-2/sage.txt @@ -1956,9 +1956,9 @@ OnReset: OnKilled: set $@jobsage_m,$@jobsage_m-1; if( $@jobsage_m > 0 )goto L_NotWin; - if(getnpctimer(1,"jobsage_1st") < 60000 ) set sagecheck,sagecheck+1; - if((getnpctimer(1,"jobsage_1st") >= 120000 ) && (getnpctimer(1,"jobsage_1st") <= 170000 )) set sagecheck,sagecheck-1; - if(getnpctimer(1,"jobsage_1st") > 170000 ) set sagecheck,sagecheck-2; + if(getnpctimer(0) < 60000 ) set sagecheck,sagecheck+1; + if((getnpctimer(0) >= 120000 ) && (getnpctimer(0) <= 170000 )) set sagecheck,sagecheck-1; + if(getnpctimer(0) > 170000 ) set sagecheck,sagecheck-2; stopnpctimer; mapannounce "job_sage.gat","Examiner: " + $@jobsage_pname$ + " killed all the monsters!",8; donpcevent "jobsage_2nd::OnStart"; @@ -2047,9 +2047,9 @@ OnKilled: set $@jobsage_m,$@jobsage_m-1; if( $@jobsage_m > 0 )goto L_NotWin; stopnpctimer; - if(getnpctimer(1,"jobsage_2nd") < 60000 ) set sagecheck,sagecheck+1; - if((getnpctimer(1,"jobsage_2nd") >= 120000 ) && (getnpctimer(1,"jobsage_2nd") <= 170000 )) set sagecheck,sagecheck-1; - if(getnpctimer(1,"jobsage_2nd") > 170000 ) set sagecheck,sagecheck-2; + if(getnpctimer(0) < 60000 ) set sagecheck,sagecheck+1; + if((getnpctimer(0) >= 120000 ) && (getnpctimer(0) <= 170000 )) set sagecheck,sagecheck-1; + if(getnpctimer(0) > 170000 ) set sagecheck,sagecheck-2; mapannounce "job_sage.gat","Examiner: " + $@jobsage_pname$ + " killed all the monsters!",8; donpcevent "jobsage_3rd::OnStart"; L_NotWin: @@ -2117,9 +2117,9 @@ OnKilled: stopnpctimer; killmonster "job_sage.gat","All"; set SAGE_Q,7; - if(getnpctimer(1,"jobsage_3rd") < 20000 ) set sagecheck,sagecheck+1; - if((getnpctimer(1,"jobsage_3rd") >= 30000 ) && (getnpctimer(1,"jobsage_2nd") <= 50000 )) set sagecheck,sagecheck-1; - if(getnpctimer(1,"jobsage_3rd") > 50000 ) set sagecheck,sagecheck-2; + if(getnpctimer(0) < 20000 ) set sagecheck,sagecheck+1; + if((getnpctimer(0) >= 30000 ) && (getnpctimer(0) <= 50000 )) set sagecheck,sagecheck-1; + if(getnpctimer(0) > 50000 ) set sagecheck,sagecheck-2; mapannounce "job_sage.gat","Examiner: Congratulations. " + $@jobsage_pname$ + "passed the test!",8; donpcevent "jobsage_success::OnSuccess"; L_NotWin: diff --git a/npc/omobs/dungeons/pront_maze.txt b/npc/omobs/dungeons/pront_maze.txt index 18ffd4efe..116cdda13 100644 --- a/npc/omobs/dungeons/pront_maze.txt +++ b/npc/omobs/dungeons/pront_maze.txt @@ -39,7 +39,7 @@ prt_maze01.gat,179,140,21,21 monster Mantis 1139,3,120000,40000,1 prt_maze01.gat,99,140,21,21 monster Side Winder 1037,3,120000,40000,1 prt_maze01.gat,139,100,21,21 monster Argos 1100,3,120000,40000,1 prt_maze01.gat,179,100,21,21 monster Argiope 1099,3,120000,40000,1 -prt_maze01.gat,19,180,21,21 monster Savage Babe 1067,3,120000,40000,1 +prt_maze01.gat,19,180,21,21 monster Savage Babe 1167,3,120000,40000,1 prt_maze01.gat,59,140,21,21 monster Choco 1214,2,120000,40000,1 prt_maze01.gat,99,20,21,21 monster Creamy 1018,1,120000,40000,1 prt_maze01.gat,0,0,0,0 monster White Plant 1082,5,180000,90000,1 -- cgit v1.2.3-60-g2f50