summaryrefslogtreecommitdiff
path: root/npc/quests
diff options
context:
space:
mode:
Diffstat (limited to 'npc/quests')
-rw-r--r--npc/quests/bard_quest.txt2
-rw-r--r--npc/quests/bunnyband.txt10
-rw-r--r--npc/quests/okolnir.txt6
-rw-r--r--npc/quests/quests_13_1.txt4
-rw-r--r--npc/quests/quests_13_2.txt8
-rw-r--r--npc/quests/quests_lutie.txt4
-rw-r--r--npc/quests/seals/mjolnir_seal.txt2
-rw-r--r--npc/quests/skills/bard_skills.txt2
-rw-r--r--npc/quests/skills/sage_skills.txt34
-rw-r--r--npc/quests/thana_quest.txt18
-rw-r--r--npc/quests/the_sign_quest.txt20
11 files changed, 55 insertions, 55 deletions
diff --git a/npc/quests/bard_quest.txt b/npc/quests/bard_quest.txt
index f429e46e6..630b15196 100644
--- a/npc/quests/bard_quest.txt
+++ b/npc/quests/bard_quest.txt
@@ -28,7 +28,7 @@
//============================================================
geffen,132,38,3 script Bard#2 1_M_BARD,{
- if (bard_q > 5) set gef_bard_q,bard_q;
+ if (BARD_Q > 5) set gef_bard_q,BARD_Q;
set @name$,strcharinfo(0);
if (gef_bard_q > 29) {
cutin "bard_eland02",2;
diff --git a/npc/quests/bunnyband.txt b/npc/quests/bunnyband.txt
index 5effd046a..8eb89773a 100644
--- a/npc/quests/bunnyband.txt
+++ b/npc/quests/bunnyband.txt
@@ -31,14 +31,14 @@ alberta,26,229,0 script Kafra Employee#bunny 4_M_01,{
mes "see if you brought";
mes "all the items...";
next;
- setarray .@Items[0],949,100,706,1,722,1,2213,1;
+ setarray .@items[0],949,100,706,1,722,1,2213,1;
for(set .@i,0; .@i<8; set .@i,.@i+2)
- if (countitem(.@Items[.@i]) < .@Items[.@i+1]) {
+ if (countitem(.@items[.@i]) < .@items[.@i+1]) {
mes "[Kafra Employee]";
mes "Ooh, I'm sorry";
mes "but you need to";
mes "bring at least";
- mes .@Items[.@i+1]+" "+getitemname(.@Items[.@i])+((!.@i)?"s.":".");
+ mes .@items[.@i+1]+" "+getitemname(.@items[.@i])+((!.@i)?"s.":".");
close;
}
mes "[Kafra Employee]";
@@ -50,12 +50,12 @@ alberta,26,229,0 script Kafra Employee#bunny 4_M_01,{
mes "while I put it together...";
next;
for(set .@i,0; .@i<8; set .@i,.@i+2)
- if (countitem(.@Items[.@i]) < .@Items[.@i+1]) {
+ if (countitem(.@items[.@i]) < .@items[.@i+1]) {
mes "[Kafra Employee]";
mes "Hm? I'm sorry,";
mes "but I actually can't";
mes "make this right now. You";
- mes "need "+.@Items[.@i+1]+" "+getitemname(.@Items[.@i])+((!.@i)?"s":"");
+ mes "need "+.@items[.@i+1]+" "+getitemname(.@items[.@i])+((!.@i)?"s":"");
mes "in order for me to put this";
mes "Bunny Band together...";
close;
diff --git a/npc/quests/okolnir.txt b/npc/quests/okolnir.txt
index c1e09bfec..78d4e6b0e 100644
--- a/npc/quests/okolnir.txt
+++ b/npc/quests/okolnir.txt
@@ -58,9 +58,9 @@ function script F_Okolnir {
mes "Would you like to try to enter here?";
close;
case 2:
- set .@Defence,getcastledata(strnpcinfo(4),3);
+ set .@defence,getcastledata(strnpcinfo(4),3);
set .@Economy,getcastledata(strnpcinfo(4),2);
- if ((.@Economy > 64) && (.@Defence > 29)) {
+ if ((.@Economy > 64) && (.@defence > 29)) {
mes "[Guide]";
mes "Great! Economy and Defense are OK.";
mes "You can enter Okolnir now....";
@@ -425,7 +425,7 @@ OnTouch:
case 4: set .@m, 1661; break;
case 5: set .@m, 1660; break;
case 6: set .@m, 1659; break;
- Default: set .@m, 1652; break;
+ default: set .@m, 1652; break;
}
monster "que_q"+getarg(0),getarg(1),getarg(2),strcharinfo(0),.@m,1,"#Gate_manager_"+getarg(0)+"::OnMyMobDead";
return;
diff --git a/npc/quests/quests_13_1.txt b/npc/quests/quests_13_1.txt
index a928466c9..b176b4081 100644
--- a/npc/quests/quests_13_1.txt
+++ b/npc/quests/quests_13_1.txt
@@ -9838,7 +9838,7 @@ mid_camp,206,286,3 script Expedition Messenger 4_M_MOCASS1,{
mes "[Expedition Messenger]";
mes "Guys, it's time to go.";
next;
- donpcevent "Expedition Messenger#2::Ongo";
+ donpcevent "Expedition Messenger#2::OnGo";
mes "[Expedition Messenger]";
mes "You, head to Schwaltzval Republic.";
mes "And you, take Arunafeltz. I'll visit Prontera Palace.";
@@ -10041,7 +10041,7 @@ OnEnable:
enablenpc "Expedition Messenger#2";
end;
-Ongo:
+OnGo:
enablenpc "Expedition Messenger#2";
enablenpc "Expedition Messenger#3";
end;
diff --git a/npc/quests/quests_13_2.txt b/npc/quests/quests_13_2.txt
index 3cf920833..16a4a6aa6 100644
--- a/npc/quests/quests_13_2.txt
+++ b/npc/quests/quests_13_2.txt
@@ -4821,11 +4821,11 @@ man_in01,372,221,5 script Scientist#lifeguard 4_MAN_BENKUNI,{
function script find_13_2 {
switch (getarg(0)) {
- case 0: setarray .@Check[0],2,10; set .@str$,"Mt. Mjolnir"; break;
- case 1: setarray .@Check[0],3,5; set .@str$,"Abyss Lake"; break;
- case 2: setarray .@Check[0],4,5; set .@str$,"Thor Volcano"; break;
+ case 0: setarray .@check[0],2,10; set .@str$,"Mt. Mjolnir"; break;
+ case 1: setarray .@check[0],3,5; set .@str$,"Abyss Lake"; break;
+ case 2: setarray .@check[0],4,5; set .@str$,"Thor Volcano"; break;
}
- if (ep13_2_tre != .@Check[0] || countitem(6076) != 1 || countitem(6077) >= .@Check[1]) end;
+ if (ep13_2_tre != .@check[0] || countitem(6076) != 1 || countitem(6077) >= .@check[1]) end;
mes "- Just arrived at "+.@str$+". I think I can find the mineral by using the Mineral Detector in the Portable Toolbox. -";
next;
switch(select("Check current location.:Do nothing.")) {
diff --git a/npc/quests/quests_lutie.txt b/npc/quests/quests_lutie.txt
index 8036e9471..9fe31ec59 100644
--- a/npc/quests/quests_lutie.txt
+++ b/npc/quests/quests_lutie.txt
@@ -169,7 +169,7 @@ xmas,115,297,4 script Vending Machine HIDDEN_NPC,{
delitem 1036,20; //Dragon_Scale
delitem 7012,200; //Tough_Scalelike_Stem
delitem 7065,300; //Sea_Otter_Leather
- emotion e_Oh;
+ emotion e_oh;
mes "^3355FF*Vroooooom~~*";
mes "*Bzzzzzt*";
mes "*choogachooga*";
@@ -344,7 +344,7 @@ xmas,115,297,4 script Vending Machine HIDDEN_NPC,{
mes "Items.^000000";
close;
}
- emotion e_x;
+ emotion e_X;
mes "[Audi]";
mes "^555555Error Error!";
mes "Incorrect items!^000000";
diff --git a/npc/quests/seals/mjolnir_seal.txt b/npc/quests/seals/mjolnir_seal.txt
index 9457f431a..08cb2e030 100644
--- a/npc/quests/seals/mjolnir_seal.txt
+++ b/npc/quests/seals/mjolnir_seal.txt
@@ -60,7 +60,7 @@ prontera,124,297,3 script Tialfi 4_M_KID1,{
else if (BaseJob == Job_Blacksmith){
set .@gift,4;
}
- else if (BaseJob == Job_hunter){
+ else if (BaseJob == Job_Hunter){
set .@gift,5;
}
else if (BaseJob == Job_Assassin){
diff --git a/npc/quests/skills/bard_skills.txt b/npc/quests/skills/bard_skills.txt
index 0074a5a79..ccafb4b2a 100644
--- a/npc/quests/skills/bard_skills.txt
+++ b/npc/quests/skills/bard_skills.txt
@@ -19,7 +19,7 @@
//= 1.3a Tixed an item ID typo. Thanks, 2Spiritual Kid
//= 1.3b Split into different files [DracoRPG]
//= 1.4 Rescripted to Aegis 10.3 standards. [L0ne_W0lf]
-//= 1.4a Checks the proper variable now. (bard_q -> gef_bard_q) [L0ne_W0lf]
+//= 1.4a Checks the proper variable now. (BARD_Q -> gef_bard_q) [L0ne_W0lf]
//= 1.5 Corrected NPC names to fall within proper restrictions. [L0ne_W0lf]
//= 1.6 Added missing checkweights. [L0ne_W0lf]
//= 1.6 Replaced effect numerics with constants. [L0ne_W0lf]
diff --git a/npc/quests/skills/sage_skills.txt b/npc/quests/skills/sage_skills.txt
index 5fdc38741..2bcda5082 100644
--- a/npc/quests/skills/sage_skills.txt
+++ b/npc/quests/skills/sage_skills.txt
@@ -80,15 +80,15 @@ yuno_in03,176,24,3 script Mischna 4_M_SAGE_C,{
next;
setarray .@ReqSkill[0],280,283,282,281;
setarray .@ReqSkill$[0],"Blaze","Quake","Tornado","Tsunami";
- setarray .@Skill[0],1018,1017,1019,1008;
- setarray .@Skill$[0],"Fire","Earth","Wind","Water";
+ setarray .@skill[0],1018,1017,1019,1008;
+ setarray .@skill$[0],"Fire","Earth","Wind","Water";
while(1) {
set .@i, select("Fire Elemental Change:Earth Elemental Change:Wind Elemental Change:Water Elemental Change")-1;
if(getskilllv(.@ReqSkill[.@i]) == 0) {
mes "[Mishuna]";
mes "I'm sorry, but you haven't";
mes "learned ^FF0000Endow "+.@ReqSkill$[.@i]+"^000000, the skill";
- mes "required for ^FF0000"+.@Skill$[.@i]+" Elemental";
+ mes "required for ^FF0000"+.@skill$[.@i]+" Elemental";
mes "Change^000000. You'll need to learn";
mes "Endow "+.@ReqSkill$[.@i]+" or select another";
mes "Elemental Change skill.";
@@ -97,7 +97,7 @@ yuno_in03,176,24,3 script Mischna 4_M_SAGE_C,{
else {
mes "[Mishuna]";
mes "Very well, I shall";
- mes "teach you the ^FF0000"+.@Skill$[.@i];
+ mes "teach you the ^FF0000"+.@skill$[.@i];
mes "Elemental Change^000000 skill";
mes "and the ^FF0000Elemental Converter";
mes "Creation skill^000000. Please remain";
@@ -112,10 +112,10 @@ yuno_in03,176,24,3 script Mischna 4_M_SAGE_C,{
specialeffect2 EF_BRANDISHSPEAR;
next;
mes "^3355FFYou've successfully";
- mes "learned the "+.@Skill$[.@i]+" Elemental";
+ mes "learned the "+.@skill$[.@i]+" Elemental";
mes "Change skill and the Elemental";
mes "Converter Creation skill.^000000";
- skill .@Skill[.@i],1,0;
+ skill .@skill[.@i],1,0;
if(.@Convert == 0)
skill "SA_CREATECON",1,0;
next;
@@ -356,14 +356,14 @@ yuno_in03,176,24,3 script Mischna 4_M_SAGE_C,{
setarray .@ReqSkill[0],280,283,282,281;
setarray .@ReqSkill$[0],"Blaze","Quake","Tornado","Tsunami";
setarray .@ReqItem$[0],"Red Bloods","Green Lives","Wind of Verdure","Crystal Blues";
- setarray .@Skill$[0],"Fire","Earth","Wind","Water";
+ setarray .@skill$[0],"Fire","Earth","Wind","Water";
while(1) {
set .@i, select("Fire Elemental Change:Earth Elemental Change:Wind Elemental Change:Water Elemental Change")-1;
if(getskilllv(.@ReqSkill[.@i]) == 0) {
mes "[Mishuna]";
mes "I'm sorry, but you have not";
mes "learned ^FF0000Endow "+.@ReqSkill$[.@i]+"^000000, the skill";
- mes "required for the "+.@Skill$[.@i]+" Elemental Change skill. Please learn Endow";
+ mes "required for the "+.@skill$[.@i]+" Elemental Change skill. Please learn Endow";
mes .@ReqSkill$[.@i]+" or select another Elemental Change skill for me to teach you.";
next;
}
@@ -372,7 +372,7 @@ yuno_in03,176,24,3 script Mischna 4_M_SAGE_C,{
mes "Very well, then. Please";
mes "bring the following items";
mes "so that you can learn the";
- mes .@Skill$[.@i]+" Elemental Change skill.";
+ mes .@skill$[.@i]+" Elemental Change skill.";
next;
mes "[Mishuna]";
mes "^FF000020 "+.@ReqItem$[.@i]+"^000000,";
@@ -394,15 +394,15 @@ yuno_in03,176,24,3 script Mischna 4_M_SAGE_C,{
set .@i, (SAG_SK/10) - 1;
setarray .@ReqItem[0],990,993,992,991;
setarray .@ReqItem$[0],"Red Bloods","Green Lives","Wind of Verdure","Crystal Blues";
- setarray .@Skill[0],1018,1017,1019,1008;
- setarray .@Skill$[0],"Fire","Earth","Wind","Water";
+ setarray .@skill[0],1018,1017,1019,1008;
+ setarray .@skill$[0],"Fire","Earth","Wind","Water";
if (countitem(.@ReqItem[.@i]) < 20 || countitem(1089) < 1 || countitem(1088) < 1) {
mes "[Mishuna]";
mes "Are you having trouble";
mes "gathering all the required";
mes "items? Just in case, let me";
mes "remind you of what you need";
- mes "to bring me to learn the "+.@Skill$[.@i];
+ mes "to bring me to learn the "+.@skill$[.@i];
mes "Elemental Change skill.";
next;
mes "[Mishuna]";
@@ -417,10 +417,10 @@ yuno_in03,176,24,3 script Mischna 4_M_SAGE_C,{
mes "[Mishuna]";
mes "Ah, you're back. I can now";
mes "finally teach you about the";
- mes .@Skill$[.@i]+" Elemental Change skill.";
+ mes .@skill$[.@i]+" Elemental Change skill.";
mes "This skill has the chance to";
mes "permanently change a targeted";
- mes "monster's attribute to "+.@Skill$[.@i]+".";
+ mes "monster's attribute to "+.@skill$[.@i]+".";
next;
mes "[Mishuna]";
mes "Remember that you must";
@@ -433,7 +433,7 @@ yuno_in03,176,24,3 script Mischna 4_M_SAGE_C,{
mes "Now, "+strcharinfo(0)+",";
mes "I'm going to cast a spell";
mes "that will help you memorize";
- mes "the "+.@Skill$[.@i]+" Elemental Change";
+ mes "the "+.@skill$[.@i]+" Elemental Change";
mes "skill. Try to stay still...";
next;
mes "^3355FFMishuna begins to chant";
@@ -450,13 +450,13 @@ yuno_in03,176,24,3 script Mischna 4_M_SAGE_C,{
delitem 1089,1; // Payon Potion
delitem 1088,1; // Morocc Potion
set SAG_SK,100;
- skill .@Skill[.@i],1,0;
+ skill .@skill[.@i],1,0;
next;
mes "[Mishuna]";
mes strcharinfo(0)+"...";
mes "I'm happy to say that you've";
mes "successfully memorized the";
- mes .@Skill$[.@i]+" Elemental Change skill.";
+ mes .@skill$[.@i]+" Elemental Change skill.";
mes "I hope that it serves you well";
mes "in battle. Farewell for now~";
close;
diff --git a/npc/quests/thana_quest.txt b/npc/quests/thana_quest.txt
index e1bcb79da..634b50308 100644
--- a/npc/quests/thana_quest.txt
+++ b/npc/quests/thana_quest.txt
@@ -455,12 +455,12 @@ tha_t01,140,78,4 script Guide#reward 4_F_ZONDAGIRL,{
mes "you please tell me what kind";
mes "of mission proof you brought?";
next;
- setarray .@Items[1],7435,7440,7441,7442;
+ setarray .@items[1],7435,7440,7441,7442;
set .@i, select("Golden Ornament:Red Feather:Blue Feather:Cursed Seal");
mes "[Liei]";
- if (!countitem(.@Items[.@i])) {
+ if (!countitem(.@items[.@i])) {
mes "I'm sorry, but you are not";
- mes "carrying any "+getitemname(.@Items[.@i])+"s.";
+ mes "carrying any "+getitemname(.@items[.@i])+"s.";
mes "Please check your inventory";
mes "one more time, and then come";
mes "to me to redeem your items";
@@ -468,15 +468,15 @@ tha_t01,140,78,4 script Guide#reward 4_F_ZONDAGIRL,{
close;
}
mes "The reward for each";
- mes getitemname(.@Items[.@i])+" is...";
+ mes getitemname(.@items[.@i])+" is...";
mes " ";
mes "1,000 zeny";
//mes "2,000 EXP";
next;
- set .@zeny_tt,(countitem(.@Items[.@i]) * 1000);
- //set .@exp_tt,(countitem(.@Items[.@i]) * 2000);
+ set .@zeny_tt,(countitem(.@items[.@i]) * 1000);
+ //set .@exp_tt,(countitem(.@items[.@i]) * 2000);
mes "[Liei]";
- mes countitem(.@Items[.@i])+" "+getitemname(.@Items[.@i])+"s, then";
+ mes countitem(.@items[.@i])+" "+getitemname(.@items[.@i])+"s, then";
mes "you will receive a total of...";
mes " ";
mes ""+.@zeny_tt+" zeny";
@@ -484,7 +484,7 @@ tha_t01,140,78,4 script Guide#reward 4_F_ZONDAGIRL,{
next;
mes "[Liei]";
mes "Would you like to exchange";
- mes "all of your "+getitemname(.@Items[.@i])+"s";
+ mes "all of your "+getitemname(.@items[.@i])+"s";
mes "for your reward right now?";
next;
switch(select("Yes:No")) {
@@ -495,7 +495,7 @@ tha_t01,140,78,4 script Guide#reward 4_F_ZONDAGIRL,{
//mes .@exp_tt+" EXP. Thank you,";
mes "and please keep up";
mes "the good work~";
- delitem .@Items[.@i], countitem(.@Items[.@i]);
+ delitem .@items[.@i], countitem(.@items[.@i]);
set Zeny, Zeny + .@zeny_tt;
//getexp .@exp_tt,0;
close;
diff --git a/npc/quests/the_sign_quest.txt b/npc/quests/the_sign_quest.txt
index 95421cd2d..4c97821aa 100644
--- a/npc/quests/the_sign_quest.txt
+++ b/npc/quests/the_sign_quest.txt
@@ -8525,7 +8525,7 @@ que_sign01,196,39,4 script Serin#serin 4_F_01,{
set sign_q,134;
donpcevent "Serin#serin::OnDisable";
donpcevent "Dark Lord#serin::OnDisable";
- donpcevent "CallMonster#serin::Oncall";
+ donpcevent "CallMonster#serin::OnCall";
close;
case 2:
mes "[Serin]";
@@ -8559,7 +8559,7 @@ que_sign01,196,39,4 script Serin#serin 4_F_01,{
set sign_q,134;
donpcevent "Serin#serin::OnDisable";
donpcevent "Dark Lord#serin::OnDisable";
- donpcevent "CallMonster#serin::Oncall";
+ donpcevent "CallMonster#serin::OnCall";
close;
}
}
@@ -8657,7 +8657,7 @@ que_sign01,196,39,4 script Serin#serin 4_F_01,{
set sign_q,134;
donpcevent "Serin#serin::OnDisable";
donpcevent "Dark Lord#serin::OnDisable";
- donpcevent "CallMonster#serin::Oncall";
+ donpcevent "CallMonster#serin::OnCall";
end;
}
}
@@ -8696,7 +8696,7 @@ que_sign01,196,39,4 script Serin#serin 4_F_01,{
set sign_q,134;
donpcevent "Serin#serin::OnDisable";
donpcevent "Dark Lord#serin::OnDisable";
- donpcevent "CallMonster#serin::Oncall";
+ donpcevent "CallMonster#serin::OnCall";
end;
}
}
@@ -8857,7 +8857,7 @@ que_sign01,197,195,4 script Serin#witch 4_F_01,{
mes "now! We'll have to battle!";
close2;
set sign_q,126;
- donpcevent "CallMonster#witch::Oncall";
+ donpcevent "CallMonster#witch::OnCall";
donpcevent "Serin#witch::OnDisable";
end;
}
@@ -8898,7 +8898,7 @@ que_sign01,197,195,4 script Serin#witch 4_F_01,{
mes "now! We'll have to battle!";
close2;
set sign_q,126;
- donpcevent "CallMonster#witch::Oncall";
+ donpcevent "CallMonster#witch::OnCall";
donpcevent "Serin#witch::OnDisable";
end;
}
@@ -9006,7 +9006,7 @@ que_sign01,197,195,4 script Serin#witch 4_F_01,{
close2;
set sign_q,126;
donpcevent "Serin#witch::OnDisable";
- donpcevent "CallMonster#witch::Oncall";
+ donpcevent "CallMonster#witch::OnCall";
end;
}
}
@@ -9053,7 +9053,7 @@ que_sign01,197,195,4 script Serin#witch 4_F_01,{
close2;
set sign_q,126;
donpcevent "Serin#witch::OnDisable";
- donpcevent "CallMonster#witch::Oncall";
+ donpcevent "CallMonster#witch::OnCall";
end;
}
}
@@ -12348,7 +12348,7 @@ OnTimer620000:
}
que_sign01,50,1,0 script CallMonster#serin -1,{
-Oncall:
+OnCall:
monster "que_sign01",196,44,"Dark Lord Incarnation",1605,1,"CallMonster#serin::OnMyMobDead";
end;
@@ -12407,7 +12407,7 @@ OnTouch:
}
que_sign01,1,2,0 script CallMonster#witch -1,{
-Oncall:
+OnCall:
monster "que_sign01",196,195,"Dark Lord Incarnation",1605,1,"CallMonster#witch::OnMyMobDead";
monster "que_sign01",180,180,"Ancient Mummy",1522,1,"CallMonster#witch::OnMyMobDead";
monster "que_sign01",210,210,"Ancient Mummy",1522,1,"CallMonster#witch::OnMyMobDead";