Skip to content

Commit

Permalink
Mora / NPC Updates
Browse files Browse the repository at this point in the history 
* Implemented all Mora quests (excluding instance-related quests and Mora Enchants).
* Updated Mora town NPCs, Quiver Maker, and guides.
* Updated Bifrost spawns and warps.
All Credits to Euphy for sending those to us, Thank you~!

Signed-off-by: shennetsind <ind@henn.et>
  • Loading branch information
@shennetsind
shennetsind committed May 31, 2013
1 parent 401136e commit 11a90e1
Show file tree
Hide file tree
Showing 8 changed files with 5,711 additions and 26 deletions.
12 changes: 9 additions & 3 deletions db/quest_db.txt
View file
Expand Up @@ -33,6 +33,7 @@
1117,0,0,0,0,0,0,0,"Ropewa & Yuridi - Eternal Promise, Broken Ring"
// Ropewa Clue Quest
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"
Expand Down Expand Up @@ -527,6 +528,11 @@
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!"
Expand Down Expand Up @@ -854,7 +860,7 @@
// New Sapha's Honor Quest
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"
Expand Down Expand Up @@ -1683,8 +1689,8 @@

//Mora Quests
// == Roast Beef Quest
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"
// == Theo
11184,0,0,0,0,0,0,0,"Runaway Laphine"
11185,0,0,0,0,0,0,0,"Pouch"
Expand Down
215 changes: 215 additions & 0 deletions npc/re/guides/guides_mora.txt
View file
@@ -0,0 +1,215 @@
//===== rAthena Script =======================================
//= Mora Guides
//===== By: ==================================================
//= Euphy
//===== Current Version: =====================================
//= 1.0
//===== Compatible With: =====================================
//= rAthena SVN
//===== Description: =========================================
//= Guides for the city of Mora.
//===== Additional Comments: =================================
//= 1.0 First version. [Euphy]
//============================================================

mora,25,158,5 script Raffle Guide#north 516,{
mes "[Raffoh]";
mes "Laoh~!";
mes "Welcome to the Village of Mora.";
mes "I can tell you whatever you want to know about the village~!";
next;
switch(select("[ Inn ]:[ Residences ]:[ Stores ]:[ Warehouse ]:Remove markers from the mini-map:Quit")) {
case 1:
mes "[Raffoh]";
mes "Laoh~!";
mes "We have an inn but we can't make travelers sleep like Raffles...";
mes "Get some rest!";
viewpoint 1,44,134,0,0x0A82FF;
close;
case 2:
mes "[Raffoh]";
mes "Laoh~!";
mes "This is where Raffles' houses are...";
mes "But keep the noise down because people are asleep~!";
viewpoint 1,119,170,1,0xAAFF00;
close;
case 3:
mes "[Raffoh]";
mes "Laoh~!";
mes "If you are looking for souvenirs, you can buy some in this district.";
viewpoint 1,112,110,2,0xDA70D6;
close;
case 4:
mes "[Raffoh]";
mes "Laoh~!";
mes "This is where they keep all kinds of packages and groceries.";
mes "There are many things that don't belong to the Raffles, so be careful!";
viewpoint 1,182,161,3,0xFF1493;
close;
case 5:
mes "[Raffoh]";
mes "Laoh~! I'm removing them all~!";
viewpoint 2,1,1,0,0xFFFF00;
viewpoint 2,1,1,1,0xFFFF00;
viewpoint 2,1,1,2,0xFFFF00;
viewpoint 2,1,1,3,0xFFFF00;
close;
case 6:
mes "[Raffoh]";
mes "Laoh~!";
mes "What kinds of sports are popular in your homeland?";
close;
}
}

