summaryrefslogtreecommitdiff
path: root/npc/re/quests/eden/eden_common.txt
diff options
context:
space:
mode:
authorshennetsind <ind@henn.et>2013-11-02 17:15:41 -0200
committershennetsind <ind@henn.et>2013-11-02 17:15:41 -0200
commitcf1ed8794ad2cfe66ec111484fc5d17f7c09ac22 (patch)
tree73815027b00f2519fda6ce5fe313f13b71fa2595 /npc/re/quests/eden/eden_common.txt
parentb2f125a5f3f25b9bcb68d4b755bacf988f0f1fcd (diff)
parent566529c819bcf9aeb1bd3a4a691c443c2b88d076 (diff)
downloadhercules-cf1ed8794ad2cfe66ec111484fc5d17f7c09ac22.tar.gz
hercules-cf1ed8794ad2cfe66ec111484fc5d17f7c09ac22.tar.bz2
hercules-cf1ed8794ad2cfe66ec111484fc5d17f7c09ac22.tar.xz
hercules-cf1ed8794ad2cfe66ec111484fc5d17f7c09ac22.zip
Merge remote-tracking branch 'upstream/master'
Signed-off-by: shennetsind <ind@henn.et> Conflicts: sql-files/main.sql sql-files/upgrades/index.txt src/common/mmo.h
Diffstat (limited to 'npc/re/quests/eden/eden_common.txt')
-rw-r--r--npc/re/quests/eden/eden_common.txt86
1 files changed, 43 insertions, 43 deletions
diff --git a/npc/re/quests/eden/eden_common.txt b/npc/re/quests/eden/eden_common.txt
index a2d2a624b..7c6be1aa4 100644
--- a/npc/re/quests/eden/eden_common.txt
+++ b/npc/re/quests/eden/eden_common.txt
@@ -19,7 +19,7 @@
//= 1.8 Updated to match the latest official script. [Euphy]
//============================================================
-moc_para01,27,35,5 script Secretary Lime Evenor 952,{
+moc_para01,27,35,5 script Secretary Lime Evenor 4_F_EDEN_OFFICER,{
if (checkweight(1201,1) == 0 || (MaxWeight - Weight) < 2000) {
mes "- Wait a minute !! -";
mes "- Currently you're carrying -";
@@ -212,44 +212,44 @@ moc_para01,27,35,5 script Secretary Lime Evenor 952,{
close;
}
}
-prontera,124,76,3 duplicate(eto) Eden Teleport Officer#1 729
-moc_ruins,68,164,3 duplicate(eto) Eden Teleport Officer#2 729
-geffen,132,66,3 duplicate(eto) Eden Teleport Officer#3 729
-alberta,124,67,3 duplicate(eto) Eden Teleport Officer#4 729
-aldebaran,133,119,5 duplicate(eto) Eden Teleport Officer#5 729
-izlude_in,68,162,1 duplicate(eto) Eden Teleport Officer#6 729
-prt_church,103,78,3 duplicate(eto) Eden Teleport Officer#7 729
-geffen_in,160,104,5 duplicate(eto) Eden Teleport Officer#8 729
-moc_prydb1,53,126,3 duplicate(eto) Eden Teleport Officer#9 729
-alberta_in,75,39,3 duplicate(eto) Eden Teleport Officer#10 729
-payon_in02,58,58,1 duplicate(eto) Eden Teleport Officer#11 729
-payon,177,111,3 duplicate(eto) Eden Teleport Officer#12 729
-que_ng,33,73,3 duplicate(eto) Eden Teleport Officer#13 729
-que_ng,144,161,5 duplicate(eto) Eden Teleport Officer#14 729
-yuno,144,189,5 duplicate(eto) Eden Teleport Officer#15 729
-rachel,125,144,3 duplicate(eto) Eden Teleport Officer#16 729
-comodo,202,151,4 duplicate(eto) Eden Teleport Officer#17 729
-hugel,93,153,4 duplicate(eto) Eden Teleport Officer#18 729
-veins,220,109,4 duplicate(eto) Eden Teleport Officer#19 729
-einbroch,250,211,4 duplicate(eto) Eden Teleport Officer#20 729
-lighthalzen,164,86,4 duplicate(eto) Eden Teleport Officer#21 729
-amatsu,100,145,5 duplicate(eto) Eden Teleport Officer#22 729
-ayothaya,221,191,3 duplicate(eto) Eden Teleport Officer#23 729
-louyang,224,107,3 duplicate(eto) Eden Teleport Officer#24 729
-gonryun,162,122,5 duplicate(eto) Eden Teleport Officer#25 729
-moscovia,209,197,5 duplicate(eto) Eden Teleport Officer#26 729
-brasilis,191,224,3 duplicate(eto) Eden Teleport Officer#27 729
-dewata,192,193,5 duplicate(eto) Eden Teleport Officer#28 729
-morocc,161,97,5 duplicate(eto) Eden Teleport Officer#29 729
-izlude,131,148,4 duplicate(eto) Eden Teleport Officer#30 729
-izlude_a,131,148,4 duplicate(eto) Eden Teleport Officer#30::eto_iz_a 729
-izlude_b,131,148,4 duplicate(eto) Eden Teleport Officer#30::eto_iz_b 729
-izlude_c,131,148,4 duplicate(eto) Eden Teleport Officer#30::eto_iz_c 729
-izlude_d,131,148,4 duplicate(eto) Eden Teleport Officer#30::eto_iz_d 729
-umbala,105,158,3 duplicate(eto) Eden Teleport Officer#31 729
-malaya,238,206,6 duplicate(eto) Eden Teleport Officer#32 729
+prontera,124,76,3 duplicate(eto) Eden Teleport Officer#1 4_F_NOVICE
+moc_ruins,68,164,3 duplicate(eto) Eden Teleport Officer#2 4_F_NOVICE
+geffen,132,66,3 duplicate(eto) Eden Teleport Officer#3 4_F_NOVICE
+alberta,124,67,3 duplicate(eto) Eden Teleport Officer#4 4_F_NOVICE
+aldebaran,133,119,5 duplicate(eto) Eden Teleport Officer#5 4_F_NOVICE
+izlude_in,68,162,1 duplicate(eto) Eden Teleport Officer#6 4_F_NOVICE
+prt_church,103,78,3 duplicate(eto) Eden Teleport Officer#7 4_F_NOVICE
+geffen_in,160,104,5 duplicate(eto) Eden Teleport Officer#8 4_F_NOVICE
+moc_prydb1,53,126,3 duplicate(eto) Eden Teleport Officer#9 4_F_NOVICE
+alberta_in,75,39,3 duplicate(eto) Eden Teleport Officer#10 4_F_NOVICE
+payon_in02,58,58,1 duplicate(eto) Eden Teleport Officer#11 4_F_NOVICE
+payon,177,111,3 duplicate(eto) Eden Teleport Officer#12 4_F_NOVICE
+que_ng,33,73,3 duplicate(eto) Eden Teleport Officer#13 4_F_NOVICE
+que_ng,144,161,5 duplicate(eto) Eden Teleport Officer#14 4_F_NOVICE
+yuno,144,189,5 duplicate(eto) Eden Teleport Officer#15 4_F_NOVICE
+rachel,125,144,3 duplicate(eto) Eden Teleport Officer#16 4_F_NOVICE
+comodo,202,151,4 duplicate(eto) Eden Teleport Officer#17 4_F_NOVICE
+hugel,93,153,4 duplicate(eto) Eden Teleport Officer#18 4_F_NOVICE
+veins,220,109,4 duplicate(eto) Eden Teleport Officer#19 4_F_NOVICE
+einbroch,250,211,4 duplicate(eto) Eden Teleport Officer#20 4_F_NOVICE
+lighthalzen,164,86,4 duplicate(eto) Eden Teleport Officer#21 4_F_NOVICE
+amatsu,100,145,5 duplicate(eto) Eden Teleport Officer#22 4_F_NOVICE
+ayothaya,221,191,3 duplicate(eto) Eden Teleport Officer#23 4_F_NOVICE
+louyang,224,107,3 duplicate(eto) Eden Teleport Officer#24 4_F_NOVICE
+gonryun,162,122,5 duplicate(eto) Eden Teleport Officer#25 4_F_NOVICE
+moscovia,209,197,5 duplicate(eto) Eden Teleport Officer#26 4_F_NOVICE
+brasilis,191,224,3 duplicate(eto) Eden Teleport Officer#27 4_F_NOVICE
+dewata,192,193,5 duplicate(eto) Eden Teleport Officer#28 4_F_NOVICE
+morocc,161,97,5 duplicate(eto) Eden Teleport Officer#29 4_F_NOVICE
+izlude,131,148,4 duplicate(eto) Eden Teleport Officer#30 4_F_NOVICE
+izlude_a,131,148,4 duplicate(eto) Eden Teleport Officer#30::eto_iz_a 4_F_NOVICE
+izlude_b,131,148,4 duplicate(eto) Eden Teleport Officer#30::eto_iz_b 4_F_NOVICE
+izlude_c,131,148,4 duplicate(eto) Eden Teleport Officer#30::eto_iz_c 4_F_NOVICE
+izlude_d,131,148,4 duplicate(eto) Eden Teleport Officer#30::eto_iz_d 4_F_NOVICE
+umbala,105,158,3 duplicate(eto) Eden Teleport Officer#31 4_F_NOVICE
+malaya,238,206,6 duplicate(eto) Eden Teleport Officer#32 4_F_NOVICE
-moc_para01,30,10,0 script #eden_out 45,1,1,{
+moc_para01,30,10,0 script #eden_out WARPNPC,1,1,{
OnTouch:
switch (nak_warp) {
case 1: warp "prontera",116,72; end;
@@ -289,7 +289,7 @@ OnTouch:
end;
}
-moc_para01,47,39,3 script #warp_2_pass 111,{
+moc_para01,47,39,3 script #warp_2_pass HIDDEN_NPC,{
if (countitem(6219) > 0) {
mes "[Lime Evenor]";
mes "Oh, it is an exclusive place only for Eden's members.";
@@ -313,7 +313,7 @@ moc_para01,47,39,3 script #warp_2_pass 111,{
close;
}
-moc_para01,16,22,7 script Old Adventurer#eden 900,{
+moc_para01,16,22,7 script Old Adventurer#eden 4_M_HUMERCHANT,{
mes "[Old Adventurer]";
mes "Harsh, I am strong enough even if I look old! What is his name? Lime Evenor? He just ignores me like I am a some kind of old senile bastard.";
next;
@@ -323,7 +323,7 @@ moc_para01,16,22,7 script Old Adventurer#eden 900,{
close;
}
-moc_para01,182,48,3 script Eden's Chief#eden 886,{
+moc_para01,182,48,3 script Eden's Chief#eden 4_COOK,{
set .@eggf,rand(1,118);
set .@eggf_1,.@eggf + 1;
set .@eggf_2,.@eggf + 2;
@@ -346,7 +346,7 @@ moc_para01,182,48,3 script Eden's Chief#eden 886,{
close;
}
-moc_para01,172,28,5 script Eden's Intern#eden 883,{
+moc_para01,172,28,5 script Eden's Intern#eden 4_M_ALCHE_D,{
mes "[Eden's Intern]";
mes "Actually, I realized that.";
next;
@@ -361,7 +361,7 @@ moc_para01,172,28,5 script Eden's Intern#eden 883,{
close;
}
-moc_para01,20,35,5 script Office Assistant Neede 814,{
+moc_para01,20,35,5 script Office Assistant Neede 4_F_CHNDOCTOR,{
mes "[Neede]";
mes "I became a Eden's member several years ago, but it feels like it was yesterday.";
mes "I have been doing lots of work, so I didn't even notice how many years I spent here.";