Mirroristas/rathena
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

* Added Kagerou/Oboro to custom Job Master (custom\jobmaster.txt)

Browse Source 
* Fixed bugreport:6413 and did some minor cleaning in 13-1 quests (quests\quests_13_1.txt)

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@16585 54d463be-8e91-2dee-dedb-b68131a5f0ec
This commit is contained in:
euphyy 2012-08-05 19:34:31 +00:00
parent 44327805ca
commit 0d6284f880
2 changed files with 240 additions and 266 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
npc/custom/jobmaster.txt
View File

@ -3,7 +3,7 @@
//===== By: ================================================== //===== By: ==================================================
//= Euphy //= Euphy
//===== Current Version: ===================================== //===== Current Version: =====================================
//= 1.2 //= 1.3
//===== Compatible With: ===================================== //===== Compatible With: =====================================
//= rAthena SVN r16114+ //= rAthena SVN r16114+
//===== Description: ========================================= //===== Description: =========================================
@ -11,6 +11,7 @@
//===== Additional Comments: ================================= //===== Additional Comments: =================================
//= 1.1 Fixed reset on Baby job change. [Euphy] //= 1.1 Fixed reset on Baby job change. [Euphy]
//= 1.2 Added Expanded Super Novice support and initial Kagerou/Oboro support. [Euphy] //= 1.2 Added Expanded Super Novice support and initial Kagerou/Oboro support. [Euphy]
//= 1.3 Kagerou/Oboro added. [Euphy]
//============================================================ //============================================================
prontera,153,193,6 script Job Master 123,{ prontera,153,193,6 script Job Master 123,{
@ -51,8 +52,7 @@ function Job_Menu; function A_An;
mes "[Job Master]"; } } mes "[Job Master]"; } }
set .@j1, roclass(.@eac|EAJL_2_1); set .@j2,roclass(.@eac|EAJL_2_2); set .@j1, roclass(.@eac|EAJL_2_1); set .@j2,roclass(.@eac|EAJL_2_2);
if ((.@eac&EAJ_UPPERMASK) == EAJ_SUPER_NOVICE) setarray .@exp[0],roclass(.@eac|EAJL_THIRD),99; if ((.@eac&EAJ_UPPERMASK) == EAJ_SUPER_NOVICE) setarray .@exp[0],roclass(.@eac|EAJL_THIRD),99;
// Kagerou & Oboro pending skill completion. if (Class == Job_Ninja) setarray .@exp[0],.@j1,70;
// if (Class == Job_Ninja) setarray .@exp[0],.@j1,70;
if (.@exp[0] && .ThirdClass) { if (.@exp[0] && .ThirdClass) {
if (BaseLevel < .Rebirth[0] || JobLevel < .@exp[1]) { if (BaseLevel < .Rebirth[0] || JobLevel < .@exp[1]) {
set .@blvl, .Rebirth[0]-BaseLevel; set .@jlvl, .@exp[1]-JobLevel; set .@blvl, .Rebirth[0]-BaseLevel; set .@jlvl, .@exp[1]-JobLevel;

68
npc/quests/quests_13_1.txt
View File

@ -3,7 +3,7 @@
//===== By: ================================================== //===== By: ==================================================
//= L0ne_W0lf //= L0ne_W0lf
//===== Current Version: ===================================== //===== Current Version: =====================================
//= 2.5 //= 2.5a
//===== Compatible With: ===================================== //===== Compatible With: =====================================
//= rAthena SVN //= rAthena SVN
//===== Description: ========================================= //===== Description: =========================================
@ -42,6 +42,7 @@
//= 2.3 Updated to match the new Izlude Map. [Masao] //= 2.3 Updated to match the new Izlude Map. [Masao]
//= 2.4 More optimization (-32kb). [Euphy] //= 2.4 More optimization (-32kb). [Euphy]
//= 2.5 Yet more optimization (-22kb). [Euphy] //= 2.5 Yet more optimization (-22kb). [Euphy]
//= 2.5a Minor fixes. [Euphy]
//============================================================ //============================================================
// Onward to the New World // Onward to the New World
@ -248,8 +249,7 @@ prt_castle,83,67,5 script Recruiter for the Brave 109,{
mes "You are definitely brave enough to venture to this new land."; mes "You are definitely brave enough to venture to this new land.";
mes "I will now appoint you to detect and have adventures in Ash-Vacuum."; mes "I will now appoint you to detect and have adventures in Ash-Vacuum.";
next; next;
switch(select("Ash-Vacuum?")) { select("Ash-Vacuum?");
case 1:
mes "[Recruiter]"; mes "[Recruiter]";
mes "Hm. That's the code name of the place where you will have your adventure. Frankly, we don't know exactly what it is, but we call it 'Ash-Vacuum'."; mes "Hm. That's the code name of the place where you will have your adventure. Frankly, we don't know exactly what it is, but we call it 'Ash-Vacuum'.";
next; next;
@ -300,7 +300,6 @@ prt_castle,83,67,5 script Recruiter for the Brave 109,{
mes "I'm done here..."; mes "I'm done here...";
close; close;
} }
}
if (ep13_ryu > 0) { if (ep13_ryu > 0) {
mes "[Recruiter]"; mes "[Recruiter]";
mes "What're you doing here?"; mes "What're you doing here?";
@ -437,8 +436,7 @@ aldebaran,127,138,3 script Promotional Staff#alde 100,{
mes "[Promotional Staff]"; mes "[Promotional Staff]";
mes "Hey, you're a well-versed person, right? Are you interested in my story?"; mes "Hey, you're a well-versed person, right? Are you interested in my story?";
next; next;
switch(select("I have something for you.")) { select("I have something for you.");
case 1:
mes "[Promotional Staff]"; mes "[Promotional Staff]";
mes "For me??"; mes "For me??";
mes "I hate annoying stuff."; mes "I hate annoying stuff.";
@ -469,7 +467,6 @@ aldebaran,127,138,3 script Promotional Staff#alde 100,{
mes "Then we can go forward."; mes "Then we can go forward.";
close; close;
} }
}
mes "[Promotional Staff]"; mes "[Promotional Staff]";
mes "We want the adventurers who are super curious and extremely brave. Join us for a wonderful adventure!"; mes "We want the adventurers who are super curious and extremely brave. Join us for a wonderful adventure!";
next; next;
@ -608,8 +605,7 @@ geffen,90,67,3 script Promotional Staff#gef 100,{
mes "[Promotional Staff]"; mes "[Promotional Staff]";
mes "Hey, you're a knowledgeable person, right? Are you interested in my story?"; mes "Hey, you're a knowledgeable person, right? Are you interested in my story?";
next; next;
switch(select("The Staff in Aldebaran sent me.")) { select("The Staff in Aldebaran sent me.");
case 1:
mes "[Promotional Staff]"; mes "[Promotional Staff]";
mes "Oh he did?"; mes "Oh he did?";
next; next;
@ -631,7 +627,6 @@ geffen,90,67,3 script Promotional Staff#gef 100,{
mes "Then we can go forward."; mes "Then we can go forward.";
close; close;
} }
}
mes "[Promotional Staff]"; mes "[Promotional Staff]";
mes "We want adventurers who are super curious and extremely brave. Join us for a wonderful adventure!"; mes "We want adventurers who are super curious and extremely brave. Join us for a wonderful adventure!";
next; next;
@ -753,8 +748,7 @@ izlude,101,173,6 script Promotional Staff#iz 100,{
mes "[Promotional Staff]"; mes "[Promotional Staff]";
mes "Hey, you're a knowledgeable adventurer. Are you interested in my story?"; mes "Hey, you're a knowledgeable adventurer. Are you interested in my story?";
next; next;
switch(select("I have something for you.")) { select("I have something for you.");
case 1:
mes "[Promotional Staff]"; mes "[Promotional Staff]";
mes "Um, you're the one sent to be tested, correct? You are in the right place. I'm the Promotional Staff in Izlude."; mes "Um, you're the one sent to be tested, correct? You are in the right place. I'm the Promotional Staff in Izlude.";
next; next;
@ -810,7 +804,6 @@ izlude,101,173,6 script Promotional Staff#iz 100,{
close; close;
} }
} }
}
mes "[Promotional Staff]"; mes "[Promotional Staff]";
mes "We want the adventurers who are super curious"; mes "We want the adventurers who are super curious";
mes "and extremely brave."; mes "and extremely brave.";
@ -1135,8 +1128,7 @@ lhz_in01,132,259,5 script Sikaiz#1 868,{
mes "[Sikaiz]"; mes "[Sikaiz]";
mes "So, what do you want to know more of? You already know about the Ash-Vacuum. Is there anything else you'd like me to tell you?"; mes "So, what do you want to know more of? You already know about the Ash-Vacuum. Is there anything else you'd like me to tell you?";
next; next;
switch(select("The three kingdoms...")) { select("The three kingdoms...");
case 1:
mes "[Sikaiz]"; mes "[Sikaiz]";
mes "Ah, I need to tell you about the alliance, but first, may I ask something?"; mes "Ah, I need to tell you about the alliance, but first, may I ask something?";
next; next;
@ -1152,7 +1144,6 @@ lhz_in01,132,259,5 script Sikaiz#1 868,{
mes "We're running out of time, so I will answer you when you come back. Ok?"; mes "We're running out of time, so I will answer you when you come back. Ok?";
close; close;
} }
}
if (ep13_ryu == 10) { if (ep13_ryu == 10) {
mes "[Sikaiz]"; mes "[Sikaiz]";
mes "Whew......"; mes "Whew......";
@ -1169,8 +1160,7 @@ lhz_in01,132,259,5 script Sikaiz#1 868,{
mes "[Sikaiz]"; mes "[Sikaiz]";
mes "The registration is also important now, but I will tell you about our status here. May I begin?"; mes "The registration is also important now, but I will tell you about our status here. May I begin?";
next; next;
switch(select("Sure.")) { select("Sure.");
case 1:
mes "[Sikaiz]"; mes "[Sikaiz]";
mes "Ok. Let me tell you about the Ash-Vacuum. It's quite a long story. So please bear with me."; mes "Ok. Let me tell you about the Ash-Vacuum. It's quite a long story. So please bear with me.";
next; next;
@ -1229,7 +1219,6 @@ lhz_in01,132,259,5 script Sikaiz#1 868,{
mes "If you have any other questions, you can still ask me..."; mes "If you have any other questions, you can still ask me...";
close; close;
} }
}
if (ep13_ryu == 9) { if (ep13_ryu == 9) {
mes "- The man standing in front -"; mes "- The man standing in front -";
mes "- is delivering a speech. -"; mes "- is delivering a speech. -";
@ -1253,8 +1242,8 @@ lhz_in01,132,259,5 script Sikaiz#1 868,{
next; next;
changequest 10065,10066; changequest 10065,10066;
set ep13_ryu,10; set ep13_ryu,10;
mes "-The speech has ended.-"; mes "- The speech has ended. -";
mes "-Let's move on.-"; mes "- Let's move on. -";
close; close;
} }
mes "[Sikaiz]"; mes "[Sikaiz]";
@ -5963,13 +5952,10 @@ mid_camp,165,245,0 script Ryosen#ep131_rhea01 748,{
mes "[Ryosen]"; mes "[Ryosen]";
mes "Whatever... Could you deliver this document to the Schwartzvalt and Arunafeltz researchers?"; mes "Whatever... Could you deliver this document to the Schwartzvalt and Arunafeltz researchers?";
next; next;
switch(select("Why me?:Alright.")) { if(select("Why me?:Alright.") == 1) {
case 1:
mes "[Ryosen]"; mes "[Ryosen]";
mes "... Eh? Didn't you come to help us?"; mes "... Eh? Didn't you come to help us?";
close; close;
case 2:
break;
} }
mes "[Ryosen]"; mes "[Ryosen]";
mes "Whew~ Very good."; mes "Whew~ Very good.";
@ -6365,16 +6351,13 @@ mid_camp,165,245,0 script Ryosen#ep131_rhea01 748,{
mes "[Ryosen]"; mes "[Ryosen]";
mes "Are you really, honestly, positively sure you want to exchange them for my cake?"; mes "Are you really, honestly, positively sure you want to exchange them for my cake?";
next; next;
switch(select("No way.:Yeah... I'll exchange.")) { if(select("No way.:Yeah... I'll exchange.") == 1) {
case 1:
mes "[Ryosen]"; mes "[Ryosen]";
mes "Ahhh..."; mes "Ahhh...";
next; next;
mes "[Ryosen]"; mes "[Ryosen]";
mes "Come back any time if you change your mind."; mes "Come back any time if you change your mind.";
close; close;
case 2:
break;
} }
mes "[Ryosen]"; mes "[Ryosen]";
mes "I don't need it!"; mes "I don't need it!";
@ -6439,13 +6422,10 @@ mid_camp,247,255,1 script Hue#ep131_rhea02 868,{
mes "[Hue]"; mes "[Hue]";
mes "You can't just come and go around as you please here. This is a restricted area."; mes "You can't just come and go around as you please here. This is a restricted area.";
next; next;
switch(select("Sorry...:I came to show you this.")) { if(select("Sorry...:I came to show you this.") == 1) {
case 1:
mes "[Hue]"; mes "[Hue]";
mes "You're just helpless, aren't you?"; mes "You're just helpless, aren't you?";
close; close;
case 2:
break;
} }
mes "[Hue]"; mes "[Hue]";
mes "What's that?"; mes "What's that?";
@ -6502,13 +6482,10 @@ mid_camp,247,255,1 script Hue#ep131_rhea02 868,{
mes "[Hue]"; mes "[Hue]";
mes "Well, thank you for entertaining me. You should tell Ryosen that."; mes "Well, thank you for entertaining me. You should tell Ryosen that.";
next; next;
switch(select("Ok, I will.:Please sign the invitation.")) { if(select("Ok, I will.:Please sign the invitation.") == 1) {
case 1:
mes "[Hue]"; mes "[Hue]";
mes "Well, you should also tell him that I think he's very talented in settin up comedy. Hahaha."; mes "Well, you should also tell him that I think he's very talented in settin up comedy. Hahaha.";
close; close;
case 2:
break;
} }
mes "[Hue]"; mes "[Hue]";
mes "... Sign this thing???"; mes "... Sign this thing???";
@ -6770,16 +6747,13 @@ mid_camp,247,255,1 script Hue#ep131_rhea02 868,{
mes "[Hue]"; mes "[Hue]";
mes "Are you sure you want to exchange this for my Pineapple Jubilee?"; mes "Are you sure you want to exchange this for my Pineapple Jubilee?";
next; next;
switch(select("No way.:sure.")) { if(select("No way.:Sure.") == 1) {
case 1:
mes "[Hue]"; mes "[Hue]";
mes "Ahhhhh..."; mes "Ahhhhh...";
next; next;
mes "[Hue]"; mes "[Hue]";
mes "Come back any time if you change your mind."; mes "Come back any time if you change your mind.";
close; close;
case 2:
break;
} }
mes "[Hue]"; mes "[Hue]";
mes "Thank you so much."; mes "Thank you so much.";
@ -8396,7 +8370,7 @@ mid_camp,72,94,4 script Fluffy Gyaruk 421,{
else if (ep13_yong1 == 3) { else if (ep13_yong1 == 3) {
mes "[Fluffy Gyaruk]"; mes "[Fluffy Gyaruk]";
mes "We offer one service to new customers."; mes "We offer one service to new customers.";
mes "If you want to us emore services, you must fo some things for us."; mes "If you want to use more services, you must do some things for us.";
next; next;
select("What kind of things?"); select("What kind of things?");
mes "[Fluffy Gyaruk]"; mes "[Fluffy Gyaruk]";
@ -12763,11 +12737,11 @@ mid_camp,256,272,3 script Defaria#moc2 897,{
next; next;
mes "[Defaria]"; mes "[Defaria]";
mes "Make it a nice, neat pile, please."; mes "Make it a nice, neat pile, please.";
mes "..Oh, you forgot to put the sweet potatoes on top."; mes "Oh, you forgot to put the sweet potatoes on top.";
mes "Yes, good. That's perfect."; mes "Yes, good. That's perfect.";
next; next;
mes "[Defaria]"; mes "[Defaria]";
mes "..Hopefully I can make a fire with your nice logs...."; mes "Hopefully I can make a fire with your nice logs....";
specialeffect EF_BEGINSPELL2; specialeffect EF_BEGINSPELL2;
next; next;
specialeffect EF_FIREWALL,AREA,"Wet Firewood#moc2"; specialeffect EF_FIREWALL,AREA,"Wet Firewood#moc2";
@ -12796,11 +12770,11 @@ mid_camp,256,272,3 script Defaria#moc2 897,{
next; next;
mes "[" + strcharinfo(0) + "]"; mes "[" + strcharinfo(0) + "]";
mes "Didn't you forget something?"; mes "Didn't you forget something?";
mes ".. Dandelion? I wanted you to tell me what you knew."; mes "... Dandelion? I wanted you to tell me what you knew.";
mes "I was hoping you'd remember something about Dandelion."; mes "I was hoping you'd remember something about Dandelion.";
next; next;
mes "[Defaria]"; mes "[Defaria]";
mes "..So,"; mes "So,";
mes "do you want me to confirm"; mes "do you want me to confirm";
mes "if Dandelion is really supported by Arunafeltz?"; mes "if Dandelion is really supported by Arunafeltz?";
next; next;
@ -13796,7 +13770,7 @@ que_job01,84,17,3 script Rin#moc_room2_1 885,{
case 1: case 1:
cutin "moc2_rin01",2; cutin "moc2_rin01",2;
mes "[Rin]"; mes "[Rin]";
mes "I'm sorry, but I'm not yet fully recovered....5.....I need to speak slowly. Please bear with me."; mes "I'm sorry, but I'm not yet fully recovered... I need to speak slowly. Please bear with me.";
next; next;
break; break;
case 2: case 2: