From 6fb9833fed000c0b0c6678b2d54db36118e2dcdf Mon Sep 17 00:00:00 2001 From: j-tkay Date: Wed, 17 Oct 2012 07:17:22 +0000 Subject: - Fixed Arch Bishop Job Change Quest, players unable to continue the quest. (npc/re/jobs/3-1/archbishop.txt) git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@16820 54d463be-8e91-2dee-dedb-b68131a5f0ec --- npc/re/jobs/3-1/archbishop.txt | 192 ++++++++++++----------------------------- 1 file changed, 56 insertions(+), 136 deletions(-) (limited to 'npc/re/jobs') diff --git a/npc/re/jobs/3-1/archbishop.txt b/npc/re/jobs/3-1/archbishop.txt index a7426a47f..6fb066902 100644 --- a/npc/re/jobs/3-1/archbishop.txt +++ b/npc/re/jobs/3-1/archbishop.txt @@ -4,7 +4,7 @@ //= L0ne_W0lf //= Credits: Gepard //===== Current Version: ===================================== -//= 1.5b +//= 1.6 //===== Compatible With: ===================================== //= rAthena SVN //===== Description: ========================================= @@ -19,6 +19,7 @@ //= 1.5 Redone the whole Script. [Masao] //= 1.5a Fixed little typo in Baby Priest & Baby Arch Bishop checks. [Masao] //= 1.5b More small fixes. [Euphy] +//= 1.6 Fixed bugs where players unable to continue the quest. [Joseph] //============================================================ prt_church,103,88,3 script Praying Minister#arch 60,{ @@ -59,14 +60,8 @@ prt_church,103,88,3 script Praying Minister#arch 60,{ mes "[Praying Minister]"; mes "All ministers of Odin should be diligent. They should never be too lazy to serve Odin."; next; - if (Sex == 1) { - mes "[Praying Minister]"; - mes "Brother, how has your life been?"; - } - else { - mes "[Praying Minister]"; - mes "Sister, how has your life been?"; - } + mes "[Praying Minister]"; + mes (Sex?"Brother":"Sister")+", how has your life been?"; mes "Have you lived it to it's fullest?"; mes "Have you served your life in the light of Odin?"; next; @@ -78,14 +73,8 @@ prt_church,103,88,3 script Praying Minister#arch 60,{ mes "We should always tell the truth."; mes "We should not fall prey to lies and deceit."; next; - if (Sex == 1) { - mes "[Praying Minister]"; - mes "Brother..."; - } - else { - mes "[Praying Minister]"; - mes "Sister..."; - } + mes "[Praying Minister]"; + mes (Sex?"Brother":"Sister")+"..."; mes "Even though we serve Odin, we are normal people."; mes "We can be degraded in spite of ourselves and we must realize that."; next; @@ -224,12 +213,7 @@ umbala,139,227,3 script Priest#arch 60,{ mes "[Priest Dayan]"; mes "Ah~, yes."; mes "Yes, I am."; - if (Sex == 1) { - mes "I'm Dayan. Nice to meet you Brother."; - } - else { - mes "I'm Dayan. Nice to meet you Sister."; - } + mes "I'm Dayan. Nice to meet you "+(Sex?"Brother.":"Sister."); next; mes "The old priest gives you an ear to ear grin. "; next; @@ -266,14 +250,8 @@ umbala,139,227,3 script Priest#arch 60,{ mes "Eh... are you?"; mes "A pilgrimage to the Holy Land..."; mes "It has been a long time since I've seen such a devout minister."; - if (Sex == 1) { - mes "Welcome. Brother."; - next; - } - else { - mes "Welcome. Sister."; - next; - } + mes "Welcome. "+(Sex?"Brother.":"Sister."); + next; mes "The old priest gives you a gracious smile."; next; mes "[Priest Dayan]"; @@ -295,12 +273,7 @@ umbala,139,227,3 script Priest#arch 60,{ mes "Mimir spring wells with intelligence, myth says that if Odin lets you have his eye that you will gain all of the knowledge within that spring."; next; mes "[Priest Dayan]"; - if (Sex == 1) { - mes "Brother."; - } - else { - mes "Sister."; - } + mes Sex?"Brother.":"Sister."; mes "Through the Holy Pilgrimage, we can make ourselves pious by cleansing our bodies and souls."; next; mes "[Priest Dayan]"; @@ -441,7 +414,6 @@ umbala,139,227,3 script Priest#arch 60,{ } yggdrasil01,220,47,0 script #A pilgrimage to the Ho 139,5,5,{ - OnTouch: if (job_arch == 2) { mes "[" + strcharinfo(0) + "]"; @@ -602,10 +574,7 @@ hu_in01,205,204,7 script Praying Nun#benew 79,{ if (job_arch == 4) { mes "- There is a nun closing her eyes as she murmurs something which sounds like a prayer. -"; next; - switch (select("Talk to her.:Stay Quiet.")) { - case 1: - break; - case 2: + if (select("Talk to her.:Stay Quiet.") == 2) { mes "- You don't feel like disturbing her -"; close; } @@ -615,12 +584,7 @@ hu_in01,205,204,7 script Praying Nun#benew 79,{ mes "[Vinue]"; mes "Ah, Welcome."; mes "It's not time to have a service yet..."; - if (Sex == 1) { - mes "Are you here to pray, brother?"; - } - else { - mes "Are you here to pray, sister?"; - } + mes "Are you here to pray, "+(Sex?"brother":"sister")+"?"; next; mes "[" + strcharinfo(0) + "]"; mes "I came here to say hello from Priest Dayan from Prontera."; @@ -639,12 +603,7 @@ hu_in01,205,204,7 script Praying Nun#benew 79,{ next; mes "[Vinue]"; mes "Ah..."; - if (Sex == 1) { - mes "He's very kind. As are you brother."; - } - else { - mes "He's very kind. As are you sister."; - } + mes "He's very kind. As are you "+(Sex?"brother":"sister")+"."; next; mes "[Vinue]"; mes "But don't worry."; @@ -654,10 +613,7 @@ hu_in01,205,204,7 script Praying Nun#benew 79,{ mes "Evil is always watching for our souls."; mes "If you are indifferent to praying, it never misses an opportunity."; next; - switch (select("A dream? What kind of dream?:Your soul should be fine.")) { - case 1: - break; - case 2: + if (select("A dream? What kind of dream?:Your soul should be fine.") == 2) { mes "[Vinue]"; mes "Oh but that's where you're wrong."; mes "My soul may be the most at risk."; @@ -715,10 +671,7 @@ hu_in01,205,204,7 script Praying Nun#benew 79,{ mes "I don't have any way to find out."; mes "I don't have a method, so I just pray."; next; - switch (select("I'll investgate for you.:I'll pray with you.")) { - case 1: - break; - case 2: + if (select("I'll investgate for you.:I'll pray with you.") == 2) { mes "[Vinue]"; mes "Thank you."; mes "I'll pray that the darkness stays away."; @@ -768,7 +721,6 @@ hu_in01,205,204,7 script Praying Nun#benew 79,{ } odin_tem02,282,263,0 script #find_val 139,3,3,{ - OnTouch: if ((job_arch > 4) && (job_arch < 100)) { hideoffnpc "Valkyrie Illusion#arch"; @@ -803,7 +755,6 @@ OnInit: } job3_arch01,29,34,3 script Valkyrie#arch 403,{ - if ((BaseLevel != 99) && (JobLevel < 50)) { warp "odin_tem02",282,263; end; @@ -988,51 +939,44 @@ job3_arch01,29,34,3 script Valkyrie#arch 403,{ close; } if (job_arch == 7) { - if (countitem(12381) > 0 || countitem(12382) > 0) { - if (countitem(12381) > 0) { - delitem 12381,countitem(12381); //ValkyrieA_Scroll - } - if (countitem(12382) > 0) { - delitem 12382,countitem(12382); //ValkyrieB_Scroll - } - if ($@archbs == 0) { - set $@archbs,1; - mes "[Valkyrie Anguhilde]"; - mes "Are you ok human?"; - mes "It was not as easy as I expected."; - mes "Will you challenge again?"; - next; - if (getmapusers("job3_arch02") > 0) { - set $@archbs,0; - mes "[Valkyrie Anguhilde]"; - //Custom translation - mes "Ah, it seems someone is already combating the evil in the temple."; - mes "I will see who it is, please wait a moment."; - close; - } + if (countitem(12381) > 0) delitem 12381,countitem(12381); //ValkyrieA_Scroll + if (countitem(12382) > 0) delitem 12382,countitem(12382); //ValkyrieB_Scroll + if ($@archbs == 0) { + set $@archbs,1; + mes "[Valkyrie Anguhilde]"; + mes "Are you ok human?"; + mes "It was not as easy as I expected."; + mes "Will you challenge again?"; + next; + if (getmapusers("job3_arch02") > 0) { set $@archbs,0; mes "[Valkyrie Anguhilde]"; - mes "OK. now I'm going to send you there."; - mes "^FF0000When you go there, you have to summon my impersonation with the scroll^000000."; - mes "An impersonation will help when you move or attack as you want through ^FF0000ALT+click^000000."; - mes "But you have to be careful if an imeprsonation falls down."; - close2; - nude; - if (countitem(2798) > 0) { - delitem 2798,countitem(2798); //Will_Of_Exhausted_Angel - } - donpcevent "start#arch::OnEnable"; - set job_arch, 7; - warp "job3_arch02",119,49; - hideonnpc "Valkyrie#arch"; - end; + //Custom translation + mes "Ah, it seems someone is already combating the evil in the temple."; + mes "I will see who it is, please wait a moment."; + close; } + set $@archbs,0; mes "[Valkyrie Anguhilde]"; - //Custom translation - mes "I am already talking to someone, please wait and talk to me again."; - close; + mes "OK. now I'm going to send you there."; + mes "^FF0000When you go there, you have to summon my impersonation with the scroll^000000."; + mes "An impersonation will help when you move or attack as you want through ^FF0000ALT+click^000000."; + mes "But you have to be careful if an imeprsonation falls down."; + close2; + nude; + if (countitem(2798) > 0) { + delitem 2798,countitem(2798); //Will_Of_Exhausted_Angel + } + donpcevent "start#arch::OnEnable"; + set job_arch, 7; + warp "job3_arch02",119,49; + hideonnpc "Valkyrie#arch"; + end; } - end; + mes "[Valkyrie Anguhilde]"; + //Custom translation + mes "I am already talking to someone, please wait and talk to me again."; + close; } end; } @@ -1062,7 +1006,6 @@ OnTouch: } - script #arch_1_01_0::archbjcq 139,5,5,{ - OnTouch: if (countitem(12381) > 0) { delitem 12381,1; //ValkyrieA_Scroll @@ -1099,7 +1042,6 @@ job3_arch02,269,302,0 duplicate(archbjcq) #arch_1_11 139,5,5 job3_arch02,245,289,0 duplicate(archbjcq) #arch_1_12 139,5,5 job3_arch02,203,286,0 script #arch_1_boss 139,5,5,{ - OnTouch: if (countitem(12381) > 0) { delitem 12381,1; //ValkyrieA_Scroll @@ -1183,7 +1125,7 @@ OnMyMobDead: mapannounce "job3_arch02","Valkyrie's Nightmare: You are so childish. I invite you to a devil's party. I'll make sure you have a fun!",bc_map,"0xFF0000"; //FW_NORMAL 12 0 0 hideoffnpc "Valkyrie#arch_02"; hideonnpc "#arch_2_boss"; - viewpoint 234,279,1,1,0xFFFF9900; + viewpoint 1,279,234,1,0xFFFF99; } end; @@ -1221,7 +1163,7 @@ job3_arch02,113,327,5 script Valkyrie#arch_01 403,{ mes "Then I look forward a good news."; close2; getitem 12382,1; //ValkyrieB_Scroll - viewpoint 46,244,1,1,0xFFFF9900; + viewpoint 1,244,46,1,0xFFFF99; hideonnpc "Valkyrie#arch_01"; donpcevent "#arch_2_start::OnEnable"; end; @@ -1265,7 +1207,6 @@ job3_arch02,244,46,5 script Valkyrie#arch_02 403,{ } job3_arch02,279,234,0 script #arch_end 139,7,7,{ - OnTouch: donpcevent "#arch_3_01::OnKill"; donpcevent "#arch_3_02::OnKill"; @@ -1434,16 +1375,14 @@ OnInit: } job3_arch02,132,323,0 script #arch_2_01 139,5,5,{ - OnTouch: if (countitem(12382) > 0) { - mapannounce "job3_arch02","Whispering of Valkyrie: I see a new ancient scroll!",bc_map,"0x000000"; //FW_NORMAL 12 0 0 + mapannounce "job3_arch02","Whispering of Valkyrie: I see a new ancient scroll!",bc_map; //FW_NORMAL 12 0 0 } end; } - script #arch_2_02_0::archbjcq2 139,5,5,{ - OnTouch: if (countitem(12382) > 0) { delitem 12382,1; //ValkyrieB_Scroll @@ -1481,21 +1420,18 @@ job3_arch02,227,169,0 duplicate(archbjcq2) #arch_2_10 139,5,5 job3_arch02,190,146,0 duplicate(archbjcq2) #arch_2_11 139,5,5 job3_arch02,252,267,0 script #arch_2_12 139,5,5,{ - OnTouch: mapannounce "job3_arch02","Whispering of an impersonation: It's a crossroad. Let's go to the left side. I have to find my pipe.",bc_map,"0xFFCE00"; //FW_NORMAL 12 0 0 end; } job3_arch02,250,290,0 script #arch_2_13 139,5,5,{ - OnTouch: mapannounce "job3_arch02","Whispering of an impersonation: I can see a ruined shrine. Take a rest in there.",bc_map,"0xFFCE00"; //FW_NORMAL 12 0 0 end; } job3_arch02,206,113,0 script #arch_2_boss 139,5,5,{ - OnTouch: if (countitem(12382) > 0) { delitem 12382,1; //ValkyrieB_Scroll @@ -1514,7 +1450,6 @@ OnTouch: } job3_arch02,284,159,0 script #arch_3_01 139,20,20,{ - OnTouch: if ((Class != Job_Priest) && (Class != Job_Baby_Priest)) { mapannounce "job3_arch02","Frus: Do you want to see God? Okay, I'll send you to the land of the dead by myself!",bc_map,"0xFF0000"; //FW_NORMAL 12 0 0 @@ -1533,7 +1468,6 @@ OnInit: } job3_arch02,307,200,0 script #arch_3_02 139,5,5,{ - OnTouch: if (Class == Job_Priest || Class == Job_Baby_Priest) { mapannounce "job3_arch02","Skogul: You are my guest!",bc_map,"0xFF0000"; //FW_NORMAL 12 0 0 @@ -1553,7 +1487,6 @@ OnInit: } job3_arch02,296,216,0 script #arch_3_03 139,5,5,{ - OnTouch: mapannounce "job3_arch02","Frus: I like your face... Can I steal it?",bc_map,"0xFF0000"; //FW_NORMAL 12 0 0 monster "job3_arch02",296,216,"Frus",1762,1; @@ -1813,20 +1746,8 @@ OnEnable: } job3_arch02,290,221,0 script #arch_end_eff 139,5,5,{ - OnTouch: - if (countitem(6154) > 0) { - delitem 6154,countitem(6154); //Broken_Horn_Pipe - } - if (countitem(12381) > 0) { - delitem 12381,countitem(12381); //ValkyrieA_Scroll - } - if (countitem(12381) > 0) { - delitem 12382,countitem(12382); //ValkyrieB_Scroll - } - if (countitem(2798) > 0) { - delitem 2798,countitem(2798); //Will_Of_Exhausted_Angel - } + specialeffect EF_MAPPILLAR2,"#arch_end"; end; } @@ -1864,19 +1785,18 @@ job3_arch01,1,1,1 script ¿ØÖÆ#arch 844,{ */ odin_tem02,30,181,0 script #wherearch01 139,10,10,{ - OnTouch: if (job_arch == 5) { - viewpoint 263,282,1,1,0xFFFF9900; + viewpoint 1,282,263,1,0xFFFF99; } end; } odin_tem02,30,335,0 script #wherearch02 139,10,10,{ - OnTouch: if (job_arch == 5) { - viewpoint 263,282,1,1,0xFFFF9900; + viewpoint 1,282,263,1,0xFFFF99; } end; -} \ No newline at end of file +} + \ No newline at end of file -- cgit v1.2.3-60-g2f50