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

- Changed Sweet_Potato --> Potato to avoid confusion with the taming item. (bugreport:2150)

Browse Source 
- Changed duplicates in /npc/custom/ so the source is a floating/mapless npc. (bugreport:1335)
- Fixed some bad English in Biological Weapon Quest. (bugreport:1745)

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@15075 54d463be-8e91-2dee-dedb-b68131a5f0ec
This commit is contained in:
brianluau 2011-12-12 14:52:31 +00:00
parent e84ca342c0
commit d90c239808
7 changed files with 103 additions and 100 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
npc/cities/aldebaran.txt
View File

@ -1062,9 +1062,9 @@ aldeba_in,79,161,6 script Kafra#04 115,{
mes "The amount of special reserve points that you have is: ^FF0000"+RESRVPTS+"^000000 pts. Please make a choice based on your point total.";
M_Menu:
next;
menu "100- Sweet Potato 7 ea",M_1a, "200- Sweet Potato 15 ea",M_1b, "300- Sweet Potato 25 ea",M_1c, "400- Sweet Potato 35 ea",M_1d,
"500- Sweet Potato 50 ea",M_1e, "600- Sweet Potato 60 ea",M_1f, "700- Sweet Potato 75 ea",M_1g, "800- Sweet Potato 85 ea",M_1h,
"900- Sweet Potato 100 ea",M_1i, "1000- 1st Lottery Chance!",M_1j, "Next items",M_2, "Cancel",M_End;
menu "100- Potato 7 ea",M_1a, "200- Potato 15 ea",M_1b, "300- Potato 25 ea",M_1c, "400- Potato 35 ea",M_1d,
"500- Potato 50 ea",M_1e, "600- Potato 60 ea",M_1f, "700- Potato 75 ea",M_1g, "800- Potato 85 ea",M_1h,
"900- Potato 100 ea",M_1i, "1000- 1st Lottery Chance!",M_1j, "Next items",M_2, "Cancel",M_End;
M_1a:
if(RESRVPTS < 100) goto sL_LowPts1;
@ -1488,4 +1488,3 @@ function script F_ClockTowerGate {
close;
}
}

177
npc/custom/banks/kafra_bank.txt
View File

