summaryrefslogtreecommitdiff
path: root/npc/re/jobs/novice/novice.txt
diff options
context:
space:
mode:
authorAsheraf <acheraf1998@gmail.com>2016-08-28 17:03:57 +0100
committerhemagx <ibrahem.h.basyone@gmail.com>2016-08-29 01:03:42 +0200
commit86977d79269408a371384e61111c3a9cf6e87b0c (patch)
tree4f2a9b1f9a3ee6436a0b857d05caa2be7e99a877 /npc/re/jobs/novice/novice.txt
parent16f998c8a79153ed9f6721c36e129b6080fa59d2 (diff)
downloadhercules-86977d79269408a371384e61111c3a9cf6e87b0c.tar.gz
hercules-86977d79269408a371384e61111c3a9cf6e87b0c.tar.bz2
hercules-86977d79269408a371384e61111c3a9cf6e87b0c.tar.xz
hercules-86977d79269408a371384e61111c3a9cf6e87b0c.zip
*strnpcinfo now uses constants
- NPC_NAME for the whole npc name including hidden part - NPC_NAME_VISIBLE for the visible part of the npc name - NPC_NAME_HIDDEN for the hidden part of the npc name - NPC_NAME_UNIQUE for the npc unique name - NPC_MAP for npc map
Diffstat (limited to 'npc/re/jobs/novice/novice.txt')
-rw-r--r--npc/re/jobs/novice/novice.txt38
1 files changed, 19 insertions, 19 deletions
diff --git a/npc/re/jobs/novice/novice.txt b/npc/re/jobs/novice/novice.txt
index fff0dbb13..a20bb81f8 100644
--- a/npc/re/jobs/novice/novice.txt
+++ b/npc/re/jobs/novice/novice.txt
@@ -163,8 +163,8 @@ new_5-1,53,114,3 duplicate(NvSprakkiA) Sprakki#nv5a 4_F_01
mes "^4d4dff- You received a quest 'Novice Training Ground -1' from Sprakki.";
mes "Please check the Quest Info Window. -^000000";
close2;
- savepoint strnpcinfo(4),100,100;
- warp strnpcinfo(4),100,100;
+ savepoint strnpcinfo(NPC_MAP),100,100;
+ warp strnpcinfo(NPC_MAP),100,100;
end;
case 2:
nov_1st_cos = 0;
@@ -218,8 +218,8 @@ new_5-1,53,114,3 duplicate(NvSprakkiA) Sprakki#nv5a 4_F_01
mes "These are the Novice Training Grounds.";
mes "I will guide you to the Novice Training Center.";
close2;
- savepoint strnpcinfo(4),100,100;
- warp strnpcinfo(4),100,100;
+ savepoint strnpcinfo(NPC_MAP),100,100;
+ warp strnpcinfo(NPC_MAP),100,100;
end;
}
}
@@ -466,7 +466,7 @@ new_5-2,100,29,4 duplicate(NvSprakkiB) Sprakki#nv5b 4_F_01
mes "I think it's better than seeing you lost and wandering about.";
mes "Hahahaha...";
close2;
- warp strnpcinfo(4),41,172;
+ warp strnpcinfo(NPC_MAP),41,172;
end;
}
} else {
@@ -480,7 +480,7 @@ new_5-2,100,29,4 duplicate(NvSprakkiB) Sprakki#nv5b 4_F_01
mes "Sure.";
mes "Be careful not to be lost again.";
close2;
- warp "new_"+charat(strnpcinfo(4),4)+"-3",96,21;
+ warp "new_"+charat(strnpcinfo(NPC_MAP),4)+"-3",96,21;
end;
case 2:
mes "[Instructor Brade]";
@@ -488,7 +488,7 @@ new_5-2,100,29,4 duplicate(NvSprakkiB) Sprakki#nv5b 4_F_01
mes "In that case, I will send you to where the Kafra Employee is at.";
mes "Use ^4d4dffKafra's Warp Service^000000 to go to town.";
close2;
- warp strnpcinfo(4),41,172;
+ warp strnpcinfo(NPC_MAP),41,172;
end;
}
}
@@ -508,7 +508,7 @@ new_5-2,100,105,3 duplicate(NvBradeA) Brade#nv5a 4_M_JOB_KNIGHT1
mes "[Jinha]";
mes "You have to see Instructor Brade first before me. I will send you to Instructor Brade.";
close2;
- warp strnpcinfo(4),100,100;
+ warp strnpcinfo(NPC_MAP),100,100;
end;
} else if (job_novice_q == 5) {
if (getskilllv("NV_FIRSTAID") > 0) {
@@ -577,7 +577,7 @@ new_5-2,100,105,3 duplicate(NvBradeA) Brade#nv5a 4_M_JOB_KNIGHT1
mes "[Jinha]";
mes "I will send you to Instructor Brade.";
close2;
- warp strnpcinfo(4),100,100;
+ warp strnpcinfo(NPC_MAP),100,100;
end;
}
} else {
@@ -622,7 +622,7 @@ new_5-2,115,120,3 duplicate(NvJinha) Jinha#nv5 1_M_ORIENT01
mes "I will send you to Instructor Brade.";
mes "Instructor Brade will start your basic training.";
close2;
- warp strnpcinfo(4),100,100;
+ warp strnpcinfo(NPC_MAP),100,100;
end;
case 2:
mes "[Chocolat]";
@@ -664,7 +664,7 @@ new_5-2,115,120,3 duplicate(NvJinha) Jinha#nv5 1_M_ORIENT01
mes "Sure.";
mes "I will see you later.";
close2;
- warp strnpcinfo(4),100,100;
+ warp strnpcinfo(NPC_MAP),100,100;
end;
}
}
@@ -746,7 +746,7 @@ new_5-2,115,120,3 duplicate(NvJinha) Jinha#nv5 1_M_ORIENT01
mes "Real Combat Training will be given by Instructor Brade. You met him earlier.";
mes "I will send you to the Real Combat Training Field.";
close2;
- .@map$ = "new_"+charat(strnpcinfo(4),4)+"-3";
+ .@map$ = "new_"+charat(strnpcinfo(NPC_MAP),4)+"-3";
savepoint .@map$,96,21;
warp .@map$,96,21;
end;
@@ -764,7 +764,7 @@ new_5-2,115,120,3 duplicate(NvJinha) Jinha#nv5 1_M_ORIENT01
mes "[Chocolat]";
mes "I will send you to the Real Combat Training Field.";
close2;
- .@map$ = "new_"+charat(strnpcinfo(4),4)+"-3";
+ .@map$ = "new_"+charat(strnpcinfo(NPC_MAP),4)+"-3";
savepoint .@map$,96,21;
warp .@map$,96,21;
end;
@@ -1132,7 +1132,7 @@ new_5-2,36,176,4 duplicate(NvGuide) Guide#nv5 8W_SOLDIER
mes "[Brade]";
mes "Ok. I'll send you to the basic course.";
close2;
- warp "new_"+charat(strnpcinfo(4),4)+"-2",100,100;
+ warp "new_"+charat(strnpcinfo(NPC_MAP),4)+"-2",100,100;
end;
case 2:
mes "[Brade]";
@@ -1151,7 +1151,7 @@ new_5-2,36,176,4 duplicate(NvGuide) Guide#nv5 8W_SOLDIER
mes "[Brade]";
mes "Ok. I'll send you to Chocolat.";
close2;
- warp "new_"+charat(strnpcinfo(4),4)+"-2",41,172;
+ warp "new_"+charat(strnpcinfo(NPC_MAP),4)+"-2",41,172;
end;
case 2:
mes "[Brade]";
@@ -1184,7 +1184,7 @@ new_5-2,36,176,4 duplicate(NvGuide) Guide#nv5 8W_SOLDIER
job_novice_q = 13;
setquest 7122;
getitem Novice_Potion,100;
- savepoint strnpcinfo(4),96,21;
+ savepoint strnpcinfo(NPC_MAP),96,21;
next;
mes "^4d4dff- You've received a quest from Instructor Brade.";
mes "Please check the quest information window. -^000000";
@@ -2308,7 +2308,7 @@ new_5-3,97,50,4 duplicate(NvEden) Eden Group Officer#nv5 4_F_NOVICE,5,5
mes "I see, then let me guide you to another level. Which level do you want to go to?";
next;
for(.@i = 1; .@i<6; ++.@i) {
- if (!compare(strnpcinfo(2),"nv"+.@i))
+ if (!compare(strnpcinfo(NPC_NAME_HIDDEN),"nv"+.@i))
.@menu$ += "Send me to Level "+.@i;
.@menu$ += ":";
}
@@ -2439,8 +2439,8 @@ new_5-1,144,107,2 duplicate(NvGuardB) Guard#nv5b 8W_SOLDIER
mes "Well, I will let you out of here.";
mes "Go find the instructor, Brade.";
close2;
- savepoint strnpcinfo(4),100,100;
- warp strnpcinfo(4),100,100;
+ savepoint strnpcinfo(NPC_MAP),100,100;
+ warp strnpcinfo(NPC_MAP),100,100;
end;
}
new_1-2,161,182,5 duplicate(NvEdwin) Instructor#nv1 4_F_03