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

* Implemented all Mora quests (excluding instance-related quests and Mora Enchants).

Browse Source 
* Updated Mora town NPCs, Quiver Maker, and guides.
* Updated Bifrost spawns and warps.
* Fixed a small error in the new refiners - thanks, Joseph!
* Other misc. changes.

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@17340 54d463be-8e91-2dee-dedb-b68131a5f0ec
This commit is contained in:
euphyy 2013-06-01 02:28:42 +00:00
parent 98e5b868e1
commit 112030451a
25 changed files with 6354 additions and 1461 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
db/quest_db.txt
View File

@ -32,6 +32,7 @@
1116,0,0,0,0,0,0,0,"Ropewa & Yuridi - Dead Man's Song"
1117,0,0,0,0,0,0,0,"Ropewa & Yuridi - Eternal Promise, Broken Ring"
1118,0,0,0,0,0,0,0,"Neighborhood Knight - I Need Clues"
1119,82800,0,0,0,0,0,0,"Neighborhood Knight - Cooldown"
1145,0,0,0,0,0,0,0,"Help the poor cat"
1146,0,0,0,0,0,0,0,"Help the poor cat"
@ -525,7 +526,11 @@
5027,0,0,0,0,0,0,0,"Northern Pool Research"
5028,43200,0,0,0,0,0,0,"Inspection of the Sample"
5029,3600,0,0,0,0,0,0,"Unidentified Creature"
5030,0,0,0,0,0,0,0,"The creature's family"
5031,0,0,0,0,0,0,0,"The creature's family"
5032,0,0,0,0,0,0,0,"The creature's family"
5033,0,0,0,0,0,0,0,"The creature's family"
5034,0,0,0,0,0,0,0,"News from the family"
5035,0,0,0,0,0,0,0,"Help the old man!"
5036,0,0,0,0,0,0,0,"Help the old man!"
5037,0,0,0,0,0,0,0,"Help the old man!"
@ -854,7 +859,7 @@
7203,0,0,0,0,0,0,0,"Secret order from Doha - Final Report"
7206,0,0,0,0,0,0,0,"New Day for Cheshire"
7207,0,0,0,0,0,0,0,"Cheshire's Box"
7208,82800,0,0,0,0,0,0,"Wait for Cheshire?"
7208,86400,0,0,0,0,0,0,"Wait for Cheshire?"
// Misty Forest Labyrinth
7211,9000,0,0,0,0,0,0,"Misty Forest Labyrinth Exploration"
@ -1682,8 +1687,8 @@
11176,0,0,0,0,0,0,0,"For my friends"
// Mora
11182,180,0,0,0,0,0,0,"Teohre's Report"
11183,0,0,0,0,0,0,0,"Teohre's Favor"
11182,60,0,0,0,0,0,0,"Theore's Report"
11183,0,0,0,0,0,0,0,"Theore's Favor"
11184,0,0,0,0,0,0,0,"Runaway Laphine"
11185,0,0,0,0,0,0,0,"Pouch"
11186,0,0,0,0,0,0,0,"Pouch"

2
npc/cities/louyang.txt
View File

@ -1,5 +1,5 @@
//===== rAthena Script =======================================
//= Louyang City NPC's
//= Louyang City NPCs
//===== By: ==================================================
//= Vidar (1.0)
//= Mass Zero (1.1)

1
npc/re/cities/dewata.txt
View File

@ -7,6 +7,7 @@
//===== Compatible With: =====================================
//= rAthena SVN
//===== Description: =========================================
//= [Official Conversion]
//= Dewata Town Script
//===== Additional Comments: =================================
//= 1.0 First version.

1
npc/re/cities/dicastes.txt
View File

@ -7,6 +7,7 @@
//===== Compatible With: =====================================
//= rAthena SVN
//===== Description: =========================================
//= [Official Conversion]
//= El Dicastes Town Script
//===== Additional Comments: =================================
//= 1.0 First version.

1
npc/re/cities/malangdo.txt
View File

@ -7,6 +7,7 @@
//===== Compatible With: =====================================
//= rAthena SVN
//===== Description: =========================================
//= [Official Conversion]
//= Malangdo Town Script
//===== Additional Comments: =================================
//= 1.0 First version. [Euphy]

1
npc/re/cities/malaya.txt
View File

@ -7,6 +7,7 @@
//===== Compatible With: =====================================
//= rAthena SVN
//===== Description: =========================================
//= [Official Conversion]
//= Port Malaya Town Script
//===== Additional Comments: =================================
//= 0.1 Alberta sailors only. [Euphy]

1596
npc/re/cities/mora.txt
View File

File diff suppressed because it is too large Load Diff