@ -1,14 +1,14 @@
//===== eAthena Script =======================================
//===== eAthena Script =======================================
//= The 2nd Bank of Prontera ( with daily 0.01% income! )
//===== By: ==================================================
//===== By: ==================================================
//= Lupus (1.0)
//===== Current Version: =====================================
//===== Current Version: =====================================
//= 1.2a
//===== Compatible With: =====================================
//===== Compatible With: =====================================
//= eAthena 1.x
//===== Description: =========================================
//===== Description: =========================================
//= A bank which has an interest %
//===== Additional Comments: =================================
//===== Additional Comments: =================================
// Look for this formula and setup your Bank daily % interest
// #kafrabank/1000 = 0.1% of interest per day
// #kafrabank/100 = 1% of interest per day
@ -16,100 +16,101 @@
//
// 1.1 Added log of bank operation -> logmes "some info";
// 1.2 Set max income to 100,000z. It would help to avoid
// zeny exploits when you change DATE at your server
// zeny exploits when you change DATE at your server
// 1.2a Corrected bad duplicate names. (bugreport:921) [Samuray22]
//============================================================
//============================================================
prontera,131,190,1 script Bank Clerk::bankg 833,{
mes"[Maniss]";
mes strcharinfo(0)+", welcome to the 2nd Bank of Prontera!";
- script Bank Clerk::bankg 833,{
mes"[Maniss]";
mes strcharinfo(0)+", welcome to the 2nd Bank of Prontera!";
set @kb_int,(gettime(6)*31)+gettime(5); //today's number
set @income,0;
//calculate %
if (#kafrabank<=0 || #kb_int>=@kb_int) goto L_NoIncomeToday;
set @income,(#kafrabank/1000)*(@kb_int-#kb_int); //@income == % of the sum
//max income constant:
if (@income>100000) set @income,100000;
set @kb_int,(gettime(6)*31)+gettime(5); //today's number
set @income,0;
//calculate %
if (#kafrabank<=0 || #kb_int>=@kb_int) goto L_NoIncomeToday;
set @income,(#kafrabank/1000)*(@kb_int-#kb_int); //@income == % of the sum
//max income constant:
if (@income>100000) set @income,100000;
L_NoIncomeToday:
set #kb_int,@kb_int; //reset days timer
if(#kafrabank==0) mes "We could open you an account.";
if(@income>0) mes "Today's income: ^135445" + @income + "^000000 zeny.";
set #kafrabank,#kafrabank+@income;
if(#kafrabank>0) mes "Your account: ^135445" + #kafrabank + "^000000 zeny.";
mes "What would you like?";
next;
if(#kafrabank==0) menu "-Open an account",-,"-Quit",B_EXIT2;
if(#kafrabank>0) menu "-Deposit money",-,"-Withdraw money",M_WITHDRAW,"-Quit",B_EXIT2;
set #kb_int,@kb_int; //reset days timer
mes"[Maniss]";
mes "Please, tell me how much zeny you would like to deposit.";
next;
if(input(@kafrabank) == 1) goto L_TOO_BIG_AMOUNT;
if(@kafrabank<1000) goto L_LESS_1000;
if(@kafrabank>zeny) goto L_NOT_ENOUGH;
set zeny,zeny-@kafrabank;
set #kafrabank,#kafrabank+@kafrabank;
mes"[Maniss]";
mes "You've made a deposit of ^135445" + @kafrabank + "z^000000.";
//we log these zeny operations into the log db
logmes "Bank %: " + @income +"z, Deposit: "+ @kafrabank +"z, Final: "+ #kafrabank +"z";
goto B_EXIT;
if(#kafrabank==0) mes "We could open you an account.";
if(@income>0) mes "Today's income: ^135445" + @income + "^000000 zeny.";
set #kafrabank,#kafrabank+@income;
if(#kafrabank>0) mes "Your account: ^135445" + #kafrabank + "^000000 zeny.";
mes "What would you like?";
next;
if(#kafrabank==0) menu "-Open an account",-,"-Quit",B_EXIT2;
if(#kafrabank>0) menu "-Deposit money",-,"-Withdraw money",M_WITHDRAW,"-Quit",B_EXIT2;
M_WITHDRAW:
if(#kafrabank==0) goto L_ZERO_ACCOUNT;
mes"[Maniss]";
mes "Your account: ^135445" + #kafrabank + "^000000 zeny.";
mes "How much zeny would you like to withdraw?";
next;
if(input(@kafrabank) == 1) goto L_TOO_BIG_AMOUNT;
if(@kafrabank<1) goto B_EXIT2;
if(@kafrabank>#kafrabank) goto L_NOT_ENOUGH;
set #kafrabank,#kafrabank-@kafrabank;
set zeny,zeny+@kafrabank;
mes"[Maniss]";
mes "Here is your ^135445" + @kafrabank + "z^000000, put your sign here...";
//we log these zeny operations into the log db
logmes "Bank %: " + @income +"z, Withdraw: "+ @kafrabank +"z, Final: "+ #kafrabank +"z";
goto B_EXIT;
L_NOT_ENOUGH:
mes"[Maniss]";
mes "You don't have enough zeny for this operation.";
next;
goto B_EXIT2;
mes"[Maniss]";
mes "Please, tell me how much zeny you would like to deposit.";
next;
if(input(@kafrabank) == 1) goto L_TOO_BIG_AMOUNT;
L_ZERO_ACCOUNT:
mes"[Maniss]";
mes "You don't have any zeny on your account!";
next;
goto B_EXIT2;
if(@kafrabank<1000) goto L_LESS_1000;
if(@kafrabank>zeny) goto L_NOT_ENOUGH;
set zeny,zeny-@kafrabank;
set #kafrabank,#kafrabank+@kafrabank;
mes"[Maniss]";
mes "You've made a deposit of ^135445" + @kafrabank + "z^000000.";
//we log these zeny operations into the log db
logmes "Bank %: " + @income +"z, Deposit: "+ @kafrabank +"z, Final: "+ #kafrabank +"z";
goto B_EXIT;
L_TOO_BIG_AMOUNT:
mes"[Maniss]";
mes "Sorry. The maximum deposit you can make on a time is 10,000,000 zeny.";
next;
goto B_EXIT2;
M_WITHDRAW:
if(#kafrabank==0) goto L_ZERO_ACCOUNT;
mes"[Maniss]";
mes "Your account: ^135445" + #kafrabank + "^000000 zeny.";
mes "How much zeny would you like to withdraw?";
next;
if(input(@kafrabank) == 1) goto L_TOO_BIG_AMOUNT;
if(@kafrabank<1) goto B_EXIT2;
if(@kafrabank>#kafrabank) goto L_NOT_ENOUGH;
set #kafrabank,#kafrabank-@kafrabank;
set zeny,zeny+@kafrabank;
mes"[Maniss]";
mes "Here is your ^135445" + @kafrabank + "z^000000, put your sign here...";
//we log these zeny operations into the log db
logmes "Bank %: " + @income +"z, Withdraw: "+ @kafrabank +"z, Final: "+ #kafrabank +"z";
goto B_EXIT;
L_NOT_ENOUGH:
mes"[Maniss]";
mes "You don't have enough zeny for this operation.";
next;
goto B_EXIT2;
L_ZERO_ACCOUNT:
mes"[Maniss]";
mes "You don't have any zeny on your account!";
next;
goto B_EXIT2;
L_TOO_BIG_AMOUNT:
mes"[Maniss]";
mes "Sorry. The maximum deposit you can make on a time is 10,000,000 zeny.";
next;
goto B_EXIT2;
L_LESS_1000:
mes"[Maniss]";
mes "We're sorry, the minimum amount of zeny you can deposit is 1,000 zeny.";
next;
goto B_EXIT2;
L_LESS_1000:
mes"[Maniss]";
mes "We're sorry, the minimum amount of zeny you can deposit is 1,000 zeny.";
next;
goto B_EXIT2;
B_EXIT:
mes "Very well... Come again soon!";
next;
mes "Very well... Come again soon!";
next;
B_EXIT2:
mes"[Maniss]";
mes "Thank you for using our Bank Service. We hope to see you again soon.";
close;
B_EXIT2:
mes"[Maniss]";
mes "Thank you for using our Bank Service. We hope to see you again soon.";
close;
}
prontera,131,190,1 duplicate(bankg) Bank Clerk#1-1 833
geffen,125,73,3 duplicate(bankg) Bank Clerk#2-1 833
izlude,145,107,1 duplicate(bankg) Bank Clerk#3-1 833
morocc,147,84,7 duplicate(bankg) Bank Clerk#4-1 833
morocc,147,84,7 duplicate(bankg) Bank Clerk#4-1 833

3
npc/custom/battleground/bg_common.txt
View File

@ -5,7 +5,7 @@
// BattleGround Warper - Entrance
// *********************************************************************
payon,189,104,3 script Maroll Battle Recruiter::BatRecruit 728,{
- script Maroll Battle Recruiter::BatRecruit 728,{
mes "[Maroll Battle Recruiter]";
mes "Good day, adventurer.";
mes "I'm a knight from a far country called Maroll Kingdom.";
@ -26,6 +26,7 @@ payon,189,104,3 script Maroll Battle Recruiter::BatRecruit 728,{
end;
}
payon,189,104,3 duplicate(BatRecruit) Maroll Battle Recruiter::BatRecruit1 728
prontera,123,83,5 duplicate(BatRecruit) Maroll Battle Recruiter::BatRecruit2 728
rachel,149,138,5 duplicate(BatRecruit) Maroll Battle Recruiter::BatRecruit3 728
moc_ruins,75,162,5 duplicate(BatRecruit) Maroll Battle Recruiter::BatRecruit4 728

5
npc/custom/healers/heal.txt
View File

@ -15,7 +15,7 @@
//= 3.1 Optimized for the greater good. [Kisuka]
//============================================================
prontera,150,184,5 script Healer#h1-1::Healer 742,{
- script Healer#h1-1::Healer 742,{
mes "[Healer]";
mes "I have amazing healing powers!!";
mes "You look like a person who needs them";
@ -34,6 +34,7 @@ prontera,150,184,5 script Healer#h1-1::Healer 742,{
}
// --------- NPC Clones ---------
prontera,150,184,5 duplicate(Healer) Healer#h1-1 742
morocc,159,96,5 duplicate(Healer) Healer#h1-2 742
ayothaya,155,111,5 duplicate(Healer) Healer#h1-3 742
geffen,121,61,5 duplicate(Healer) Healer#h1-4 742
@ -48,4 +49,4 @@ amatsu,200,80,5 duplicate(Healer) Healer#h1-12 742
gonryun,164,130,5 duplicate(Healer) Healer#h1-13 742
yuno,152,186,5 duplicate(Healer) Healer#h1-14 742
niflheim,188,180,5 duplicate(Healer) Healer#h1-15 742
louyang,225,103,5 duplicate(Healer) Healer#h1-16 742
louyang,225,103,5 duplicate(Healer) Healer#h1-16 742

5
npc/custom/healers/heal_payment.txt
View File

@ -18,7 +18,7 @@
//= Removed Duplicates [Silent]
//============================================================
prontera,150,184,5 script Healer#h2-1::Healer2 742,{
- script Healer#h2-1::Healer2 742,{
set @tempHp, MaxHp-Hp;
set @tempSpReal, MaxSp-Sp;
set @tempSp, ((MaxSp-Sp) * BaseLevel) / 5;
@ -90,6 +90,7 @@ prontera,150,184,5 script Healer#h2-1::Healer2 742,{
}
prontera,150,184,5 duplicate(Healer2) Healer#h2-1 742
morocc,159,96,5 duplicate(Healer2) Healer#h2-2 742
ayothaya,155,111,5 duplicate(Healer2) Healer#h2-3 742
geffen,121,61,5 duplicate(Healer2) Healer#h2-4 742
@ -104,4 +105,4 @@ amatsu,200,80,5 duplicate(Healer2) Healer#h2-12 742
gonryun,164,130,5 duplicate(Healer2) Healer#h2-13 742
yuno,152,186,5 duplicate(Healer2) Healer#h2-14 742
niflheim,188,180,5 duplicate(Healer2) Healer#h2-15 742
louyang,225,103,5 duplicate(Healer2) Healer#h2-16 742
louyang,225,103,5 duplicate(Healer2) Healer#h2-16 742

2
npc/custom/stock_market.txt
View File

@ -790,4 +790,4 @@ mes "Goodbye.";
close;
}
prontera,140,181,5 duplicate(stockmarket) Stock Market 109
prontera,140,181,5 duplicate(stockmarket) Stock Market 109

4
npc/quests/quests_hugel.txt
View File

@ -1404,8 +1404,8 @@ hu_in01,326,307,3 script Siria 90,{
mes "needs some more.";
next;
mes "[Siria]";
mes "Oh, thank God! Okay, well,";
mes "I just ran out of the medicine.";
mes "Aww, I just ran out of";
mes "the medicine too. Find";
mes "Morriphen's friend, and get";
mes "it from him. He's supposed to";
mes "be in Lighthalzen, somewhere...";