summaryrefslogtreecommitdiff
path: root/npc
diff options
context:
space:
mode:
authorEmistry Haoyan <Equinox1991@gmail.com>2016-10-27 00:22:34 +0800
committerEmistry Haoyan <Equinox1991@gmail.com>2016-11-03 21:10:24 +0800
commit383703c2853e4a052afc900637b9cab6d7aa730e (patch)
tree6a909a35390e4eb0cc532dafdcbef9d98c428e27 /npc
parent5fdf937cbe04c75708ab27b4a15d0a63ffcedf02 (diff)
downloadhercules-383703c2853e4a052afc900637b9cab6d7aa730e.tar.gz
hercules-383703c2853e4a052afc900637b9cab6d7aa730e.tar.bz2
hercules-383703c2853e4a052afc900637b9cab6d7aa730e.tar.xz
hercules-383703c2853e4a052afc900637b9cab6d7aa730e.zip
Update Eden Quest script
- Fix classes checking (https://github.com/HerculesWS/Hercules/issues/1173) - Update and remove redundant script
Diffstat (limited to 'npc')
-rw-r--r--npc/re/quests/eden/eden_quests.txt158
1 files changed, 64 insertions, 94 deletions
diff --git a/npc/re/quests/eden/eden_quests.txt b/npc/re/quests/eden/eden_quests.txt
index f58c3ed5a..9e49a415b 100644
--- a/npc/re/quests/eden/eden_quests.txt
+++ b/npc/re/quests/eden/eden_quests.txt
@@ -9,7 +9,7 @@
//= This file is part of Hercules.
//= http://herc.ws - http://github.com/HerculesWS/Hercules
//=
-//= Copyright (C) 2012-2015 Hercules Dev Team
+//= Copyright (C) 2012-2016 Hercules Dev Team
//= Copyright (C) Capuche
//= Copyright (C) Euphy
//= Copyright (C) Masao
@@ -117,7 +117,7 @@ moc_para01,25,35,4 script Instructor Boya#para01 4_M_KNIGHT_GOLD,{
case 2:
mes "You are so rude!";
specialeffect2 EF_HIT1;
- percentheal -50,0;
+ percentheal -50, 0;
next;
mes "-Beats quickly and this shining Rune Knight turns invisible.";
mes "It hurts too much-";
@@ -712,7 +712,7 @@ moc_fild11,180,253,5 script Talking Dog#para03 4_RUS_DWOLF,{
next;
mes "-When the dog barked, your HP and SP recovered.-";
npcskill "AL_HEAL",11,99,60;
- percentheal 100,100;
+ percentheal 100, 100;
close;
}
if (para_suv01 == 3) {
@@ -750,7 +750,7 @@ moc_fild11,180,253,5 script Talking Dog#para03 4_RUS_DWOLF,{
next;
mes "-When the dog barked, your HP and SP recovered.-";
npcskill "AL_HEAL",11,99,60;
- percentheal 100,100;
+ percentheal 100, 100;
close;
}
if (para_suv01 == 4) {
@@ -806,7 +806,7 @@ moc_fild11,180,253,5 script Talking Dog#para03 4_RUS_DWOLF,{
next;
mes "-When the dog barked, your HP and SP recovered.-";
npcskill "AL_HEAL",11,99,60;
- percentheal 100,100;
+ percentheal 100, 100;
close;
}
if (para_suv01 == 5) {
@@ -952,7 +952,7 @@ prt_sewb1,131,262,3 script Timid Cat#para04 4_M_BABYCAT,{
mes "Take care to check your map so you don't get lost.";
mes "It's a service meeow.";
npcskill "AL_HEAL",11,99,60;
- percentheal 100,100;
+ percentheal 100, 100;
close;
}
if (para_suv01 == 8) {
@@ -990,7 +990,7 @@ prt_sewb1,131,262,3 script Timid Cat#para04 4_M_BABYCAT,{
mes "I will help you a little.";
mes "Here, I have recovered your strengh meow..";
npcskill "AL_HEAL",11,99,60;
- percentheal 100,100;
+ percentheal 100, 100;
close;
}
if (para_suv01 == 9) {
@@ -1025,7 +1025,7 @@ prt_sewb1,131,262,3 script Timid Cat#para04 4_M_BABYCAT,{
mes "I will help you a little.";
mes "Here, I have recovered your strengh meow..";
npcskill "AL_HEAL",11,99,60;
- percentheal 100,100;
+ percentheal 100, 100;
close;
}
if (para_suv01 >= 10) {
@@ -1137,7 +1137,7 @@ pay_arche,41,136,3 script Eden Member Karl#para05 4_M_KHMAN,{
mes "Just in case I will recover all your energy.";
mes "It's the last step so be careful.";
npcskill "AL_HEAL",11,99,60;
- percentheal 100,100;
+ percentheal 100, 100;
close;
}
if (para_suv01 == 15) {
@@ -1168,7 +1168,7 @@ pay_arche,41,136,3 script Eden Member Karl#para05 4_M_KHMAN,{
mes "Just in case I will recover all your energy.";
mes "It's the last step so be careful.";
npcskill "AL_HEAL",11,99,60;
- percentheal 100,100;
+ percentheal 100, 100;
close;
}
if (para_suv01 >= 16) {
@@ -1290,7 +1290,7 @@ anthell01,29,264,5 script Eden Member Cloud#para06 4_M_HUMAN_02,{
mes "Can you stay longer?";
mes "Ok, I will recover your strengh so, keep going.";
npcskill "AL_HEAL",11,99,60;
- percentheal 100,100;
+ percentheal 100, 100;
close;
}
if (para_suv01 == 19) {
@@ -1329,7 +1329,7 @@ anthell01,29,264,5 script Eden Member Cloud#para06 4_M_HUMAN_02,{
mes "See, to cheer you up I will heal you until you finish the training.";
mes "Chin up and cheer up.";
npcskill "AL_HEAL",11,99,60;
- percentheal 100,100;
+ percentheal 100, 100;
close;
}
if (para_suv01 == 20) {
@@ -1357,7 +1357,7 @@ anthell01,29,264,5 script Eden Member Cloud#para06 4_M_HUMAN_02,{
mes "Just Vitata, isn't that an easy opponent?";
mes "If you see Maya just run away.";
npcskill "AL_HEAL",11,99,60;
- percentheal 100,100;
+ percentheal 100, 100;
close;
}
if (para_suv01 >= 21) {
@@ -1472,7 +1472,7 @@ in_orcs01,38,175,3 script Eden Member Hooksha 1_F_SIGNZISK,{
mes "You look tired I will recover your health.";
mes "If you are in trouble just come back here to safety.";
npcskill "AL_HEAL",11,99,60;
- percentheal 100,100;
+ percentheal 100, 100;
close;
}
if (para_suv01 == 26) {
@@ -1503,7 +1503,7 @@ in_orcs01,38,175,3 script Eden Member Hooksha 1_F_SIGNZISK,{
mes "You look tired, I will recover your health.";
mes "If you are in trouble just come back here to safety.";
npcskill "AL_HEAL",11,99,60;
- percentheal 100,100;
+ percentheal 100, 100;
close;
}
if (para_suv01 == 27) {
@@ -1529,7 +1529,7 @@ in_orcs01,38,175,3 script Eden Member Hooksha 1_F_SIGNZISK,{
mes "You look tired, I will recover your health.";
mes "If you are in trouble just come back here to safety.";
npcskill "AL_HEAL",11,99,60;
- percentheal 100,100;
+ percentheal 100, 100;
close;
}
if (para_suv01 == 28) {
@@ -1602,7 +1602,7 @@ in_orcs01,38,175,3 script Eden Member Hooksha 1_F_SIGNZISK,{
mes "You look tired, I will recover your health.";
mes "If you are in trouble just come back here to safety.";
npcskill "AL_HEAL",11,99,60;
- percentheal 100,100;
+ percentheal 100, 100;
close;
}
if (para_suv01 == 31) {
@@ -1626,7 +1626,7 @@ in_orcs01,38,175,3 script Eden Member Hooksha 1_F_SIGNZISK,{
mes "You look tired I will recover your health.";
mes "If you are in trouble just come back here to safety.";
npcskill "AL_HEAL",11,99,60;
- percentheal 100,100;
+ percentheal 100, 100;
close;
}
if (para_suv01 == 32) {
@@ -1729,7 +1729,7 @@ iz_dun04,43,46,3 script Eden Member Callandiva 4_F_CRU,{
mes "Mermans are not easy opponents.";
mes "I will help you recover so cheer up.";
npcskill "AL_HEAL",11,99,60;
- percentheal 100,100;
+ percentheal 100, 100;
close;
}
if (para_suv01 == 35) {
@@ -1763,7 +1763,7 @@ iz_dun04,43,46,3 script Eden Member Callandiva 4_F_CRU,{
mes "Strouf are not easy opponents.";
mes "I can help you recover so cheer up.";
npcskill "AL_HEAL",11,99,60;
- percentheal 100,100;
+ percentheal 100, 100;
close;
}
if (para_suv01 >= 36) {
@@ -1855,38 +1855,31 @@ moc_para01,112,96,5 script Administrator Michael 4_M_RUSMAN1,{
close;
}
mes "[Michael]";
- if (Class == Job_Swordman || Class == Job_Swordman_High || Class == Job_Knight || Class == Job_Crusader) {
+ if (BaseClass == Job_Swordman) {
callsub S_Select,"We have one and Two-handed swords",
P_Slayer1,"Eden Slayer I","Two-handed sword","Attack 162","",
P_Sabre1,"Eden Saber I","One-handed sword","Attack 147","This is what we strive for.";
- }
- if (Class == Job_Thief || Class == Job_Thief_High || Class == Job_Assassin || Class == Job_Rogue || Class == Job_Ninja || Class == Job_Novice || Class == Job_Novice_High) {
+ } else if (BaseClass == Job_Thief || BaseClass == Job_Ninja || BaseClass == Job_Novice) {
callsub S_Select,"",
P_Dagger1,"Eden Dagger I","Dagger","MATK+60, attack 124","This is what we strive for.";
- }
- if (Class == Job_Merchant || Class == Job_Merchant_High || Class == Job_Blacksmith || Class == Job_Alchemist) {
+ } else if (BaseClass == Job_Merchant) {
callsub S_Select,"We have a mace and a One-handed sword",
P_Sabre1,"Eden Saber I","One-handed sword","Attack 147","This is what we strive for.",
P_Mace1,"Eden Mace I","Mace","Attack 142","";
- }
- if (Class == Job_Archer || Class == Job_Archer_High || Class == Job_Hunter || Class == Job_Dancer || Class == Job_Bard) {
+ } else if (BaseClass == Job_Archer) {
callsub S_Select,"",
P_Bow1,"Eden Bow I","Bow","Attack 82","";
- }
- if (Class == Job_Acolyte || Class == Job_Acolyte_High || Class == Job_Priest || Class == Job_Monk) {
+ } else if (BaseClass == Job_Acolyte) {
callsub S_Select,"We have a mace and a staff",
P_Mace1,"Eden Mace I","Mace","Attack 142","",
P_Staff1,"Eden Staff I","Staff","INT+2, MATK+125, attack 60","";
- }
- if (Class == Job_Mage || Class == Job_Mage_High || Class == Job_Wizard || Class == Job_Sage) {
+ } else if (BaseClass == Job_Mage) {
callsub S_Select,"",
P_Staff1,"Eden Staff I","Staff","INT+2, MATK+125, attack 60","";
- }
- if (Class == Job_Gunslinger) {
+ } else if (BaseClass == Job_Gunslinger) {
callsub S_Select,"",
P_Revolver1,"Eden Revolver I","Revolver","HIT-5, attack 44","";
}
-
mes "Let me see... you will receive..";
mes "the Eden Group Boots II and Uniform II.";
next;
@@ -1933,34 +1926,28 @@ moc_para01,112,96,5 script Administrator Michael 4_M_RUSMAN1,{
close;
}
mes "[Michael]";
- if (Class == Job_Swordman || Class == Job_Swordman_High || Class == Job_Knight || Class == Job_Crusader) {
+ if (BaseClass == Job_Swordman) {
callsub S_Select,"We have one and Two-handed swords",
P_Sabre2,"Eden Saber II","One-handed sword","Attack 170","",
P_Slayer2,"Eden Slayer II","Two-handed sword","Attack 185","";
- }
- if (Class == Job_Thief || Class == Job_Thief_High || Class == Job_Assassin || Class == Job_Rogue || Class == Job_Novice || Class == Job_Novice_High || Class == Job_SuperNovice || Class == Job_Soul_Linker || Class == Job_Ninja) {
+ } else if (BaseClass == Job_Thief || BaseClass == Job_Novice || BaseJob == Job_Soul_Linker || BaseClass == Job_Ninja) {
callsub S_Select,"",
P_Dagger2,"Eden Dagger II","Dagger","MATK+70, attack 158","";
- }
- if (Class == Job_Acolyte || Class == Job_Acolyte_High || Class == Job_Priest || Class == Job_Monk) {
+ } else if (BaseClass == Job_Acolyte) {
callsub S_Select,"We have a mace and a staff",
P_Mace2,"Eden Mace II","Mace","Attack 163","",
P_Staff2,"Eden Staff II","Staff","INT+3, MATK+150, attack 60","";
- }
- if (Class == Job_Archer || Class == Job_Archer_High || Class == Job_Hunter || Class == Job_Dancer || Class == Job_Bard) {
+ } else if (BaseClass == Job_Archer) {
callsub S_Select,"",
P_Bow2,"Eden Bow II","Bow","Attack 82","";
- }
- if (Class == Job_Mage || Class == Job_Mage_High || Class == Job_Wizard || Class == Job_Sage) {
+ } else if (BaseClass == Job_Mage) {
callsub S_Select,"",
P_Staff2,"Eden Staff II","Staff","INT+3, MATK+155, attack 60","";
- }
- if (Class == Job_Merchant || Class == Job_Merchant_High || Class == Job_Blacksmith || Class == Job_Alchemist) {
+ } else if (BaseClass == Job_Merchant) {
callsub S_Select,"We have a mace and a One-handed sword",
P_Sabre2,"Eden Saber II","One-handed sword","Attack 170","",
P_Mace2,"Eden Mace II","Mace","Attack 163","";
- }
- if (Class == Job_Gunslinger) {
+ } else if (BaseClass == Job_Gunslinger) {
callsub S_Select,"",
P_Revolver2,"Eden Revolver II","Revolver","HIT-5, attack 60","";
}
@@ -2024,12 +2011,12 @@ moc_para01,112,96,5 script Administrator Michael 4_M_RUSMAN1,{
mes "What status bonus do you want to upgrade?";
next;
switch (select("Upgrade STR", "Upgrade AGI", "Upgrade VIT", "Upgrade INT", "Upgrade DEX", "Upgrade LUK", "Nevermind.")) {
- case 1: callsub S_Upgrade,"STR",4701;
- case 2: callsub S_Upgrade,"AGI",4731;
- case 3: callsub S_Upgrade,"VIT",4741;
- case 4: callsub S_Upgrade,"INT",4711;
- case 5: callsub S_Upgrade,"DEX",4721;
- case 6: callsub S_Upgrade,"LUK",4751;
+ case 1: callsub S_Upgrade,"STR",Strength2;
+ case 2: callsub S_Upgrade,"AGI",Agility2;
+ case 3: callsub S_Upgrade,"VIT",Vitality2;
+ case 4: callsub S_Upgrade,"INT",Inteligence2;
+ case 5: callsub S_Upgrade,"DEX",Dexterity2;
+ case 6: callsub S_Upgrade,"LUK",Luck2;
case 7:
mes "[Michael]";
mes "Why? It'll be beter than it is.";
@@ -2252,8 +2239,7 @@ moc_para01,179,44,3 script Chef 4_M_CHNCOOK,{
mes "- After eating the meal, You feel a little bit full.";
mes "You've recovered some HP and SP. -";
Zeny = Zeny - 2700;
- percentheal 50,0;
- percentheal 0,50;
+ percentheal 50, 50;
close;
}
mes "[Chef]";
@@ -2269,8 +2255,7 @@ moc_para01,179,44,3 script Chef 4_M_CHNCOOK,{
mes "- After eating the meal, You feel a little bit full.";
mes "You've recovered some HP and SP. -";
Zeny = Zeny - 3000;
- percentheal 50,0;
- percentheal 0,50;
+ percentheal 50, 50;
close;
}
mes "[Chef]";
@@ -2291,8 +2276,7 @@ moc_para01,179,44,3 script Chef 4_M_CHNCOOK,{
mes "- After eating the meal, You feel a little bit full.";
mes "You've recovered some HP and SP. -";
Zeny = Zeny - 3600;
- percentheal 75,0;
- percentheal 0,75;
+ percentheal 75, 75;
close;
}
mes "[Chef]";
@@ -2308,8 +2292,7 @@ moc_para01,179,44,3 script Chef 4_M_CHNCOOK,{
mes "- After eating the meal, You feel a little bit full.";
mes "You've recovered some HP and SP. -";
Zeny = Zeny - 4000;
- percentheal 75,0;
- percentheal 0,75;
+ percentheal 75, 75;
close;
}
mes "[Chef]";
@@ -2327,8 +2310,7 @@ moc_para01,179,44,3 script Chef 4_M_CHNCOOK,{
mes "- After eating the meal, You feel a little bit full.";
mes "You've recovered your HP and SP. -";
Zeny = Zeny - 4500;
- percentheal 100,0;
- percentheal 0,100;
+ percentheal 100, 100;
close;
}
mes "[Chef]";
@@ -2346,8 +2328,7 @@ moc_para01,179,44,3 script Chef 4_M_CHNCOOK,{
mes "- After eating the meal, You feel a little bit full.";
mes "You've recovered your HP and SP. -";
Zeny = Zeny - 5000;
- percentheal 100,0;
- percentheal 0,100;
+ percentheal 100, 100;
close;
}
mes "[Chef]";
@@ -2967,7 +2948,7 @@ comodo,173,354,5 script Dispatched Instructor#02 1_M_JOBTESTER,{
mes "[Romeo]";
mes "Let me help you recover if you are tired.";
npcskill "AL_HEAL",10,99,60;
- percentheal 0,100;
+ percentheal 0, 100;
}
}
else if (para_2nd01 == 3) {
@@ -3027,7 +3008,7 @@ um_fild01,34,280,5 script Instructor Romeo#2nd02 1_M_JOBTESTER,{
mes "[Romeo]";
mes "I'll help you recover if you are tired.";
npcskill "AL_HEAL",10,99,60;
- percentheal 0,100;
+ percentheal 0, 100;
}
}
else if (para_2nd01 == 4) {
@@ -3057,7 +3038,7 @@ um_fild01,34,280,5 script Instructor Romeo#2nd02 1_M_JOBTESTER,{
mes "[Romeo]";
mes "I'll help you recover if you are tired.";
npcskill "AL_HEAL",10,99,60;
- percentheal 0,100;
+ percentheal 0, 100;
}
}
else {
@@ -3144,7 +3125,7 @@ glast_01,195,131,5 script Dispatched Instructor#03 4_F_SISTER,{
mes "I'll watch your back!.";
mes "... Of.. Course.. I'll fight too!";
npcskill "AL_HEAL",10,99,60;
- percentheal 0,100;
+ percentheal 0, 100;
}
}
else if (para_2nd01 == 9) {
@@ -3176,7 +3157,7 @@ glast_01,195,131,5 script Dispatched Instructor#03 4_F_SISTER,{
mes "I'll watch your back, like last time.";
mes "... Of... Course... I'll fight them too!";
npcskill "AL_HEAL",10,99,60;
- percentheal 0,100;
+ percentheal 0, 100;
}
}
else if (para_2nd01 == 10) {
@@ -3280,7 +3261,7 @@ ein_fild08,172,359,3 script Dispatched Instructor#04 4_M_4THPRIN1,{
mes "If you're hurt I'll heal you a bit.";
}
npcskill "AL_HEAL",10,99,60;
- percentheal 0,100;
+ percentheal 0, 100;
}
else if (para_2nd01 == 14) {
if (questprogress(7226,HUNTING) == 2 && questprogress(7227,HUNTING) == 2) {
@@ -3312,7 +3293,7 @@ ein_fild08,172,359,3 script Dispatched Instructor#04 4_M_4THPRIN1,{
mes "Ugh this is difficult.";
mes "I'll make you feel better though.";
npcskill "AL_HEAL",10,99,60;
- percentheal 0,100;
+ percentheal 0, 100;
}
}
else if (para_2nd01 == 15) {
@@ -3418,7 +3399,7 @@ ice_dun01,154,13,5 script Dispatched Instructor#05 4_F_JOB_BLACKSMITH,{
setquest 7231; // Hunting and Gathering
getexp 40000,40000;
npcskill "AL_HEAL",10,99,60;
- percentheal 0,100;
+ percentheal 0, 100;
}
else {
mes "The biggest stumbling block is dealing with the Siromas.";
@@ -3637,7 +3618,7 @@ man_fild01,43,234,3 script Dispatched Instructor#07 4_DST_SOLDIER,{
mes "You seem a bit flushed.";
mes "Fine I'll heal you!";
npcskill "AL_HEAL",10,99,60;
- percentheal 0,100;
+ percentheal 0, 100;
}
}
else if (para_2nd01 == 25)
@@ -3722,7 +3703,7 @@ spl_fild02,377,149,3 script Dispatched Instructor#08 4_M_DST_MASTER,{
mes "[Mine]";
mes "You're not lying about being a real adventurer are you?";
npcskill "AL_HEAL",10,99,60;
- percentheal 0,100;
+ percentheal 0, 100;
}
}
else if (para_2nd01 == 27) {
@@ -3952,19 +3933,19 @@ moc_para01,111,83,3 script Blacksmith Thorn#2nd10 2_M_OLDBLSMITH,{
P_Bow3,"Eden Group Bow III","Bow, Attack 140",
P_Tail1,"Eden Group Whip I","Whip, Attack 125";
}
- else if (Class == Job_Ninja) {
+ else if (BaseClass == Job_Ninja) {
callsub L_Select,"",
P_Dagger3,"Eden Group Dagger III","Dagger, MATK +80, ATK 165",
P_Huuma_Shuriken1,"Eden Group Huuma Shuriken I","Huuma Suriken, MATK +50, ATK 170";
}
- else if (Class == Job_Star_Gladiator)
+ else if (BaseJob == Job_Star_Gladiator)
getitem P_Dic1,1;
- else if (Class == Job_Soul_Linker) {
+ else if (BaseJob == Job_Soul_Linker) {
callsub L_Select,"",
P_Dagger3,"Eden Group Dagger III","Dagger, MATK +80, ATK 165",
P_Staff3,"Eden Group Staff III","Staff, MATK +170, INT +4, ATK 60";
}
- else if (Class == Job_Gunslinger)
+ else if (BaseClass == Job_Gunslinger)
getitem P_Revolver3,1;
else {
mes "Hmm, you are eligible to receive equipment.";
@@ -4079,21 +4060,10 @@ moc_para01,112,79,3 script Weapons Expert BK#2nd11 4_M_REPAIR,{
P_Revolver3,
P_Knuckle1,
P_Huuma_Shuriken1;
- .@menu$ = "Eden Group Slayer III:" +
- "Eden Group Saber III:" +
- "Eden Group Dagger III:" +
- "Eden Group Katar I:" +
- "Eden Group Axe I:" +
- "Eden Group Spear I:" +
- "Eden Group Staff III:" +
- "Eden Group Mace III:" +
- "Eden Group Bow III:" +
- "Eden Group Dictionary I:" +
- "Eden Group Guitar I:" +
- "Eden Group Whip I:" +
- "Eden Group Revolver III:" +
- "Eden Group Knuckles I:" +
- "Eden Group Huuma Shuriken I";
+ .@wplist_size = getarraysize(.@wplist);
+ for ( .@i = 0; .@i < .@wplist_size; ++.@i ) {
+ .@menu$ += getitemname(.@wplist[.@i]) + ":";
+ }
mes "[BK]";
mes "What's happening?";
mes "No way?!";