summaryrefslogtreecommitdiff
path: root/npc/pre-re/jobs/1-1
diff options
context:
space:
mode:
authorHaru <haru@dotalux.com>2014-10-26 02:29:12 +0100
committerHaru <haru@dotalux.com>2014-11-02 01:36:50 +0100
commiteb5a3ece8568bae80d2d6912cd172f4cce029e68 (patch)
tree59ad4ef160c69bf9be6574e56ded3c54acb13526 /npc/pre-re/jobs/1-1
parentbf4b0a281207e46a9b21a9c9f779aeafaa739b62 (diff)
downloadhercules-eb5a3ece8568bae80d2d6912cd172f4cce029e68.tar.gz
hercules-eb5a3ece8568bae80d2d6912cd172f4cce029e68.tar.bz2
hercules-eb5a3ece8568bae80d2d6912cd172f4cce029e68.tar.xz
hercules-eb5a3ece8568bae80d2d6912cd172f4cce029e68.zip
Replaced 'set' with direct assignment where applicable (pre-re folder)
Signed-off-by: Haru <haru@dotalux.com>
Diffstat (limited to 'npc/pre-re/jobs/1-1')
-rw-r--r--npc/pre-re/jobs/1-1/acolyte.txt12
-rw-r--r--npc/pre-re/jobs/1-1/archer.txt14
-rw-r--r--npc/pre-re/jobs/1-1/mage.txt62
-rw-r--r--npc/pre-re/jobs/1-1/merchant.txt64
-rw-r--r--npc/pre-re/jobs/1-1/swordman.txt10
-rw-r--r--npc/pre-re/jobs/1-1/thief.txt14
6 files changed, 88 insertions, 88 deletions
diff --git a/npc/pre-re/jobs/1-1/acolyte.txt b/npc/pre-re/jobs/1-1/acolyte.txt
index 49bb33c9b..9e138d9c6 100644
--- a/npc/pre-re/jobs/1-1/acolyte.txt
+++ b/npc/pre-re/jobs/1-1/acolyte.txt
@@ -104,17 +104,17 @@ prt_church,184,41,4 script Cleric#aco 1_M_PASTOR,{
mes "give you a mission...";
switch(rand(3)) {
default:
- set job_acolyte_q,2;
+ job_acolyte_q = 2;
mes "Please visit ^000077Father Rubalkabara^000000, a member of the Prontera Parish, and return here. He has been practicing asceticism in the ^000077Relics NorthEast of Prontera City^000000.";
setquest 1001;
break;
case 1:
- set job_acolyte_q,3;
+ job_acolyte_q = 3;
mes "Please visit ^000077Mother Mathilda^000000 and then return to me. She has been practicing asceticism near ^000077Morroc Town, SouthWest of Prontera City^000000.";
setquest 1002;
break;
case 2:
- set job_acolyte_q,4;
+ job_acolyte_q = 4;
mes "Please visit ^000077Father Yosuke^000000 and return here. He has been practicing asceticism around ^000077a bridge somewhere NorthWest of Prontera^000000.";
setquest 1003;
break;
@@ -278,7 +278,7 @@ prt_fild03,365,255,2 script Ascetic#aco 4_M_ORIENT02,{
mes "Farewell.";
close2;
savepoint "prt_fild03",361,255;
- set job_acolyte_q,6;
+ job_acolyte_q = 6;
end;
}
else {
@@ -346,7 +346,7 @@ moc_fild07,41,355,4 script Ascetic#2aco 4_F_SISTER,{
mes "Please return to the Prontera Sanctuary and speak to the Priest in charge.";
close2;
savepoint "moc_fild07",35,355;
- set job_acolyte_q,7;
+ job_acolyte_q = 7;
end;
}
else {
@@ -423,7 +423,7 @@ prt_fild00,208,218,6 script Ascetic#3aco 4W_M_02,{
mes "Now go back to the Santuary and finish becoming an Acolyte, kid.";
close2;
savepoint "prt_fild00",206,230;
- set job_acolyte_q,8;
+ job_acolyte_q = 8;
end;
}
else {
diff --git a/npc/pre-re/jobs/1-1/archer.txt b/npc/pre-re/jobs/1-1/archer.txt
index 710580054..97ea540c1 100644
--- a/npc/pre-re/jobs/1-1/archer.txt
+++ b/npc/pre-re/jobs/1-1/archer.txt
@@ -95,7 +95,7 @@ payon_in02,64,71,4 script Archer Guildsman#archer 4_M_03,{
mes "If so, you need to fill out this application form.";
next;
if (select("Apply.:Cancel") == 1) {
- set job_archer_q,1;
+ job_archer_q = 1;
setquest 1004;
mes "[Archer Guildsman]";
mes "Okay, sign here. Alright, um, I'll promote you once you meet the requirements.";
@@ -132,12 +132,12 @@ payon_in02,64,71,4 script Archer Guildsman#archer 4_M_03,{
close;
}
if (job_archer_q == 1) {
- set .@archer_item1,countitem(1066) * 5;
- set .@archer_item2,countitem(1067) * 3;
- set .@archer_item3,countitem(1068) * 2;
- set .@archer_item4,countitem(1019);
- set .@total_archer,.@archer_item1 + .@archer_item2 + .@archer_item3 + .@archer_item4;
- set .@total_archer2,(((.@archer_item2 + .@archer_item3) * 2) + .@archer_item4);
+ .@archer_item1 = countitem(1066) * 5;
+ .@archer_item2 = countitem(1067) * 3;
+ .@archer_item3 = countitem(1068) * 2;
+ .@archer_item4 = countitem(1019);
+ .@total_archer = .@archer_item1 + .@archer_item2 + .@archer_item3 + .@archer_item4;
+ .@total_archer2 = (((.@archer_item2 + .@archer_item3) * 2) + .@archer_item4);
mes "[Archer Guildsman]";
mes "Excellent!";
mes "Now then,";
diff --git a/npc/pre-re/jobs/1-1/mage.txt b/npc/pre-re/jobs/1-1/mage.txt
index b2c6b346d..541c76235 100644
--- a/npc/pre-re/jobs/1-1/mage.txt
+++ b/npc/pre-re/jobs/1-1/mage.txt
@@ -106,22 +106,22 @@ geffen_in,164,124,4 script Mage Guildsman 2_F_MAGICMASTER,{
case 1:
mes "Make me a ^3355FFMixed Solution No. 1^000000";
mes "and bring it back to me.";
- set job_magician_q,1;
+ job_magician_q = 1;
break;
case 2:
mes "Make me a ^3355FFMixed Solution No. 2^000000";
mes "and bring it back to me.";
- set job_magician_q,2;
+ job_magician_q = 2;
break;
case 3:
mes "Make me a ^3355FFMixed Solution No. 3^000000";
mes "and bring it back to me.";
- set job_magician_q,3;
+ job_magician_q = 3;
break;
default:
mes "Make me a ^3355FFMixed Solution No. 4^000000";
mes "and bring it back to me.";
- set job_magician_q,4;
+ job_magician_q = 4;
}
next;
getitem 1092,1; //Empty_Cylinder
@@ -305,7 +305,7 @@ geffen_in,164,112,4 script Mixing Machine HIDDEN_NPC,{
mes "Process Halting.";
close;
}
- set .@mixitem2,1;
+ .@mixitem2 = 1;
break;
case 2:
if (countitem(1088) == 0) {
@@ -316,10 +316,10 @@ geffen_in,164,112,4 script Mixing Machine HIDDEN_NPC,{
mes "Process Halting.";
close;
}
- set .@mixitem2,2;
+ .@mixitem2 = 2;
break;
case 3:
- set .@mixitem2,0;
+ .@mixitem2 = 0;
break;
}
while (1) {
@@ -384,20 +384,20 @@ geffen_in,164,112,4 script Mixing Machine HIDDEN_NPC,{
if (.@mixitem2 == 2) delitem 1088,1; //Morocc_Potion
mes "Items are Ready.";
mes "Close the Lid.";
- set .@progress,3;
+ .@progress = 3;
next;
}
break;
case 2:
- set .@continue,0;
+ .@continue = 0;
next;
break;
case 3:
- set .@mixitem1_1,0;
- set .@mixitem1_2,0;
- set .@mixitem1_3,0;
- set .@progress,0;
- set .@continue,0;
+ .@mixitem1_1 = 0;
+ .@mixitem1_2 = 0;
+ .@mixitem1_3 = 0;
+ .@progress = 0;
+ .@continue = 0;
mes "[Mixing Machine]";
mes "Reset Complete.";
mes "Initiate again?";
@@ -430,8 +430,8 @@ geffen_in,164,112,4 script Mixing Machine HIDDEN_NPC,{
next;
}
else {
- if (countitem(909) > 0) set .@mixitem1_1,.@mixitem1_1 + .@input;
- set .@progress,2;
+ if (countitem(909) > 0) .@mixitem1_1 += .@input;
+ .@progress = 2;
break;
}
}
@@ -446,8 +446,8 @@ geffen_in,164,112,4 script Mixing Machine HIDDEN_NPC,{
next;
}
else {
- if (countitem(914) > 0) set .@mixitem1_2,.@mixitem1_2 + .@input;
- set .@progress,2;
+ if (countitem(914) > 0) .@mixitem1_2 += .@input;
+ .@progress = 2;
break;
}
}
@@ -462,8 +462,8 @@ geffen_in,164,112,4 script Mixing Machine HIDDEN_NPC,{
next;
}
else {
- if (countitem(519) > 0) set .@mixitem1_3,.@mixitem1_3 + .@input;
- set .@progress,2;
+ if (countitem(519) > 0) .@mixitem1_3 += .@input;
+ .@progress = 2;
break;
}
}
@@ -471,8 +471,8 @@ geffen_in,164,112,4 script Mixing Machine HIDDEN_NPC,{
case 4:
if (.@progress != 2)
- set .@progress,1;
- set .@continue,1;
+ .@progress = 1;
+ .@continue = 1;
next;
}
if (.@continue) break;
@@ -506,15 +506,15 @@ geffen_in,164,112,4 script Mixing Machine HIDDEN_NPC,{
next;
if (select("Confirm.:Cancel.") == 1) {
if (.@input == 8472)
- set .@magic_powder,1;
+ .@magic_powder = 1;
else if (.@input == 3735)
- set .@magic_powder,2;
+ .@magic_powder = 2;
else if (.@input == 2750)
- set .@magic_powder,3;
+ .@magic_powder = 3;
else if (.@input == 5429)
- set .@magic_powder,4;
+ .@magic_powder = 4;
else
- set .@magic_powder,5;
+ .@magic_powder = 5;
}
break;
}
@@ -524,10 +524,10 @@ geffen_in,164,112,4 script Mixing Machine HIDDEN_NPC,{
mes "Catalyst Stone.";
next;
switch(select("Yellow Gemstone.:Red Gemstone.:Blue Gemstone.:1carat Diamond.:Skip.")) {
- case 1: set .@mixitem3,1; break;
- case 2: set .@mixitem3,2; break;
- case 3: set .@mixitem3,3; break;
- case 4: set .@mixitem3,4; break;
+ case 1: .@mixitem3 = 1; break;
+ case 2: .@mixitem3 = 2; break;
+ case 3: .@mixitem3 = 3; break;
+ case 4: .@mixitem3 = 4; break;
case 5: break;
}
mes "[Mixing Machine]";
diff --git a/npc/pre-re/jobs/1-1/merchant.txt b/npc/pre-re/jobs/1-1/merchant.txt
index 4162bf0b1..a82d32ff1 100644
--- a/npc/pre-re/jobs/1-1/merchant.txt
+++ b/npc/pre-re/jobs/1-1/merchant.txt
@@ -98,9 +98,9 @@ alberta_in,53,43,6 script Merchant#mer 4_M_04,{
mes "[Chief Mahnsoo]";
mes "Hello there,";
mes ""+ strcharinfo(0) +".";
- set job_merchant_q,0;
- set job_merchant_q2,0;
- set quest_alb_01,0;
+ job_merchant_q = 0;
+ job_merchant_q2 = 0;
+ quest_alb_01 = 0;
mes "Unfortunately, you failed to earn your Merchant License this time.";
next;
mes "[Chief Mahnsoo]";
@@ -170,7 +170,7 @@ alberta_in,53,43,6 script Merchant#mer 4_M_04,{
mes "*Ahem* Aaaaand let me give you a little bit of money for delivering that message to Blossom for me.";
mes "I hope you'll help me again next time~";
Zeny += 200;
- set quest_alb_01,2;
+ quest_alb_01 = 2;
}
else {
mes "[Chief Mahnsoo]";
@@ -340,7 +340,7 @@ alberta_in,53,43,6 script Merchant#mer 4_M_04,{
case 1:
mes "[Chief Mahnsoo]";
if (Zeny >= 1000) {
- set job_merchant_q,2;
+ job_merchant_q = 2;
Zeny -= 1000;
mes "Alright~";
mes "That's 1,000 zeny.";
@@ -354,7 +354,7 @@ alberta_in,53,43,6 script Merchant#mer 4_M_04,{
case 2:
mes "[Chief Mahnsoo]";
if (Zeny >= 500) {
- set job_merchant_q,1;
+ job_merchant_q = 1;
Zeny -= 500;
mes "Let's see...";
mes "That's 500 Zeny. Although I don't think splitting payment is a good idea for any Merchant, it's alright since you're still learning.";
@@ -498,13 +498,13 @@ S_GiveSerial:
mes "The package's";
mes "Serial Number is";
mes "^3355FF"+getarg(0)+"^000000.";
- set job_merchant_q2,getarg(1);
+ job_merchant_q2 = getarg(1);
}
else {
mes "The package's";
mes "Serial Number is";
mes "^3355FF"+getarg(2)+"^000000.";
- set job_merchant_q2,getarg(3);
+ job_merchant_q2 = getarg(3);
}
return;
}
@@ -564,7 +564,7 @@ alberta_in,28,29,2 script Merchant Guildsman#mer 4_M_01,{
delitem 1080,1; //Merchant_Voucher_8
else {
next;
- set job_merchant_q,9;
+ job_merchant_q = 9;
mes " [Union Staff Kay] ";
mes "Wait a sec.";
mes "Where's the receipt?";
@@ -579,9 +579,9 @@ alberta_in,28,29,2 script Merchant Guildsman#mer 4_M_01,{
mes "...Great! Everything's perfect! I'll report your success to the Guildmaster. You should talk to Chief Mahnsoo now, alright?";
close2;
if (job_merchant_q == 6)
- set job_merchant_q,8;
+ job_merchant_q = 8;
else if (job_merchant_q == 5)
- set job_merchant_q,7;
+ job_merchant_q = 7;
end;
}
else if (job_merchant_q == 4 || job_merchant_q == 3 && countitem(1081) == 0 && countitem(1082) == 0 && countitem(1091) == 0) {
@@ -592,7 +592,7 @@ alberta_in,28,29,2 script Merchant Guildsman#mer 4_M_01,{
mes "the delivery go?";
next;
if (select("*Sob* I lost the package.:Fine.") == 1) {
- set job_merchant_q,9;
+ job_merchant_q = 9;
mes "[Union Staff Kay]";
mes "Are you kidding me? You'll fail the test if you lose the package!";
next;
@@ -618,7 +618,7 @@ alberta_in,28,29,2 script Merchant Guildsman#mer 4_M_01,{
mes "Where is it?!";
next;
if (select("*Sob* I lost it!:I have it right here.") == 1) {
- set job_merchant_q,9;
+ job_merchant_q = 9;
mes "[Union Staff Kay]";
mes "You...";
mes "Lost it?!";
@@ -645,9 +645,9 @@ alberta_in,28,29,2 script Merchant Guildsman#mer 4_M_01,{
else if (countitem(1091) != 0)
delitem 1091,1; //Merchant_Box_Etc
if (job_merchant_q == 4)
- set job_merchant_q,2;
+ job_merchant_q = 2;
else if (job_merchant_q == 3)
- set job_merchant_q,1;
+ job_merchant_q = 1;
next;
mes "[Union Staff Kay]";
mes "I need some time to get everything in order, so come back later.";
@@ -658,7 +658,7 @@ alberta_in,28,29,2 script Merchant Guildsman#mer 4_M_01,{
close;
}
else if ((job_merchant_q == 0 || job_merchant_q == 1 || job_merchant_q == 2)) {
- set where_village,0;
+ where_village = 0;
mes "[Union Staff Kay]";
mes "Hey there.";
mes "what brings";
@@ -686,10 +686,10 @@ alberta_in,28,29,2 script Merchant Guildsman#mer 4_M_01,{
mes "Alright, there you go. Lemme give you the package. Now, choose the destination of the delivery.";
next;
switch(select("Prontera.:Geffen.:Morocc.:Byalan Island.")) {
- case 1: set .@where_village,1; break;
- case 2: set .@where_village,2; break;
- case 3: set .@where_village,3; break;
- case 4: set .@where_village,4; break;
+ case 1: .@where_village = 1; break;
+ case 2: .@where_village = 2; break;
+ case 3: .@where_village = 3; break;
+ case 4: .@where_village = 4; break;
}
mes "[Union Staff Kay]";
mes "Okay, now you need to give me the package's Serial Number. If you wanna cancel, just enter '0', alright?";
@@ -761,9 +761,9 @@ alberta_in,28,29,2 script Merchant Guildsman#mer 4_M_01,{
getitem 1091,1; //Merchant_Box_Etc
}
if (job_merchant_q == 2)
- set job_merchant_q,4;
+ job_merchant_q = 4;
else if (job_merchant_q == 1)
- set job_merchant_q,3;
+ job_merchant_q = 3;
mes "[Union Staff Kay]";
mes "Alright. Take this package and guard it with your life until it's safely delivered to the customer. Don't lose this thing, got it?";
next;
@@ -840,9 +840,9 @@ morocc_in,140,102,4 script Student#mer 4_M_04,{
close;
}
if (job_merchant_q == 4)
- set job_merchant_q,6;
+ job_merchant_q = 6;
else if (job_merchant_q == 3)
- set job_merchant_q,5;
+ job_merchant_q = 5;
next;
mes "[Dyer's Student]";
mes "Thanks a lot!";
@@ -928,9 +928,9 @@ geffen_in,155,122,4 script Guild Staff#mer 1_M_01,{
close;
}
if (job_merchant_q == 4)
- set job_merchant_q,6;
+ job_merchant_q = 6;
else if (job_merchant_q == 3)
- set job_merchant_q,5;
+ job_merchant_q = 5;
next;
mes "[Guild Staff]";
mes "Heh heh~";
@@ -1022,9 +1022,9 @@ prontera,248,42,0 script Kafra Employee#mer 4_F_KAFRA2,{
end;
}
if (job_merchant_q == 4)
- set job_merchant_q,6;
+ job_merchant_q = 6;
else if (job_merchant_q == 3)
- set job_merchant_q,5;
+ job_merchant_q = 5;
mes "[Kafra Employee]";
mes "Thanks again";
mes "for going through";
@@ -1059,7 +1059,7 @@ prontera,248,42,0 script Kafra Employee#mer 4_F_KAFRA2,{
end;
}
Zeny -= 600;
- set RESRVPTS, RESRVPTS + 37;
+ RESRVPTS += 37;
cutin "",255;
warp "izlude",94,103;
end;
@@ -1131,14 +1131,14 @@ function script F_MercKafra {
end;
}
if (job_merchant_q == 4)
- set job_merchant_q,6;
+ job_merchant_q = 6;
else if (job_merchant_q == 3)
- set job_merchant_q,5;
+ job_merchant_q = 5;
next;
if (countitem(1072) != 0 && quest_alb_01 == 0) {
select("This is from Chief Mahnsoo of the Merchant Guild...");
delitem 1072,1; //Delivery_Message
- set quest_alb_01,1;
+ quest_alb_01 = 1;
mes "[Kafra Employee]";
mes "Oh~! A letter from";
mes "Mahnsoo! Thank you";
diff --git a/npc/pre-re/jobs/1-1/swordman.txt b/npc/pre-re/jobs/1-1/swordman.txt
index 8b4a9f974..6b520b393 100644
--- a/npc/pre-re/jobs/1-1/swordman.txt
+++ b/npc/pre-re/jobs/1-1/swordman.txt
@@ -109,7 +109,7 @@ izlude_in,74,172,4 script Swordman#swd_1 2_M_SWORDMASTER,{
next;
if (select("Sign up.:Cancel.") == 1) {
savepoint "izlude_in",65,165;
- set job_sword_q,1;
+ job_sword_q = 1;
setquest 1014;
mes "[Swordman]";
mes "Ah, yes. Your application will be reviewed as soon as possible.";
@@ -154,7 +154,7 @@ izlude_in,74,172,4 script Swordman#swd_1 2_M_SWORDMASTER,{
mes "Hahaha! Congratulations! Now you are fully qualified to be a real Swordman! I will transform you right away!";
next;
callfunc "Job_Change",Job_Swordman;
- set job_sword_q,0;
+ job_sword_q = 0;
completequest 1014;
mes "[Swordman]";
mes "Once again, congratulations. I expect that you will be a good representative of the Swordman Association.";
@@ -279,12 +279,12 @@ izlude_in,30,163,0 script Test Hall Staff#swd_1 8W_SOLDIER,{
next;
mes "[Test Hall Staff]";
mes "Try to relax and do your best. This course isn't so difficult.";
- set job_sword_q,2;
+ job_sword_q = 2;
}
else if (job_sword_q == 2) {
mes "Retesting? Try not to worry about it. It's good that you don't back down from a challenge! Here, take these and cheer up!";
getitem 512,5; //Apple
- set job_sword_q,3;
+ job_sword_q = 3;
}
else if (job_sword_q == 3)
mes "Don't ever give up! Now retesting!";
@@ -310,7 +310,7 @@ job_sword1,230,204,2 script Test Hall Staff#2swd_3 8W_SOLDIER,{
}
job_sword1,223,167,2 script Mae#swd_1_success 4_F_03,{
mapannounce "job_sword1","Applicant " + strcharinfo(0) + ". You successfully passed the test.",bc_map;
- set job_sword_q,4;
+ job_sword_q = 4;
mes "[Mae]";
mes "I sencerely congratulate you for passing the test!";
mes "I already sent your test result to the Job Department.Please inquire at the Officer in Centre.Thank you.";
diff --git a/npc/pre-re/jobs/1-1/thief.txt b/npc/pre-re/jobs/1-1/thief.txt
index 356809cdc..e0d13a0c9 100644
--- a/npc/pre-re/jobs/1-1/thief.txt
+++ b/npc/pre-re/jobs/1-1/thief.txt
@@ -251,7 +251,7 @@ moc_prydb1,39,129,2 script Thief Guide 1_F_04,{
mes "[Thief Guide]";
mes "" + strcharinfo(0) + "?";
mes "What kind of name is " + strcharinfo(0) + "? Anyway, give me a second.";
- set job_thief_q,1;
+ job_thief_q = 1;
next;
mes "[Thief Guide]";
mes "Alright, your registration has been processed. Okay, you can begin your test if you're ready.";
@@ -296,7 +296,7 @@ moc_prydb1,39,129,2 script Thief Guide 1_F_04,{
next;
mes "[Thief Guide]";
mes "Because I feel like it, I now decree that you have passed this interview. Good work!";
- set job_thief_q,2;
+ job_thief_q = 2;
setquest 1013;
next;
mes "[Thief Guide]";
@@ -385,10 +385,10 @@ moc_prydb1,42,133,2 script Comrade 2_M_THIEFMASTER,{
close;
}
next;
- set .@thief_item1,countitem(1069) * 3;
- set .@thief_item2,countitem(1070);
- set .@total_thief,.@thief_item1 + .@thief_item2;
- set .@money_thief,((.@thief_item1 * 5) + (.@thief_item2 * 2)) + 200;
+ .@thief_item1 = countitem(1069) * 3;
+ .@thief_item2 = countitem(1070);
+ .@total_thief = .@thief_item1 + .@thief_item2;
+ .@money_thief = ((.@thief_item1 * 5) + (.@thief_item2 * 2)) + 200;
mes "[Comrade]";
if (countitem(1069) != 0) {
mes "First, let me check the Orange Net Mushrooms you got.";
@@ -503,7 +503,7 @@ moc_ruins,141,125,3 script Mr. Irrelevant 4_M_01,{
mes "[Mr. Irrelevant]";
mes "Your name is " + strcharinfo(0) + "? Ah, it's on the list. Alright, I'll let you into the Mushroom Farm , but I can't guarantee your safety...";
close2;
- set job_thief_q,3;
+ job_thief_q = 3;
switch(rand(5)) {
case 1: warp "job_thief1",228,106; end;
case 2: warp "job_thief1",38,50; end;