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

Fixed a bunch of bugs and typos, and made some little optimizations in various quests.

Browse Source 
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@16604 54d463be-8e91-2dee-dedb-b68131a5f0ec
This commit is contained in:
daegaladh 2012-08-08 04:19:17 +00:00
parent 95bdaece5e
commit 178bfb2839
11 changed files with 199 additions and 192 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
npc/quests/kiel_hyre_quest.txt
View File

@ -521,8 +521,8 @@ OnTouch:
// Juno Toast Sales Girl.
//----------------------------------------------------------------------------
yuno,217,114,6 script Little Kid#kh 96,{
mes "[Cezu]";
if (KielHyreQuest < 6) {
mes "[Cezu]";
mes "Fresh, crunchy toast!";
mes "If you want some, come";
mes "and get some tooooast~";
@ -530,7 +530,6 @@ yuno,217,114,6 script Little Kid#kh 96,{
}
else if (KielHyreQuest == 6) {
if (KHToastGirlEnd < 1) {
mes "[Cezu]";
mes "Fresh, crunchy toast!";
mes "If you want some, come";
mes "and get some tooooast~";
@ -580,7 +579,6 @@ yuno,217,114,6 script Little Kid#kh 96,{
}
}
else if (KHToastGirlEnd == 1) {
mes "[Cezu]";
mes "Would you please go to";
mes "the Lighthalzen Windmill";
mes "and tell them that Cezu needs";
@ -590,7 +588,6 @@ yuno,217,114,6 script Little Kid#kh 96,{
close;
}
else if (KHToastGirlEnd == 2) {
mes "[Cezu]";
mes "Hey, you're back with the";
mes "ingredients! Thank you so";
mes "much, I really needed these!";
@ -603,14 +600,12 @@ yuno,217,114,6 script Little Kid#kh 96,{
close;
}
}
else if ((KielHyreQuest >= 6) || (KHToastGirlEnd == 3)) {
//KHToastGirlEnd no longer needed-- deleting.
set KHToastGirlEnd,0;
mes "[Cezu]";
mes "Hot, fresh and";
mes "cruuuunchy toast!";
mes "Come and get some!";
close;
//KHToastGirlEnd no longer needed-- deleting.
if (KielHyreQuest > 6) set KHToastGirlEnd,0;
mes "Hot, fresh and";
mes "cruuuunchy toast!";
mes "Come and get some!";
close;
}
}

293
npc/quests/quests_airship.txt
View File

