diff options
Diffstat (limited to 'npc/pre-re/jobs/1-1')
-rw-r--r-- | npc/pre-re/jobs/1-1/archer.txt | 30 | ||||
-rw-r--r-- | npc/pre-re/jobs/1-1/mage.txt | 64 | ||||
-rw-r--r-- | npc/pre-re/jobs/1-1/merchant.txt | 138 | ||||
-rw-r--r-- | npc/pre-re/jobs/1-1/swordman.txt | 2 | ||||
-rw-r--r-- | npc/pre-re/jobs/1-1/thief.txt | 20 |
5 files changed, 127 insertions, 127 deletions
diff --git a/npc/pre-re/jobs/1-1/archer.txt b/npc/pre-re/jobs/1-1/archer.txt index 075bb391a..946638d64 100644 --- a/npc/pre-re/jobs/1-1/archer.txt +++ b/npc/pre-re/jobs/1-1/archer.txt @@ -145,10 +145,10 @@ payon_in02,64,71,4 script Archer Guildsman#archer 4_M_03,{ close; } if (job_archer_q == 1) { - .@archer_item1 = countitem(1066) * 5; - .@archer_item2 = countitem(1067) * 3; - .@archer_item3 = countitem(1068) * 2; - .@archer_item4 = countitem(1019); + .@archer_item1 = countitem(Tree_Of_Archer_1) * 5; + .@archer_item2 = countitem(Tree_Of_Archer_2) * 3; + .@archer_item3 = countitem(Tree_Of_Archer_3) * 2; + .@archer_item4 = countitem(Wooden_Block); .@total_archer = .@archer_item1 + .@archer_item2 + .@archer_item3 + .@archer_item4; .@total_archer2 = (((.@archer_item2 + .@archer_item3) * 2) + .@archer_item4); mes "[Archer Guildsman]"; @@ -159,17 +159,17 @@ payon_in02,64,71,4 script Archer Guildsman#archer 4_M_03,{ mes "[Archer Guildsman]"; mes "I will appraise the value of the various types of Trunks, needed to produce a Bow, that you've brought."; next; - if (countitem(1066) == 0 && countitem(1067) == 0 && countitem(1068) == 0 && countitem(1019) == 0) { + if (countitem(Tree_Of_Archer_1) == 0 && countitem(Tree_Of_Archer_2) == 0 && countitem(Tree_Of_Archer_3) == 0 && countitem(Wooden_Block) == 0) { mes "[Archer Guildsman]"; mes "Um..."; mes "Unfortunately you didn't bring any of the required items. There's nothing for me to appraise."; close; } mes "[Archer Guildsman]"; - if (countitem(1066) != 0) mes " Grade S : " + countitem(1066) + " ea, Grade: " + .@archer_item1 + " . "; - if (countitem(1067) != 0) mes " Grade A : " + countitem(1067) + " ea, Grade : " + .@archer_item2 + " . "; - if (countitem(1068) != 0) mes " Grade B : " + countitem(1068) + " ea, Grade : " + .@archer_item3 + " . "; - if (countitem(1019) != 0) mes " Grade C : " + countitem(1019) + " ea, Grade : " + .@archer_item4 + " . "; + if (countitem(Tree_Of_Archer_1) != 0) mes " Grade S : " + countitem(Tree_Of_Archer_1) + " ea, Grade: " + .@archer_item1 + " . "; + if (countitem(Tree_Of_Archer_2) != 0) mes " Grade A : " + countitem(Tree_Of_Archer_2) + " ea, Grade : " + .@archer_item2 + " . "; + if (countitem(Tree_Of_Archer_3) != 0) mes " Grade B : " + countitem(Tree_Of_Archer_3) + " ea, Grade : " + .@archer_item3 + " . "; + if (countitem(Wooden_Block) != 0) mes " Grade C : " + countitem(Wooden_Block) + " ea, Grade : " + .@archer_item4 + " . "; if (.@total_archer < 25) { mes "Total Grades: ^FF0000" + .@total_archer + "^000000 / 40"; next; @@ -196,10 +196,10 @@ payon_in02,64,71,4 script Archer Guildsman#archer 4_M_03,{ next; mes "[Archer Guildsman]"; mes "I'll transfer these Trunks to our Bow Production Department. Now that you've met the requirements, let me promote you right away!"; - if (countitem(1066) != 0) delitem 1066,countitem(1066); //Tree_Of_Archer_1 - if (countitem(1067) != 0) delitem 1067,countitem(1067); //Tree_Of_Archer_2 - if (countitem(1068) != 0) delitem 1068,countitem(1068); //Tree_Of_Archer_3 - if (countitem(1019) != 0) delitem 1019,countitem(1019); //Wooden_Block + if (countitem(Tree_Of_Archer_1) != 0) delitem Tree_Of_Archer_1,countitem(Tree_Of_Archer_1); + if (countitem(Tree_Of_Archer_2) != 0) delitem Tree_Of_Archer_2,countitem(Tree_Of_Archer_2); + if (countitem(Tree_Of_Archer_3) != 0) delitem Tree_Of_Archer_3,countitem(Tree_Of_Archer_3); + if (countitem(Wooden_Block) != 0) delitem Wooden_Block,countitem(Wooden_Block); } next; callfunc "Job_Change",Job_Archer; @@ -214,8 +214,8 @@ payon_in02,64,71,4 script Archer Guildsman#archer 4_M_03,{ next; mes "[Archer Guildsman]"; mes "Ah, your bow has arrived from the Bow Production Department. Here, take it! It's yours~"; - getitem 1702,1; //Bow_ - getitem 1750,.@total_archer2; //Arrow + getitem Bow_,1; + getitem Arrow,.@total_archer2; next; mes "[Archer Guildsman]"; mes "Now, off you go. Hunt with pride, knowing you were trained by one of the best!"; diff --git a/npc/pre-re/jobs/1-1/mage.txt b/npc/pre-re/jobs/1-1/mage.txt index 0108f6a04..4836258c4 100644 --- a/npc/pre-re/jobs/1-1/mage.txt +++ b/npc/pre-re/jobs/1-1/mage.txt @@ -139,7 +139,7 @@ geffen_in,164,124,4 script Mage Guildsman 2_F_MAGICMASTER,{ job_magician_q = 4; } next; - getitem 1092,1; //Empty_Cylinder + getitem Empty_Cylinder,1; mes "[Mage Guildsman]"; mes "You can find the neccessary ingredients inside the Guide Book in this Guild. So you better look up what you need before you go."; next; @@ -175,13 +175,13 @@ geffen_in,164,124,4 script Mage Guildsman 2_F_MAGICMASTER,{ mes "solution accurately..."; next; mes "[Mage Guildsman]"; - if (countitem(1071) == 0 && countitem(1085) == 0 && countitem(1086) == 0 && countitem(1087) == 0 && countitem(1090) == 0) { + if (countitem(Mage_Test_1) == 0 && countitem(Mage_Test_2) == 0 && countitem(Mage_Test_3) == 0 && countitem(Mage_Test_4) == 0 && countitem(Mage_Test_Etc) == 0) { mes "Hey, where's the Solution"; mes "I asked for...? I can't check it if you don't show it to me, right?"; close; } else { - if ((job_magician_q == 1 && countitem(1071) == 0) || (job_magician_q == 2 && countitem(1085) == 0) || (job_magician_q == 3 && countitem(1086) == 0) || (job_magician_q == 4 && countitem(1087) == 0)) { + if ((job_magician_q == 1 && countitem(Mage_Test_1) == 0) || (job_magician_q == 2 && countitem(Mage_Test_2) == 0) || (job_magician_q == 3 && countitem(Mage_Test_3) == 0) || (job_magician_q == 4 && countitem(Mage_Test_4) == 0)) { mes "Wait."; mes "This isn't the"; mes "Solution I asked for!"; @@ -196,19 +196,19 @@ geffen_in,164,124,4 script Mage Guildsman 2_F_MAGICMASTER,{ else mes "You're supposed to make Mixed Solution No. 4 and bring it back to me. Now go and try it again."; - if (countitem(1071) != 0) delitem 1071,1; //Mage_Test_1 - else if (countitem(1085) != 0) delitem 1085,1; //Mage_Test_2 - else if (countitem(1086) != 0) delitem 1086,1; //Mage_Test_3 - else if (countitem(1087) != 0) delitem 1087,1; //Mage_Test_4 - else delitem 1090,1; //Mage_Test_Etc + if (countitem(Mage_Test_1) != 0) delitem Mage_Test_1,1; + else if (countitem(Mage_Test_2) != 0) delitem Mage_Test_2,1; + else if (countitem(Mage_Test_3) != 0) delitem Mage_Test_3,1; + else if (countitem(Mage_Test_4) != 0) delitem Mage_Test_4,1; + else delitem Mage_Test_Etc,1; close; } } - if (countitem(1071) != 0) delitem 1071,1; //Mage_Test_1 - else if (countitem(1085) != 0) delitem 1085,1; //Mage_Test_2 - else if (countitem(1086) != 0) delitem 1086,1; //Mage_Test_3 - else if (countitem(1087) != 0) delitem 1087,1; //Mage_Test_4 - else delitem 1090,1; //Mage_Test_Etc + if (countitem(Mage_Test_1) != 0) delitem Mage_Test_1,1; + else if (countitem(Mage_Test_2) != 0) delitem Mage_Test_2,1; + else if (countitem(Mage_Test_3) != 0) delitem Mage_Test_3,1; + else if (countitem(Mage_Test_4) != 0) delitem Mage_Test_4,1; + else delitem Mage_Test_Etc,1; mes "Hmm. I can see that you tried really hard. For a beginner's attempt, this is really good."; mes "Great work!"; next; @@ -312,7 +312,7 @@ geffen_in,164,112,4 script Mixing Machine HIDDEN_NPC,{ next; switch(select("Payon Solution.:Morroc Solution.:No Solvent.")) { case 1: - if (countitem(1089) == 0) { + if (countitem(Payon_Potion) == 0) { mes "[Mixing Machine]"; mes "Error."; mes "Cannot find the item."; @@ -323,7 +323,7 @@ geffen_in,164,112,4 script Mixing Machine HIDDEN_NPC,{ .@mixitem2 = 1; break; case 2: - if (countitem(1088) == 0) { + if (countitem(Morocc_Potion) == 0) { mes "[Mixing Machine]"; mes "Error."; mes "Cannot find the item."; @@ -366,37 +366,37 @@ geffen_in,164,112,4 script Mixing Machine HIDDEN_NPC,{ mes "Place items into the Mixing Receptacle now. Please wait."; next; mes "[Mixing Machine]"; - if (countitem(909) < .@mixitem1_1) { + if (countitem(Jellopy) < .@mixitem1_1) { mes "Insufficient Jellopy."; mes "Please Check again."; mes "Process Halted."; close; } - else if (countitem(914) < .@mixitem1_2) { + else if (countitem(Fluff) < .@mixitem1_2) { mes "Insufficient Fluff."; mes "Please Check again."; mes "Process Halted."; close; } - else if (countitem(519) < .@mixitem1_3) { + else if (countitem(Milk) < .@mixitem1_3) { mes "Insufficient Milk."; mes "Please Check again."; mes "Process Halted."; close; } else if (.@mixitem2 == 1 || .@mixitem2 == 2) { - if (countitem(1089) == 0 && countitem(1088) == 0) { + if (countitem(Payon_Potion) == 0 && countitem(Morocc_Potion) == 0) { mes "Solution not found."; mes "Please Check again."; mes "Process Halted."; close; } } - if (.@mixitem1_1 != 0) delitem 909,.@mixitem1_1; //Jellopy - if (.@mixitem1_2 != 0) delitem 914,.@mixitem1_2; //Fluff - if (.@mixitem1_3 != 0) delitem 519,.@mixitem1_3; //Milk - if (.@mixitem2 == 1) delitem 1089,1; //Payon_Potion - if (.@mixitem2 == 2) delitem 1088,1; //Morocc_Potion + if (.@mixitem1_1 != 0) delitem Jellopy,.@mixitem1_1; + if (.@mixitem1_2 != 0) delitem Fluff,.@mixitem1_2; + if (.@mixitem1_3 != 0) delitem Milk,.@mixitem1_3; + if (.@mixitem2 == 1) delitem Payon_Potion,1; + if (.@mixitem2 == 2) delitem Morocc_Potion,1; mes "Items are Ready."; mes "Close the Lid."; .@progress = 3; @@ -445,7 +445,7 @@ geffen_in,164,112,4 script Mixing Machine HIDDEN_NPC,{ next; } else { - if (countitem(909) > 0) .@mixitem1_1 += .@input; + if (countitem(Jellopy) > 0) .@mixitem1_1 += .@input; .@progress = 2; break; } @@ -461,7 +461,7 @@ geffen_in,164,112,4 script Mixing Machine HIDDEN_NPC,{ next; } else { - if (countitem(914) > 0) .@mixitem1_2 += .@input; + if (countitem(Fluff) > 0) .@mixitem1_2 += .@input; .@progress = 2; break; } @@ -477,7 +477,7 @@ geffen_in,164,112,4 script Mixing Machine HIDDEN_NPC,{ next; } else { - if (countitem(519) > 0) .@mixitem1_3 += .@input; + if (countitem(Milk) > 0) .@mixitem1_3 += .@input; .@progress = 2; break; } @@ -574,32 +574,32 @@ geffen_in,164,112,4 script Mixing Machine HIDDEN_NPC,{ if (.@mixitem1_1 == 2 && .@mixitem1_2 == 3 && .@mixitem1_3 == 1 && .@mixitem2 == 1 && .@mixitem3 == 1 && .@magic_powder == 1) { mes "[Mixing Machine]"; mes "Mage Test Solution No. 1."; - getitem 1071,1; //Mage_Test_1 + getitem Mage_Test_1,1; next; } else if (.@mixitem1_1 == 3 && .@mixitem1_2 == 1 && .@mixitem1_3 == 1 && .@mixitem2 == 0 && .@mixitem3 == 2 && .@magic_powder == 2) { mes "[Mixing Machine]"; mes "Mage Test Solution No. 2."; - getitem 1085,1; //Mage_Test_2 + getitem Mage_Test_2,1; next; } else if (.@mixitem1_1 == 6 && .@mixitem1_2 == 1 && .@mixitem1_3 == 0 && .@mixitem2 == 1 && .@mixitem3 == 3 && .@magic_powder == 3) { mes "[Mixing Machine]"; mes "Mage Test Solution No. 3."; - getitem 1086,1; //Mage_Test_3 + getitem Mage_Test_3,1; next; } else if (.@mixitem1_1 == 2 && .@mixitem1_2 == 3 && .@mixitem1_3 == 0 && .@mixitem2 == 2 && .@mixitem3 == 4 && .@magic_powder == 4) { mes "[Mixing Machine]"; mes "Mage Test Solution No. 4."; - getitem 1087,1; //Mage_Test_4 + getitem Mage_Test_4,1; next; } else { mes "[Mixing Machine]"; mes "Unexpected"; mes "Error Occurred."; - getitem 1090,1; //Mage_Test_Etc + getitem Mage_Test_Etc,1; next; } mes "[Mixing Machine]"; diff --git a/npc/pre-re/jobs/1-1/merchant.txt b/npc/pre-re/jobs/1-1/merchant.txt index eb20de033..8ba33489d 100644 --- a/npc/pre-re/jobs/1-1/merchant.txt +++ b/npc/pre-re/jobs/1-1/merchant.txt @@ -434,7 +434,7 @@ alberta_in,53,43,6 script Merchant#mer 4_M_04,{ next; mes "[Chief Mahnsoo]"; mes "Would you please give her this message when you deliver the package? Please~"; - getitem 1072,1; //Delivery_Message + getitem Delivery_Message,1; break; } next; @@ -555,22 +555,22 @@ alberta_in,28,29,2 script Merchant Guildsman#mer 4_M_01,{ else if (job_merchant_q2 == 7 || job_merchant_q2 == 8) mes "Oh hohohoho~! The Kafra Babe on Byalan Island?! Awesome! Anyway, did you bring the receipt?"; - if (job_merchant_q2 == 1 && countitem(1073) != 0) - delitem 1073,1; //Merchant_Voucher_1 - else if (job_merchant_q2 == 2 && countitem(1074) != 0) - delitem 1074,1; //Merchant_Voucher_2 - else if (job_merchant_q2 == 3 && countitem(1075) != 0) - delitem 1075,1; //Merchant_Voucher_3 - else if (job_merchant_q2 == 4 && countitem(1076) != 0) - delitem 1076,1; //Merchant_Voucher_4 - else if (job_merchant_q2 == 5 && countitem(1077) != 0) - delitem 1077,1; //Merchant_Voucher_5 - else if (job_merchant_q2 == 6 && countitem(1078) != 0) - delitem 1078,1; //Merchant_Voucher_6 - else if (job_merchant_q2 == 7 && countitem(1079) != 0) - delitem 1079,1; //Merchant_Voucher_7 - else if (job_merchant_q2 == 8 && countitem(1080) != 0) - delitem 1080,1; //Merchant_Voucher_8 + if (job_merchant_q2 == 1 && countitem(Merchant_Voucher_1) != 0) + delitem Merchant_Voucher_1,1; + else if (job_merchant_q2 == 2 && countitem(Merchant_Voucher_2) != 0) + delitem Merchant_Voucher_2,1; + else if (job_merchant_q2 == 3 && countitem(Merchant_Voucher_3) != 0) + delitem Merchant_Voucher_3,1; + else if (job_merchant_q2 == 4 && countitem(Merchant_Voucher_4) != 0) + delitem Merchant_Voucher_4,1; + else if (job_merchant_q2 == 5 && countitem(Merchant_Voucher_5) != 0) + delitem Merchant_Voucher_5,1; + else if (job_merchant_q2 == 6 && countitem(Merchant_Voucher_6) != 0) + delitem Merchant_Voucher_6,1; + else if (job_merchant_q2 == 7 && countitem(Merchant_Voucher_7) != 0) + delitem Merchant_Voucher_7,1; + else if (job_merchant_q2 == 8 && countitem(Merchant_Voucher_8) != 0) + delitem Merchant_Voucher_8,1; else { next; job_merchant_q = 9; @@ -593,7 +593,7 @@ alberta_in,28,29,2 script Merchant Guildsman#mer 4_M_01,{ job_merchant_q = 7; end; } - else if (job_merchant_q == 4 || job_merchant_q == 3 && countitem(1081) == 0 && countitem(1082) == 0 && countitem(1091) == 0) { + else if (job_merchant_q == 4 || job_merchant_q == 3 && countitem(Merchant_Box_1) == 0 && countitem(Merchant_Box_2) == 0 && countitem(Merchant_Box_Etc) == 0) { mes " [Union Staff Kay] "; mes "Huh?"; mes "You're back?"; @@ -614,12 +614,12 @@ alberta_in,28,29,2 script Merchant Guildsman#mer 4_M_01,{ mes "Okay..."; close; } - else if (job_merchant_q == 4 || job_merchant_q == 3 && countitem(1081) != 0 || countitem(1082) != 0 || countitem(1091) != 0) { + else if (job_merchant_q == 4 || job_merchant_q == 3 && countitem(Merchant_Box_1) != 0 || countitem(Merchant_Box_2) != 0 || countitem(Merchant_Box_Etc) != 0) { mes "[Union Staff Kay]"; mes "Hey, what are you still doing here? Shouldn't you be on your way already?"; next; if (select("I need a new package.:Oh, yeah. You're right!") == 1) { - if (countitem(1081) == 0 && countitem(1082) == 0 && countitem(1083) == 0 && countitem(1091) == 0) { + if (countitem(Merchant_Box_1) == 0 && countitem(Merchant_Box_2) == 0 && countitem(Merchant_Box_3) == 0 && countitem(Merchant_Box_Etc) == 0) { mes "[Union Staff Kay]"; mes "Wha--?"; mes "So where did"; @@ -647,12 +647,12 @@ alberta_in,28,29,2 script Merchant Guildsman#mer 4_M_01,{ } mes "[Union Staff Kay]"; mes "*Sigh* Man, you're starting to become a pain in the ass. Hold on, lemme cancel your record..."; - if (countitem(1081) != 0) - delitem 1081,1; //Merchant_Box_1 - else if (countitem(1082) != 0) - delitem 1082,1; //Merchant_Box_2 - else if (countitem(1091) != 0) - delitem 1091,1; //Merchant_Box_Etc + if (countitem(Merchant_Box_1) != 0) + delitem Merchant_Box_1,1; + else if (countitem(Merchant_Box_2) != 0) + delitem Merchant_Box_2,1; + else if (countitem(Merchant_Box_Etc) != 0) + delitem Merchant_Box_Etc,1; if (job_merchant_q == 4) job_merchant_q = 2; else if (job_merchant_q == 3) @@ -739,35 +739,35 @@ alberta_in,28,29,2 script Merchant Guildsman#mer 4_M_01,{ } if (.@where_village == 1) { if (job_merchant_q2 == 1 && .@input == 2485741) - getitem 1081,1; //Merchant_Box_1 + getitem Merchant_Box_1,1; else if (job_merchant_q2 == 2 && .@input == 2328137) - getitem 1082,1; //Merchant_Box_2 + getitem Merchant_Box_2,1; else - getitem 1091,1; //Merchant_Box_Etc + getitem Merchant_Box_Etc,1; } else if (.@where_village == 2) { if (job_merchant_q2 == 3 && .@input == 2989396) - getitem 1081,1; //Merchant_Box_1 + getitem Merchant_Box_1,1; else if (job_merchant_q2 == 4 && .@input == 2191737) - getitem 1082,1; //Merchant_Box_2 + getitem Merchant_Box_2,1; else - getitem 1091,1; //Merchant_Box_Etc + getitem Merchant_Box_Etc,1; } else if (.@where_village == 3) { if (job_merchant_q2 == 5 && .@input == 3012685) - getitem 1081,1; //Merchant_Box_1 + getitem Merchant_Box_1,1; else if (job_merchant_q2 == 6 && .@input == 3487372) - getitem 1082,1; //Merchant_Box_2 + getitem Merchant_Box_2,1; else - getitem 1091,1; //Merchant_Box_Etc + getitem Merchant_Box_Etc,1; } else { if (job_merchant_q2 == 7 && .@input == 3318702) - getitem 1081,1; //Merchant_Box_1 + getitem Merchant_Box_1,1; else if (job_merchant_q2 == 8 && .@input == 3543625) - getitem 1082,1; //Merchant_Box_2 + getitem Merchant_Box_2,1; else - getitem 1091,1; //Merchant_Box_Etc + getitem Merchant_Box_Etc,1; } if (job_merchant_q == 2) job_merchant_q = 4; @@ -804,7 +804,7 @@ morocc_in,140,102,4 script Student#mer 4_M_04,{ mes "the right place."; next; mes "[Dyer's Student]"; - if (countitem(1081) == 1 || countitem(1082) == 1 || countitem(1091) == 1) { + if (countitem(Merchant_Box_1) == 1 || countitem(Merchant_Box_2) == 1 || countitem(Merchant_Box_Etc) == 1) { mes "Okay~"; mes "Please set the"; mes "package down"; @@ -822,21 +822,21 @@ morocc_in,140,102,4 script Student#mer 4_M_04,{ mes "Let me check the Serial Number of the package so I can give you the receipt, okay?"; next; mes "[Dyer's Student]"; - if (job_merchant_q2 == 5 && countitem(1081) != 0) { + if (job_merchant_q2 == 5 && countitem(Merchant_Box_1) != 0) { mes "3012685..."; mes "That's right."; mes "Here's your"; mes "receipt."; - delitem 1081,1; //Merchant_Box_1 - getitem 1077,1; //Merchant_Voucher_5 + delitem Merchant_Box_1,1; + getitem Merchant_Voucher_5,1; } - else if (job_merchant_q2 == 6 && countitem(1082) != 0) { + else if (job_merchant_q2 == 6 && countitem(Merchant_Box_2) != 0) { mes "3487372..."; mes "That's right."; mes "Here's your"; mes "receipt."; - delitem 1082,1; //Merchant_Box_2 - getitem 1078,1; //Merchant_Voucher_6 + delitem Merchant_Box_2,1; + getitem Merchant_Voucher_6,1; } else { mes "Excuse me, but..."; @@ -886,7 +886,7 @@ geffen_in,155,122,4 script Guild Staff#mer 1_M_01,{ mes "Ah, you must be with the Merchant Guild. Finally, my package has arrived! Alright...!"; next; mes "[Guild Staff]"; - if (countitem(1081) == 1 || countitem(1082) == 1 || countitem(1091) == 1) { + if (countitem(Merchant_Box_1) == 1 || countitem(Merchant_Box_2) == 1 || countitem(Merchant_Box_Etc) == 1) { mes "You must be very tired"; mes "from having to travel"; mes "in this kind"; @@ -902,15 +902,15 @@ geffen_in,155,122,4 script Guild Staff#mer 1_M_01,{ mes "[Guild Staff]"; mes "Alright, let me"; mes "check the Serial Number..."; - if (job_merchant_q2 == 3 && countitem(1081) != 0) { + if (job_merchant_q2 == 3 && countitem(Merchant_Box_1) != 0) { mes "2989396. Yes, this is what we ordered. Here is your receipt."; - delitem 1081,1; //Merchant_Box_1 - getitem 1075,1; //Merchant_Voucher_3 + delitem Merchant_Box_1,1; + getitem Merchant_Voucher_3,1; } - else if (job_merchant_q2 == 4 && countitem(1082) != 0) { + else if (job_merchant_q2 == 4 && countitem(Merchant_Box_2) != 0) { mes "2191737. Yes, this is what we ordered. Here is your receipt."; - delitem 1082,1; //Merchant_Box_2 - getitem 1076,1; //Merchant_Voucher_4 + delitem Merchant_Box_2,1; + getitem Merchant_Voucher_4,1; } else { mes "Uh oh, this is the wrong number. This isn't what we ordered..."; @@ -978,7 +978,7 @@ prontera,248,42,0 script Kafra Employee#mer 4_F_KAFRA2,{ mes "the Merchant Guild?"; mes "Oh, yes, please set"; mes "it down right over there..."; - if (countitem(1081) == 1 || countitem(1082) == 1 || countitem(1091) == 1) { + if (countitem(Merchant_Box_1) == 1 || countitem(Merchant_Box_2) == 1 || countitem(Merchant_Box_Etc) == 1) { mes "You must be really tired"; mes "after carrying it for so long!"; } @@ -993,21 +993,21 @@ prontera,248,42,0 script Kafra Employee#mer 4_F_KAFRA2,{ mes "[Kafra Employee]"; mes "Now, let me check"; mes "the serial number..."; - if (job_merchant_q2 == 1 && countitem(1081) != 0) { + if (job_merchant_q2 == 1 && countitem(Merchant_Box_1) != 0) { mes "2485741. Right, this is"; mes "the one we ordered. Oh,"; mes "and don't forget this receipt!"; next; - delitem 1081,1; //Merchant_Box_1 - getitem 1073,1; //Merchant_Voucher_1 + delitem Merchant_Box_1,1; + getitem Merchant_Voucher_1,1; } - else if (job_merchant_q2 == 2 && countitem(1082) != 0) { + else if (job_merchant_q2 == 2 && countitem(Merchant_Box_2) != 0) { mes "2328137. Right, this is"; mes "the one we ordered. Oh,"; mes "and don't forget this receipt!"; next; - delitem 1082,1; //Merchant_Box_2 - getitem 1074,1; //Merchant_Voucher_2 + delitem Merchant_Box_2,1; + getitem Merchant_Voucher_2,1; } else { mes "Mmmm? Hold on. This is"; @@ -1097,7 +1097,7 @@ function script F_MercKafra { mes "the Merchant Guild?"; mes "Oh, yes, please set"; mes "it down right over there..."; - if (countitem(1081) == 1 || countitem(1082) == 1 || countitem(1091) == 1) { + if (countitem(Merchant_Box_1) == 1 || countitem(Merchant_Box_2) == 1 || countitem(Merchant_Box_Etc) == 1) { mes "You must be really tired"; mes "after carrying it for so long!"; } @@ -1112,19 +1112,19 @@ function script F_MercKafra { mes "[Kafra Employee]"; mes "Now, let me check"; mes "the serial number..."; - if (job_merchant_q2 == 7 && countitem(1081) != 0) { + if (job_merchant_q2 == 7 && countitem(Merchant_Box_1) != 0) { mes "3318702. Right, this is"; mes "the one we ordered. Oh,"; mes "and don't forget this receipt!"; - delitem 1081,1; //Merchant_Box_1 - getitem 1079,1; //Merchant_Voucher_7 + delitem Merchant_Box_1,1; + getitem Merchant_Voucher_7,1; } - else if (job_merchant_q2 == 8 && countitem(1082) != 0) { + else if (job_merchant_q2 == 8 && countitem(Merchant_Box_2) != 0) { mes "3543625. Right, this is"; mes "the one we ordered. Oh,"; mes "and don't forget this receipt!"; - delitem 1082,1; //Merchant_Box_2 - getitem 1080,1; //Merchant_Voucher_8 + delitem Merchant_Box_2,1; + getitem Merchant_Voucher_8,1; } else { mes "Mmmm? Hold on. This is"; @@ -1144,9 +1144,9 @@ function script F_MercKafra { else if (job_merchant_q == 3) job_merchant_q = 5; next; - if (countitem(1072) != 0 && quest_alb_01 == 0) { + if (countitem(Delivery_Message) != 0 && quest_alb_01 == 0) { select("This is from Chief Mahnsoo of the Merchant Guild..."); - delitem 1072,1; //Delivery_Message + delitem Delivery_Message,1; quest_alb_01 = 1; mes "[Kafra Employee]"; mes "Oh~! A letter from"; @@ -1163,7 +1163,7 @@ function script F_MercKafra { mes "of this. This isn't anything"; mes "special, but please take it."; mes "Well, see you again~"; - getitem 513,3; //Banana + getitem Banana,3; } else { mes "[Kafra Employee]"; diff --git a/npc/pre-re/jobs/1-1/swordman.txt b/npc/pre-re/jobs/1-1/swordman.txt index 33cfeb695..49a113d01 100644 --- a/npc/pre-re/jobs/1-1/swordman.txt +++ b/npc/pre-re/jobs/1-1/swordman.txt @@ -294,7 +294,7 @@ izlude_in,30,163,0 script Test Hall Staff#swd_1 8W_SOLDIER,{ } 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 + getitem Apple,5; job_sword_q = 3; } else if (job_sword_q == 3) diff --git a/npc/pre-re/jobs/1-1/thief.txt b/npc/pre-re/jobs/1-1/thief.txt index 4777cb603..32f2f0d75 100644 --- a/npc/pre-re/jobs/1-1/thief.txt +++ b/npc/pre-re/jobs/1-1/thief.txt @@ -151,7 +151,7 @@ moc_prydb1,39,129,2 script Thief Guide 1_F_04,{ mes "*Sigh* Look, there's really no need for you to be in this kind of place. You oughta go where you ought to go."; close; } - if (job_thief_q == 3 && countitem(1069) > 0 || countitem(1070) > 0) { + if (job_thief_q == 3 && countitem(Mushroom_Of_Thief_1) > 0 || countitem(Mushroom_Of_Thief_2) > 0) { mes "[Thief Guide]"; mes "Hmmm?"; mes "You gathered Mushrooms for"; @@ -393,7 +393,7 @@ moc_prydb1,42,133,2 script Comrade 2_M_THIEFMASTER,{ else if (job_thief_q == 3) { mes "[Comrade]"; mes "Ah, the guide told me about you. So, let me check your mushrooms..."; - if (countitem(1069) == 0 && countitem(1070) == 0) { + if (countitem(Mushroom_Of_Thief_1) == 0 && countitem(Mushroom_Of_Thief_2) == 0) { next; mes "[Comrade]"; mes "What the hell..."; @@ -401,17 +401,17 @@ moc_prydb1,42,133,2 script Comrade 2_M_THIEFMASTER,{ close; } next; - .@thief_item1 = countitem(1069) * 3; - .@thief_item2 = countitem(1070); + .@thief_item1 = countitem(Mushroom_Of_Thief_1) * 3; + .@thief_item2 = countitem(Mushroom_Of_Thief_2); .@total_thief = .@thief_item1 + .@thief_item2; .@money_thief = ((.@thief_item1 * 5) + (.@thief_item2 * 2)) + 200; mes "[Comrade]"; - if (countitem(1069) != 0) { + if (countitem(Mushroom_Of_Thief_1) != 0) { mes "First, let me check the Orange Net Mushrooms you got."; - mes "Huh, " + countitem(1069) + " of them."; + mes "Huh, " + countitem(Mushroom_Of_Thief_1) + " of them."; } - if (countitem(1070) != 0) - mes "Now I'll just check your Orange Gooey Mushrooms. That's " + countitem(1070) + " you gathered."; + if (countitem(Mushroom_Of_Thief_2) != 0) + mes "Now I'll just check your Orange Gooey Mushrooms. That's " + countitem(Mushroom_Of_Thief_2) + " you gathered."; next; mes "[Comrade]"; mes "So that would"; @@ -442,8 +442,8 @@ moc_prydb1,42,133,2 script Comrade 2_M_THIEFMASTER,{ mes "[Comrade]"; mes strcharinfo(0) + "..."; mes "You have passed the official Thief Test. You are now one of us."; - if (countitem(1069) != 0) delitem 1069,countitem(1069); //Mushroom_Of_Thief_1 - if (countitem(1070) != 0) delitem 1070,countitem(1070); //Mushroom_Of_Thief_2 + if (countitem(Mushroom_Of_Thief_1) != 0) delitem Mushroom_Of_Thief_1,countitem(Mushroom_Of_Thief_1); + if (countitem(Mushroom_Of_Thief_2) != 0) delitem Mushroom_Of_Thief_2,countitem(Mushroom_Of_Thief_2); callfunc "Job_Change",Job_Thief; callfunc "F_ClearJobVar"; completequest 1013; |