git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@8806 54d463be-8e91-2dee-dedb-b68131a5f0ec

This commit is contained in:
Lupus 2006-09-19 11:08:21 +00:00
parent cf75d0d331
commit b0ff60c47b
4 changed files with 186 additions and 221 deletions

View File

@ -32,6 +32,8 @@ Playtester
Date Added
======
09/19
* Preparations for optimization of Louyang/Nifelhem scripts [Lupus]
09/16
* fixed apple dice game in Airship, fixed missing } in Einbech quests [Lupus]
09/15

View File

@ -3,7 +3,7 @@
//===== By: ==================================================
//= Nexon
//===== Current Version: =====================================
//= 1.3
//= 1.4
//===== Compatible With: =====================================
//= eAthena Revision 3000+
//===== Description: =========================================
@ -374,22 +374,21 @@ einbroch.gat,232,272,3 script Train Station Staff#01::EinbrochTrain 852,{
mes "stay in Einbroch.";
close;
s_Yes:
if(Zeny < 200)goto s_NEnough;
mes "[Staff]";
if(Zeny < 200){
mes "I'm sorry but you";
mes "do not have enough";
mes "money to pay the fee.";
close;
}
set Zeny,Zeny - 200;
mes "Thank you";
mes "very much.";
mes "Have a safe trip.";
mes "^111111*Ahem*^000000 All aboard!";
close2;
set Zeny,Zeny - 200;
warp "einbech.gat",43,215;
end;
s_NEnough:
mes "[Staff]";
mes "I'm sorry but you";
mes "do not have enough";
mes "money to pay the fee.";
close;
s_Enviroment:
mes "[Staff]";
mes "Einbroch is infamous for";
@ -665,17 +664,17 @@ ein_in01.gat,68,209,4 script Khashurantze 852,{
mes "special authority in order";
mes "to enter this place. I'll have";
mes "to ask you to leave right now.";
if(EinFactory > 0)goto L_work;
if(EinFactory > 0){
next;
mes "[Khashurantze]";
mes "Oh? Mr. Zelmeto asked you to help out?";
mes "In that case excuse me.";
close;
}
close2;
warp "einbroch.gat",179,63;
end;
L_work:
next;
mes "[Khashurantze]";
mes "Oh? Mr. Zelmeto asked you to help out?";
mes "In that case excuse me.";
close;
}
ein_in01.gat,113,211,3 script Treinz 851,{
@ -923,8 +922,13 @@ s_Save:
close;
s_Rest:
if(Zeny < 5000)goto s_NEnoughZeny;
mes "[Hotel Employee]";
if(Zeny < 5000){
mes "I'm sorry but";
mes "you don't seem";
mes "to have enough zeny.";
close;
}
mes "Thank you.";
mes "Please enjoy";
mes "your rest~";
@ -934,13 +938,6 @@ s_Rest:
percentheal 100,100;
end;
s_NEnoughZeny:
mes "[Hotel Employee]";
mes "I'm sorry but";
mes "you don't seem";
mes "to have enough zeny.";
close;
}
ein_in01.gat,21,147,4 script Megass 853,3,3,{

View File

@ -3,7 +3,7 @@
//===== By: ==================================================
//= erKURITA
//===== Current Version: =====================================
//= 1.0
//= 1.0a
//===== Compatible With: =====================================
//= eAthena 1.0
//===== Description: =========================================
@ -19,6 +19,7 @@
//= 0.8 Removed Duplicates [Silent]
//= 0.9 Removed Duplicates [Toms]
//= 1.0 Added a missing feature to the donation NPC [MasterOfMuppets]
//= 1.0a added constants to emotions, minor optimization [Lupus]
//=============================================================
lighthalzen.gat,198,285,5 script Jiwon 862,{
@ -40,7 +41,6 @@ lighthalzen.gat,198,285,5 script Jiwon 862,{
}
lighthalzen.gat,220,244,3 script Samnang 863,{
mes "[Samnang]";
@ -590,8 +590,8 @@ lighthalzen.gat,182,102,3 script Lucius 866,{
next;
menu "Sure.",s_Sure,"No, thanks.",-;
s_Cancel:
mes "[Lucius]";
s_Cancel:
mes "I understand. Still,";
mes "keep in mind that when";
mes "you give from your heart,";
@ -609,12 +609,25 @@ s_Sure:
mes "to cancel, please enter '0'.";
next;
input @zenydonate;
if(@zenydonate > 30000)goto s_Much;
if(!@zenydonate)goto s_Cancel;
if(Zeny < @zenydonate)goto s_NEnoughZ;
set Zeny,Zeny - @zenydonate;
set $donatedzeny,$donatedzeny + @zenydonate;
mes "[Lucius]";
if(!@zenydonate)goto s_Cancel;
if(@zenydonate > 30000){
mes "I'm sorry but you can't";
mes "donate more than 30,000";
mes "zeny. Please choose another";
mes "number.";
close;
}
if(Zeny < @zenydonate){
mes "I'm sorry but you do";
mes "not have as much zeny";
mes "as you wish to donate.";
mes "Please come back when you";
mes "do!";
close;
}
set Zeny,Zeny - @zenydonate;
set $donatedzeny,$donatedzeny + @zenydonate;
mes "Thank you so much";
mes "for your " + @zenydonate + " zeny donation.";
mes "I promise that your money";
@ -627,39 +640,21 @@ s_Sure:
mes "donations. I'm glad to see";
mes "that there are still kinda and";
mes "generous people in the world.";
if($donatedzeny > 259999)
{
next;
mes "[Lucius]";
mes "This should be enough";
mes "to send to the Poor Relief";
mes "Organization. Please accpet";
mes "this small gift as a token of";
mes "my gratitude, adventurer. Bless";
mes "you, youngster and take care.";
getitem 603,1;
getitem 12016,1;
set $donatedzeny,0;
if($donatedzeny > 259999){
next;
mes "[Lucius]";
mes "This should be enough";
mes "to send to the Poor Relief";
mes "Organization. Please accpet";
mes "this small gift as a token of";
mes "my gratitude, adventurer. Bless";
mes "you, youngster and take care.";
getitem 603,1;
getitem 12016,1;
set $donatedzeny,0;
}
close;
s_Much:
mes "[Lucius]";
mes "I'm sorry but you can't";
mes "donate more than 30,000";
mes "zeny. Please choose another";
mes "number.";
close;
s_NEnoughZ:
mes "[Lucius]";
mes "I'm sorry but you do";
mes "not have as much zeny";
mes "as you wish to donate.";
mes "Please come back when you";
mes "do!";
close;
}
lighthalzen.gat,147,105,3 script Laqumet 869,{
@ -1019,7 +1014,7 @@ lighthalzen.gat,296,239,3 script Berru 706,{
mes "[Berru]";
mes "Daddy...! Waaaaah~!";
mes "I wanna see my daddy!";
emotion 28;
emotion e_sob;
next;
mes "[Pilia]";
mes "Berru, I don't";
@ -1033,7 +1028,7 @@ lighthalzen.gat,296,239,3 script Berru 706,{
mes "home! He said he'll";
mes "bring us candy tonight!";
mes "You go sleep first, Pilia!";
emotion 7;
emotion e_ag;
next;
mes "[Pilia]";
mes "*Sigh...*";
@ -1054,18 +1049,22 @@ lighthalzen.gat,312,234,2 script Beggar 777,{
mes "Would you give me";
mes "some money?";
next;
menu "Give him some money.",L_give,"Ignore him.",-;
mes "[" + strcharinfo(0) + "]";
mes "...";
mes "......";
close;
L_give:
if(Zeny < 50)goto L_zeny;
if(select("Give him some money.:Ignore him.")==2){
mes "[" + strcharinfo(0) + "]";
mes "...";
mes "......";
close;
}
if(Zeny < 50){
mes "[Beggar]";
mes "You don't seem to have";
mes "enough zeny.";
close;
}
set Zeny,Zeny-50;
mes "[" + strcharinfo(0) + "]";
mes "Here you go,";
mes "take this.";
set Zeny,Zeny-50;
next;
mes "[Beggar]";
mes "Thank you so much.";
@ -1074,7 +1073,7 @@ L_give:
mes "a story with you and impart";
mes "some of the wisdom I've";
mes "learned over the years.";
emotion 15;
emotion e_thx;
next;
mes "[Beggar]";
mes "Anger. People deal with";
@ -1134,12 +1133,6 @@ L_give:
mes "to take in, I know.";
close;
L_zeny:
mes "[Beggar]";
mes "You don't seem to have";
mes "enough zeny.";
close;
}
// ---------------------------------------------------------------------------
@ -1158,7 +1151,7 @@ lighthalzen.gat,311,194,3 script Reuben 870,{
mes "Did you just hear";
mes "me talk to myself?";
mes "Crud! Don't be so nosy!";
emotion 6;
emotion e_an;
close;
}
@ -1260,7 +1253,7 @@ lighthalzen.gat,337,296,3 script Employee 867,{
mes "professional positions. This";
mes "is a great chance to make a";
mes "difference... and some money~";
emotion 21;
emotion e_no1;
close;
}
@ -1372,7 +1365,7 @@ lhz_in01.gat,125,40,2 script Dowbow Ryuei#Dowbow_Ryuei 843,{
mes "outlook on life. If you don't";
mes "mind, I'd like to shake";
mes "your hand, adventurer.";
emotion 21;
emotion e_no1;
close;
L_reality:
@ -2003,8 +1996,16 @@ s_Staff:
lhz_in01.gat,19,129,0 script LhzHiddenTrg1::LhzTrig -1,1,1{
OnTouch:
if(isequipped(2241) && isequipped(2243)) goto s_Staff;
mes "[Rekenber Guard]";
if(isequipped(2241) && isequipped(2243)){
mes "Keep your eyes open.";
mes "I've heard rumors that some";
mes "adventurers from Rune-Midgard";
mes "are trying to sneak into here!";
mes "I know the security here is";
mes "pretty much failsafe, but...";
close;
}
mes "This area is restricted";
mes "to the public! Who are you";
mes "and how did you get in here?!";
@ -2013,16 +2014,6 @@ OnTouch:
warp "lhz_in01.gat",34,224;
end;
s_Staff:
mes "[Rekenber Guard]";
mes "Keep your eyes open.";
mes "I've heard rumors that some";
mes "adventurers from Rune-Midgard";
mes "are trying to sneak into here!";
mes "I know the security here is";
mes "pretty much failsafe, but...";
close;
}
lhz_in01.gat,23,137,0 duplicate(LhzTrig) LhzHiddenTrg2 -1,1,1
@ -2031,8 +2022,30 @@ lhz_in01.gat,24,131,2 duplicate(LhzTrig) Rekenber Guard#02 867
lhz_in01.gat,25,141,4 script Regenschirm Guard 868,{
if(isequipped(2241) && isequipped(2243)) goto s_Staff;
mes "[Regenschirm Guard]";
if(isequipped(2241) && isequipped(2243)){
mes "Do you wish to";
mes "go underground?";
next;
if(select("Yes:No")==1){
if(isequipped(2657)){
warp "lhz_dun01.gat",150,288;
end;
}
mes "[Regenschirm Guard]";
mes "I'm sorry but I can't let";
mes "staff without proper autorization";
mes "pass. Only staff members with";
mes "Laboratory Passports are allowed";
mes "to enter the underground.";
close;
}
mes "[Regenschirm Guard]";
mes "Thank you and";
mes "have a nice day.";
close;
}
mes "This area is restricted";
mes "to the public! Who are you";
mes "and how did you get in here?!";
@ -2041,30 +2054,4 @@ lhz_in01.gat,25,141,4 script Regenschirm Guard 868,{
warp "lhz_in01.gat",34,224;
end;
s_Staff:
mes "[Regenschirm Guard]";
mes "Do you wish to";
mes "go underground?";
next;
menu "Yes",s_Yes,"No",-;
mes "[Regenschirm Guard]";
mes "Thank you and";
mes "have a nice day.";
close;
s_Yes:
if(isequipped(2657)) goto s_Auth;
mes "[Regenschirm Guard]";
mes "I'm sorry but I can't let";
mes "staff without proper autorization";
mes "pass. Only staff members with";
mes "Laboratory Passports are allowed";
mes "to enter the underground.";
close;
s_Auth:
warp "lhz_dun01.gat",150,288;
end;
}

View File

@ -8,7 +8,7 @@
//= MasterOfMuppets (2.0)
//= eAthena Dev Team
//===== Current Version: =====================================
//= 2.7
//= 2.7a
//===== Compatible With: =====================================
//= Any eAthena Version
//===== Description: =========================================
@ -33,7 +33,7 @@
//= 2.6 Removed Duplicates [Silent]
//= 2.6a Updated a few names with new item_db.txt names [Evera]
//= 2.7 Split quests to quests/quests_louyang.txt [Evera]
//= Replaced some instances of using global vars when not needed [Evera]
//= 2.7a Minor optimizations before Louyang quests [Lupus]
//============================================================
alberta.gat,245,45,4 script Girl#02 815,{
@ -81,8 +81,14 @@ M_GOTO:
next;
menu "Sure",-,"Cancel",M_CANCEL2;
if(Zeny < 10000) goto L_NOZENY;
mes "[Girl]";
if(Zeny < 10000){
mes "...";
mes "You don't seem";
mes "to have 10,100 zeny...";
mes "Go get some money first!";
close;
}
mes "Okay~";
mes "Ready!";
mes "Have fun!";
@ -91,14 +97,6 @@ M_GOTO:
warp "lou_fild01.gat",190,101;
end;
L_NOZENY:
mes "[Girl]";
mes "...";
mes "You don't seem";
mes "to have 10,100 zeny...";
mes "Go get some money first!";
close;
M_CANCEL:
mes "[Girl]";
mes "Oh...";
@ -519,90 +517,71 @@ louyang.gat,276,136,4 script Fist Master 819,{
}
louyang.gat,272,133,0 script Trainee::trainees 819,{
set @talk,rand(12);
if(@talk == 1) goto L_QUOT1;
if(@talk == 2) goto L_QUOT2;
if(@talk == 3) goto L_QUOT3;
if(@talk == 4) goto L_QUOT4;
if(@talk == 5) goto L_QUOT5;
if(@talk == 6) goto L_QUOT6;
if(@talk == 7) goto L_QUOT7;
if(@talk == 8) goto L_QUOT8;
if(@talk == 9) goto L_QUOT9;
if(@talk == 10) goto L_QUOT10;
if(@talk == 11) goto L_QUOT11;
L_QUOT0:
mes "[Trainee]";
mes "Aha~!";
mes "Hai~!!";
mes "Huh...";
close;
L_QUOT1:
mes "[Trainee]";
mes "Woh~!";
mes "Hai~!!";
mes "Huh huh...";
close;
L_QUOT2:
mes "[Trainee]";
mes "Kyaa~";
mes "Yah~~!!";
mes ".......";
close;
L_QUOT3:
mes "[Trainee]";
mes "Hu~!";
mes "Hu hu~~!!";
mes "Hu...";
close;
L_QUOT4:
mes "[Trainee]";
mes "Wah?!";
mes "Ahchiu~~!!";
mes "Wah...";
close;
L_QUOT5:
mes "[Trainee]";
mes "Yaah~";
mes "...!";
mes "........!!";
close;
L_QUOT6:
mes "[Trainee]";
mes "Chongchiu!!";
mes "Hu~~!!";
mes "Hwooh~~";
close;
L_QUOT7:
mes "[Trainee]";
mes "Zhua loh~!";
mes ".....";
mes "Hu";
close;
L_QUOT8:
mes "[Trainee]";
mes "One hit~!";
mes "Hai~!!";
mes "Yah~!!";
close;
L_QUOT9:
mes "[Trainee]";
mes "Ai yah..";
mes "Yaahah~~";
mes "(rolls around)......";
close;
L_QUOT10:
mes "[Trainee]";
mes "Niu ah...";
mes "One~~!!";
mes "Two~~!!!";
close;
L_QUOT11:
mes "[Trainee]";
mes "Yeeah~!";
mes "Ah Im so tired~~!!";
mes "(faints).....";
close;
switch(rand(12)){
case 0:
mes "Aha~!";
mes "Hai~!!";
mes "Huh...";
close;
case 1:
mes "[Trainee]";
mes "Woh~!";
mes "Hai~!!";
mes "Huh huh...";
close;
case 2:
mes "Kyaa~";
mes "Yah~~!!";
mes ".......";
close;
case 3:
mes "Hu~!";
mes "Hu hu~~!!";
mes "Hu...";
close;
case 4:
mes "Wah?!";
mes "Ahchiu~~!!";
mes "Wah...";
close;
case 5:
mes "Yaah~";
mes "...!";
mes "........!!";
close;
case 6:
mes "Chongchiu!!";
mes "Hu~~!!";
mes "Hwooh~~";
close;
case 7:
mes "Zhua loh~!";
mes ".....";
mes "Hu";
close;
case 8:
mes "One hit~!";
mes "Hai~!!";
mes "Yah~!!";
close;
case 9:
mes "Ai yah..";
mes "Yaahah~~";
mes "(rolls around)......";
close;
case 10:
mes "Niu ah...";
mes "One~~!!";
mes "Two~~!!!";
close;
case 11:
default:
mes "Yeeah~!";
mes "Ah Im so tired~~!!";
mes "(faints).....";
close;
}
}
louyang.gat,272,131,0 duplicate(trainees) Trainee#2 819
@ -737,8 +716,11 @@ lou_in01.gat,25,23,4 script Friendly Looking Lady 817,{
mes "person.";
close;
s_Yes:
if(zeny < 500)goto L_Zeny;
mes "[Hong Miao]";
if(zeny < 500){
mes "I am sorry, but you don't have enough money.";
close;
}
mes "Thank for your patronage.";
mes "We are trying to provide you with";
mes "the best service, Please";
@ -747,10 +729,7 @@ s_Yes:
set Zeny,Zeny - 500;
warp "lou_in01.gat",16,19;
end;
L_Zeny:
mes "[Hong Miao]";
mes "I am sorry, but you don't have enough money.";
close;
s_Next_Time:
mes "[Hong Miao]";
mes "Please come";
@ -778,6 +757,6 @@ lou_in02.gat,272,55,1 script Familiar-Looking Patient 86,{
mes "*Cough cough...*";
mes "Awww......www...";
mes "Aww...wwww..";
emotion 9;
emotion e_dots;
close;
}