summaryrefslogtreecommitdiff
path: root/npc/pre-re/quests/collection
diff options
context:
space:
mode:
authorHaru <haru@dotalux.com>2015-12-18 05:22:33 +0100
committerHaru <haru@dotalux.com>2015-12-18 05:22:33 +0100
commit8bb331ce4c2e662a096c9f7a8fd308dc1e5eac0a (patch)
tree54669433655bb853309ea1cae12da049622324fa /npc/pre-re/quests/collection
parent53abb8cdf92cd3d153b0a3d5b99b55cbd631f36c (diff)
parent0828824948c77bbfc357e08e8a5a0a96671b1ca6 (diff)
downloadhercules-8bb331ce4c2e662a096c9f7a8fd308dc1e5eac0a.tar.gz
hercules-8bb331ce4c2e662a096c9f7a8fd308dc1e5eac0a.tar.bz2
hercules-8bb331ce4c2e662a096c9f7a8fd308dc1e5eac0a.tar.xz
hercules-8bb331ce4c2e662a096c9f7a8fd308dc1e5eac0a.zip
Merge branch 'dastgir-ScriptCleanup2' into hercules
Closes #920 as merged
Diffstat (limited to 'npc/pre-re/quests/collection')
-rw-r--r--npc/pre-re/quests/collection/quest_alligator.txt8
-rw-r--r--npc/pre-re/quests/collection/quest_caramel.txt8
-rw-r--r--npc/pre-re/quests/collection/quest_coco.txt8
-rw-r--r--npc/pre-re/quests/collection/quest_creamy.txt8
-rw-r--r--npc/pre-re/quests/collection/quest_demonpungus.txt8
-rw-r--r--npc/pre-re/quests/collection/quest_dokebi.txt4
-rw-r--r--npc/pre-re/quests/collection/quest_dryad.txt8
-rw-r--r--npc/pre-re/quests/collection/quest_fabre.txt4
-rw-r--r--npc/pre-re/quests/collection/quest_frilldora.txt4
-rw-r--r--npc/pre-re/quests/collection/quest_goat.txt8
-rw-r--r--npc/pre-re/quests/collection/quest_golem.txt4
-rw-r--r--npc/pre-re/quests/collection/quest_hode.txt8
-rw-r--r--npc/pre-re/quests/collection/quest_leafcat.txt8
-rw-r--r--npc/pre-re/quests/collection/quest_pecopeco.txt4
-rw-r--r--npc/pre-re/quests/collection/quest_pupa.txt4
15 files changed, 48 insertions, 48 deletions
diff --git a/npc/pre-re/quests/collection/quest_alligator.txt b/npc/pre-re/quests/collection/quest_alligator.txt
index 920c3c6a1..84f1d4730 100644
--- a/npc/pre-re/quests/collection/quest_alligator.txt
+++ b/npc/pre-re/quests/collection/quest_alligator.txt
@@ -182,7 +182,7 @@ cmd_fild01,362,256,3 script Cuir#Gator_Hunt 1_M_MOC_LORD,{
switch(select("I have the Anolian Skins:Gators bite!")) {
case 1:
/*
- if (checkweight(503,10) == 0) {
+ if (checkweight(Yellow_Potion,10) == 0) {
mes "[Cuir]";
mes "Hey, it looks like that the weight on";
mes "your back will crush you. Come back";
@@ -190,14 +190,14 @@ cmd_fild01,362,256,3 script Cuir#Gator_Hunt 1_M_MOC_LORD,{
close;
}
*/
- if (countitem(7003) > 19) {
+ if (countitem(Anolian_Skin) > 19) {
mes "[Cuir]";
mes "Thank you for the ^00CE0020 Anolian Skins^000000!";
mes "I hope you can continue to help me collect these skins.";
mes "The armor creators around the world are clamoring for them.";
- delitem 7003,20; //Anolian_Skin
+ delitem Anolian_Skin,20;
getexp 68950,43300;
- //getitem 503,10; //Yellow_Potion
+ //getitem Yellow_Potion,10;
close;
}
else {
diff --git a/npc/pre-re/quests/collection/quest_caramel.txt b/npc/pre-re/quests/collection/quest_caramel.txt
index 20bf28b8e..97d5b50ec 100644
--- a/npc/pre-re/quests/collection/quest_caramel.txt
+++ b/npc/pre-re/quests/collection/quest_caramel.txt
@@ -182,7 +182,7 @@ mjolnir_01,296,29,6 script Yullo#Caramel_Hunt 4_F_SISTER,{
switch(select("I have Porcupine Quills:Well I don't think I can help.")) {
case 1:
/*
- if (checkweight(501,10) == 0) {
+ if (checkweight(Red_Potion,10) == 0) {
mes "[Yullo]";
mes "Hey, it looks like that the weight on";
mes "your back will crush you. Come back";
@@ -190,13 +190,13 @@ mjolnir_01,296,29,6 script Yullo#Caramel_Hunt 4_F_SISTER,{
close;
}
*/
- if (countitem(1027) > 24) {
+ if (countitem(Porcupine_Spike) > 24) {
mes "[Yullo]";
mes "Great, you have enough!";
mes "Just like I promised a little reward.";
- delitem 1027,25; //Porcupine_Spike
+ delitem Porcupine_Spike,25;
getexp 10425,6272;
- //getitem 501,10; //Red_Potion
+ //getitem Red_Potion,10;
close;
}
else {
diff --git a/npc/pre-re/quests/collection/quest_coco.txt b/npc/pre-re/quests/collection/quest_coco.txt
index 88a860610..358726e1a 100644
--- a/npc/pre-re/quests/collection/quest_coco.txt
+++ b/npc/pre-re/quests/collection/quest_coco.txt
@@ -180,7 +180,7 @@ mjolnir_01,293,20,3 script Nutters#Coco_Hunt 4_M_YOYOROGUE,{
switch(select("I have 25 Acorns:Please come again?")) {
case 1:
/*
- if (checkweight(502,5) == 0) {
+ if (checkweight(Orange_Potion,5) == 0) {
mes "[Nutters]";
mes "Hey, it looks like that the weight on";
mes "your back will crush you. Come back";
@@ -188,7 +188,7 @@ mjolnir_01,293,20,3 script Nutters#Coco_Hunt 4_M_YOYOROGUE,{
close;
}
*/
- if (countitem(1026) > 24) {
+ if (countitem(Acorn) > 24) {
mes "[Nutters]";
mes "Oh great you found out where they were hiding them.";
mes "Gimme Gimme!!!";
@@ -196,9 +196,9 @@ mjolnir_01,293,20,3 script Nutters#Coco_Hunt 4_M_YOYOROGUE,{
mes "[Nutters]";
mes "Oh that's right, sorry I just love roasting Acorns. Mmm.";
mes "Here is what I promised you.";
- delitem 1026,25; //Acorn
+ delitem Acorn,25;
getexp 3600,3905;
- //getitem 502,5; //Orange_Potion
+ //getitem Orange_Potion,5;
close;
}
else {
diff --git a/npc/pre-re/quests/collection/quest_creamy.txt b/npc/pre-re/quests/collection/quest_creamy.txt
index 6e0ff1503..e768e1c2c 100644
--- a/npc/pre-re/quests/collection/quest_creamy.txt
+++ b/npc/pre-re/quests/collection/quest_creamy.txt
@@ -179,7 +179,7 @@ prt_fild04,356,148,3 script Laertes#Creamy_Hunt 4_M_NFMAN,{
switch(select("I have Powder of Butterfly:What did you need?")) {
case 1:
/*
- if (checkweight(502,5) == 0) {
+ if (checkweight(Orange_Potion,5) == 0) {
mes "[Laertes]";
mes "Hey, it looks like that the weight on";
mes "your back will crush you. Come back";
@@ -187,13 +187,13 @@ prt_fild04,356,148,3 script Laertes#Creamy_Hunt 4_M_NFMAN,{
close;
}
*/
- if (countitem(924) > 24) {
+ if (countitem(Powder_Of_Butterfly) > 24) {
mes "[Laertes]";
mes "Hey, thank you again.";
mes "Here you go, as promised.";
- delitem 924,25; //Powder_Of_Butterfly
+ delitem Powder_Of_Butterfly,25;
getexp 2950,1125;
- //getitem 502,5; //Orange_Potion
+ //getitem Orange_Potion,5;
close;
}
else {
diff --git a/npc/pre-re/quests/collection/quest_demonpungus.txt b/npc/pre-re/quests/collection/quest_demonpungus.txt
index 87d9bc4a6..f3785b932 100644
--- a/npc/pre-re/quests/collection/quest_demonpungus.txt
+++ b/npc/pre-re/quests/collection/quest_demonpungus.txt
@@ -179,7 +179,7 @@ ein_fild01,43,249,0 script Local Villager#hunt 4_M_HUMAN_01,{
switch(select("I have Bacillus:What did you need?")) {
case 1:
/*
- if (checkweight(504,10) == 0) {
+ if (checkweight(White_Potion,10) == 0) {
mes "[Local Villager]";
mes "Hey, it looks like that the weight on";
mes "your back will crush you. Come back";
@@ -187,12 +187,12 @@ ein_fild01,43,249,0 script Local Villager#hunt 4_M_HUMAN_01,{
close;
}
*/
- if (countitem(7119) > 49) {
+ if (countitem(Spawns) > 49) {
mes "[Local Villager]";
mes "I had my doubts, but you have proven me wrong.";
- delitem 7119,50; //Spawns
+ delitem Spawns,50;
getexp 250266,144452;
- //getitem 504,10; //White_Potion
+ //getitem White_Potion,10;
close;
}
else {
diff --git a/npc/pre-re/quests/collection/quest_dokebi.txt b/npc/pre-re/quests/collection/quest_dokebi.txt
index c357c3234..5226cca51 100644
--- a/npc/pre-re/quests/collection/quest_dokebi.txt
+++ b/npc/pre-re/quests/collection/quest_dokebi.txt
@@ -176,11 +176,11 @@ pay_fild10,108,357,5 script Li#Dokebi_Hunt 4_F_01,{
next;
switch(select("I have some Dokebi Horns:What did you need?")) {
case 1:
- if (countitem(1021) > 49) {
+ if (countitem(Dokkaebi_Horn) > 49) {
mes "[Li]";
mes "Oh, great!";
mes "Thank you for the horns.";
- delitem 1021,50; //Dokkaebi_Horn
+ delitem Dokkaebi_Horn,50;
getexp 42000,36000;
close;
}
diff --git a/npc/pre-re/quests/collection/quest_dryad.txt b/npc/pre-re/quests/collection/quest_dryad.txt
index 4419ca971..339f49761 100644
--- a/npc/pre-re/quests/collection/quest_dryad.txt
+++ b/npc/pre-re/quests/collection/quest_dryad.txt
@@ -180,7 +180,7 @@ um_fild01,34,281,5 script Lilla#Dryad_Hunt 4_F_07,{
switch(select("I have some Sharp Leafs:What did you need?")) {
case 1:
/*
- if (checkweight(504,10) == 0) {
+ if (checkweight(White_Potion,10) == 0) {
mes "[Lilla]";
mes "Hey, it looks like that the weight on";
mes "your back will crush you. Come back";
@@ -188,7 +188,7 @@ um_fild01,34,281,5 script Lilla#Dryad_Hunt 4_F_07,{
close;
}
*/
- if (countitem(7100) > 49) {
+ if (countitem(Sharp_Leaf) > 49) {
mes "[Lilla]";
mes "Hey, your a sweet little thing.";
mes "Thanks so much for helping me!";
@@ -196,9 +196,9 @@ um_fild01,34,281,5 script Lilla#Dryad_Hunt 4_F_07,{
mes "[Lilla]";
mes "Oh, I almost forgot. I have something for you ^_^";
mes "Thank you so much again for your help.";
- delitem 7100,50; //Sharp_Leaf
+ delitem Sharp_Leaf,50;
getexp 262485,141835;
- //getitem 504,10; //White_Potion
+ //getitem White_Potion,10;
close;
}
else {
diff --git a/npc/pre-re/quests/collection/quest_fabre.txt b/npc/pre-re/quests/collection/quest_fabre.txt
index e90cacbdb..ec36e1510 100644
--- a/npc/pre-re/quests/collection/quest_fabre.txt
+++ b/npc/pre-re/quests/collection/quest_fabre.txt
@@ -180,11 +180,11 @@ gef_fild07,321,193,4 script Langry#Fabre_Hunt 4_M_SAGE_A,{
next;
switch(select("I have some Fluff:What was that again?")) {
case 1:
- if (countitem(914) > 24) {
+ if (countitem(Fluff) > 24) {
mes "[Langry]";
mes "Thank you for the Fluff. This helps me out greatly.";
mes "Oh and here you go, this should help you get stronger, faster!";
- delitem 914,25; //Fluff
+ delitem Fluff,25;
getexp 385,30;
close;
}
diff --git a/npc/pre-re/quests/collection/quest_frilldora.txt b/npc/pre-re/quests/collection/quest_frilldora.txt
index 5612f7c78..876101cca 100644
--- a/npc/pre-re/quests/collection/quest_frilldora.txt
+++ b/npc/pre-re/quests/collection/quest_frilldora.txt
@@ -179,11 +179,11 @@ moc_fild17,66,273,5 script Lemly#Frilldora_Hunt 4_F_JOB_ASSASSIN,{
// Item turn in
switch(select("I have some Frills:What did you need?")) {
case 1:
- if (countitem(1012) > 24) {
+ if (countitem(Lizard_Scruff) > 24) {
mes "[Lemly]";
mes "Hey, thank you.";
mes "These are pretty icky though.";
- delitem 1012,25; //Lizard_Scruff
+ delitem Lizard_Scruff,25;
getexp 30000,23000;
close;
}
diff --git a/npc/pre-re/quests/collection/quest_goat.txt b/npc/pre-re/quests/collection/quest_goat.txt
index 434840f9e..6c7a9ea88 100644
--- a/npc/pre-re/quests/collection/quest_goat.txt
+++ b/npc/pre-re/quests/collection/quest_goat.txt
@@ -180,7 +180,7 @@ ein_fild06,82,171,0 script Vegetable Farmer#Goat 4_F_SHABBY,{
switch(select("I have Antelope Horns:What did you need?")) {
case 1:
/*
- if (checkweight(504,10) == 0) {
+ if (checkweight(White_Potion,10) == 0) {
mes "[Vegetable Farmer]";
mes "Hey, it looks like that the weight on";
mes "your back will crush you. Come back";
@@ -188,13 +188,13 @@ ein_fild06,82,171,0 script Vegetable Farmer#Goat 4_F_SHABBY,{
close;
}
*/
- if (countitem(7106) > 49) {
+ if (countitem(Goat's_Horn) > 49) {
mes "[Vegetable Farmer]";
mes "Amazing, you did that with speed.";
mes "I am truly grateful.";
- delitem 7106,50; //Goat's_Horn
+ delitem Goat's_Horn,50;
getexp 258489,155155;
- //getitem 504,10; //White_Potion
+ //getitem White_Potion,10;
close;
}
else {
diff --git a/npc/pre-re/quests/collection/quest_golem.txt b/npc/pre-re/quests/collection/quest_golem.txt
index 79059da29..2ab40efc2 100644
--- a/npc/pre-re/quests/collection/quest_golem.txt
+++ b/npc/pre-re/quests/collection/quest_golem.txt
@@ -177,10 +177,10 @@ moc_fild11,57,138,0 script Private Jeremy#hunt 4_M_MOC_SOLDIER,{
next;
switch(select("I have Stone Hearts:What did you need?")) {
case 1:
- if (countitem(953) > 24) {
+ if (countitem(Stone_Heart) > 24) {
mes "[Private Jeremy]";
mes "The Morroc Guard thanks you, citizen.";
- delitem 953,25; //Stone_Heart
+ delitem Stone_Heart,25;
getexp 14000,9000;
close;
}
diff --git a/npc/pre-re/quests/collection/quest_hode.txt b/npc/pre-re/quests/collection/quest_hode.txt
index 5c5fe33e3..16cbf69aa 100644
--- a/npc/pre-re/quests/collection/quest_hode.txt
+++ b/npc/pre-re/quests/collection/quest_hode.txt
@@ -182,7 +182,7 @@ moc_fild17,208,346,5 script Shone#Hode_Hunt 4_M_MOC_SOLDIER,{
switch(select("I have 25 Earthworm Peelings:What was it again?")) {
case 1:
/*
- if (checkweight(502,10) == 0) {
+ if (checkweight(Orange_Potion,10) == 0) {
mes "[Shone]";
mes "Hey, it looks like that the weight on";
mes "your back will crush you. Come back";
@@ -190,13 +190,13 @@ moc_fild17,208,346,5 script Shone#Hode_Hunt 4_M_MOC_SOLDIER,{
close;
}
*/
- if (countitem(1055) > 24) {
+ if (countitem(Earthworm_Peeling) > 24) {
mes "Thank you for the 25 Earthworm";
mes "Peelings!";
mes "Here is that reward I promised you, I hope take this wisdom I have passed on to you and share it with others.";
- delitem 1055,25; //Earthworm_Peeling
+ delitem Earthworm_Peeling,25;
getexp 15775,1125;
- //getitem 502,10; //Orange_Potion
+ //getitem Orange_Potion,10;
close;
}
else {
diff --git a/npc/pre-re/quests/collection/quest_leafcat.txt b/npc/pre-re/quests/collection/quest_leafcat.txt
index 3b3a0eab6..c980926e5 100644
--- a/npc/pre-re/quests/collection/quest_leafcat.txt
+++ b/npc/pre-re/quests/collection/quest_leafcat.txt
@@ -179,7 +179,7 @@ ayo_fild01,44,241,5 script Lella#LeafCat_Hunt 4_F_YUNYANG,{
switch(select("I have 50 Huge Leafs:What, sorry I was day dreaming")) {
case 1:
/*
- if (checkweight(503,10) == 0) {
+ if (checkweight(Yellow_Potion,10) == 0) {
mes "[Lella]";
mes "Hey, it looks like that the weight on";
mes "your back will crush you. Come back";
@@ -187,15 +187,15 @@ ayo_fild01,44,241,5 script Lella#LeafCat_Hunt 4_F_YUNYANG,{
close;
}
*/
- if (countitem(7198) > 49) {
+ if (countitem(Great_Leaf) > 49) {
mes "[Lella]";
mes "Wonderful I can tell it is just a little bit quieter around here!";
next;
mes "[Lella]";
mes "The more leafs I collect the quieter it seems around here.";
- delitem 7198,50; //Great_Leaf
+ delitem Great_Leaf,50;
getexp 25740,31512;
- //getitem 503,10; //Yellow_Potion
+ //getitem Yellow_Potion,10;
close;
}
else {
diff --git a/npc/pre-re/quests/collection/quest_pecopeco.txt b/npc/pre-re/quests/collection/quest_pecopeco.txt
index 462703638..32c595c92 100644
--- a/npc/pre-re/quests/collection/quest_pecopeco.txt
+++ b/npc/pre-re/quests/collection/quest_pecopeco.txt
@@ -195,10 +195,10 @@ moc_fild02,74,329,3 script Gregor#PecoPeco_Hunt 4W_M_01,{
next;
switch(select("I have some Bill of Birds:What did you need?")) {
case 1:
- if (countitem(925) > 24) {
+ if (countitem(Bill_Of_Birds) > 24) {
mes "[Gregor]";
mes "Thank you so much.";
- delitem 925,25; //Bill_Of_Birds
+ delitem Bill_Of_Birds,25;
getexp 4000,2000;
next;
mes "[Gregor]";
diff --git a/npc/pre-re/quests/collection/quest_pupa.txt b/npc/pre-re/quests/collection/quest_pupa.txt
index 4280870ea..5868fae84 100644
--- a/npc/pre-re/quests/collection/quest_pupa.txt
+++ b/npc/pre-re/quests/collection/quest_pupa.txt
@@ -185,11 +185,11 @@ gef_fild04,191,54,3 script Halgus#Pupa_Hunt 2_F_MAGICMASTER,{
next;
switch(select("I have Chrysalis:What did you need?")) {
case 1:
- if (countitem(915) > 24) {
+ if (countitem(Chrysalis) > 24) {
mes "[Halgus]";
mes "Amazing you found so many that fast.";
mes "Like I promised, give me the Chrysalis and I will reward you with my wisdom.";
- delitem 915,25; //Chrysalis
+ delitem Chrysalis,25;
getexp 385,30;
close;
}