mora,167,76,3 script Raffle Guide#east 522,{
mes "[Raffuh]";
mes "Uh...";
mes "This, this is the Village of Mora.";
mes "Uh... which place do you want to know about?";
next;
switch(select("[ Inn ]:[ Residences ]:[ Stores ]:[ Warehouse ]:Remove markers from the mini-map:Quit")) {
case 1:
mes "[Raffuh]";
mes "Uh...";
mes "Are, are you sleepy?";
mes "You can sleep here uh!! Put your stuff down uh! And-- and---";
viewpoint 1,44,134,0,0x0A82FF;
close;
case 2:
mes "[Raffuh]";
mes "Uh...";
mes "Why are you trying to find out where I live--?";
mes "Uh, no... I'd like to live with my friends--";
viewpoint 1,119,170,1,0xAAFF00;
close;
case 3:
mes "[Raffuh]";
mes "Uh...";
mes "There are a lot of things in those stores-- oh, there is a hot spring also uh!";
viewpoint 1,112,110,2,0xDA70D6;
close;
case 4:
mes "[Raffuh]";
mes "Uh...";
mes "You can't just march into the warehouse, or you'll be in trouble--";
mes "Many of the things there are from outside the village-- Raffuh has been in trouble several times--";
viewpoint 1,182,161,3,0xFF1493;
close;
case 5:
mes "[Raffuh]";
mes "Are you sure you want them removed?";
viewpoint 2,1,1,0,0xFFFF00;
viewpoint 2,1,1,1,0xFFFF00;
viewpoint 2,1,1,2,0xFFFF00;
viewpoint 2,1,1,3,0xFFFF00;
close;
case 6:
mes "[Raffuh]";
mes "Uh...";
mes "Being a guide doesn't help much with my social phobia--";
close;
}
}

mora,115,138,5 script Raffle Guide#center 524,{
mes "[Raffla]";
mes "Lala!";
mes "Welcome to the Village of Mora la!";
mes "If you need to know anything about the village, just ask me la!";
next;
switch(select("[ Inn ]:[ Residences ]:[ Stores ]:[ Warehouse ]:Remove markers from the mini-map:Quit.")) {
case 1:
mes "[Raffla]";
mes "Lala!";
mes "This is where travelers can rest la!";
mes "The innkeeper is very kind, so try to talk to him a lot la!";
viewpoint 1,44,134,0,0x0A82FF;
close;
case 2:
mes "[Raffla]";
mes "Lala!";
mes "This is where Raffles live la!";
mes "Head over there la!";
viewpoint 1,119,170,1,0xAAFF00;
close;
case 3:
mes "[Raffla]";
mes "Lala!";
mes "So you want to buy something la?";
mes "There are a lot of stores and cafes, so check them out la!";
viewpoint 1,112,110,2,0xDA70D6;
close;
case 4:
mes "[Raffla]";
mes "Lala!";
mes "The warehouse is where you keep your valuables la!";
mes "Be careful so you don't get robbed la!";
viewpoint 1,182,161,3,0xFF1493;
close;
case 5:
mes "[Raffla]";
mes "Okay, I'll remove all the markers from the map la!";
viewpoint 2,1,1,0,0xFFFF00;
viewpoint 2,1,1,1,0xFFFF00;
viewpoint 2,1,1,2,0xFFFF00;
viewpoint 2,1,1,3,0xFFFF00;
close;
case 6:
mes "[Raffla]";
mes "Lala!";
mes "I really don't know how my family ends up doing these things la!";
close;
}
}

