Fixed a bunch of bugs and typos, and made some little optimizations in various quests.
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@16604 54d463be-8e91-2dee-dedb-b68131a5f0ec
This commit is contained in:
daegaladh
parent
95bdaece5e
commit
178bfb2839
@ -521,8 +521,8 @@ OnTouch:
|
||||
// Juno Toast Sales Girl.
|
||||
//----------------------------------------------------------------------------
|
||||
yuno,217,114,6 script Little Kid#kh 96,{
|
||||
if (KielHyreQuest < 6) {
|
||||
mes "[Cezu]";
|
||||
if (KielHyreQuest < 6) {
|
||||
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,10 +600,8 @@ 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]";
|
||||
if (KielHyreQuest > 6) set KHToastGirlEnd,0;
|
||||
mes "Hot, fresh and";
|
||||
mes "cruuuunchy toast!";
|
||||
mes "Come and get some!";
|
||||
|
||||
@ -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,16 +3073,22 @@ 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))
|
||||
{
|
||||
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;
|
||||
}
|
||||
}
|
||||
while (1) {
|
||||
while (1) {
|
||||
L_Retry:
|
||||
next;
|
||||
input @input;
|
||||
if (@input < 100 || @input > 999) {
|
||||
mes "[Security System]";
|
||||
mes "^FF0000Error.";
|
||||
mes "The password entered";
|
||||
@ -3093,11 +3097,12 @@ L_Input:
|
||||
mes "3 digit passwords.^000000";
|
||||
close;
|
||||
}
|
||||
set @thanainput1,@thanainput / 100;
|
||||
set @thanainput2,(@thanainput % 100) / 10;
|
||||
set @thanainput3,@thanainput % 10;
|
||||
if ((@thanainput1 == 0) || (@thanainput2 == 0) || (@thanainput3 == 0))
|
||||
{
|
||||
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";
|
||||
@ -3105,25 +3110,24 @@ L_Input:
|
||||
mes "other number more than";
|
||||
mes "once. Please try again.^000000";
|
||||
next;
|
||||
goto L_Input;
|
||||
}
|
||||
}
|
||||
set @retry,@retry+1;
|
||||
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;
|
||||
mes "^0000ff"+@yagu100+"^000000 - ^0000ff"+@yagu10+"^000000 - ^0000ff"+@yagu1+"^000000.";
|
||||
mes "Please wait for authorization to complete.";
|
||||
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)
|
||||
{
|
||||
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.";
|
||||
@ -3203,25 +3207,26 @@ L_Input:
|
||||
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"+@thanacode1+"^FF0000 - ^000000"+@thanacode2+"^000000 - ^000000"+@thanacode3+"^FF0000. Password";
|
||||
mes "will now be reset.^000000";
|
||||
set @thanatry,0;
|
||||
mes "^000000"+@yagu100+"^FF0000 - ^000000"+@yagu10+"^000000 - ^000000"+@yagu1+"^FF0000.";
|
||||
mes "Password will now be reset.^000000";
|
||||
close;
|
||||
}
|
||||
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;
|
||||
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;
|
||||
}
|
||||
}
|
||||
end;
|
||||
}
|
||||
|
||||
@ -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;
|
||||
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]";
|
||||
|
||||
@ -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;
|
||||
|
||||
@ -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,{
|
||||
|
||||
@ -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) {
|
||||
|
||||
@ -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)) {
|
||||
|
||||
@ -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";
|
||||
|
||||
@ -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;
|
||||
|
||||
@ -1155,20 +1155,7 @@ L_Retry:
|
||||
close;
|
||||
}
|
||||
}
|
||||
if ((@retry > 0) && (@retry < 5)) {
|
||||
mes "[Screen]";
|
||||
mes "*Beeeeep*";
|
||||
mes "Unauthorized";
|
||||
mes "numerical sequence.";
|
||||
next;
|
||||
mes "[Screen]";
|
||||
mes "Correct number";
|
||||
mes "in correct place";
|
||||
mes "in sequence total: ^FF0000"+@strike+"^000000";
|
||||
mes " ";
|
||||
mes "Correct number total: ^FF0000"+@ball+"^000000";
|
||||
goto L_Retry;
|
||||
}
|
||||
if (@retry > 4) {
|
||||
mes "[Screen]";
|
||||
mes "*Beeeeep*";
|
||||
mes "Unauthorized";
|
||||
@ -1190,6 +1177,19 @@ L_Retry:
|
||||
mes "will change upon retry.";
|
||||
close;
|
||||
}
|
||||
mes "[Screen]";
|
||||
mes "*Beeeeep*";
|
||||
mes "Unauthorized";
|
||||
mes "numerical sequence.";
|
||||
next;
|
||||
mes "[Screen]";
|
||||
mes "Correct number";
|
||||
mes "in correct place";
|
||||
mes "in sequence total: ^FF0000"+@strike+"^000000";
|
||||
mes " ";
|
||||
mes "Correct number total: ^FF0000"+@ball+"^000000";
|
||||
goto L_Retry;
|
||||
}
|
||||
}
|
||||
mes "^3355FFThis device is currently";
|
||||
mes "inactivated and not in";
|
||||
|
||||
@ -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";
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user