From f1dc59968a54ec1e83a9d93ebd38944d468dd68c Mon Sep 17 00:00:00 2001 From: masao87 Date: Thu, 17 May 2012 12:53:16 +0000 Subject: - Updated Monster spawns in Job change Quests to renewal. bugreport:5574 - Some minor changes to the Arch Bishop Job change Quest. git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@16124 54d463be-8e91-2dee-dedb-b68131a5f0ec --- npc/jobs/2-1/hunter.txt | 29 +++++------ npc/jobs/2-1/knight.txt | 15 ++---- npc/jobs/2-1/wizard.txt | 24 ++++----- npc/jobs/3-1/archbishop.txt | 116 ++------------------------------------------ 4 files changed, 33 insertions(+), 151 deletions(-) (limited to 'npc') diff --git a/npc/jobs/2-1/hunter.txt b/npc/jobs/2-1/hunter.txt index 76c12d26b..7ec9fd7ec 100644 --- a/npc/jobs/2-1/hunter.txt +++ b/npc/jobs/2-1/hunter.txt @@ -5,7 +5,7 @@ //= Converted by kobra_k88 //= Further bugfixed and tested by Lupus //===== Current Version: ===================================== -//= 3.6 +//= 3.7 //===== Compatible With: ===================================== //= rAthena SVN //===== Description: ========================================= @@ -52,6 +52,7 @@ //= -Deleted a Unnecesary Next; on Hunter Guildsman#hnt. (bugreports:1665,2239,2179) //= 3.5 Added Quest Log commands. [Kisuka] //= 3.6 Removed the need for use of 'goto.' [L0ne_W0lf] +//= 3.7 Modified the quest to renewal. [Vali] (Thanks to Muad_Dib for the necessary info). //============================================================ // Notices in the old Hunter Guild. @@ -503,14 +504,14 @@ hu_in01,382,382,4 script Guild Receptionist#hnt 732,{ mes "You see, we're having some financial problems. Let's see, we're short on these items..."; next; switch(rand(1,7)) { - //Claw_Of_Desert_Wolf, Wooden_Block, White_Herb - case 1: setarray .@items[0], 7030,5, 1019,5, 509,3, 3; changequest 4001,4002; break; - //Bill_Of_Birds, Skel_Bonem Green_Herb + //Insect_Feeler, Wooden_Block, White_Herb + case 1: setarray .@items[0], 928,5, 1019,5, 509,3, 3; changequest 4001,4002; break; + //Bill_Of_Birds, Skel_Bone, Green_Herb case 2: setarray .@items[0], 925,3, 932,5, 511,3, 4; changequest 4001,4003; break; - //Posionous_Canine, Animal's_Skin, Red_Herb - case 3: setarray .@items[0], 937,3, 919,3, 507,5, 5; changequest 4001,4004; break; - //Dokkaebi_Horn, Piece_Of_Egg_Shell, Fluff - case 4: setarray .@items[0], 1021,3, 7032,3, 914,10, 6; changequest 4001,4005; break; + //Colorful_Shell, Animal's_Skin, Red_Herb + case 3: setarray .@items[0], 1013,3, 919,3, 507,5, 5; changequest 4001,4004; break; + //Horn, Poison_Spore, Fluff + case 4: setarray .@items[0], 947,3, 7033,3, 914,10, 6; changequest 4001,4005; break; //Shell, Worm_Peelings, Yellow_Herb case 5: setarray .@items[0], 935,9, 955,9, 508,9, 7; changequest 4001,4006; break; //Tooth_Of_Bat, Sticky_Mucus, Bear's_Foot @@ -533,14 +534,14 @@ hu_in01,382,382,4 script Guild Receptionist#hnt 732,{ } else if (HNTR_Q >= 3 && HNTR_Q <= 9) { switch(HNTR_Q) { - //Claw_Of_Desert_Wolf, Wooden_Block, White_Herb - case 3: setarray .@items[0], 7030,5, 1019,5, 509,3, 10; break; + //Insect_Feeler, Wooden_Block, White_Herb + case 3: setarray .@items[0], 928,5, 1019,5, 509,3, 10; break; //Bill_Of_Birds, Skel_Bonem Green_Herb case 4: setarray .@items[0], 925,3, 932,5, 511,3, 10; break; - //Posionous_Canine, Animal's_Skin, Red_Herb - case 5: setarray .@items[0], 937,3, 919,3, 507,5, 10; break; - //Dokkaebi_Horn, Piece_Of_Egg_Shell, Fluff - case 6: setarray .@items[0], 1021,3, 7032,3, 914,10, 10; break; + //Colorful_Shell, Animal's_Skin, Red_Herb + case 5: setarray .@items[0], 1013,3, 919,3, 507,5, 10; break; + //Horn, Poison_Spore, Fluff + case 6: setarray .@items[0], 947,3, 7033,3, 914,10, 10; break; //Shell, Worm_Peelings, Yellow_Herb case 7: setarray .@items[0], 935,9, 955,9, 508,9, 11; break; //Tooth_Of_Bat, Sticky_Mucus, Bear's_Foot diff --git a/npc/jobs/2-1/knight.txt b/npc/jobs/2-1/knight.txt index 9d4dca8ff..6700dd85f 100644 --- a/npc/jobs/2-1/knight.txt +++ b/npc/jobs/2-1/knight.txt @@ -5,7 +5,7 @@ //= Converted by kobra_k88 //= Further bugfixed and tested by Lupus //===== Current Version: ===================================== -//= 3.0 +//= 3.1 //===== Compatible With: ===================================== //= rAthena SVN //===== Description: ========================================= @@ -37,6 +37,7 @@ //= 2.8 Now uses enable and disable waitingroomevent. [L0ne_W0lf] //= 2.9 Added Quest Log commands. [Kisuka] //= 3.0 Removed the need for use of 'goto.' [L0ne_W0lf] +//= 3.1 Modified the quest to renewal. [Vali] (Thanks to Muad_Dib for the necessary info). //============================================================ prt_in,88,101,4 script Chivalry Captain#knt 56,{ @@ -1450,19 +1451,13 @@ OnInit: OnEnable: enablenpc "Knight2"; - set .MyMobs,12; + set .MyMobs,6; monster "job_knt",53,52,"Frilldora",1119,1,"Knight2::OnMyMobDead"; monster "job_knt",34,52,"Frilldora",1119,1,"Knight2::OnMyMobDead"; - monster "job_knt",43,42,"Desert Wolf",1106,1,"Knight2::OnMyMobDead"; - monster "job_knt",43,62,"Desert Wolf",1106,1,"Knight2::OnMyMobDead"; monster "job_knt",58,52,"Drainliar",1111,1,"Knight2::OnMyMobDead"; monster "job_knt",58,52,"Drainliar",1111,1,"Knight2::OnMyMobDead"; monster "job_knt",29,52,"Drainliar",1111,1,"Knight2::OnMyMobDead"; monster "job_knt",29,52,"Drainliar",1111,1,"Knight2::OnMyMobDead"; - monster "job_knt",60,68,"Anacondaq",1030,1,"Knight2::OnMyMobDead"; - monster "job_knt",27,68,"Anacondaq",1030,1,"Knight2::OnMyMobDead"; - monster "job_knt",60,35,"Anacondaq",1030,1,"Knight2::OnMyMobDead"; - monster "job_knt",27,35,"Anacondaq",1030,1,"Knight2::OnMyMobDead"; initnpctimer; end; @@ -1511,14 +1506,12 @@ OnInit: OnEnable: enablenpc "Knight3"; - set .MyMobs,7; + set .MyMobs,5; monster "job_knt",136,152,"Goblin",1122,1,"Knight3::OnMyMobDead"; monster "job_knt",150,152,"Goblin",1123,1,"Knight3::OnMyMobDead"; monster "job_knt",143,145,"Goblin",1124,1,"Knight3::OnMyMobDead"; monster "job_knt",143,167,"Goblin",1125,1,"Knight3::OnMyMobDead"; monster "job_knt",139,167,"Goblin",1126,1,"Knight3::OnMyMobDead"; - monster "job_knt",147,167,"Goblin Archer",1258,1,"Knight3::OnMyMobDead"; - monster "job_knt",136,158,"Steam Goblin",1280,1,"Knight3::OnMyMobDead"; initnpctimer; end; diff --git a/npc/jobs/2-1/wizard.txt b/npc/jobs/2-1/wizard.txt index 5b9dee1fa..808c884a4 100644 --- a/npc/jobs/2-1/wizard.txt +++ b/npc/jobs/2-1/wizard.txt @@ -4,7 +4,7 @@ //= (Aegis) Translated by yoshiki, converted by kobra_k88 //= Further bugfixed and tested by Lupus //===== Current Version: ===================================== -//= 3.1 +//= 3.2 //===== Compatible With: ===================================== //= rAthena SVN //===== Description: ========================================= @@ -25,6 +25,7 @@ //= Was probably cuased by a warp BEFORE a percentheal //= 3.0 Added Quest Log commands. [Kisuka] //= 3.1 Removed the need for use of 'goto.' [L0ne_W0lf] +//= 3.2 Modified the quest to renewal. [Vali] (Thanks to Muad_Dib for the necessary info). //============================================================ gef_tower,111,37,4 script Wizard Guildsman 70,{ @@ -1096,15 +1097,14 @@ OnInit: OnEnable: enablenpc "Room of Water"; - set .MyMobs,8; + set .MyMobs,7; monster "job_wiz",109,174,"Phen",1158,1,"Room of Water::OnMyMobDead"; - monster "job_wiz",118,174,"Clam",1074,1,"Room of Water::OnMyMobDead"; + monster "job_wiz",118,174,"Shellfish",1074,1,"Room of Water::OnMyMobDead"; monster "job_wiz",109,165,"Vadon",1066,1,"Room of Water::OnMyMobDead"; monster "job_wiz",118,165,"Cornutus",1067,1,"Room of Water::OnMyMobDead"; monster "job_wiz",101,157,"Marina",1141,1,"Room of Water::OnMyMobDead"; monster "job_wiz",126,157,"Marin",1242,1,"Room of Water::OnMyMobDead"; monster "job_wiz",98,170,"Magnolia",1138,1,"Room of Water::OnMyMobDead"; - monster "job_wiz",129,170,"Obeaune",1044,1,"Room of Water::OnMyMobDead"; initnpctimer; end; @@ -1265,17 +1265,14 @@ OnInit: OnEnable: enablenpc "Room of Earth"; - set .MyMobs,10; + set .MyMobs,7; monster "job_wiz",111,102,"Yoyo",1057,1,"Room of Earth::OnMyMobDead"; monster "job_wiz",120,102,"Deniro",1105,1,"Room of Earth::OnMyMobDead"; monster "job_wiz",111,102,"Caramel",1103,1,"Room of Earth::OnMyMobDead"; - monster "job_wiz",120,102,"Hode",1127,1,"Room of Earth::OnMyMobDead"; - monster "job_wiz",111,93,"Savage",1166,1,"Room of Earth::OnMyMobDead"; monster "job_wiz",120,93,"Giearth",1121,1,"Room of Earth::OnMyMobDead"; monster "job_wiz",107,98,"Bigfoot",1060,1,"Room of Earth::OnMyMobDead"; monster "job_wiz",124,98,"Orc Warrior",1023,1,"Room of Earth::OnMyMobDead"; monster "job_wiz",104,86,"Vitata",1176,1,"Room of Earth::OnMyMobDead"; - monster "job_wiz",127,86,"Mantis",1139,1,"Room of Earth::OnMyMobDead"; initnpctimer; end; @@ -1357,8 +1354,7 @@ OnInit: OnEnable: enablenpc "Room of Earth#Door"; donpcevent "Room of Earth::OnDisable"; - set .MyMobs,7; - monster "job_wiz",116,97,"Flora",1118,1,"Room of Earth#Door::OnMyMobDead"; + set .MyMobs,6; monster "job_wiz",114,95,"Mandragora",1020,1,"Room of Earth#Door::OnMyMobDead"; monster "job_wiz",118,95,"Mandragora",1020,1,"Room of Earth#Door::OnMyMobDead"; monster "job_wiz",114,99,"Mandragora",1020,1,"Room of Earth#Door::OnMyMobDead"; @@ -1437,15 +1433,13 @@ OnInit: OnEnable: enablenpc "Room of Fire"; - set .MyMobs,8; - monster "job_wiz",58,110,"Zerom",1178,1,"Room of Fire::OnMyMobDead"; + set .MyMobs,6; monster "job_wiz",33,110,"Goblin",1123,1,"Room of Fire::OnMyMobDead"; monster "job_wiz",40,103,"Scorpion",1001,1,"Room of Fire::OnMyMobDead"; monster "job_wiz",51,103,"Frilldora",1119,1,"Room of Fire::OnMyMobDead"; monster "job_wiz",40,92,"PecoPeco",1019,1,"Room of Fire::OnMyMobDead"; monster "job_wiz",51,92,"Elder Willow",1033,1,"Room of Fire::OnMyMobDead"; monster "job_wiz",37,89,"Metaller",1058,1,"Room of Fire::OnMyMobDead"; - monster "job_wiz",54,89,"Desert Wolf",1106,1,"Room of Fire::OnMyMobDead"; initnpctimer; end; @@ -1529,8 +1523,8 @@ OnEnable: donpcevent "Room of Fire::OnDisable"; set .MyMobs,3; monster "job_wiz",44,99,"Greatest General",1277,1,"Room of Fire#Door::OnMyMobDead"; - monster "job_wiz",43,99,"Horong",1129,1,"Room of Fire#Door::OnMyMobDead"; - monster "job_wiz",45,99,"Horong",1129,1,"Room of Fire#Door::OnMyMobDead"; + monster "job_wiz",43,99,"Greatest General",1277,1,"Room of Fire#Door::OnMyMobDead"; + monster "job_wiz",45,99,"Greatest General",1277,1,"Room of Fire#Door::OnMyMobDead"; initnpctimer; end; diff --git a/npc/jobs/3-1/archbishop.txt b/npc/jobs/3-1/archbishop.txt index 1836edd5d..439b3f779 100644 --- a/npc/jobs/3-1/archbishop.txt +++ b/npc/jobs/3-1/archbishop.txt @@ -257,15 +257,11 @@ umbala,139,227,3 script Priest#arch 60,{ mes "[" + strcharinfo(0) + "]"; mes "Hmm, I wanted to tell you..."; next; - input .@inputstr$; - mes "[" + strcharinfo(0) + "]"; - mes "" + .@inputstr$ + ""; - next; input .@urans$; if (.@urans$ != "I'm here for the Holy Pilgrimage") { mes "Priest Dayan doesn't seem to understand you. He just stares at you and smiles."; next; - mes "[Priest]"; + mes "[Priest Dayan]"; mes "Eh? Say what?"; close; } @@ -1019,13 +1015,7 @@ job3_arch01,29,34,3 script Valkyrie#arch 403,{ set $@archbs,0; close2; nude; - while (1) { - if (countitem(2798) == 0) { - break; - } else { - delitem 2798,1; //Will_Of_Exhausted_Angel - } - } + delitem 2798,countitem(2798); //Will_Of_Exhausted_Angel donpcevent "start#arch::OnEnable"; set job_arch, 7; changequest 2190,2191; @@ -1070,14 +1060,7 @@ job3_arch01,29,34,3 script Valkyrie#arch 403,{ mes "But you have to be careful if an imeprsonation falls down."; close2; nude; - while (1) { - if (countitem(2798) == 0) { - break; - } - else { - delitem 2798,1; //Will_Of_Exhausted_Angel - } - } + delitem 2798,countitem(2798); //Will_Of_Exhausted_Angel donpcevent "start#arch::OnEnable"; set job_arch, 7; warp "job3_arch02",119,49; @@ -1090,10 +1073,6 @@ job3_arch01,29,34,3 script Valkyrie#arch 403,{ close; } -OnInit: - set $@archbs,0; - end; - OnBc: set $@archbs,0; //Custom translation @@ -1127,12 +1106,8 @@ OnTouch: set .@randht,rand(1,10); if (.@randht < 8) { mapannounce "job3_arch02","Whispering of an impersonation: I can feel the devil's spirits! Be careful!",bc_map,"0xFFCE00"; //FW_NORMAL 12 0 0 - //GetHEALTHSTATE VAR_CURSE 10 } else if (.@randht == 8 || .@randht == 9) { mapannounce "job3_arch02","Embodiment of the voice: They are close to you!",bc_map,"0xFFCE00"; //FW_NORMAL 12 0 0 //Custom translation; - //GetHEALTHSTATE VAR_POISON 10 - } else { - //GetHEALTHSTATE VAR_HEALTHSTATENORMAL 0 } } else { mapannounce "job3_arch02","Whispering of an impersonation: You can't do anything by yourself! Let's go back!",bc_map,"0xFFCE00"; //FW_NORMAL 12 0 0 @@ -1362,14 +1337,7 @@ OnTouch: mes "It can be dangerous, so let's go back."; close2; nude; - while (1) { - if (countitem(2798) == 0) { - break; - } - else { - delitem 2798,1; //Will_Of_Exhausted_Angel - } - } + delitem 2798,countitem(2798); //Will_Of_Exhausted_Angel delitem 6154,countitem(6154); //Broken_Horn_Pipe mapwarp "job3_arch02","job3_arch01",29,29; end; @@ -1449,14 +1417,7 @@ OnTouch: mes "Don't forget an altruistic minister's spirit like today forever."; mes "I hope we see each other in Valhalla sometime."; nude; - while (1) { - if (countitem(2798) == 0) { - break; - } - else { - delitem 2798,1; //Will_Of_Exhausted_Angel - } - } + delitem 2798,countitem(2798); //Will_Of_Exhausted_Angel delitem 6154,countitem(6154); //Broken_Horn_Pipe set job_arch,100; completequest 2191; @@ -1522,13 +1483,10 @@ OnTouch: set .@randht,rand(1,10); if (.@randht < 8) { mapannounce "job3_arch02","Whispering of an impersonation: I can feel the devil's spirits. Can you hear? The sound of gathering in crowds.",bc_map,"0xFFCE00"; //FW_NORMAL 12 0 0 - //GetHEALTHSTATE VAR_CURSE 10 } else if (.@randht == 8 || .@randht == 9) { mapannounce "job3_arch02","Embodiment of Sounds: Battle Stance!",bc_map,"0xFFCE00"; //FW_NORMAL 12 0 0 //Custom translation; - //GetHEALTHSTATE VAR_POISON 10 } else { mapannounce "job3_arch02","Whispering of an impersonation: I can't leave you! Die!",bc_map,"0xFFCE00"; //FW_NORMAL 12 0 0 - //GetHEALTHSTATE VAR_HEALTHSTATENORMAL 0 } } else { mapannounce "job3_arch02","Whispering of an impersonation: You can't do anything by yourself! Let's go back!",bc_map,"0xFFCE00"; //FW_NORMAL 12 0 0 @@ -1576,7 +1534,6 @@ OnTouch: } else { if (getmercinfo(1) == 2038) { mapannounce "job3_arch02","A shout of devil: You are so childish. I'll invite you to a party of the devil. I'll make you have a fun!",bc_map,"0xFF0000"; //FW_NORMAL 12 0 0 - //GetHEALTHSTATE VAR_CURSE 10 } else { mapannounce "job3_arch02","Whispering of an impersonation: You can't do anything by yourself! Let's go back!",bc_map,"0xFFCE00"; //FW_NORMAL 12 0 0 mapwarp "job3_arch02","job3_arch01",29,29; @@ -1762,69 +1719,6 @@ OnTimer60000: } end; -OnTimer120000: - if (getmapusers("job3_arch02") == 0) { - mapwarp "job3_arch02","job3_arch01",29,29; - donpcevent "Valkyrie#arch::OnBc"; - stopnpctimer; - } - end; - -OnTimer180000: - if (getmapusers("job3_arch02") == 0) { - mapwarp "job3_arch02","job3_arch01",29,29; - donpcevent "Valkyrie#arch::OnBc"; - stopnpctimer; - } - end; - -OnTimer240000: - if (getmapusers("job3_arch02") == 0) { - mapwarp "job3_arch02","job3_arch01",29,29; - donpcevent "Valkyrie#arch::OnBc"; - stopnpctimer; - } - end; - -OnTimer300000: - if (getmapusers("job3_arch02") == 0) { - mapwarp "job3_arch02","job3_arch01",29,29; - donpcevent "Valkyrie#arch::OnBc"; - stopnpctimer; - } - end; - -OnTimer360000: - if (getmapusers("job3_arch02") == 0) { - mapwarp "job3_arch02","job3_arch01",29,29; - donpcevent "Valkyrie#arch::OnBc"; - } - end; - -OnTimer420000: - if (getmapusers("job3_arch02") == 0) { - mapwarp "job3_arch02","job3_arch01",29,29; - donpcevent "Valkyrie#arch::OnBc"; - stopnpctimer; - } - end; - -OnTimer480000: - if (getmapusers("job3_arch02") == 0) { - mapwarp "job3_arch02","job3_arch01",29,29; - donpcevent "Valkyrie#arch::OnBc"; - stopnpctimer; - } - end; - -OnTimer540000: - if (getmapusers("job3_arch02") == 0) { - mapwarp "job3_arch02","job3_arch01",29,29; - donpcevent "Valkyrie#arch::OnBc"; - stopnpctimer; - } - end; - OnTimer600000: mapannounce "job3_arch02","Demons cry: Too boring, can no longer imagine what will happen! Friends, we went to lessons learned that could fool arrogant guy, OK?",bc_map,"0xFF0000"; //FW_NORMAL 12 0 0 //Custom translation; end; -- cgit v1.2.3-60-g2f50