summaryrefslogtreecommitdiff
path: root/npc/instances
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/instances
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/instances')
-rw-r--r--npc/instances/EndlessTower.txt24
-rw-r--r--npc/instances/NydhoggsNest.txt4
-rw-r--r--npc/instances/SealedShrine.txt48
3 files changed, 38 insertions, 38 deletions
diff --git a/npc/instances/EndlessTower.txt b/npc/instances/EndlessTower.txt
index 2f58b6276..b1126c0bc 100644
--- a/npc/instances/EndlessTower.txt
+++ b/npc/instances/EndlessTower.txt
@@ -44,7 +44,7 @@
6@tower mapflag src4instance
alberta,214,77,6 script Captain Janssen 4_M_SEAMAN,{
- if (checkweight(1201,1) == 0) {
+ if (checkweight(Knife,1) == 0) {
mes "^008800Wait here!!";
mes "You're carrying too much stuff. Why don't you put some of it away, and then come back.^000000";
close;
@@ -1203,12 +1203,12 @@ function script F_Tower_Warp {
setarray .@map$[1],"2@tower","3@tower","4@tower";
.@i = select("26th Level:51st Level:76th Level");
- if (countitem(6000) < .@i) {
+ if (countitem(Dark_Ashes) < .@i) {
mes "-Warning-";
mes "To warp to the "+.@level$[.@i]+" Level, you need "+.@i+" Ashes of the Darkness.";
close;
}
- delitem 6000,.@i; //Dark_Ashes
+ delitem Dark_Ashes,.@i;
mapannounce instance_mapname("1@tower"), strcharinfo(0)+". You will be warped to the "+.@level$[.@i]+" Level.",bc_map,"0x00ff99";
warp instance_mapname(.@map$[.@i]),52,354;
close;
@@ -1334,7 +1334,7 @@ OnEnable:
end;
OnTouch_:
- getitem 6000,1; //Dark_Ashes
+ getitem Dark_Ashes,1;
warp instance_mapname("2@tower"),52,354;
end;
@@ -1466,7 +1466,7 @@ OnEnable:
end;
OnTouch_:
- getitem 6000,1; //Dark_Ashes
+ getitem Dark_Ashes,1;
warp instance_mapname("3@tower"),52,354;
end;
@@ -1581,7 +1581,7 @@ OnEnable:
end;
OnTouch_:
- getitem 6000,1; //Dark_Ashes
+ getitem Dark_Ashes,1;
warp instance_mapname("4@tower"),52,354;
end;
@@ -1695,7 +1695,7 @@ OnEnable:
end;
OnTouch_:
- getitem 6000,1; //Dark_Ashes
+ getitem Dark_Ashes,1;
warp instance_mapname("5@tower"),101,72;
end;
@@ -2124,7 +2124,7 @@ OnMyMobDead:
}
6@tower,169,127,2 script Lost Soul#102 4_M_NFDEADSWDMAN,{
- if (checkweight(1201,1) == 0) {
+ if (checkweight(Knife,1) == 0) {
mes "You're carrying too much stuff. Why don't you put some of it away, and then come back?";
close;
}
@@ -2134,7 +2134,7 @@ OnMyMobDead:
mes "[Lost Souls]";
mes "Thank you so much. Now we can escape from this cold and dark place... to heaven.";
next;
- if ((countitem(13412) > 0) && (countitem(13413) > 0)) {
+ if ((countitem(Twin_Edge_B) > 0) && (countitem(Twin_Edge_R) > 0)) {
mes "[Lost Souls]";
mes "Hey, you have the remnants of Nacht Sieger with you.";
next;
@@ -2151,9 +2151,9 @@ OnMyMobDead:
mes "[Lost Souls]";
mes "Good, then I'll combine these to create a two-handed sword.";
next;
- delitem 13412,1; //Twin_Edge_B
- delitem 13413,1; //Twin_Edge_R
- getitem 1185,1; //Violet_Fear
+ delitem Twin_Edge_B,1;
+ delitem Twin_Edge_R,1;
+ getitem Violet_Fear,1;
break;
case 2:
mes "[Lost Souls]";
diff --git a/npc/instances/NydhoggsNest.txt b/npc/instances/NydhoggsNest.txt
index 58351581f..a1d9de802 100644
--- a/npc/instances/NydhoggsNest.txt
+++ b/npc/instances/NydhoggsNest.txt
@@ -1053,7 +1053,7 @@ spl_in01,104,56,3 script Aide Arioss#edq 4_F_FAIRYKID2,3,3,{
mes "[Aide Arioss]";
mes "It can't compare with the effort you have put in for us... but please accept our token of friendship.";
getexp 1500000,350000;
- getitem 6081,10; //Splendide_Coin
+ getitem Splendide_Coin,10;
ins_nyd = 131;
mes "[Aide Arioss]";
mes "If we can help you with anything in the future, we will do all we can to assist you. Once again, thank you.";
@@ -1289,7 +1289,7 @@ man_in01,311,57,3 script Neat Etorr#edq 4_MAN_NITT,3,3,{
mes "[Neat Etorr]";
mes "It's not a lot, but please this as a token of our appreciation.";
getexp 1500000,350000;
- getitem 6080,10; //Manuk_Coin
+ getitem Manuk_Coin,10;
ins_nyd = 132;
close;
} else if (ins_nyd == 132) {
diff --git a/npc/instances/SealedShrine.txt b/npc/instances/SealedShrine.txt
index 9f8dc6620..89b9a6f98 100644
--- a/npc/instances/SealedShrine.txt
+++ b/npc/instances/SealedShrine.txt
@@ -47,7 +47,7 @@ monk_test,309,146,3 script Friar Patrick#edq 4_M_OLDFRIAR,{
mes "[Friar Patrick]";
mes "What brought you to this place?";
next;
- if (countitem(6004) > 0) {
+ if (countitem(Bapho_Doll) > 0) {
.@doll = 1;
.@selection = select("What is this place?:I want to enter.:About the Cursed Baphomet Doll.:Cancel.");
}
@@ -222,7 +222,7 @@ monk_test,309,146,3 script Friar Patrick#edq 4_M_OLDFRIAR,{
}
monk_test,306,151,3 script Grave of Baphomet#edq HIDDEN_NPC,{
- if (countitem(6002)) delitem 6002,countitem(6002); //Token_Of_Apostle
+ if (countitem(Token_Of_Apostle)) delitem Token_Of_Apostle,countitem(Token_Of_Apostle);
mes "This gravestone has a carving of a wicked devil with large horns. It arouses an ominous feeling.";
next;
if(select("Touch the stone.:Step back.") == 2)
@@ -277,7 +277,7 @@ prt_monk,261,91,3 script Rust Blackhand#edq 4_M_DWARF,{
mes "[Rust Blackhand]";
mes "Did you bring all of the ingredients?";
next;
- if (countitem(6004) && countitem(2256) && (countitem(7799) > 29) && (countitem(7798) > 49) && (Zeny >= 990000)) {
+ if (countitem(Bapho_Doll) && countitem(Magestic_Goat) && (countitem(Dark_Crystal) > 29) && (countitem(Dark_Debris) > 49) && (Zeny >= 990000)) {
mes "[Rust Blackhand]";
mes "kkk... You prepared the ingredients well. Why don't you leave it there and wait?";
next;
@@ -290,13 +290,13 @@ prt_monk,261,91,3 script Rust Blackhand#edq 4_M_DWARF,{
next;
mes "... ... ...";
next;
- delitem 6004,1; //Bapho_Doll
- delitem 2256,1; //Magestic_Goat
- delitem 7799,30; //Dark_Crystal
- delitem 7798,50; //Dark_Debris
+ delitem Bapho_Doll,1;
+ delitem Magestic_Goat,1;
+ delitem Dark_Crystal,30;
+ delitem Dark_Debris,50;
Zeny -= 990000;
completequest 3043;
- getitem 5374,1; //L_Magestic_Goat
+ getitem L_Magestic_Goat,1;
mes "[Rust Blackhand]";
mes "It's done. You may be excited, of course. I understand...";
next;
@@ -316,7 +316,7 @@ prt_monk,261,91,3 script Rust Blackhand#edq 4_M_DWARF,{
close;
}
}
- else if (!.@new_maje && countitem(6004) > 0) {
+ else if (!.@new_maje && countitem(Bapho_Doll) > 0) {
switch(select("About the Cursed Baphomet Doll:Stop talking.")) {
case 1:
mes "[Rust Blackhand]";
@@ -371,12 +371,12 @@ prt_monk,261,91,3 script Rust Blackhand#edq 4_M_DWARF,{
close;
}
}
- else if (!.@new_maje && !countitem(6004)) {
+ else if (!.@new_maje && !countitem(Bapho_Doll)) {
mes "[Rust Blackhand]";
mes "If you don't have business with me, go away! As you see, I make equipment for the Brothers at the monastery, not for adventurers like you. Do you understand?";
close;
}
- else if (.@new_maje == 2 && countitem(6004)) {
+ else if (.@new_maje == 2 && countitem(Bapho_Doll)) {
switch(select("About the Cursed Baphomet Doll:Stop talking.")) {
case 1:
mes "[Rust Blackhand]";
@@ -429,7 +429,7 @@ prt_monk,261,91,3 script Rust Blackhand#edq 4_M_DWARF,{
close;
}
}
- else if (.@new_maje == 2 && !countitem(6004)) {
+ else if (.@new_maje == 2 && !countitem(Bapho_Doll)) {
mes "[Rust Blackhand]";
mes "Why are you hanging around here? If you don't want a ^4d4dffGigantic Magestic Goat^000000, go away.";
close;
@@ -485,7 +485,7 @@ OnMyMobDead:
if (mobcount(.@map$,instance_npcname("ins_baphomet_lotto3")+"::OnMyMobDead") < 1) {
mapannounce .@map$, "All apostles of Baphomet are dead!",bc_map,"0x00ff99";
}
- getitem 6002,1; //Token_Of_Apostle
+ getitem Token_Of_Apostle,1;
end;
}
@@ -552,12 +552,12 @@ OnMyMobDead:
mes "[Voice of the Gravestone]";
mes "Did you find the pendant?";
next;
- if (countitem(6003) > 0) {
+ if (countitem(Soul_Pendant) > 0) {
specialeffect EF_MAPPILLAR;
mes "[Voice of the Gravestone]";
mes "Yes... This is... My pendant...";
next;
- delitem 6003,1; //Soul_Pendant
+ delitem Soul_Pendant,1;
enablenpc instance_npcname("Ancient Hero's Soul#1F");
disablenpc instance_npcname("Gravestone#");
mes "[Voice of the Gravestone]";
@@ -734,8 +734,8 @@ OnInstanceInit: // Temporary fix for @reloadscript.
mes "[Ancient Hero's Soul]";
mes "Did you get 10 ^0000FFEssence of Fire^000000 and ^0000FFToken of Apostle^000000?";
next;
- if ((countitem(6001) > 9) && (countitem(6002) > 0)) {
- delitem 6001,countitem(6001); //Essence_Of_Fire
+ if ((countitem(Essence_Of_Fire) > 9) && (countitem(Token_Of_Apostle) > 0)) {
+ delitem Essence_Of_Fire,countitem(Essence_Of_Fire);
'ins_baphomet = 4;
mes "[Ancient Hero's Soul]";
mes "Okay. You've done your work. Now check your companions and tell me when everyone has finished their work.";
@@ -753,7 +753,7 @@ OnInstanceInit: // Temporary fix for @reloadscript.
mes "[Ancient Hero's Soul]";
mes "Do you have a ^0000FFToken of Apostle^000000?";
next;
- if (countitem(6002) > 0) {
+ if (countitem(Token_Of_Apostle) > 0) {
'ins_baphomet = 4;
mes "[Ancient Hero's Soul]";
mes "Okay. You've done your work. Tell your representative to check your companions and come to me when everyone has finished their work.";
@@ -819,8 +819,8 @@ OnInstanceInit:
//== To 2F Warp ============================================
1@cata,281,12,0 script ins_bapho_to_2f WARPNPC,1,1,{
OnTouch:
- if (countitem(6002) > 0) {
- delitem 6002,countitem(6002); //Token_Of_Apostle
+ if (countitem(Token_Of_Apostle) > 0) {
+ delitem Token_Of_Apostle,countitem(Token_Of_Apostle);
'ins_baphomet = 5;
warp instance_mapname("2@cata"),80,144;
end;
@@ -839,7 +839,7 @@ OnInstanceInit:
//== Gravestones ===========================================
- script Gravestone#SS1 -1,{
if ('ins_baphomet == 1) {
- getitem 6003,1; //Soul_Pendant
+ getitem Soul_Pendant,1;
'ins_baphomet = 2;
mes "A small object is shining under a leaning grave.";
next;
@@ -888,18 +888,18 @@ OnInstanceInit:
- script Bobbing Torch#SS -1,{
.@party_id = getcharid(1);
if (getpartyleader(.@party_id,2) == getcharid(0)) {
- if (('ins_baphomet == 3) && (countitem(6001) < 11)) {
+ if (('ins_baphomet == 3) && (countitem(Essence_Of_Fire) < 11)) {
mes "A huge torch appearing as if it can burn everything is bobbing up and down in front of me.";
next;
mes "The grand appearance and heat of the fire makes me step back... But I pluck up my courage and reach out to pick up the torch.";
next;
specialeffect2 EF_HOLYHIT;
- getitem 6001,1; //Essence_Of_Fire
+ getitem Essence_Of_Fire,1;
mes "The symbol of inheritor shines. Then a small crystal falls into my hand from the torch.";
disablenpc instance_npcname(strnpcinfo(0));
close;
}
- else if (('ins_baphomet == 3) && (countitem(6001) > 10)) {
+ else if (('ins_baphomet == 3) && (countitem(Essence_Of_Fire) > 10)) {
mes "You have 10 Essence of Fire already, so you don't need to collect any more.";
close;
}