8
npc/re/guides/guides_mora.txt
View File

@ -12,7 +12,7 @@
//= 1.0 First version. [Euphy]
//============================================================
mora,25,158,6 script Raffle Guide#west 516,{
mora,25,158,5 script Raffle Guide#north 516,{
mes "[Raffoh]";
mes "Laoh~!";
mes "Welcome to the Village of Mora.";
@ -62,7 +62,7 @@ mora,25,158,6 script Raffle Guide#west 516,{
}
}
mora,167,76,4 script Raffle Guide#east 522,{
mora,167,76,3 script Raffle Guide#east 522,{
mes "[Raffuh]";
mes "Uh...";
mes "This, this is the Village of Mora.";
@ -112,7 +112,7 @@ mora,167,76,4 script Raffle Guide#east 522,{
}
}
mora,115,138,4 script Raffle Guide#center 524,{
mora,115,138,5 script Raffle Guide#center 524,{
mes "[Raffla]";
mes "Lala!";
mes "Welcome to the Village of Mora la!";
@ -163,7 +163,7 @@ mora,115,138,4 script Raffle Guide#center 524,{
}
}
mora,72,51,4 script Raffle Guide#south 518,{
mora,72,51,3 script Raffle Guide#south 518,{
mes "[Raffli]";
mes "Lali?";
mes "Welcome to the Village of Mora.";

4
npc/re/kafras/kafras.txt
View File

@ -49,12 +49,12 @@ izlude,128,148,6 duplicate(kaf_izlude) Kafra Employee 117
//============================================================
malaya,71,79,4 script Kafra Employee::kaf_malaya1 581,{
callfunc "F_Kafra",0,3,2,500,700;
savepoint "malaya",43,57;
savepoint "malaya",44,56;
callfunc "F_KafEnd",0,1,"in Port Malaya";
}
malaya,234,204,4 script Kafra Employee::kaf_malaya2 581,{
callfunc "F_Kafra",0,3,2,500,700;
savepoint "malaya",280,213;
savepoint "malaya",281,212;
callfunc "F_KafEnd",0,1,"in Port Malaya";
}

2
npc/re/merchants/blessed_refiner.txt
View File

