summaryrefslogtreecommitdiff
path: root/npc/jobs/1-1e
diff options
context:
space:
mode:
Diffstat (limited to 'npc/jobs/1-1e')
-rw-r--r--npc/jobs/1-1e/gunslinger.txt22
-rw-r--r--npc/jobs/1-1e/ninja.txt14
-rw-r--r--npc/jobs/1-1e/taekwon.txt2
3 files changed, 19 insertions, 19 deletions
diff --git a/npc/jobs/1-1e/gunslinger.txt b/npc/jobs/1-1e/gunslinger.txt
index c17e83cb8..3f02f7808 100644
--- a/npc/jobs/1-1e/gunslinger.txt
+++ b/npc/jobs/1-1e/gunslinger.txt
@@ -198,9 +198,9 @@ que_ng,152,167,3 script Master Miller 4_M_HUOLDARMY,{
GUNS_Q = 6;
completequest 6024;
if (rand(1,2) == 1) {
- getitem 13100,1; // Six_Shooter
+ getitem Six_Shooter,1; // Six_Shooter
} else {
- getitem 13150,1; // Branch
+ getitem Branch,1; // Branch
}
close;
}
@@ -281,7 +281,7 @@ payon,184,65,3 script Wise Bull Horn 4_M_LGTGRAND,{
close;
}
else if (GUNS_Q == 2) {
- if (countitem(912) < 3 || countitem(914) < 3 || countitem(1019) < 1 || countitem(935) < 10 || countitem(511) < 3 || countitem(1013) < 3) {
+ if (countitem(Zargon) < 3 || countitem(Fluff) < 3 || countitem(Wooden_Block) < 1 || countitem(Shell) < 10 || countitem(Green_Herb) < 3 || countitem(Colorful_Shell) < 3) {
mes "[Wise Bull Horn]";
mes "I can make a voucher that";
mes "will demonstrate your desire";
@@ -307,12 +307,12 @@ payon,184,65,3 script Wise Bull Horn 4_M_LGTGRAND,{
mes "a Gunslinger.";
close;
}
- delitem 912,3; // Zargon
- delitem 914,3; // Fluff
- delitem 1019,1; // Wooden_Block
- delitem 935,10; // Shell
- delitem 511,3; // Green_Herb
- delitem 1013,3; // Colorful_Shell
+ delitem Zargon,3; // Zargon
+ delitem Fluff,3; // Fluff
+ delitem Wooden_Block,1; // Wooden_Block
+ delitem Shell,10; // Shell
+ delitem Green_Herb,3; // Green_Herb
+ delitem Colorful_Shell,3; // Colorful_Shell
GUNS_Q = 3;
changequest 6021,6022;
mes "[Wise Bull Horn]";
@@ -365,7 +365,7 @@ payon,184,65,3 script Wise Bull Horn 4_M_LGTGRAND,{
close;
}
else if (GUNS_Q == 4) {
- if (countitem(519) < 1) {
+ if (countitem(Milk) < 1) {
mes "[Wise Bull Horn]";
mes "I'm an old man that will";
mes "soon be reunited with mother";
@@ -374,7 +374,7 @@ payon,184,65,3 script Wise Bull Horn 4_M_LGTGRAND,{
mes "a cold glass of Milk, please?";
close;
}
- delitem 519,1; // Milk
+ delitem Milk,1; // Milk
GUNS_Q = 5;
changequest 6023,6024;
mes "[Wise Bull Horn]";
diff --git a/npc/jobs/1-1e/ninja.txt b/npc/jobs/1-1e/ninja.txt
index 9eb760c15..a8348a9b9 100644
--- a/npc/jobs/1-1e/ninja.txt
+++ b/npc/jobs/1-1e/ninja.txt
@@ -280,7 +280,7 @@ que_ng,30,65,3 script Cougar#nq 4_M_JOB_ASSASSIN,{
close;
}
else if (NINJ_Q == 4) {
- if (countitem(7053) < 5 || countitem(1010) < 1) {
+ if (countitem(Cyfar) < 5 || countitem(Phracon) < 1) {
mes "[Cougar]";
mes "Hurry and bring";
mes "^3355FF5 Cyfars^000000 and";
@@ -354,9 +354,9 @@ que_ng,30,65,3 script Cougar#nq 4_M_JOB_ASSASSIN,{
mes "quiet as the falling shadows.";
callfunc "Job_Change",Job_Ninja;
NINJ_Q = 5;
- delitem 7053,5; // Cyfar
- delitem 1010,1; // Phracon
- getitem 13010,1; // Asura
+ delitem Cyfar,5; // Cyfar
+ delitem Phracon,1; // Phracon
+ getitem Asura,1; // Asura
completequest 6018;
close;
}
@@ -457,7 +457,7 @@ einbroch,184,194,3 script Suspicious Man#nq 4_M_SITDOWN,{
close;
}
else if (NINJ_Q == 2) {
- if (countitem(7053) < 5 || countitem(1010) < 1) {
+ if (countitem(Cyfar) < 5 || countitem(Phracon) < 1) {
mes "[Suspicious Man]";
mes "Please bring";
mes "^3355FF5 Cyfars^000000 and";
@@ -544,8 +544,8 @@ einbroch,184,194,3 script Suspicious Man#nq 4_M_SITDOWN,{
mes "It'll take a while to";
mes "return to Amatsu, so let";
mes "me send you there directly...";
- delitem 1010,1; // Phracon
- delitem 7053,5; // Cyfar
+ delitem Phracon,1; // Phracon
+ delitem Cyfar,5; // Cyfar
NINJ_Q = 3;
changequest 6016,6017;
close2;
diff --git a/npc/jobs/1-1e/taekwon.txt b/npc/jobs/1-1e/taekwon.txt
index b242af416..b3d610c6d 100644
--- a/npc/jobs/1-1e/taekwon.txt
+++ b/npc/jobs/1-1e/taekwon.txt
@@ -395,7 +395,7 @@ payon,157,141,5 script Phoenix#TKJobChange 4_M_MONK,{
completequest 6002;
callfunc "Job_Change",Job_Taekwon;
callfunc "F_ClearJobVar";
- getitem 2101,1; // Guard[0]
+ getitem Guard,1; // Guard[0]
mes "[Phoenix]";
mes "You are still young, so";
mes "I assume you'll want a job";