From f569968e15e9c89222713c7c3a61b8240df36db8 Mon Sep 17 00:00:00 2001 From: masao87 Date: Sun, 5 Aug 2012 15:26:07 +0000 Subject: - This should fix all job quests which didn't work after the update. git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@16584 54d463be-8e91-2dee-dedb-b68131a5f0ec --- npc/jobs/2-2/alchemist.txt | 5 ++- npc/jobs/2-2/crusader.txt | 89 +++++++++++++++++++++++++--------------------- npc/jobs/2-2/dancer.txt | 40 ++++++++++++--------- npc/jobs/2-2/monk.txt | 18 ++++++++++ npc/jobs/2-2/rogue.txt | 26 ++++++++++++++ npc/jobs/2-2/sage.txt | 46 +++++++++++++----------- 6 files changed, 147 insertions(+), 77 deletions(-) (limited to 'npc/jobs/2-2') diff --git a/npc/jobs/2-2/alchemist.txt b/npc/jobs/2-2/alchemist.txt index 1503ce948..58cb14cc8 100644 --- a/npc/jobs/2-2/alchemist.txt +++ b/npc/jobs/2-2/alchemist.txt @@ -2364,8 +2364,9 @@ alde_alche,145,19,1 script Chief Researcher 57,{ if (select("partisan:partizan:pato:paros:pack") == 2) { set @alch_q, @alch_q + 10; } + next; } - else if (.@alche_puz == 2) { + if (.@alche_puz == 2) { mes "m p d i c f a r o g n k w a s"; next; set @alch_q, 0; @@ -2387,6 +2388,7 @@ alde_alche,145,19,1 script Chief Researcher 57,{ if (select("forgemerchant:potionmerchant:dcmerchant:vendingmerchant:battlemerchant") == 2) { set @alch_q, @alch_q + 10; } + next; } else { mes "s m i e x b w u n e t a g l r"; @@ -2410,6 +2412,7 @@ alde_alche,145,19,1 script Chief Researcher 57,{ if (select("forgemerchant:potionmerchant:dcmerchant:vendingmerchant:battlemerchant") == 2) { set @alch_q, @alch_q + 10; } + next; } mes "[Nicholas Flamel]"; mes "Ah, you finished."; diff --git a/npc/jobs/2-2/crusader.txt b/npc/jobs/2-2/crusader.txt index 880ab7889..62035ff7f 100644 --- a/npc/jobs/2-2/crusader.txt +++ b/npc/jobs/2-2/crusader.txt @@ -1447,7 +1447,7 @@ OnTimer301000: end; OnInit: - hideoffnpc "Summoner#1"; + enablenpc "Summoner#1"; monster "job_cru",94,45,"Mandragora",1020,1,"Summoner#1::OnMyMobDead"; monster "job_cru",94,55,"Mandragora",1020,1,"Summoner#1::OnMyMobDead"; monster "job_cru",94,65,"Mandragora",1020,1,"Summoner#1::OnMyMobDead"; @@ -1464,7 +1464,7 @@ OnInit: end; OnEnable: - hideoffnpc "Summoner#1"; + enablenpc "Summoner#1"; monster "job_cru",94,45,"Mandragora",1020,1,"Summoner#1::OnMyMobDead"; monster "job_cru",94,55,"Mandragora",1020,1,"Summoner#1::OnMyMobDead"; monster "job_cru",94,65,"Mandragora",1020,1,"Summoner#1::OnMyMobDead"; @@ -1485,7 +1485,7 @@ OnReset: end; OnDisable: - hideonnpc "Summoner#1"; + disablenpc "Summoner#1"; end; OnMyMobDead: @@ -1510,7 +1510,7 @@ OnTimer346000: end; OnInit: - hideoffnpc "Summoner#2"; + enablenpc "Summoner#2"; monster "job_cru",98,50,"Flora",1118,1,"Summoner#2::OnMyMobDead"; monster "job_cru",92,60,"Flora",1118,1,"Summoner#2::OnMyMobDead"; monster "job_cru",104,60,"Flora",1118,1,"Summoner#2::OnMyMobDead"; @@ -1522,7 +1522,7 @@ OnInit: end; OnEnable: - hideoffnpc "Summoner#2"; + enablenpc "Summoner#2"; monster "job_cru",98,50,"Flora",1118,1,"Summoner#2::OnMyMobDead"; monster "job_cru",92,60,"Flora",1118,1,"Summoner#2::OnMyMobDead"; monster "job_cru",104,60,"Flora",1118,1,"Summoner#2::OnMyMobDead"; @@ -1538,7 +1538,7 @@ OnReset: end; OnDisable: - hideonnpc "Summoner#2"; + disablenpc "Summoner#2"; end; OnMyMobDead: @@ -1563,7 +1563,7 @@ OnTimer346000: end; OnInit: - hideoffnpc "Summoner#3"; + enablenpc "Summoner#3"; monster "job_cru",92,50,"Greatest General",1277,1,"Summoner#3::OnMyMobDead"; monster "job_cru",104,50,"Greatest General",1277,1,"Summoner#3::OnMyMobDead"; monster "job_cru",98,60,"Greatest General",1277,1,"Summoner#3::OnMyMobDead"; @@ -1576,7 +1576,7 @@ OnInit: end; OnEnable: - hideoffnpc "Summoner#3"; + enablenpc "Summoner#3"; monster "job_cru",90,50,"Greatest General",1277,1,"Summoner#3::OnMyMobDead"; monster "job_cru",105,50,"Greatest General",1277,1,"Summoner#3::OnMyMobDead"; monster "job_cru",98,60,"Greatest General",1277,1,"Summoner#3::OnMyMobDead"; @@ -1593,7 +1593,7 @@ OnReset: end; OnDisable: - hideonnpc "Summoner#3"; + disablenpc "Summoner#3"; end; OnMyMobDead: @@ -1618,7 +1618,7 @@ OnTimer186000: end; OnInit: - hideoffnpc "Summoner#4"; + enablenpc "Summoner#4"; monster "job_cru",98,50,"Familiar",1005,1,"Summoner#4::OnMyMobDead"; monster "job_cru",98,55,"Familiar",1005,1,"Summoner#4::OnMyMobDead"; monster "job_cru",98,60,"Familiar",1005,1,"Summoner#4::OnMyMobDead"; @@ -1634,7 +1634,7 @@ OnInit: end; OnEnable: - hideoffnpc "Summoner#4"; + enablenpc "Summoner#4"; monster "job_cru",98,50,"Familiar",1005,1,"Summoner#4::OnMyMobDead"; monster "job_cru",98,55,"Familiar",1005,1,"Summoner#4::OnMyMobDead"; monster "job_cru",98,60,"Familiar",1005,1,"Summoner#4::OnMyMobDead"; @@ -1654,7 +1654,7 @@ OnReset: end; OnDisable: - hideonnpc "Summoner#4"; + disablenpc "Summoner#4"; end; OnMyMobDead: @@ -1663,6 +1663,7 @@ OnMyMobDead: } job_cru,98,105,0 script Summoner#5 45,4,3,{ + end; OnTouch: set CRUS_Q,6; @@ -1691,7 +1692,7 @@ job_cru,24,187,2 script Waiting Room#1 700,{ end; OnInit: - hideonnpc "Waiting Room#1"; + disablenpc "Waiting Room#1"; waitingroom "Waiting Room",20,"Waiting Room#1::OnStartArena",1; enablewaitingroomevent; end; @@ -1708,6 +1709,7 @@ OnEnable: } job_cru,168,17,0 script Zombie Guide 139,2,2,{ + end; OnTouch: mes "[Bliant Piyord]"; @@ -1728,11 +1730,11 @@ job_cru,2,1,1 script Monster Summon#0 110,1,1,{ end; OnInit: - hideonnpc "Monster Summon#0"; + disablenpc "Monster Summon#0"; end; OnEnable: - hideoffnpc "Monster Summon#0"; + enablenpc "Monster Summon#0"; donpcevent "Monster Summon#1::OnEnable"; donpcevent "Monster Summon#2::OnEnable"; donpcevent "Monster Summon#3::OnEnable"; @@ -1767,7 +1769,7 @@ OnMyMobDead: end; OnDisable: - hideonnpc "Monster Summon#0"; + disablenpc "Monster Summon#0"; end; OnReset: @@ -1776,6 +1778,7 @@ OnReset: } job_cru,168,45,0 script Monster Summon#1 139,15,1,{ + end; OnTouch: donpcevent "Monster Summon#0::OnM1"; @@ -1783,19 +1786,20 @@ OnTouch: end; OnInit: - hideonnpc "Monster Summon#1"; + disablenpc "Monster Summon#1"; end; OnEnable: - hideoffnpc "Monster Summon#1"; + enablenpc "Monster Summon#1"; end; OnDisable: - hideonnpc "Monster Summon#1"; + disablenpc "Monster Summon#1"; end; } job_cru,168,80,0 script Monster Summon#2 139,15,1,{ + end; OnTouch: donpcevent "Monster Summon#0::OnM2"; @@ -1803,19 +1807,20 @@ OnTouch: end; OnInit: - hideonnpc "Monster Summon#2"; + disablenpc "Monster Summon#2"; end; OnEnable: - hideoffnpc "Monster Summon#2"; + enablenpc "Monster Summon#2"; end; OnDisable: - hideonnpc "Monster Summon#2"; + disablenpc "Monster Summon#2"; end; } job_cru,168,115,0 script Monster Summon#3 139,15,1,{ + end; OnTouch: monster "job_cru",168,110,"Archer Skeleton",1016,1; @@ -1824,19 +1829,20 @@ OnTouch: end; OnInit: - hideonnpc "Monster Summon#3"; + disablenpc "Monster Summon#3"; end; OnEnable: - hideoffnpc "Monster Summon#3"; + enablenpc "Monster Summon#3"; end; OnDisable: - hideonnpc "Monster Summon#3"; + disablenpc "Monster Summon#3"; end; } job_cru,168,150,0 script Monster Summon#4 139,15,1,{ + end; OnTouch: monster "job_cru",168,150,"Ghoul",1036,1; @@ -1844,7 +1850,7 @@ OnTouch: end; OnInit: - hideonnpc "Monster Summon#4"; + disablenpc "Monster Summon#4"; end; OnMyMobDead: @@ -1852,7 +1858,7 @@ OnMyMobDead: end; OnEnable: - hideoffnpc "Monster Summon#4"; + enablenpc "Monster Summon#4"; end; OnReset: @@ -1860,11 +1866,12 @@ OnReset: end; OnDisable: - hideonnpc "Monster Summon#4"; + disablenpc "Monster Summon#4"; end; } job_cru,168,180,0 script Monster Summon#5 45,4,3,{ + end; OnTouch: warp "prt_castle",35,147; @@ -1877,15 +1884,15 @@ OnTouch: end; OnInit: - hideonnpc "Monster Summon#5"; + disablenpc "Monster Summon#5"; end; OnEnable: - hideoffnpc "Monster Summon#5"; + enablenpc "Monster Summon#5"; end; OnDisable: - hideonnpc "Monster Summon#5"; + disablenpc "Monster Summon#5"; end; } @@ -1922,16 +1929,16 @@ OnTimer243000: end; OnInit: - hideonnpc "Monster Summon#6"; + disablenpc "Monster Summon#6"; end; OnEnable: - hideoffnpc "Monster Summon#6"; + enablenpc "Monster Summon#6"; initnpctimer; end; OnDisable: - hideonnpc "Monster Summon#6"; + disablenpc "Monster Summon#6"; end; OnStop: @@ -1940,39 +1947,41 @@ OnStop: } job_cru,168,110,0 script Monster Summon#7 139,14,82,{ + end; OnTouch: warp "prontera",234,318; end; OnInit: - hideonnpc "Monster Summon#7"; + disablenpc "Monster Summon#7"; end; OnEnable: - hideoffnpc "Monster Summon#7"; + enablenpc "Monster Summon#7"; end; OnDisable: - hideonnpc "Monster Summon#7"; + disablenpc "Monster Summon#7"; end; } job_cru,168,17,0 script Monster Summon#8 139,14,5,{ + end; OnTouch: warp "prontera",234,318; end; OnInit: - hideonnpc "Monster Summon#8"; + disablenpc "Monster Summon#8"; end; OnEnable: - hideoffnpc "Monster Summon#8"; + enablenpc "Monster Summon#8"; end; OnDisable: - hideonnpc "Monster Summon#8"; + disablenpc "Monster Summon#8"; end; } \ No newline at end of file diff --git a/npc/jobs/2-2/dancer.txt b/npc/jobs/2-2/dancer.txt index f64fbe00f..7c9076a6b 100644 --- a/npc/jobs/2-2/dancer.txt +++ b/npc/jobs/2-2/dancer.txt @@ -1303,6 +1303,7 @@ OnTimer89000: } job_duncer,69,110,0 script dance#return 139,1,4,{ + end; OnTouch: mapannounce "job_duncer","Good! Well done! Go back to Bijou!",bc_map; @@ -1312,18 +1313,19 @@ OnTouch: end; OnDisable: - hideonnpc "dance#return"; + disablenpc "dance#return"; donpcevent "dance#return#2::OnDisable"; donpcevent "dance#return#3::OnDisable"; end; OnEnable: - hideoffnpc "dance#return"; + enablenpc "dance#return"; donpcevent "dance#return#2::OnEnable"; end; } job_duncer,66,110,0 script dance#return#2 139,1,1,{ + end; OnTouch: set DANC_Q,9; @@ -1332,16 +1334,17 @@ OnTouch: end; OnDisable: - hideonnpc "dance#return#2"; + disablenpc "dance#return#2"; end; OnEnable: - hideoffnpc "dance#return#2"; + enablenpc "dance#return#2"; donpcevent "dance#return#3::OnEnable"; end; } job_duncer,72,110,0 script dance#return#3 139,1,1,{ + end; OnTouch: set DANC_Q,9; @@ -1350,16 +1353,17 @@ OnTouch: end; OnDisable: - hideonnpc "dance#return#3"; + disablenpc "dance#return#3"; end; OnEnable: - hideoffnpc "dance#return#3"; + enablenpc "dance#return#3"; donpcevent "Waiting Room#dance::OnReset"; end; } job_duncer,69,113,0 script dance#up 139,1,1,{ + end; OnTouch: donpcevent "Backdancer#1::OnHuk"; @@ -1370,15 +1374,16 @@ OnTouch: end; OnDisable: - hideonnpc "dance#up"; + disablenpc "dance#up"; end; OnEnable: - hideoffnpc "dance#up"; + enablenpc "dance#up"; end; } job_duncer,69,107,0 script dance#down 139,1,1,{ + end; OnTouch: donpcevent "Backdancer#1::OnHuk"; @@ -1389,15 +1394,16 @@ OnTouch: end; OnDisable: - hideonnpc "dance#down"; + disablenpc "dance#down"; end; OnEnable: - hideoffnpc "dance#down"; + enablenpc "dance#down"; end; } job_duncer,66,110,0 script dance#left 139,1,1,{ + end; OnTouch: donpcevent "Backdancer#1::OnHuk"; @@ -1408,15 +1414,16 @@ OnTouch: end; OnDisable: - hideonnpc "dance#left"; + disablenpc "dance#left"; end; OnEnable: - hideoffnpc "dance#left"; + enablenpc "dance#left"; end; } job_duncer,72,110,0 script dance#right 139,1,1,{ + end; OnTouch: donpcevent "Backdancer#1::OnHuk"; @@ -1427,15 +1434,16 @@ OnTouch: end; OnDisable: - hideonnpc "dance#right"; + disablenpc "dance#right"; end; OnEnable: - hideoffnpc "dance#right"; + enablenpc "dance#right"; end; } job_duncer,69,110,0 script dance#cen 139,1,1,{ + end; OnTouch: donpcevent "Backdancer#1::OnHuk"; @@ -1446,11 +1454,11 @@ OnTouch: end; OnDisable: - hideonnpc "dance#cen"; + disablenpc "dance#cen"; end; OnEnable: - hideoffnpc "dance#cen"; + enablenpc "dance#cen"; end; } diff --git a/npc/jobs/2-2/monk.txt b/npc/jobs/2-2/monk.txt index 08a7c9af8..321599f0c 100644 --- a/npc/jobs/2-2/monk.txt +++ b/npc/jobs/2-2/monk.txt @@ -3188,6 +3188,7 @@ monk_test,82,85,1 script Proctor 95,{ } monk_test,144,277,0 script mob_monk#1_1 139,1,1,{ + end; OnTouch: monster "monk_test",144,277,"Zombie",1015,1; @@ -3202,6 +3203,7 @@ OnReset: } monk_test,134,291,0 script mob_monk#1_2 139,1,1,{ + end; OnTouch: monster "monk_test",134,291,"Zombie",1015,1; @@ -3216,6 +3218,7 @@ OnReset: } monk_test,157,284,0 script mob_monk#1_3 139,1,1,{ + end; OnTouch: monster "monk_test",157,284,"Mummy",1041,1; @@ -3227,6 +3230,7 @@ OnReset: } monk_test,156,261,0 script mob_monk#1_4 139,1,1,{ + end; OnTouch: monster "monk_test",156,261,"Mummy",1041,1; @@ -3238,6 +3242,7 @@ OnReset: } monk_test,149,268,0 script mob_monk#1_5 139,1,1,{ + end; OnTouch: monster "monk_test",149,268,"Zombie",1015,1; @@ -3253,6 +3258,7 @@ OnReset: } monk_test,166,278,0 script exit_monk#1 45,1,1,{ + end; OnTouch: mes "[Proctor]"; @@ -3301,6 +3307,7 @@ monk_test,88,91,1 script Proctor#mk 52,{ } monk_test,140,181,0 script mob_monk#2_1 139,1,1,{ + end; OnTouch: monster "monk_test",140,181,"Zombie",1015,1; @@ -3315,6 +3322,7 @@ OnReset: } monk_test,150,164,0 script mob_monk#2_2 139,1,1,{ + end; OnTouch: monster "monk_test",150,164,"Zombie",1015,1; @@ -3329,6 +3337,7 @@ OnReset: } monk_test,158,192,0 script mob_monk#2_3 139,1,1,{ + end; OnTouch: monster "monk_test",158,192,"Mummy",1041,1; @@ -3340,6 +3349,7 @@ OnReset: } monk_test,165,186,0 script mob_monk#2_4 139,1,1,{ + end; OnTouch: monster "monk_test",165,186,"Mummy",1041,1; @@ -3351,6 +3361,7 @@ OnReset: } monk_test,162,182,0 script mob_monk#2_5 139,1,1,{ + end; OnTouch: monster "monk_test",162,182,"Zombie",1015,1; @@ -3366,6 +3377,7 @@ OnReset: } monk_test,166,178,0 script exit_monk#2 45,1,1,{ + end; OnTouch: mes "[Proctor]"; @@ -3414,6 +3426,7 @@ monk_test,95,85,1 script Proctor#btl#3 79,{ } monk_test,249,277,0 script mob_monk#3_1 139,1,1,{ + end; OnTouch: monster "monk_test",249,277,"Zombie",1015,1; @@ -3428,6 +3441,7 @@ OnReset: } monk_test,231,296,0 script mob_monk#3_2 139,1,1,{ + end; OnTouch: monster "monk_test",231,296,"Zombie",1015,1; @@ -3442,6 +3456,7 @@ OnReset: } monk_test,264,292,0 script mob_monk#3_3 139,1,1,{ + end; OnTouch: monster "monk_test",264,292,"Mummy",1041,1; @@ -3453,6 +3468,7 @@ OnReset: } monk_test,252,284,0 script mob_monk#3_4 139,1,1,{ + end; OnTouch: monster "monk_test",252,284,"Mummy",1041,1; @@ -3464,6 +3480,7 @@ OnReset: } monk_test,257,285,0 script mob_monk#3_5 139,1,1,{ + end; OnTouch: monster "monk_test",257,285,"Zombie",1015,1; @@ -3480,6 +3497,7 @@ OnReset: } monk_test,270,278,0 script exit_monk#3 45,1,1,{ + end; OnTouch: mes "[Proctor]"; diff --git a/npc/jobs/2-2/rogue.txt b/npc/jobs/2-2/rogue.txt index 5310fbb9c..eef267cb9 100644 --- a/npc/jobs/2-2/rogue.txt +++ b/npc/jobs/2-2/rogue.txt @@ -1122,6 +1122,7 @@ in_rogue,376,23,1 script Mr. Smith 57,{ } cmd_fild09,106,195,0 script Warp#1 45,1,1,{ + end; OnTouch: if (ROGUE_Q < 8){ @@ -1217,6 +1218,7 @@ OnTouch: } cmd_fild09,335,143,0 script Warp#2 45,1,1,{ + end; OnTouch: if (ROGUE_Q < 8){ @@ -1312,6 +1314,7 @@ OnTouch: } cmd_fild04,304,180,0 script Warp#3 45,1,1,{ + end; OnTouch: if (ROGUE_Q < 8){ @@ -1459,6 +1462,7 @@ in_rogue,272,135,1 script Hermanthorn Jr 85,{ } in_rogue,270,130,0 script he_to_rogue 45,1,1,{ + end; OnTouch: if (ROGUE_Q == 12) { @@ -1502,6 +1506,7 @@ OnTouch: } in_rogue,200,389,0 script gen_ro#1 139,3,3,{ + end; OnTouch: if (Class == Job_Baby_Thief || Class == Job_Thief) { @@ -1521,6 +1526,7 @@ OnDisable: } in_rogue,100,389,0 script gen_ro#2 139,3,3,{ + end; OnTouch: if (Class == Job_Baby_Thief || Class == Job_Thief) { @@ -1537,6 +1543,7 @@ OnDisable: } in_rogue,150,389,0 script gen_ro#3 139,3,3,{ + end; OnTouch: if (Class == Job_Baby_Thief || Class == Job_Thief) { @@ -1554,6 +1561,7 @@ OnDisable: } in_rogue,250,389,0 script gen_ro#4 139,3,3,{ + end; OnTouch: if (Class == Job_Baby_Thief || Class == Job_Thief) { @@ -1570,6 +1578,7 @@ OnDisable: } in_rogue,9,389,0 script oneway_to_gu 45,1,1,{ + end; OnTouch: donpcevent "gen_ro#4::OnDisable"; @@ -1838,6 +1847,7 @@ in_rogue,177,109,1 script Antonio Junior 88,{ in_rogue,161,103,0 warp out#1 1,1,cmd_fild04,302,177 in_rogue,370,320,0 script quest_out 45,1,1,{ + end; OnTouch: set ROGUE_Q,16; @@ -1847,6 +1857,7 @@ OnTouch: } in_rogue,15,184,0 script mob_rogue#1 139,8,1,{ + end; OnTouch: if (Class == Job_Baby_Thief || Class == Job_Thief) { @@ -1867,6 +1878,7 @@ OnReset: } in_rogue,15,273,0 script mob_rogue#2 139,8,1,{ + end; OnTouch: if (Class == Job_Baby_Thief || Class == Job_Thief) { @@ -1884,6 +1896,7 @@ OnReset: } in_rogue,15,333,0 script mob_rogue#3 139,8,1,{ + end; OnTouch: if (Class == Job_Baby_Thief || Class == Job_Thief) { @@ -1905,6 +1918,7 @@ OnReset: } in_rogue,39,341,0 script mob_rogue#4 139,1,8,{ + end; OnTouch: if (Class == Job_Baby_Thief || Class == Job_Thief) { @@ -1923,6 +1937,7 @@ OnReset: } in_rogue,102,334,0 script mob_rogue#5 139,1,4,{ + end; OnTouch: if (Class == Job_Baby_Thief || Class == Job_Thief) { @@ -1941,6 +1956,7 @@ OnReset: } in_rogue,58,309,0 script mob_rogue#6 139,4,1,{ + end; OnTouch: if (Class == Job_Baby_Thief || Class == Job_Thief) { @@ -1959,6 +1975,7 @@ OnReset: } in_rogue,101,264,0 script mob_rogue#7 139,5,5,{ + end; OnTouch: if (Class == Job_Baby_Thief || Class == Job_Thief) { @@ -1975,6 +1992,7 @@ OnReset: } in_rogue,140,312,0 script mob_rogue#8 139,5,5,{ + end; OnTouch: if (Class == Job_Baby_Thief || Class == Job_Thief) { @@ -1990,6 +2008,7 @@ OnReset: } in_rogue,139,246,0 script mob_rogue#9 139,4,4,{ + end; OnTouch: if (Class == Job_Baby_Thief || Class == Job_Thief) { @@ -2010,6 +2029,7 @@ OnReset: } in_rogue,197,249,0 script mob_rogue#10 139,1,8,{ + end; OnTouch: if (Class == Job_Baby_Thief || Class == Job_Thief) { @@ -2043,6 +2063,7 @@ OnReset: } in_rogue,96,205,0 script mob_rogue#11 139,1,8,{ + end; OnTouch: if (Class == Job_Baby_Thief || Class == Job_Thief) { @@ -2057,6 +2078,7 @@ OnTouch: } in_rogue,86,187,0 script mob_rogue#12 139,1,8,{ + end; OnTouch: if (Class == Job_Baby_Thief || Class == Job_Thief) { @@ -2073,6 +2095,7 @@ OnReset: } in_rogue,223,187,0 script mob_rogue#13 139,1,8,{ + end; OnTouch: if (Class == Job_Baby_Thief || Class == Job_Thief) { @@ -2091,6 +2114,7 @@ OnReset: } in_rogue,233,207,0 script mob_rogue#14 139,8,3,{ + end; OnTouch: if (Class == Job_Baby_Thief || Class == Job_Thief) { @@ -2102,6 +2126,7 @@ OnTouch: } in_rogue,244,319,0 script mob_rogue#15 139,1,8,{ + end; OnTouch: if (Class == Job_Baby_Thief || Class == Job_Thief) { @@ -2122,6 +2147,7 @@ OnReset: } in_rogue,334,319,0 script mob_rogue#16 139,8,8,{ + end; OnTouch: if (Class == Job_Baby_Thief || Class == Job_Thief) { diff --git a/npc/jobs/2-2/sage.txt b/npc/jobs/2-2/sage.txt index 71718fed2..a8f2848d1 100644 --- a/npc/jobs/2-2/sage.txt +++ b/npc/jobs/2-2/sage.txt @@ -959,6 +959,7 @@ yuno_in03,105,177,5 script Written Test Professor 754,{ if (select("Odin:Loki:Thor:Venadin") == 1) { set @sage_t,@sage_t + 5; } + next; } if (.@sage_m2 == 2) { mes "1. Choose the jewel that the Morroc Jewel Merchant does not sell."; @@ -1061,6 +1062,7 @@ yuno_in03,105,177,5 script Written Test Professor 754,{ if (select("Yggdrasil:Iggdrassil:Mastella:Dead Branch") == 1) { set @sage_t,@sage_t + 5; } + next; } else { mes "1. Choose the item that the Magical Tool merchant in Geffen does not sell."; @@ -1163,6 +1165,7 @@ yuno_in03,105,177,5 script Written Test Professor 754,{ if (select("Empelium Gold:Emperium:Emperor:Phracon") == 2) { set @sage_t,@sage_t + 5; } + next; } mes "[Claytos Verdo]"; mes "Well, you answered all 20 of the questions."; @@ -1318,6 +1321,7 @@ yuno_in03,105,177,5 script Written Test Professor 754,{ if (select("Odin:Loki:Thor:Venadin") == 1) { set @sage_t,@sage_t + 5; } + next; } if (.@sage_m2 == 2) { mes "1. Choose the jewel that the Morroc Jewel Merchant does not sell."; @@ -1420,6 +1424,7 @@ yuno_in03,105,177,5 script Written Test Professor 754,{ if (select("Yggdrasil:Iggdrassil:Mastella:Dead Branch") == 1) { set @sage_t,@sage_t + 5; } + next; } else { mes "1. Choose the item that the Magical Tool merchant in Geffen does not sell."; @@ -1522,6 +1527,7 @@ yuno_in03,105,177,5 script Written Test Professor 754,{ if (select("Empelium Gold:Emperium:Emperor:Phracon") == 2) { set @sage_t,@sage_t + 5; } + next; } mes "[Claytos Verdo]"; mes "Well, we finished all 20 questions."; @@ -3482,7 +3488,7 @@ job_sage,50,165,2 script Waiting Room#sg 700,{ end; OnInit: - hideonnpc "Waiting Room#sg"; + disablenpc "Waiting Room#sg"; waitingroom "Waiting Room",20,"Waiting Room#sg::OnStartArena",1; enablewaitingroomevent; end; @@ -3502,11 +3508,11 @@ job_sage,1,2,1 script Arena#1 66,{ end; OnInit: - hideonnpc "Arena#1"; + disablenpc "Arena#1"; end; OnEnable: - hideoffnpc "Arena#1"; + enablenpc "Arena#1"; monster "job_sage",111,102,"Grade F",1183,1,"Arena#1::OnMyMobDead"; monster "job_sage",120,102,"Grade F",1183,1,"Arena#1::OnMyMobDead"; monster "job_sage",111,93,"Grade F",1183,1,"Arena#1::OnMyMobDead"; @@ -3531,7 +3537,7 @@ OnReset: end; OnDisable: - hideonnpc "Arena#1"; + disablenpc "Arena#1"; end; OnMyMobDead: @@ -3602,11 +3608,11 @@ job_sage,1,3,1 script Arena#2 66,{ end; OnInit: - hideonnpc "Arena#2"; + disablenpc "Arena#2"; end; OnEnable: - hideoffnpc "Arena#2"; + enablenpc "Arena#2"; donpcevent "Arena#1::OnReset"; donpcevent "Arena#1::OnDisable"; monster "job_sage",111,102,"Numerical Value",1063,1,"Arena#2::OnMyMobDead"; @@ -3641,7 +3647,7 @@ OnReset: end; OnDisable: - hideonnpc "Arena#2"; + disablenpc "Arena#2"; end; OnMyMobDead: @@ -3709,11 +3715,11 @@ job_sage,1,4,1 script Arena#Doorkeeper 66,{ end; OnInit: - hideonnpc "Arena#Doorkeeper"; + disablenpc "Arena#Doorkeeper"; end; OnEnable: - hideoffnpc "Arena#Doorkeeper"; + enablenpc "Arena#Doorkeeper"; donpcevent "Arena#2::OnReset"; donpcevent "Arena#2::OnDisable"; monster "job_sage",116,97,"Academic Probation",1179,1,"Arena#Doorkeeper::OnMyMobDead"; @@ -3727,7 +3733,7 @@ OnReset: OnDisable: donpcevent "Arena#3::OnDisable"; - hideonnpc "Arena#Doorkeeper"; + disablenpc "Arena#Doorkeeper"; end; OnMyMobDead: @@ -3781,15 +3787,15 @@ OnTouch: end; OnInit: - hideonnpc "Arena#Fail"; + disablenpc "Arena#Fail"; end; OnEnable: - hideoffnpc "Arena#Fail"; + enablenpc "Arena#Fail"; end; OnDisable: - hideonnpc "Arena#Fail"; + disablenpc "Arena#Fail"; end; } @@ -3797,7 +3803,7 @@ job_sage,1,4,1 script Arena#3 66,{ end; OnInit: - hideonnpc "Arena#3"; + disablenpc "Arena#3"; end; OnEnable: @@ -3812,7 +3818,7 @@ OnReset: end; OnDisable: - hideonnpc "Arena#3"; + disablenpc "Arena#3"; end; } @@ -3823,15 +3829,15 @@ OnTouch: end; OnInit: - hideonnpc "SageSucceeded"; + disablenpc "SageSucceeded"; end; OnEnable: - hideoffnpc "SageSucceeded"; + enablenpc "SageSucceeded"; end; OnDisable: - hideonnpc "SageSucceeded"; + disablenpc "SageSucceeded"; end; } @@ -3839,7 +3845,7 @@ job_sage,1,6,1 script Test Helper#sg 66,{ end; OnInit: - hideonnpc "Test Helper#sg"; + disablenpc "Test Helper#sg"; end; OnEnable: @@ -3847,7 +3853,7 @@ OnEnable: end; OnDisable: - hideonnpc "Test Helper#sg"; + disablenpc "Test Helper#sg"; end; OnTimer2000: -- cgit v1.2.3-60-g2f50