summaryrefslogtreecommitdiff
path: root/npc/re/quests
diff options
context:
space:
mode:
authorHaru <haru@dotalux.com>2013-11-10 04:28:03 +0100
committerHaru <haru@dotalux.com>2013-11-10 04:31:28 +0100
commitb4f1b3b5c5c009ed4f7635c5349ea97c80c08c25 (patch)
treecbd305d3896bdc9f498ed9eb72836dc7b6c32b99 /npc/re/quests
parentc9b63614070f7fce81c88cd60e5edad5a7730df0 (diff)
downloadhercules-b4f1b3b5c5c009ed4f7635c5349ea97c80c08c25.tar.gz
hercules-b4f1b3b5c5c009ed4f7635c5349ea97c80c08c25.tar.bz2
hercules-b4f1b3b5c5c009ed4f7635c5349ea97c80c08c25.tar.xz
hercules-b4f1b3b5c5c009ed4f7635c5349ea97c80c08c25.zip
Follow-up to 857bdc4f98be6cd1e185a24565d6b6b54752b9b4
- Consolidated case in variables, labels, constants. Signed-off-by: Haru <haru@dotalux.com>
Diffstat (limited to 'npc/re/quests')
-rw-r--r--npc/re/quests/eden/41-55.txt4
-rw-r--r--npc/re/quests/eden/eden_quests.txt16
-rw-r--r--npc/re/quests/quests_malangdo.txt14
3 files changed, 17 insertions, 17 deletions
diff --git a/npc/re/quests/eden/41-55.txt b/npc/re/quests/eden/41-55.txt
index 45c5ee876..eb1c22e42 100644
--- a/npc/re/quests/eden/41-55.txt
+++ b/npc/re/quests/eden/41-55.txt
@@ -54,7 +54,7 @@ moc_para01,40,38,3 script Mission [41 - 55] 4_BOARD3,{
}
end;
}
- setarray .@Exp[0],9600,7200,15750,7875,11100,8550,17100,9000,12300,9900,20250,10350,13800,11025,22500,11250;
+ setarray .@exp[0],9600,7200,15750,7875,11100,8550,17100,9000,12300,9900,20250,10350,13800,11025,22500,11250;
for(set .@i,0; .@i<16; set .@i,.@i+1)
if (checkquest(12072+.@i,HUNTING) == 2) {
mes "[Mission Board]";
@@ -63,7 +63,7 @@ moc_para01,40,38,3 script Mission [41 - 55] 4_BOARD3,{
erasequest 12088;
erasequest 12072+.@i;
specialeffect2 EF_STEAL;
- getexp .@Exp[.@i],0;
+ getexp .@exp[.@i],0;
close;
}
if ((checkquest(12072,HUNTING) == 0) && (checkquest(12073,HUNTING) == 0) && (checkquest(12074,HUNTING) == 0) && (checkquest(12075,HUNTING) == 0) && (checkquest(12076,HUNTING) == 0) && (checkquest(12077,HUNTING) == 0) && (checkquest(12078,HUNTING) == 0) && (checkquest(12079,HUNTING) == 0) && (checkquest(12080,HUNTING) == 0) && (checkquest(12081,HUNTING) == 0) && (checkquest(12082,HUNTING) == 0) && (checkquest(12083,HUNTING) == 0) && (checkquest(12084,HUNTING) == 0) && (checkquest(12085,HUNTING) == 0) && (checkquest(12086,HUNTING) == 0) && (checkquest(12087,HUNTING) == 0)) {
diff --git a/npc/re/quests/eden/eden_quests.txt b/npc/re/quests/eden/eden_quests.txt
index bdd6eb4c2..c96d5a049 100644
--- a/npc/re/quests/eden/eden_quests.txt
+++ b/npc/re/quests/eden/eden_quests.txt
@@ -4560,12 +4560,12 @@ moc_para01,111,83,3 script Toren 2_M_OLDBLSMITH,{
close;
}
if (para_suv02 == 14) {
- setarray .@Check[0],18514,2571,2473,15031;
- setarray .@Item$[0],"Hat","Mantle","Boots","Uniform";
+ setarray .@check[0],18514,2571,2473,15031;
+ setarray .@item$[0],"Hat","Mantle","Boots","Uniform";
for(set .@i,0; .@i<4; set .@i,.@i+1)
- if (countitem(.@Check[.@i]) < 1) {
+ if (countitem(.@check[.@i]) < 1) {
mes "[Toren]";
- mes "Where is the Paradise "+.@Item$[.@i]+" I gave you?";
+ mes "Where is the Paradise "+.@item$[.@i]+" I gave you?";
next;
mes "[Toren]";
mes "...Fine, I will sell you another one for ^FF0000250,000 Zeny^000000. Don't lose it this time.";
@@ -4581,7 +4581,7 @@ moc_para01,111,83,3 script Toren 2_M_OLDBLSMITH,{
close;
}
set Zeny, Zeny - 250000;
- getitem .@Check[.@i],1;
+ getitem .@check[.@i],1;
mes "[Toren]";
mes "These advanced gears are not easy to make, please take better care of this one.";
close;
@@ -4659,14 +4659,14 @@ moc_para01,111,83,3 script Toren 2_M_OLDBLSMITH,{
mes "[Toren]";
mes "Now pick which gear you would like me to enchant.";
next;
- setarray .@Item[0],2571,2473,15031;
+ setarray .@item[0],2571,2473,15031;
set .@i, select("Paradise Mantle II.:Paradise Boots IV.:Paradise Uniform IV.")-1;
- if (countitem(.@Item[.@i]) < 1) {
+ if (countitem(.@item[.@i]) < 1) {
mes "[Toren]";
mes "Bring one and I'll enchant it.";
close;
}
- set .@paragearcount, .@Item[.@i];
+ set .@paragearcount, .@item[.@i];
mes "[Toren]";
mes "Here we go!";
close2;
diff --git a/npc/re/quests/quests_malangdo.txt b/npc/re/quests/quests_malangdo.txt
index 62b356c23..dbf405542 100644
--- a/npc/re/quests/quests_malangdo.txt
+++ b/npc/re/quests/quests_malangdo.txt
@@ -5434,7 +5434,7 @@ malangdo,212,204,0 script Beginning Compass#nya_02 CLEAR_NPC,{
L_Viewpoint:
switch(getarg(0)) {
case 1: // Order 1: Red, Blue, Yellow, Green, White
- setarray .@Colors$[1],"^FF0000","^0000FF","^FFFF00","^00FF00","^cccccc";
+ setarray .@colors$[1],"^FF0000","^0000FF","^FFFF00","^00FF00","^cccccc";
setarray .@Text$[1],"Red","Blue","Yellow","Green","White";
if (getarg(1) <= 1)
viewpoint 1,213,89,0,0xFF0000;
@@ -5447,7 +5447,7 @@ L_Viewpoint:
viewpoint 1,111,178,4,0xcccccc;
break;
case 2: // Order 2: Yellow, Blue, White, Green, Red
- setarray .@Colors$[1],"^FFFF00","^0000FF","^cccccc","^00FF00","^FF0000";
+ setarray .@colors$[1],"^FFFF00","^0000FF","^cccccc","^00FF00","^FF0000";
setarray .@Text$[1],"Yellow","Blue","White","Green","Red";
if (getarg(1) <= 1)
viewpoint 1,73,253,0,0xFFFF00;
@@ -5461,7 +5461,7 @@ L_Viewpoint:
break;
}
for(set .@i,1; .@i<=5; set .@i,.@i+1)
- set .@str$, .@str$+((.@i >= getarg(1))?.@Colors$[.@i]:"")+.@Text$[.@i]+" ";
+ set .@str$, .@str$+((.@i >= getarg(1))?.@colors$[.@i]:"")+.@Text$[.@i]+" ";
if (getarg(1) > 1)
mes "After inserting the card and pressing the red button, the path to the destination lit up.";
mes "The order will be "+.@str$+"^000000.";
@@ -6226,12 +6226,12 @@ L_ShowLights:
mes "In that order.";
next;
mes "Luminous";
- setarray .@Color$[0],"Red","Blue","Yellow","Green";
+ setarray .@color$[0],"Red","Blue","Yellow","Green";
setarray .@Cutin$[0],"nya_red","nya_blue","nya_yellow","nya_green";
for(set .@i,0; .@i<getarg(0); set .@i,.@i+1) {
set .@rand, rand(4);
set .@Lamp[.@i],.@rand;
- mes .@Color$[.@rand];
+ mes .@color$[.@rand];
if (.@i+1 == getarg(0))
mes "Shines according to this order.";
cutin .@Cutin$[.@rand],4;
@@ -6242,9 +6242,9 @@ L_ShowLights:
mes "Stop the machine by pressing the right button within time.";
next;
set .@pass,0;
- setarray .@Count$[0],"first","second","third","fourth","fifth","sixth","seventh","eighth";
+ setarray .@count$[0],"first","second","third","fourth","fifth","sixth","seventh","eighth";
for(set .@i,0; .@i<getarg(0); set .@i,.@i+1) {
- mes "Which color button do you want to press "+.@Count$[.@i]+"?";
+ mes "Which color button do you want to press "+.@count$[.@i]+"?";
next;
// Red <-> Green, Blue <-> Yellow
set .@j, select("Red:Blue:Yellow:Green");