@ -122,7 +122,7 @@
mes "I am busy, don't joke with me!";
close;
}
if (getequiprefinerycnt(.@part) < 100) {
if (getequippercentrefinery(.@part) < 100) {
mes "[Blacksmith Dister]";
mes "This "+.@type$+" has been refined many times. Although it will not disappear upon failure, the "+.@ore$+" will disappear!";
next;

2
npc/re/merchants/enchan_mal.txt
View File

@ -67,7 +67,7 @@ malangdo,213,167,4 script Mayomayo#mal 555,{
set @mal_equip_id, getequipid(EQI_HAND_R);
set .@equip_type, getiteminfo(@mal_equip_id,11);
//callsub L_Socket,<cost multiplier>,<type>;
//callsub L_Socket,<cost multiplier>,<4-x enchants possible>;
switch(.@equip_type) { // Check weapon type first to speed up the checks.
case 1: // Daggers
switch(@mal_equip_id) {

4
npc/re/merchants/hd_refiner.txt
View File

@ -107,7 +107,7 @@
mes "I will wait until you are ready.";
close;
}
if (getequiprefinerycnt(.@part) < 100) {
if (getequippercentrefinery(.@part) < 100) {
mes "[Blacksmith Mighty Hammer]";
mes "It looks like this item will likely fail to be refined.";
mes "Well, even if it fails, it only decreases by 1 refine level.";
@ -254,7 +254,7 @@ lhz_in02,280,19,3 duplicate(MightyHammer) Mighty Hammer#lhz 826
mes "Okay. If that's what you want...";
close;
}
if (getequiprefinerycnt(.@part) < 100) {
if (getequippercentrefinery(.@part) < 100) {
mes "[Basta]";
mes "This "+.@type$+" has already been refined pretty high.";
mes "If you try to refine it more, the refine level could decrease.";

23
npc/re/merchants/quivers.txt
View File

@ -3,7 +3,7 @@
//===== By: ==================================================
//= Muad_Dib (Prometheus Project); L0ne_W0lf
//===== Current Version: =====================================
//= 1.0
//= 1.1
//===== Compatible With: =====================================
//= rAthena SVN
//===== Description: =========================================
@ -15,9 +15,22 @@
// arg(3): The quiver given by the NPC (item ID).
//===== Additional Comments: =================================
//= 1.0 Added Mora NPC. [Euphy]
//= 1.1 Updated to match the official scripts. [Euphy]
//============================================================
mora,106,117,4 script Quiver Maker#mora 516,{
mora,106,117,3 script Quiver Maker#mora 516,{
if (checkweight(1201,1) == 0) {
mes "[Quiver Maker]";
mes "You have too many things with you.";
mes "Make some space in your inventory and come back. I'll tell you something interesting.";
close;
}
if (MaxWeight - Weight < 2000) {
mes "[Quiver Maker]";
mes "You seem worn out with all that stuff.";
mes "Make some space in your inventory and come back. I'll tell you something interesting.";
close;
}
mes "[Quiver Maker]";
mes "Mora villagers ask what good quivers are. They just don't know how the world works.";
mes "No wonder they don't know a thing about quivers - spreading jam over leaves all day long.";
@ -81,6 +94,7 @@ S_BuyQuiver:
set .@quiver, 1;
set .@arrows_used, getarg(1);
set .@arrow_zeny01, getarg(2);
set .@zeny_mes,1;
break;
case 3:
mes "[Quiver Maker]";
@ -89,7 +103,10 @@ S_BuyQuiver:
}
if (Zeny < .@arrow_zeny01) {
mes "[Quiver Maker]";
mes "I'm sorry, but you don't have enough Zeny!";
if (.@zeny_mes == 1)
mes "I said I'd accept human coins just for you, and you still don't want to spend the money?";
else
mes "You really don't expect to get your hands on a masterpiece for nothing, do you?";
close;
}
mes "[Quiver Maker]";

27
npc/re/mobs/fields/bifrost.txt
View File

@ -3,31 +3,32 @@
//===== By: ==================================================
//= Chilly
//===== Current Version: =====================================
//= 1.0
//= 1.1
//===== Compatible With: =====================================
//= rAthena SVN
//===== Description: =========================================
//= Official kRO monster spawns
//===== Additional Comments: =================================
//= 1.0 First Release
//= 1.1 Renewal spawn update. [Euphy]
//============================================================
//==================================================
// bif_fild01 - Bifrost South
//==================================================
bif_fild01,0,0,0,0 monster Luciola Vespa 1994,25,0,0,0
bif_fild01,0,0,0,0 monster Cornus 1992,15,0,0,0
bif_fild01,0,0,0,0 monster Pom Spider 2132,5,0,0,0
bif_fild01,0,0,0,0 monster Angra Mantis 2133,5,0,0,0
bif_fild01,0,0,0,0 monster Little Fatum 2136,30,0,0,0
bif_fild01,0,0,0,0 monster Miming 2137,50,0,0,0
bif_fild01,0,0,0,0 monster Luciola Vespa 1994,29,5000,0,0
bif_fild01,0,0,0,0 monster Cornus 1992,17,5000,0,0
bif_fild01,0,0,0,0 monster Miming 2137,58,5000,0,0
bif_fild01,0,0,0,0 monster Little Fatum 2136,34,5000,0,0
bif_fild01,0,0,0,0 monster Angra Mantis 2133,5,5000,0,0
bif_fild01,0,0,0,0 monster Pom Spider 2132,5,5000,0,0
//==================================================
// bif_fild02 - Bifrost North
//==================================================
bif_fild02,0,0,0,0 monster Luciola Vespa 1994,25,0,0,0
bif_fild02,0,0,0,0 monster Cornus 1992,15,0,0,0
bif_fild02,0,0,0,0 monster Pom Spider 2132,5,0,0,0
bif_fild02,0,0,0,0 monster Angra Mantis 2133,5,0,0,0
bif_fild02,0,0,0,0 monster Little Fatum 2136,50,0,0,0
bif_fild02,0,0,0,0 monster Miming 2137,30,0,0,0
bif_fild02,0,0,0,0 monster Luciola Vespa 1994,27,5000,0,0
bif_fild02,0,0,0,0 monster Cornus 1992,16,5000,0,0
bif_fild02,0,0,0,0 monster Miming 2137,33,5000,0,0
bif_fild02,0,0,0,0 monster Little Fatum 2136,55,5000,0,0
bif_fild02,0,0,0,0 monster Angra Mantis 2133,5,5000,0,0
bif_fild02,0,0,0,0 monster Pom Spider 2132,5,5000,0,0

1
npc/re/quests/homun_s.txt
View File

@ -7,6 +7,7 @@
//===== Compatible With: =====================================
//= rAthena SVN
//===== Description: =========================================
//= [Official Conversion]
//= Genetic quest to mutate a level 99 evolved Homunculus
//= into a Homunculus S.
//===== Additional Comments: =================================

8
npc/re/quests/magic_books.txt
View File

@ -8,14 +8,14 @@
//===== Compatible With: =====================================
//= rAthena
//===== Description: =========================================
//= [Official Conversion]
//= An NPC which sells you different kinds of Magic Books.
//===== Additional Comments: =================================
//= 1.0 First Version. [Masao]
//= 1.1 Optimized, 60% size reduction. [Euphy]
//= 1.1 Optimized. [Euphy]
//============================================================
geffen_in,176,105,4 script Magic Book Master Velof 64,{
if (checkweight(1201,1) == 0) {
mes "You're carrying too many items. Please make some room in your bag first.";
close;
@ -273,7 +273,6 @@ geffen_in,176,105,4 script Magic Book Master Velof 64,{
}
geffen_in,175,112,4 script Lea 123,{
if (checkweight(1201,1) == 0) {
mes "You're carrying too many items. Please make some room in your bag first.";
close;
@ -510,7 +509,6 @@ geffen_in,175,112,4 script Lea 123,{
}
mid_camp,255,244,4 script Galfos 735,{
if (checkweight(1201,1) == 0) {
mes "You're carrying too many items. Please make some room in your bag first.";
close;
@ -674,7 +672,6 @@ mid_camp,255,244,4 script Galfos 735,{
}
dic_in01,25,190,0 script Mysterious Documents 844,{
if (isequipped(2782) < 1) {
mes "I better not forget to equip my ring.";
close;
@ -837,7 +834,6 @@ function script Magic_Book_Essence {
mes "Someone already used this area.";
close;
}
thor_v02,163,104,0 script Powerful Lava Energy#33 844,{ callfunc "Magic_Book_Essence",12218,7097,40,"Lava"; end; }
thor_v01,185,91,0 script Powerful Flame Energy#33 844,{ callfunc "Magic_Book_Essence",12219,7098,10,"Flame"; end; }
ice_dun03,137,148,0 script Powerful Glacier Energy 844,{ callfunc "Magic_Book_Essence",12220,7561,10,"Glacier"; end; }

1
npc/re/quests/quests_dewata.txt
View File

@ -7,6 +7,7 @@
//===== Compatible With: =====================================
//= rAthena SVN
//===== Description: =========================================
//= [Official Conversion]
//= Quest NPCs related to Dewata:
//== "Dewata Legend"
//== "Help Out the Old Man"

272
npc/re/quests/quests_dicastes.txt
View File

@ -7,6 +7,7 @@
//===== Compatible With: =====================================
//= rAthena SVN
//===== Description: =========================================
//= [Official Conversion]
//= Quest NPCs related to Dewata:
//== Sapha's Visit, Doha's Secrect Order, Frede's Request,
//== Department Quests, Document Quests,
@ -62,114 +63,113 @@ manuk,321,182,5 script Entrance Manager#ep133 450,{
}
dic_dun01,266,113,5 script Curious Sapha#ep13_3_ 449,{
mes "[Curious Sapha]";
if (isequipped(2782)) {
mes "Hello?";
if (!isequipped(2782)) {
mes "[Curious Sapha]";
mes "¡ö¡ñ¡Ð ¡ò ¡õ?";
next;
switch(select("What are you doing here?:Buy research items.:Hello!:I want to help your research.")) {
case 1:
mes "[Curious Sapha]";
mes "Do you see that dirty vigilante over there?";
next;
mes "[Curious Sapha]";
mes "He was attacked by Scarabas after falling into Scaraba Hall.";
mes "And he was the only one attacked even with others around him.";
next;
mes "[Curious Sapha]";
mes "I think he slipped and fell on some secretion of the Queen Scaraba. I thought it was an accident was looking into it.";
next;
mes "[Curious Sapha]";
mes "If the research results are correct, the Scarabas are very sensitive to the smell.";
mes "Or else say they go crazy over it. Almost as if they were losing it...";
next;
mes "[Curious Sapha]";
mes "I came to research the relationship between the Queen secretion component and the Scarabas.";
mes "So I created this into a perfume to carry it easily.";
next;
mes "[Curious Sapha]";
mes "I might be able to use this perfume's reaction to Scarabas and make progress in research.";
close;
case 2:
if (!checkweight(1201,1)) {
mes "[Curious Sapha]";
mes "You don't seem to have enough space.";
close;
}
if ((MaxWeight - Weight) < 2000) {
mes "[Curious Sapha]";
mes "Your bags already seem too heavy.";
close;
}
mes "[Curious Sapha]";
mes "You want to buy the Scaraba Perfume? A gift for home?";
mes "Well, it has become a rare perfume.";
next;
mes "[Curious Sapha]";
mes "I'll give you a deal and sell it by 500 Zeny each. But, try not to carry it with you into Scaraba Hall.";
mes "How many do you want? You can buy up to 100.";
next;
input .@input;
set .@deal, 500 * .@input;
if (.@deal == 0) {
mes "[Curious Sapha]";
mes "You changed your mind?";
close;
}
if (Zeny < .@deal) {
mes "[Curious Sapha]";
mes "You don't have enough money.";
close;
}
mes "[Curious Sapha]";
mes "Will you buy "+.@input+"?";
next;
if(select("Yes:No") == 2) {
mes "[Curious Sapha]";
mes "You changed your mind?";
close;
}
set Zeny, Zeny - .@deal;
getitem 6437,.@input; //Scaraba_Perfume
mes "[Curious Sapha]";
mes "Here you go. Scaraba might flock around you so don't use it near Scaraba Hall.";
close;
case 3:
mes "[Curious Sapha]";
mes "Hello? You must be a traveler. This place is dangerous so please find your way out of this tunnel.";
close;
case 4:
mes "[Curious Sapha]";
mes "Do you have any useful information?";
mes "Please let me know!";
input .@str$;
next;
mes "[Curious Sapha]";
mes "It says ^0000FF"+.@str$+"^000000.";
next;
set .@his_rd_ms, rand(1,3);
if (.@his_rd_ms == 1) {
mes "[Curious Sapha]";
mes "That is great information!";
mes "I must start on the research.";
close;
}
else if (.@his_rd_ms == 2) {
mes "[Curious Sapha]";
mes "I already know about that information but I'm really grateful for you to come all the way here to tell me.";
close;
}
else {
mes "[Curious Sapha]";
mes "Hmm... do you think so?";
mes "I have some doubts about your information. I'll think it over.";
close;
}
mes "- Cannot understand a word. -";
close;
}
mes "[Curious Sapha]";
mes "Hello?";
next;
switch(select("What are you doing here?:Buy research items.:Hello!:I want to help your research.")) {
case 1:
mes "[Curious Sapha]";
mes "Do you see that dirty vigilante over there?";
next;
mes "[Curious Sapha]";
mes "He was attacked by Scarabas after falling into Scaraba Hall.";
mes "And he was the only one attacked even with others around him.";
next;
mes "[Curious Sapha]";
mes "I think he slipped and fell on some secretion of the Queen Scaraba. I thought it was an accident was looking into it.";
next;
mes "[Curious Sapha]";
mes "If the research results are correct, the Scarabas are very sensitive to the smell.";
mes "Or else say they go crazy over it. Almost as if they were losing it...";
next;
mes "[Curious Sapha]";
mes "I came to research the relationship between the Queen secretion component and the Scarabas.";
mes "So I created this into a perfume to carry it easily.";
next;
mes "[Curious Sapha]";
mes "I might be able to use this perfume's reaction to Scarabas and make progress in research.";
close;
case 2:
if (checkweight(1201,1) == 0) {
mes "[Curious Sapha]";
mes "You don't seem to have enough space.";
close;
}
if (MaxWeight - Weight < 2000) {
mes "[Curious Sapha]";
mes "Your bags already seem too heavy.";
close;
}
mes "[Curious Sapha]";
mes "You want to buy the Scaraba Perfume? A gift for home?";
mes "Well, it has become a rare perfume.";
next;
mes "[Curious Sapha]";
mes "I'll give you a deal and sell it by 500 Zeny each. But, try not to carry it with you into Scaraba Hall.";
mes "How many do you want? You can buy up to 100.";
next;
input .@input;
set .@deal, 500 * .@input;
if (.@deal == 0) {
mes "[Curious Sapha]";
mes "You changed your mind?";
close;
}
if (Zeny < .@deal) {
mes "[Curious Sapha]";
mes "You don't have enough money.";
close;
}
mes "[Curious Sapha]";
mes "Will you buy "+.@input+"?";
next;
if(select("Yes:No") == 2) {
mes "[Curious Sapha]";
mes "You changed your mind?";
close;
}
set Zeny, Zeny - .@deal;
getitem 6437,.@input; //Scaraba_Perfume
mes "[Curious Sapha]";
mes "Here you go. Scaraba might flock around you so don't use it near Scaraba Hall.";
close;
case 3:
mes "[Curious Sapha]";
mes "Hello? You must be a traveler. This place is dangerous so please find your way out of this tunnel.";
close;
case 4:
mes "[Curious Sapha]";
mes "Do you have any useful information?";
mes "Please let me know!";
input .@str$;
next;
mes "[Curious Sapha]";
mes "It says ^0000FF"+.@str$+"^000000.";
next;
switch(rand(1,3)) {
case 1:
mes "[Curious Sapha]";
mes "That is great information!";
mes "I must start on the research.";
close;
case 2:
mes "[Curious Sapha]";
mes "I already know about that information but I'm really grateful for you to come all the way here to tell me.";
close;
case 3:
mes "[Curious Sapha]";
mes "Hmm... do you think so?";
mes "I have some doubts about your information. I'll think it over.";
close;
}
}
mes "¡ö¡ñ¡Ð ¡ò ¡õ?";
next;
mes "- Cannot understand a word. -";
close;
}
// Vigilantes
@ -261,7 +261,7 @@ dic_dun01,284,102,5 script Dirty Vigilante#ep13_3 450,{
next;
if (select("Enter after spraying perfume.:Do not enter because it's dangerous.") == 1) {
if (!countitem(6437)) {
mes "- You Scaraba Perfume disappeared. -";
mes "- Your Scaraba Perfume disappeared. -";
close;
}
mes "[Vigilante]";
@ -278,7 +278,7 @@ dic_dun01,284,102,5 script Dirty Vigilante#ep13_3 450,{
close;
}
mes "[Vigilante]";
mes "Phew, what happened?! Why are they all over me";
mes "Phew, what happened?! Why are they all over me?";
next;
mes "[Vigilante]";
mes "I already had bad luck in falling into Scaraba Hall and being drenched with this awful ^FF0000stench^000000 my head is starting to ache!";
@ -422,7 +422,6 @@ dic_in01,254,119,0 script Item Storage#01 844,{
// Civil Services
//============================================================
function script que_dic {
if (!getarg(0)) {
if (checkquest(getarg(1),HUNTING) != 2) return;
@ -982,7 +981,6 @@ dic_in01,40,193,1 script Papyrus#0001 453,{
// Document Packages
//============================================================
- script Document Package#main -1,{
function eldicastes_dp;
if (isequipped(2782) < 1) {
@ -1090,7 +1088,6 @@ dic_in01,25,187,0 duplicate(Document Package#main) Document Package#0004 844
// Unknown Relics
//============================================================
function script unknown_d {
if (checkquest(getarg(0)) == -1) {
mes "You see some traces of digging.";
@ -3354,10 +3351,8 @@ dicastes01,225,211,3 script Tragis#pa0829 453,{
// Doha's Secret Orders
//============================================================
mid_campin,168,170,3 script Inspector Doha#ep133 59,{
// if ((GetInventoryRemainCount 1301 3 == 2) || (GetInventoryRemainCount 1301 3 == 3)) {
if ((MaxWeight - Weight) < 1000) {
if (checkweight(1201,1) == 0 || MaxWeight - Weight < 1000) {
mes "- You can too many items to proceed with the quest. -";
close;
}
@ -5127,7 +5122,7 @@ dic_in01,165,104,0 script Frede#13_3_in 454,{
mes "Maybe......they forgot?";
next;
mes "[Frede]";
mes "Oh.. what should I do......";
mes "Oh... what should I do......";
mes "I would run there myself if only my legs would move normally.";
next;
mes "[Frede]";
@ -5158,7 +5153,7 @@ dic_in01,165,104,0 script Frede#13_3_in 454,{
}
else if (ep13_3_bra == 3) {
mes "[Frede]";
mes "Oh.. what should I do......";
mes "Oh... what should I do......";
mes "I would run there myself if only my legs would move normally.";
next;
mes "[Frede]";
@ -6912,7 +6907,6 @@ dic_in01,42,264,3 script Adventurer Clerk#ep133 453,{
}
// Enchantment NPCs
//============================================================
- script dic_enc#main -1,{
set .@re$, strnpcinfo(1);
set .@n$, "["+.@re$+"]";
@ -6973,21 +6967,21 @@ dic_in01,42,264,3 script Adventurer Clerk#ep133 453,{
mes .@n$;
set .@cat_hi, rand(1,30);
if (.@cat_hi == 1) mes "It is difficult to find fish here. Can't find any so Jahbong would forget that he's busy or angry at the sight of a Fish Tail.";
if (.@cat_hi == 2) mes "Grrr... I was punished with a ladle for peeing on my blanket yesterday.";
if (.@cat_hi == 3) mes "I dream sometimes of a giant patting me on the head. But I feel more annoyed than afraid.";
if (.@cat_hi == 4) mes "Newbie Jarute, Ahat doesn't seem to look like a Sapha.";
if (.@cat_hi == 5) mes "Our people say Ahat looks like a beautiful cat.";
if (.@cat_hi == 6) mes "I heard there was a superior equipment upgrade craftsman in the capital city of Manuk.";
if (.@cat_hi == 7) mes "Grrr... I don't think my voice sounds normal these days. I think it's the weather.";
if (.@cat_hi == 8) mes "There are times when I shout out loud but it is only because I am in a good mood. No need to be startled.";
if (.@cat_hi == 9) mes "I feel an urge to jump on a pile with my four paws when I see one.";
if (.@cat_hi == 10) mes "I must have been a cat in my previous life.";
if (.@cat_hi == 11) mes "I dreamt about the giant again. I waved my paws annoyed and he kept on patting me.";
if (.@cat_hi == 12) mes "Yup!! Was the rumor true that Ahat looks like a human?! ";
if (.@cat_hi == 13) mes "I heard on my way that this Pinqucula Dark has a Withered Flower.";
if (.@cat_hi == 14) mes "There is a guy named Pinguicula nearby who has the Sharp Leaf nearby.";
if (.@cat_hi == 15) mes "There is a guy named Pinguicula nearby who has the Great Leaf nearby.";
if (.@cat_hi == 16) mes "I recommend getting it from the Dracos nearby. But then, they only drop it randomly so you may come back empty handed...";
else if (.@cat_hi == 2) mes "Grrr... I was punished with a ladle for peeing on my blanket yesterday.";
else if (.@cat_hi == 3) mes "I dream sometimes of a giant patting me on the head. But I feel more annoyed than afraid.";
else if (.@cat_hi == 4) mes "Newbie Jarute, Ahat doesn't seem to look like a Sapha.";
else if (.@cat_hi == 5) mes "Our people say Ahat looks like a beautiful cat.";
else if (.@cat_hi == 6) mes "I heard there was a superior equipment upgrade craftsman in the capital city of Manuk.";
else if (.@cat_hi == 7) mes "Grrr... I don't think my voice sounds normal these days. I think it's the weather.";
else if (.@cat_hi == 8) mes "There are times when I shout out loud but it is only because I am in a good mood. No need to be startled.";
else if (.@cat_hi == 9) mes "I feel an urge to jump on a pile with my four paws when I see one.";
else if (.@cat_hi == 10) mes "I must have been a cat in my previous life.";
else if (.@cat_hi == 11) mes "I dreamt about the giant again. I waved my paws annoyed and he kept on patting me.";
else if (.@cat_hi == 12) mes "Yup!! Was the rumor true that Ahat looks like a human?! ";
else if (.@cat_hi == 13) mes "I heard on my way that this Pinqucula Dark has a Withered Flower.";
else if (.@cat_hi == 14) mes "There is a guy named Pinguicula nearby who has the Sharp Leaf nearby.";
else if (.@cat_hi == 15) mes "There is a guy named Pinguicula nearby who has the Great Leaf nearby.";
else if (.@cat_hi == 16) mes "I recommend getting it from the Dracos nearby. But then, they only drop it randomly so you may come back empty handed...";
else mes "Hmm... This may not be important to you but.";
next;
mes .@n$;
@ -7325,14 +7319,14 @@ dic_fild01,228,159,4 script Jahbong#pa0829 496,{
}
set .@cattalkj,rand(1,9);
if (.@cattalkj == 1) mes "Don't touch my back! I might bite you unconsciously.";
else if (.@cattalkj == 2) mes "Pub owner Shay carried something away to make something strange! Be careful!";
else if (.@cattalkj == 3) mes "We cats can jump 5 times our size. Isn't it cool? But then, don't ask me to jump from here now.";
else if (.@cattalkj == 4) mes "I have to be diligent with my grooming to maintain beautiful fur.";
else if (.@cattalkj == 5) mes "I have to groom myself everyday to maintain shiny fluffy fur. But I don't have very nice fur in the first place. Very sad.";
else if (.@cattalkj == 6) mes "You should receive a Sapha Certification with both paws as a sign of respect. No cat deserves a certification if they don't!";
else if (.@cattalkj == 7) mes "I don't really talk that much! Ahat looks like... meow meow meooow... sorry.";
else if (.@cattalkj == 8) mes "Meow~~~~~~~~~~";
else mes "Yarn is a great way to calm a cat.";
else if (.@cattalkj == 2) mes "Pub owner Shay carried something away to make something strange! Be careful!";
else if (.@cattalkj == 3) mes "We cats can jump 5 times our size. Isn't it cool? But then, don't ask me to jump from here now.";
else if (.@cattalkj == 4) mes "I have to be diligent with my grooming to maintain beautiful fur.";
else if (.@cattalkj == 5) mes "I have to groom myself everyday to maintain shiny fluffy fur. But I don't have very nice fur in the first place. Very sad.";
else if (.@cattalkj == 6) mes "You should receive a Sapha Certification with both paws as a sign of respect. No cat deserves a certification if they don't!";
else if (.@cattalkj == 7) mes "I don't really talk that much! Ahat looks like... meow meow meooow... sorry.";
else if (.@cattalkj == 8) mes "Meow~~~~~~~~~~";
else mes "Yarn is a great way to calm a cat.";
next;
mes "[Jahbong]";
mes "Why are you here?";

1
npc/re/quests/quests_malangdo.txt
View File

@ -7,6 +7,7 @@
//===== Compatible With: =====================================
//= rAthena SVN
//===== Description: =========================================
//= [Official Conversion]
//= Quest NPCs related to Malangdo:
//== Malangdo Island, Help the Bad Cats in Danger,
//== Clean the Ship, Help Chef Nyas, Play with Baby Cats,

1
npc/re/quests/quests_malaya.txt
View File

@ -7,6 +7,7 @@
//===== Compatible With: =====================================
//= rAthena SVN
//===== Description: =========================================
//= [Official Conversion]
//= Quest NPCs related to Port Malaya.
//===== Additional Comments: =================================
//= 0.1 Traders only. Adapted from Masao's conversion. [Euphy]

5823
npc/re/quests/quests_mora.txt
View File

File diff suppressed because it is too large Load Diff

16
npc/re/warps/fields/bif_fild.txt
View File

@ -3,7 +3,7 @@
//===== By: ==================================================
//= Chilly
//===== Current Version: =====================================
//= 1.1
//= 1.2
//===== Compatible With: =====================================
//= rAthena SVN
//===== Description: =========================================
@ -11,13 +11,14 @@
//===== Additional Comments: =================================
//= 1.0 First Version.
//= 1.1 Added official warp scripts. [Euphy]
//= 1.2 Updated to match the official script. [Euphy]
//============================================================
splendide,275,390,0 warp bifrost_field0001 1,1,bif_fild01,316,50
bif_fild01,318,48,0 warp bifrost_field0002 1,1,splendide,275,387
mora,182,74,0 warp bifrost_field0003 1,1,bif_fild02,285,330
mora,20,159,0 warp bifrost_field0004 1,1,bif_fild02,98,309
mora,56,25,0 warp bifrost_field0005 1,1,bif_fild02,177,162
bif_fild01,318,48,0 warp bifrost_field0002 1,1,splendide,271,382
mora,182,74,0 warp bifrost_field0003 1,1,bif_fild02,286,327
mora,20,159,0 warp bifrost_field0004 1,1,bif_fild02,99,308
mora,56,25,0 warp bifrost_field0005 1,1,bif_fild02,176,162
- script bifrost_field0000 -1,{
mes "At the end of the small path through the bright flower garden";
@ -34,7 +35,10 @@ mora,56,25,0 warp bifrost_field0005 1,1,bif_fild02,177,162
}
}
close;
OnTouch:
specialeffect EF_LEVEL99_4;
end;
}
bif_fild02,285,333,0 duplicate(bifrost_field0000) Small Hole#ep14_mora1 844
bif_fild02,285,332,0 duplicate(bifrost_field0000) Small Hole#ep14_mora1 844
bif_fild02,95,310,0 duplicate(bifrost_field0000) Small Hole#ep14_mora2 844
bif_fild02,174,162,0 duplicate(bifrost_field0000) Small Hole#ep14_mora3 844

1
npc/re/warps/fields/bra_fild.txt
View File

@ -12,5 +12,6 @@
//===== Additional Comments: =================================
//= 1.0 First version.
//============================================================
bra_fild01,72,34,0 warp bra_fild01_brasilis 1,1,brasilis,309,334
brasilis,308,336,0 warp brasilis_bra_fild01 1,1,bra_fild01,74,34

4
npc/warps/dungeons/tha_t.txt
View File

@ -5,9 +5,9 @@
//===== Current Version: =====================================
//= 1.1 Beta
//===== Compatible With: =====================================
//= Any rAthena Version i guess?
//= Any Athena Version
//===== Description: =========================================
//= It's the Thanatos Tower Warps...
//= Warp Points for Thanatos Tower
//===== Additional Comments: =================================
//= 1.0 - First Release [Ishizu-chan]
//= 1.1 - Added Entrance Warp Guard

2
src/common/mmo.h
View File

@ -100,7 +100,7 @@
#define MAX_GUILDSKILL 15 // increased max guild skills because of new skills [Sara-chan]
#define MAX_GUILDLEVEL 50
#define MAX_GUARDIANS 8 //Local max per castle. [Skotlex]
#define MAX_QUEST_DB 2400 //Max quests that the server will load
#define MAX_QUEST_DB 2500 //Max quests that the server will load
#define MAX_QUEST_OBJECTIVES 3 //Max quest objectives for a quest
// for produce