@ -3050,8 +3050,7 @@ OnTimer120000:
ein_in01,261,35,0 script lab03#heart 139,1,1,{
OnTouch:
if(lhz_heart == 9)
{
if(lhz_heart == 9) {
mes "[Security System]";
mes "^FF0000Unauthorized person";
mes "detected. Password";
@ -3059,8 +3058,7 @@ OnTouch:
mes "Access denied.^000000";
close;
}
else if(lhz_heart == 10)
{
else if(lhz_heart == 10) {
mes "[Security System]";
mes "^FF0000Enter the 3 digit password.";
mes "You will be allowed 5 tries";
@ -3075,153 +3073,160 @@ OnTouch:
mes "not enter any number";
mes "more than once. Make";
mes "sure the password is 3 digits.";
set @retry,0;
next;
L_Recode:
set @thanacode1,rand(1,9);
set @thanacode2,rand(1,9);
set @thanacode3,rand(1,9);
if((@thanacode1 == @thanacode2) || (@thanacode1 == @thanacode3) || (@thanacode2 == @thanacode3)) goto L_Recode;
L_Input:
input @thanainput;
if((@thanainput < 100) || (@thanainput > 999))
{
mes "[Security System]";
mes "^FF0000Error.";
mes "The password entered";
mes "exceeds the number digit";
mes "limit. You must only enter";
mes "3 digit passwords.^000000";
close;
while (1) {
set @yagu100,rand(1,9);
set @yagu10,rand(1,9);
set @yagu1,rand(1,9);
if (((@yagu100 != @yagu10) && (@yagu100 != @yagu1)) && (@yagu10 != @yagu1)) {
break;
}
}
set @thanainput1,@thanainput / 100;
set @thanainput2,(@thanainput % 100) / 10;
set @thanainput3,@thanainput % 10;
if ((@thanainput1 == 0) || (@thanainput2 == 0) || (@thanainput3 == 0))
{
while (1) {
while (1) {
L_Retry:
next;
input @input;
if (@input < 100 || @input > 999) {
mes "[Security System]";
mes "^FF0000Error.";
mes "The password entered";
mes "exceeds the number digit";
mes "limit. You must only enter";
mes "3 digit passwords.^000000";
close;
}
set @input100,@input / 100;
set @input10,(@input % 100) / 10;
if (((@input100 > 0) && (@input10 > 0)) && ((@input % 10) > 0)) {
if ((@input100 != @input10) && (@input100 != (@input % 10)) && (@input10 != (@input % 10))) {
break;
}
mes "[Security System]";
mes "^FF0000Error.";
mes "You cannot enter the";
mes "number 0, or use any";
mes "other number more than";
mes "once. Please try again.^000000";
next;
}
}
set @retry,@retry+1;
mes "[Security System]";
mes "^FF0000Error.";
mes "You cannot enter the";
mes "number 0, or use any";
mes "other number more than";
mes "once. Please try again.^000000";
mes "^ff0000"+strcharinfo(0)+"^000000";
mes "has entered the following:";
mes "^0000ff"+@yagu100+"^000000 - ^0000ff"+@yagu10+"^000000 - ^0000ff"+@yagu1+"^000000.";
mes "Please wait for authorization to complete.";
next;
goto L_Input;
}
mes "[Security System]";
mes "^ff0000"+strcharinfo(0)+"^000000";
mes "has entered the following:";
mes "^0000ff"+@thanainput1+"^000000 - ^0000ff"+@thanainput2+"^000000 - ^0000ff"+@thanainput3+"^000000. Please wait for";
mes "authorization to complete.";
set @thanatry,@thanatry +1;
next;
set @strike,0;
set @ball,0;
if(@thanainput1 == @thanacode1) set @strike,@strike +1;
if(@thanainput2 == @thanacode2) set @strike,@strike +1;
if(@thanainput3 == @thanacode3) set @strike,@strike +1;
if((@thanainput1 == @thanacode2) || (@thanainput1 == @thanacode3)) set @ball,@ball +1;
if((@thanainput2 == @thanacode1) || (@thanainput2 == @thanacode3)) set @ball,@ball +1;
if((@thanainput3 == @thanacode1) || (@thanainput3 == @thanacode2)) set @ball,@ball +1;
if(@strike == 3)
{
mes "[Security System]";
mes "Authorization complete.";
mes "Archive access granted.";
next;
mes "^3355FFThe archive door opens,";
mes "revealing a series of";
mes "filed documents. Out";
mes "of all of them, one of the";
mes "files grabs your attention.^000000";
next;
mes "Varmunt Project No. 3";
mes "Security Level : Grade 1-C";
set @strike,0;
set @ball,0;
if (@yagu100 == @input100) set @strike,@strike+1;
if (@yagu10 == @input10) set @strike,@strike+1;
if (@yagu1 == (@input % 10)) set @strike,@strike+1;
if ((@yagu100 == @input10) || (@yagu100 == (@input % 10))) set .@ball,.@ball+1;
if ((@yagu10 == @input100) || (@yagu10 == (@input % 10))) set @ball,@ball+1;
if ((@yagu1 == @input100) || (@yagu1 == @input10)) set @ball,@ball+1;
if (@strike == 3) {
mes "[Security System]";
mes "Authorization complete.";
mes "Archive access granted.";
next;
mes "^3355FFThe archive door opens,";
mes "revealing a series of";
mes "filed documents. Out";
mes "of all of them, one of the";
mes "files grabs your attention.^000000";
next;
mes "Varmunt Project No. 3";
mes "Security Level : Grade 1-C";
mes " ";
mes "Caution: Only project members";
mes "of the Ymir Heart Synthesization project are authorized to view";
mes "this classified document.";
next;
mes "Varmunt Project No. 3";
mes "Security Level : Grade 1-C";
mes " ";
mes "All others found reading";
mes "this document are subject";
mes "to punishment or dismissal.";
next;
mes "^3355FFYou perceive the sound of";
mes "footsteps and quickly try to";
mes "return the document to its";
mes "original place. However,";
mes "the person that has come";
mes "to the archive has already";
mes "seen you holding the file.^000000";
next;
donpcevent "Ferlock#lab::OnEnter";
mes "[Ferlock]";
mes "Excuse me, but are";
mes "you an employee here?";
mes "I've come to pick up a";
mes "new Rune Stone for the";
mes "Airship. Wait, wait...";
mes "You look familiar...";
next;
emotion e_omg,0,"Ferlock#lab";
mes "[Ferlock]";
mes "That's right, aren't you the";
mes "one who brought me my";
mes "brother's letter? Yeah, you";
mes "were asking me about the";
mes "Airship's flight mechanics.";
mes "So you're not an employee...";
next;
mes "[Ferlock]";
mes "Boy, you must be more than";
mes "curious to be looking up that";
mes "information in a restricted";
mes "area. But don't worry, you";
mes "must have your reasons,";
mes "so I won't call the guards.";
next;
mes "[Ferlock]";
mes "Still, you better get out";
mes "of here. The guards patrol";
mes "this place regularly, so you're";
mes "almost sure to get caught. Hmm,";
mes "come and see me later at the";
mes "Airship, alright? Now hurry!";
close2;
donpcevent "Ferlock#lab::OnInit";
changequest 8042,8043;
set lhz_heart,11;
end;
}
mes "[Password Checker]";
mes " ";
mes "Caution: Only project members";
mes "of the Ymir Heart Synthesization project are authorized to view";
mes "this classified document.";
mes "^333333Total of correct numbers";
mes "in correct sequence: ^ff0000"+@strike+"^333333";
mes "Total of correct numbers misplaced: ^ff0000"+@ball+"^333333.";
mes "Please use these results";
mes "to make a more accurate guess.^000000";
next;
mes "Varmunt Project No. 3";
mes "Security Level : Grade 1-C";
mes " ";
mes "All others found reading";
mes "this document are subject";
mes "to punishment or dismissal.";
next;
mes "^3355FFYou perceive the sound of";
mes "footsteps and quickly try to";
mes "return the document to its";
mes "original place. However,";
mes "the person that has come";
mes "to the archive has already";
mes "seen you holding the file.^000000";
next;
donpcevent "Ferlock#lab::OnEnter";
mes "[Ferlock]";
mes "Excuse me, but are";
mes "you an employee here?";
mes "I've come to pick up a";
mes "new Rune Stone for the";
mes "Airship. Wait, wait...";
mes "You look familiar...";
next;
emotion e_omg,0,"Ferlock#lab";
mes "[Ferlock]";
mes "That's right, aren't you the";
mes "one who brought me my";
mes "brother's letter? Yeah, you";
mes "were asking me about the";
mes "Airship's flight mechanics.";
mes "So you're not an employee...";
next;
mes "[Ferlock]";
mes "Boy, you must be more than";
mes "curious to be looking up that";
mes "information in a restricted";
mes "area. But don't worry, you";
mes "must have your reasons,";
mes "so I won't call the guards.";
next;
mes "[Ferlock]";
mes "Still, you better get out";
mes "of here. The guards patrol";
mes "this place regularly, so you're";
mes "almost sure to get caught. Hmm,";
mes "come and see me later at the";
mes "Airship, alright? Now hurry!";
close2;
donpcevent "Ferlock#lab::OnInit";
changequest 8042,8043;
set lhz_heart,11;
end;
}
mes "[Password Checker]";
mes " ";
mes "^333333Total of correct numbers";
mes "in correct sequence: ^ff0000"+@strike+"^333333";
mes "Total of correct numbers misplaced: ^ff0000"+@ball+"^333333.";
mes "Please use these results";
mes "to make a more accurate guess.^000000";
next;
if(@thanatry > 4)
{
if (@retry > 4) {
mes "[Security System]";
mes "^FF0000The correct password";
mes "for this session was";
mes "^000000"+@yagu100+"^FF0000 - ^000000"+@yagu10+"^000000 - ^000000"+@yagu1+"^FF0000.";
mes "Password will now be reset.^000000";
close;
}
mes "[Security System]";
mes "^FF0000The correct password";
mes "for this session was";
mes "^000000"+@thanacode1+"^FF0000 - ^000000"+@thanacode2+"^000000 - ^000000"+@thanacode3+"^FF0000. Password";
mes "will now be reset.^000000";
set @thanatry,0;
close;
mes "Beeeeep!";
mes "Incorrect password.";
mes " ";
switch (@retry) {
case 1: mes "Initialing 2nd attempt...^000000"; break;
case 2: mes "Initialing 3rd attempt...^000000"; break;
case 3: mes "Initialing 4th attempt...^000000"; break;
case 4: mes "Initialing final attempt...^000000"; break;
}
goto L_Retry;
}
mes "[Security System]";
mes "Beeeeep!";
mes "Incorrect password.";
mes " ";
if(@thanatry == 1) mes "Initialing 2nd attempt...^000000";
if(@thanatry == 2) mes "Initialing 3rd attempt...^000000";
if(@thanatry == 3) mes "Initialing 4th attempt...^000000";
if(@thanatry == 4) mes "Initialing final attempt...^000000";
next;
goto L_Input;
}
end;
}

15
npc/quests/quests_alberta.txt
View File

@ -2348,8 +2348,7 @@ alberta_in,131,95,5 script Iromo#ep3_2 706,{
next;
mes "-Silent pause-";
next;
set name,PcName;
mes "-" + name + " starts to speak-";
mes "-"+strcharinfo(0)+" starts to speak-";
mes "-And tells him of the journeys-";
mes "-Adventures, joy, sorrow, and loss-";
mes "-One by one to the boy-";
@ -2726,8 +2725,10 @@ alberta_in,131,95,5 script Iromo#ep3_2 706,{
mes "that grows outside of the village.";
mes "I can stand it.";
next;
set ep13_2_hiki,2;
changequest 10079,10080;
if (ep13_2_hiki == 1) {
set ep13_2_hiki,2;
changequest 10079,10080;
}
mes "[Iromo]";
mes "But, I can have other food";
mes "instead of the outside food.";
@ -2840,7 +2841,7 @@ alberta_in,120,93,3 script Iromo's Mother#ep3_2 53,{
mes "But, somehow...";
mes "he doesn't go out anymore.";
next;
if (BaseLevel > 40) {
if (BaseLevel > 40 && checkquest(10079) == -1) {
set ep13_2_hiki,1;
setquest 10079;
}
@ -2948,7 +2949,7 @@ alberta,45,106,5 script Little Boy#ep3_2 706,{
}
if (ep13_2_hiki == 3) {
mes "[Little Boy]";
mes "I am hugry. We don't have";
mes "I am hungry. We don't have";
mes "much snack bar in this village.";
next;
mes "[Little Boy]";
@ -2980,7 +2981,7 @@ alberta,45,106,5 script Little Boy#ep3_2 706,{
close;
}
mes "[Little Boy]";
mes "I am hugry. We don't have";
mes "I am hungry. We don't have";
mes "much snack bar in this village.";
next;
mes "[Little Boy]";

3
npc/quests/quests_ein.txt
View File

@ -5793,8 +5793,7 @@ OnTouch:
}
}
else {
mes "[Security System]";
mes "You haved failed";
mes "You have failed";
mes "the identification";
mes "check. Access denied.";
close;

8
npc/quests/quests_lighthalzen.txt
View File

@ -11737,6 +11737,7 @@ OnInit:
end;
OnEnter:
initnpctimer;
enablenpc "#packidentity";
end;
@ -11757,8 +11758,15 @@ OnTouch:
close2;
donpcevent "Man#Lyozien::OnEnter";
donpcevent "#packidentity::OnInit";
stopnpctimer;
end;
}
OnTimer120000:
donpcevent "Man#Lyozien::OnEnter";
donpcevent "#packidentity::OnInit";
stopnpctimer;
end;
}
lhz_in01,187,247,3 script #flashback1 139,2,2,{