mora,72,51,3 script Raffle Guide#south 518,{
mes "[Raffli]";
mes "Lali?";
mes "Welcome to the Village of Mora.";
mes "If you need to know anything about the village, just ask me.";
next;
switch(select("[ Inn ]:[ Residences ]:[ Stores ]:[ Warehouse ]:Remove markers from the mini-map:Quit")) {
case 1:
mes "[Raffli]";
mes "Lali?";
mes "This is where travelers can rest.";
mes "The innkeeper is very kind, so get to know him.";
viewpoint 1,44,134,0,0x0A82FF;
close;
case 2:
mes "[Raffli]";
mes "Lali?";
mes "This is where Raffles live.";
mes "Are you coming to Raffli's house li? I'm so happy.";
viewpoint 1,119,170,1,0xAAFF00;
close;
case 3:
mes "[Raffli]";
mes "Lali?";
mes "There are a lot of things I want to buy.";
mes "You can find tons of places to eat and shop, and tons of things to buy.";
viewpoint 1,112,110,2,0xDA70D6;
close;
case 4:
mes "[Raffli]";
mes "Lali?";
mes "The warehouse is where you keep your valuables.";
mes "But don't get robbed.";
viewpoint 1,182,161,3,0xFF1493;
close;
case 5:
mes "[Raffli]";
mes "I'll remove all the markers.";
viewpoint 2,1,1,0,0xFFFF00;
viewpoint 2,1,1,1,0xFFFF00;
viewpoint 2,1,1,2,0xFFFF00;
viewpoint 2,1,1,3,0xFFFF00;
close;
case 6:
mes "[Raffli]";
mes "Lali?";
mes "Brother seems to be upset today li. Did I do anything wrong?";
close;
}
}
121 changes: 121 additions & 0 deletions npc/re/merchants/quivers.txt
View file
@@ -0,0 +1,121 @@
//===== rAthena Script =======================================
//= Arrow Quivers
//===== By: ==================================================
//= Muad_Dib (Prometheus Project); L0ne_W0lf
//===== Current Version: =====================================
//= 1.1
//===== Compatible With: =====================================
//= rAthena SVN
//===== Description: =========================================
//= Turns arrows into Arrow Quivers.
// Breakdown of Subroutine "S_BuyQuiver"
// arg(0): Type of Arrow to be packaged (item ID).
// arg(1): How many of each 'getarg(0)' arrow per quiver.
// arg(2): The cost of making a 'getarg(0)' quiver.
// 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,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.";
next;
switch(select("Please make me a quiver.:What's a quiver?")) {
case 1:
mes "[Quiver Maker]";
mes "At last someone appreciates a quiver!";
mes "I can make Elven Quivers and Hunting Quivers.";
mes "Which do you need?";
next;
switch(select("An Elven Quiver:A Hunting Quiver:I don't need a quiver.")) {
case 1: callsub S_BuyQuiver,1773,500,500,12575; //Arrow_Of_Elf_Cntr
case 2: callsub S_BuyQuiver,1774,500,500,12576; //Hunting_Arrow_Cntr
case 3:
mes "[Quiver Maker]";
mes "You can buy arrows off the tool merchant next to me.";
close;
}
case 2:
mes "[Quiver Maker]";
mes "An arrow may be thin and light, but carrying hundreds and thousands of arrows is like carrying a whole log.";
next;
mes "[Quiver Maker]";
mes "But when you have quivers, you can put arrows in them and save weight and space.";
mes "If you're interested in one, I'll stitch one up for you.";
close;
}
end;

S_BuyQuiver:
if (countitem(getarg(0)) < getarg(1)) {
mes "[Quiver Maker]";
mes "Bring more than "+getarg(1)+" "+getitemname(getarg(0))+" and I'll make you a quiver.";
close;
}
mes "[Quiver Maker]";
mes "Oh, I see you have "+getitemname(getarg(0))+" in your hand!";
mes "Are you interested in using a quiver? It's really convenient!";
mes "If you're interested, I can trade "+getarg(1)+" of those arrows for one of these quivers for ^FF3131"+getarg(2)+" zeny^000000.";
next;
switch(select("Trade all the arrows you have:Get only one quiver:Don't trade")) {
case 1:
set .@arrows, countitem(getarg(0));
set .@quiver, .@arrows / getarg(1);
set .@arrows_used, .@quiver * getarg(1);
set .@arrow_zeny01, .@quiver * getarg(2);
mes "The number of arrows you have : ^3131FF"+.@arrows+"^000000";
mes "The number of quivers available : ^3131FF"+.@quiver+"^000000";
mes "Zeny needed for trade : ^3131FF"+.@arrow_zeny01+" zeny^000000";
next;
mes "Trade?";
next;
if(select("Trade:Don't trade") == 2) {
mes "[Quiver Maker]";
mes "Hey, you don't doubt my skills, do you?";
close;
}
break;
case 2:
set .@quiver, 1;
set .@arrows_used, getarg(1);
set .@arrow_zeny01, getarg(2);
set .@zeny_mes,1;
break;
case 3:
mes "[Quiver Maker]";
mes "Hey, you don't doubt my skills, do you?";
close;
}
if (Zeny < .@arrow_zeny01) {
mes "[Quiver Maker]";
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]";
mes "Hey, here you are.";
mes "There is ^3131FFsomething you need to know^000000 - try to remember it.";
mes "^FF0000You can't use quivers when your encumbrance is over 70%.^000000";
mes "You'd better keep that in mind, or you might be in trouble later.";
set Zeny, Zeny-.@arrow_zeny01;
delitem getarg(0),.@arrows_used;
getitem getarg(3),.@quiver;
close;
}

0 comments on commit 11a90e1

Please sign in to comment.