4
npc/quests/quests_moscovia.txt
View File

@ -1,4 +1,4 @@
//===== rAthena Script =======================================
//===== rAthena Script =======================================
//= Moscovia Quests
//===== By: ==================================================
//= Kisuka
@ -8315,8 +8315,8 @@ mosk_in,215,46,5 script Baba Yaga, the Horrible 970,{
mes "If you do this, what the villagers want";
mes "will be happening,";
mes "forever.";
set mos_nowinter,19;
getitem 7765,1;
set mos_nowinter,19;
close;
}
else if (mos_nowinter == 19) {

4
npc/quests/quests_nameless.txt
View File

@ -1,4 +1,4 @@
//===== rAthena Script =======================================
//===== rAthena Script =======================================
//= Nameless Island Quests
//===== By: ==================================================
//= L0ne_W0lf
@ -7525,7 +7525,7 @@ payon,244,62,3 script Moonho Ahn 897,{
else if (((.@input$ == "Odd") && (.@number == 2)) || ((.@input$ == "Even") && (.@number == 1))) {
set .@number_false_3,.@number_false_3+1;
mes "[Moonho Ahn]";
mes "Well, it's ^0000FF+.@input+^000000.";
mes "Well, it's ^0000FF"+.@input+"^000000.";
mes "Looks like I won.";
next;
if ((.@number_right_3 < 2) && (.@number_false_3 <2)) {

3
npc/quests/quests_niflheim.txt
View File

@ -42,7 +42,6 @@ niflheim,224,243,3 script Alreg#nif 795,{
next;
mes "^FF3355*Crunch* Crunch*^000000";
if (nif_esc == 0 && (MISC_QUEST & 32) == 0) {
set piano_root,rand(1,2);
percentheal -60,0;
next;
mes "["+ strcharinfo(0) +"]";
@ -240,7 +239,7 @@ OnTouch:
mes "you could play music...^000000";
close;
}
if (nif_esc == 11) {
if (nif_esc == 11 && countitem(7184) > 5) {
set nif_esc,12;
delitem 7184,6; //Piano_Keyboard
mes "^3355FFYou took the keys you've found";

16
npc/quests/quests_veins.txt
View File

@ -262,7 +262,7 @@ ve_fild05,257,130,4 script Wincing Old Man#ve 945,{
set veins_stone,5;
close;
}
else if (veins_stone < 7) {
else if (veins_stone > 4 && veins_stone < 7) {
mes "[Zabaroo]";
mes "Thanks again for your help!";
mes "What did Absar call this";
@ -400,7 +400,7 @@ ve_in,169,310,6 script Strange Old Man#ve 121,{
close;
}
else if (veins_stone == 2) {
if (countitem(999) > 4 && countitem(7561) > 1 && countitem(1033) > 4) {
if (countitem(999) > 4 && countitem(1033) > 4 && countitem(7561) > 1) {
mes "[Absar]";
mes "Good, you finally";
mes "brought everthing.";
@ -467,7 +467,7 @@ ve_in,169,310,6 script Strange Old Man#ve 121,{
}
ve_in02,37,28,4 script Factory Manager 898,{
if (veins_stone < 5) {
if (veins_stone && veins_stone < 5) {
mes "[Mirhen]";
mes "Hey, employees only beyond this point!";
mes "Geez, don't we have a sigh that says that?";
@ -4151,7 +4151,7 @@ veins,227,127,5 script Ivory 940,{
close;
}
else if (rachel_camel == 6) {
if ((countitem(519) > 9) && (countitem(511) > 99) && (countitem(909) > 49) && (countitem(713) > 4)) {
if ((countitem(511) > 99) && (countitem(909) > 49) && (countitem(519) > 9) && (countitem(713) > 4)) {
mes "[Organic Soap Maker Ivory]";
mes "Oh, great! You brought";
mes "everything! Now... It's";
@ -4793,7 +4793,7 @@ ve_fild07,235,42,3 script Silk Sand Camel 938,{
close;
}
else if (rachel_camel > 11 && rachel_camel < 17) {
if (countitem(519) > 1 && countitem(511) > 19 && countitem(909) > 9 && countitem(713) > 0) {
if (countitem(511) > 19 && countitem(909) > 9 && countitem(519) > 1 && countitem(713) > 0) {
mes "^3355FFThe camel can smell";
mes "that you have food for";
mes "it, and started salivating.";
@ -5153,7 +5153,7 @@ ra_temin,87,133,1 script Rachel Guard#vol1 934,5,2,{
disablenpc "Rachel Guard#vol1";
end;
}
else if ((aru_vol> 2) && (aru_vol < 5)) {
else if ((aru_vol > 2) && (aru_vol < 5)) {
mes "[Guard Karlum]";
mes "Hey! Lamir told me that";
mes "she didn't want to see";
@ -5217,7 +5217,7 @@ OnTouch:
}
ra_temin,115,140,1 script Flower Vase#vol 111,{
if ((aru_vol> 2) && (aru_vol < 5)) {
if ((aru_vol > 2) && (aru_vol < 5)) {
mes "^3355FFYou find a giant";
mes "vase full of beautiful";
mes "flowers that look freshly";
@ -6923,7 +6923,7 @@ thor_camp,159,74,3 script Colonel Vito#3 946,{
thor_camp,141,62,0 script #vol_study1::VeinsWarp -1,3,3,{
OnTouch:
if ((aru_vol >= 14 && aru_vol <= 16) || (aru_vol == 19)) {
if ((aru_vol > 13 && aru_vol < 17) || (aru_vol == 19)) {
warp "thor_camp",156,67;
}
end;

22
npc/quests/thana_quest.txt
View File

@ -1155,7 +1155,7 @@ L_Retry:
close;
}
}
if ((@retry > 0) && (@retry < 5)) {
if (@retry > 4) {
mes "[Screen]";
mes "*Beeeeep*";
mes "Unauthorized";
@ -1167,7 +1167,15 @@ L_Retry:
mes "in sequence total: ^FF0000"+@strike+"^000000";
mes " ";
mes "Correct number total: ^FF0000"+@ball+"^000000";
goto L_Retry;
next;
mes "[Screen]";
mes "Correct number";
mes "authorization";
mes "sequence was...";
mes "^ff0000"+@yagu100+"^000000, ^ff0000"+@yagu10+"^000000, ^ff0000"+@yagu1+"^000000";
mes "Authorization number";
mes "will change upon retry.";
close;
}
mes "[Screen]";
mes "*Beeeeep*";
@ -1180,15 +1188,7 @@ L_Retry:
mes "in sequence total: ^FF0000"+@strike+"^000000";
mes " ";
mes "Correct number total: ^FF0000"+@ball+"^000000";
next;
mes "[Screen]";
mes "Correct number";
mes "authorization";
mes "sequence was...";
mes "^ff0000"+@yagu100+"^000000, ^ff0000"+@yagu10+"^000000, ^ff0000"+@yagu1+"^000000";
mes "Authorization number";
mes "will change upon retry.";
close;
goto L_Retry;
}
}
mes "^3355FFThis device is currently";

4
npc/quests/the_sign_quest.txt
View File

@ -1,4 +1,4 @@
//===== rAthena Script =======================================
//===== rAthena Script =======================================
//= The Sign Quest
//===== By: ==================================================
//= SinSloth(Most of the NPCs), MasterOfMuppets(Some of the NPCs + bug fixes) & Kargha(The quiz NPCs)
@ -11391,7 +11391,7 @@ niflheim,102,54,4 script Mad Man#s 739,{
next;
switch(select("Pay him.:Don't pay him.")) {
case 1:
if (Zeny < 20000) {
if (Zeny < 60000) {
mes "[Laichin]";
mes "What is this?";
mes "You tryin to welch";