summaryrefslogtreecommitdiff
path: root/npc/re/jobs
diff options
context:
space:
mode:
Diffstat (limited to 'npc/re/jobs')
-rw-r--r--npc/re/jobs/1-1/acolyte.txt8
-rw-r--r--npc/re/jobs/1-1/archer.txt2
-rw-r--r--npc/re/jobs/1-1/mage.txt2
-rw-r--r--npc/re/jobs/1-1/merchant.txt2
-rw-r--r--npc/re/jobs/1-1/swordman.txt2
-rw-r--r--npc/re/jobs/1-1/thief.txt4
-rw-r--r--npc/re/jobs/3-1/archbishop.txt112
-rw-r--r--npc/re/jobs/3-1/guillotine_cross.txt128
-rw-r--r--npc/re/jobs/3-1/mechanic.txt20
-rw-r--r--npc/re/jobs/3-1/ranger.txt60
-rw-r--r--npc/re/jobs/3-1/rune_knight.txt66
-rw-r--r--npc/re/jobs/3-1/warlock.txt24
-rw-r--r--npc/re/jobs/3-2/genetic.txt52
-rw-r--r--npc/re/jobs/3-2/minstrel.txt90
-rw-r--r--npc/re/jobs/3-2/royal_guard.txt30
-rw-r--r--npc/re/jobs/3-2/shadow_chaser.txt44
-rw-r--r--npc/re/jobs/3-2/sorcerer.txt12
-rw-r--r--npc/re/jobs/3-2/sura.txt30
-rw-r--r--npc/re/jobs/3-2/wanderer.txt50
-rw-r--r--npc/re/jobs/novice/novice.txt252
-rw-r--r--npc/re/jobs/novice/supernovice_ex.txt4
-rw-r--r--npc/re/jobs/repair.txt48
22 files changed, 521 insertions, 521 deletions
diff --git a/npc/re/jobs/1-1/acolyte.txt b/npc/re/jobs/1-1/acolyte.txt
index ca80fda9c..07c37a07c 100644
--- a/npc/re/jobs/1-1/acolyte.txt
+++ b/npc/re/jobs/1-1/acolyte.txt
@@ -12,7 +12,7 @@
//= 1.2 Added Baby Job compatibility [Streusel]
//= 1.3 Rewrote bits [Euphy]
//============================================================
-prt_church,184,41,4 script Cleric#aco 60,{
+prt_church,184,41,4 script Cleric#aco 1_M_PASTOR,{
if (Upper == 1) {
if (ADVJOB == Job_High_Priest || ADVJOB == Job_Champion) {
if (Class == Job_Novice_High) {
@@ -110,7 +110,7 @@ prt_church,184,41,4 script Cleric#aco 60,{
}
}
-prt_fild03,365,255,2 script Ascetic#aco 89,{
+prt_fild03,365,255,2 script Ascetic#aco 4_M_ORIENT02,{
mes "[Father Rubalkabara]";
if (BaseJob == Job_Novice) {
if (job_acolyte_q == 6) {
@@ -187,7 +187,7 @@ prt_fild03,365,255,2 script Ascetic#aco 89,{
}
}
-moc_fild07,41,355,4 script Ascetic#2aco 95,{
+moc_fild07,41,355,4 script Ascetic#2aco 4_F_SISTER,{
mes "[Mother Mathilda]";
if (BaseJob == Job_Novice) {
if (job_acolyte_q == 7) {
@@ -256,7 +256,7 @@ moc_fild07,41,355,4 script Ascetic#2aco 95,{
}
}
-prt_fild00,208,218,6 script Ascetic#3aco 98,{
+prt_fild00,208,218,6 script Ascetic#3aco 4W_M_02,{
mes "[Father Yosuke]";
if (BaseJob == Job_Novice) {
if (job_acolyte_q == 8) {
diff --git a/npc/re/jobs/1-1/archer.txt b/npc/re/jobs/1-1/archer.txt
index d22e85f04..71df65889 100644
--- a/npc/re/jobs/1-1/archer.txt
+++ b/npc/re/jobs/1-1/archer.txt
@@ -11,7 +11,7 @@
//= 1.1 Added Baby Job compatibility [Streusel]
//= 1.2 Rewrote bits [Euphy]
//============================================================
-payon_in02,64,71,4 script Archer Guildsman#archer 85,{
+payon_in02,64,71,4 script Archer Guildsman#archer 4_M_03,{
if (Upper == 1) {
if (Class == Job_Novice_High && (ADVJOB == Job_Sniper || ADVJOB == Job_Clown || ADVJOB == Job_Gypsy)) {
mes "[Archer Guildsman]";
diff --git a/npc/re/jobs/1-1/mage.txt b/npc/re/jobs/1-1/mage.txt
index ef60603f0..e87f89328 100644
--- a/npc/re/jobs/1-1/mage.txt
+++ b/npc/re/jobs/1-1/mage.txt
@@ -11,7 +11,7 @@
//= 1.1 Added Baby Job compatibility [Streusel]
//= 1.2 Rewrote bits [Euphy]
//============================================================
-geffen_in,164,124,4 script Mage Guildsman#mage 123,{
+geffen_in,164,124,4 script Mage Guildsman#mage 2_F_MAGICMASTER,{
if (Upper == 1) {
if (ADVJOB == Job_High_Wizard || ADVJOB == Job_Professor) {
if (Class == Job_Novice_High) {
diff --git a/npc/re/jobs/1-1/merchant.txt b/npc/re/jobs/1-1/merchant.txt
index 05b82ec66..619a2a465 100644
--- a/npc/re/jobs/1-1/merchant.txt
+++ b/npc/re/jobs/1-1/merchant.txt
@@ -11,7 +11,7 @@
//= 1.1 Added Baby Job compatibility [Streusel]
//= 1.2 Rewrote bits [Euphy]
//============================================================
-alberta_in,53,43,6 script Merchant#mer 86,{
+alberta_in,53,43,6 script Merchant#mer 4_M_04,{
if (Upper == 1) {
if (Class == Job_Novice_High && (ADVJOB == Job_Whitesmith || ADVJOB == Job_Creator)) {
mes "[Chief Mahnsoo]";
diff --git a/npc/re/jobs/1-1/swordman.txt b/npc/re/jobs/1-1/swordman.txt
index fffebe722..d8bd67711 100644
--- a/npc/re/jobs/1-1/swordman.txt
+++ b/npc/re/jobs/1-1/swordman.txt
@@ -11,7 +11,7 @@
//= 1.1 Added Baby Job compatibility [Streusel]
//= 1.2 Rewrote bits [Euphy]
//============================================================
-izlude_in,74,172,4 script Swordman#swd 119,{
+izlude_in,74,172,4 script Swordman#swd 2_M_SWORDMASTER,{
if (Upper == 1) {
if (Class == Job_Novice_High && (ADVJOB == Job_Lord_Knight || ADVJOB == Job_Paladin)) {
mes "[Swordman]";
diff --git a/npc/re/jobs/1-1/thief.txt b/npc/re/jobs/1-1/thief.txt
index c99368b8c..c42888a66 100644
--- a/npc/re/jobs/1-1/thief.txt
+++ b/npc/re/jobs/1-1/thief.txt
@@ -11,7 +11,7 @@
//= 1.1 Added Baby Job compatibility [Streusel]
//= 1.2 Rewrote bits [Euphy]
//============================================================
-moc_prydb1,39,129,2 script Thief Guide#thief 69,{
+moc_prydb1,39,129,2 script Thief Guide#thief 1_F_04,{
if (Upper == 1) {
if (ADVJOB == Job_Assassin_Cross || ADVJOB == Job_Stalker) {
if (Class == Job_Novice_High) {
@@ -155,7 +155,7 @@ moc_prydb1,39,129,2 script Thief Guide#thief 69,{
close;
}
-moc_prydb1,42,133,2 script Thief Guildsman#thief 118,{
+moc_prydb1,42,133,2 script Thief Guildsman#thief 2_M_THIEFMASTER,{
if(q_job_thief == 1) {
mes "[Thief Guildsman]";
mes "Alright. You must have passed the job interview, huh?";
diff --git a/npc/re/jobs/3-1/archbishop.txt b/npc/re/jobs/3-1/archbishop.txt
index ccc03b7f2..26782eb94 100644
--- a/npc/re/jobs/3-1/archbishop.txt
+++ b/npc/re/jobs/3-1/archbishop.txt
@@ -24,7 +24,7 @@
//= 1.9 Added GM management function. [Euphy]
//============================================================
-prt_church,103,88,3 script Praying Minister#arch 60,{
+prt_church,103,88,3 script Praying Minister#arch 1_M_PASTOR,{
if (BaseJob != Job_Priest) {
if (Class == Job_Arch_Bishop || Class == Job_Arch_Bishop_T || Class == Job_Baby_Bishop) {
mes "[Praying Minister]";
@@ -162,13 +162,13 @@ prt_church,103,88,3 script Praying Minister#arch 60,{
close;
}
-umbala,137,227,5 script Utan Boy#arch 787,{
+umbala,137,227,5 script Utan Boy#arch 4_M_UMKID,{
mes "[Utan Boy]";
mes "........";
close;
}
-umbala,139,227,3 script Priest#arch 60,{
+umbala,139,227,3 script Priest#arch 1_M_PASTOR,{
if (job_arch == 0) {
mes "[Priest]";
mes "Un...ba... Unba?";
@@ -414,7 +414,7 @@ umbala,139,227,3 script Priest#arch 60,{
close;
}
-yggdrasil01,220,47,0 script #arch_pilgrimage 139,5,5,{
+yggdrasil01,220,47,0 script #arch_pilgrimage HIDDEN_WARP_NPC,5,5,{
OnTouch:
if (job_arch == 2) {
mes "[" + strcharinfo(0) + "]";
@@ -573,7 +573,7 @@ OnTouch:
end;
}
-hu_in01,205,204,7 script Praying Nun#benew 79,{
+hu_in01,205,204,7 script Praying Nun#benew 1_F_PRIEST,{
if (job_arch == 4) {
mes "- There is a nun closing her eyes as she murmurs something which sounds like a prayer. -";
next;
@@ -722,14 +722,14 @@ hu_in01,205,204,7 script Praying Nun#benew 79,{
close;
}
-odin_tem02,282,263,0 script #find_val 139,3,3,{
+odin_tem02,282,263,0 script #find_val HIDDEN_WARP_NPC,3,3,{
OnTouch:
if ((job_arch > 4) && (job_arch < 100))
hideoffnpc "Valkyrie Illusion#arch";
end;
}
-odin_tem02,281,275,3 script Valkyrie Illusion#arch 403,{
+odin_tem02,281,275,3 script Valkyrie Illusion#arch 4_F_VALKYRIE2,{
if ((job_arch > 4) && (job_arch < 100)) {
mes "You can see Valkyrie who has a despairing face.";
next;
@@ -754,7 +754,7 @@ OnInit:
end;
}
-job3_arch01,29,34,3 script Valkyrie#arch 403,{
+job3_arch01,29,34,3 script Valkyrie#arch 4_F_VALKYRIE2,{
if (checkweight(1201,1) == 0 || (MaxWeight - Weight) < 2000) {
mes "- Wait a Sec !! -";
mes "- You are carrying too many items, -";
@@ -980,7 +980,7 @@ OnBc:
end;
}
-job3_arch02,119,49,0 script #arch_1_start 139,6,6,{
+job3_arch02,119,49,0 script #arch_1_start HIDDEN_WARP_NPC,6,6,{
OnTouch:
if (countitem(12381) == 0)
getitem 12381,1; //ValkyrieA_Scroll
@@ -1008,20 +1008,20 @@ OnTouch:
mapwarp "job3_arch02","job3_arch01",29,29;
end;
}
-job3_arch02,112,73,0 duplicate(archbjcq) #arch_1_01 139,5,5
-job3_arch02,94,123,0 duplicate(archbjcq) #arch_1_02 139,5,5
-job3_arch02,93,173,0 duplicate(archbjcq) #arch_1_03 139,5,5
-job3_arch02,114,186,0 duplicate(archbjcq) #arch_1_04 139,5,5
-job3_arch02,134,201,0 duplicate(archbjcq) #arch_1_05 139,5,5
-job3_arch02,154,211,0 duplicate(archbjcq) #arch_1_06 139,5,5
-job3_arch02,175,227,0 duplicate(archbjcq) #arch_1_07 139,5,5
-job3_arch02,201,240,0 duplicate(archbjcq) #arch_1_08 139,5,5
-job3_arch02,223,252,0 duplicate(archbjcq) #arch_1_09 139,5,5
-job3_arch02,255,268,0 duplicate(archbjcq) #arch_1_10 139,5,5
-job3_arch02,269,302,0 duplicate(archbjcq) #arch_1_11 139,5,5
-job3_arch02,245,289,0 duplicate(archbjcq) #arch_1_12 139,5,5
+job3_arch02,112,73,0 duplicate(archbjcq) #arch_1_01 HIDDEN_WARP_NPC,5,5
+job3_arch02,94,123,0 duplicate(archbjcq) #arch_1_02 HIDDEN_WARP_NPC,5,5
+job3_arch02,93,173,0 duplicate(archbjcq) #arch_1_03 HIDDEN_WARP_NPC,5,5
+job3_arch02,114,186,0 duplicate(archbjcq) #arch_1_04 HIDDEN_WARP_NPC,5,5
+job3_arch02,134,201,0 duplicate(archbjcq) #arch_1_05 HIDDEN_WARP_NPC,5,5
+job3_arch02,154,211,0 duplicate(archbjcq) #arch_1_06 HIDDEN_WARP_NPC,5,5
+job3_arch02,175,227,0 duplicate(archbjcq) #arch_1_07 HIDDEN_WARP_NPC,5,5
+job3_arch02,201,240,0 duplicate(archbjcq) #arch_1_08 HIDDEN_WARP_NPC,5,5
+job3_arch02,223,252,0 duplicate(archbjcq) #arch_1_09 HIDDEN_WARP_NPC,5,5
+job3_arch02,255,268,0 duplicate(archbjcq) #arch_1_10 HIDDEN_WARP_NPC,5,5
+job3_arch02,269,302,0 duplicate(archbjcq) #arch_1_11 HIDDEN_WARP_NPC,5,5
+job3_arch02,245,289,0 duplicate(archbjcq) #arch_1_12 HIDDEN_WARP_NPC,5,5
-job3_arch02,203,286,0 script #arch_1_boss 139,5,5,{
+job3_arch02,203,286,0 script #arch_1_boss HIDDEN_WARP_NPC,5,5,{
OnTouch:
if (countitem(12381)) {
delitem 12381,1; //ValkyrieA_Scroll
@@ -1051,7 +1051,7 @@ OnRed:
end;
}
-job3_arch02,390,389,1 script #arch_val01 844,{
+job3_arch02,390,389,1 script #arch_val01 CLEAR_NPC,{
end;
OnEnable:
areamonster "job3_arch02",111,325,115,329,"Valkyrie's Nightmare",2036,1,"#arch_val01::OnMyMobDead";
@@ -1082,7 +1082,7 @@ OnKill:
end;
}
-job3_arch02,390,387,1 script #arch_val02 844,{
+job3_arch02,390,387,1 script #arch_val02 CLEAR_NPC,{
end;
OnEnable:
areamonster "job3_arch02",242,44,246,48,"Valkyrie's Nightmare",2036,1,"#arch_val02::OnMyMobDead";
@@ -1100,7 +1100,7 @@ OnKill:
end;
}
-job3_arch02,113,327,5 script Valkyrie#arch_01 403,{
+job3_arch02,113,327,5 script Valkyrie#arch_01 4_F_VALKYRIE2,{
if (getmercinfo(1)) {
mes "[Valkyrie]";
mes "If you want to talk with me, you have to ^3131FFcancel all contracts^000000 with any mercenaries you have.";
@@ -1135,7 +1135,7 @@ job3_arch02,113,327,5 script Valkyrie#arch_01 403,{
end;
}
-job3_arch02,244,46,5 script Valkyrie#arch_02 403,{
+job3_arch02,244,46,5 script Valkyrie#arch_02 4_F_VALKYRIE2,{
mes "[Valkyrie Anguhilde]";
mes "Did you find the rest of the pieces?";
next;
@@ -1172,7 +1172,7 @@ job3_arch02,244,46,5 script Valkyrie#arch_02 403,{
end;
}
-job3_arch02,279,234,0 script #arch_end 139,7,7,{
+job3_arch02,279,234,0 script #arch_end HIDDEN_WARP_NPC,7,7,{
end;
OnTouch:
donpcevent "#arch_3_01::OnKill";
@@ -1304,14 +1304,14 @@ OnInit:
end;
}
-job3_arch02,281,232,1 script Valkyrie Anguhilde#end 403,{
+job3_arch02,281,232,1 script Valkyrie Anguhilde#end 4_F_VALKYRIE2,{
end;
OnInit:
hideonnpc "Valkyrie Anguhilde#end";
end;
}
-job3_arch02,273,235,5 script Valkyrie of the heavens 811,{
+job3_arch02,273,235,5 script Valkyrie of the heavens 4_F_VALKYRIE,{
if (job_arch == 100) {
mes "[Valkyrie of the heavens]";
mes "Now, go back to your world.";
@@ -1330,7 +1330,7 @@ OnInit:
end;
}
-job3_arch02,132,323,0 script #arch_2_01 139,5,5,{
+job3_arch02,132,323,0 script #arch_2_01 HIDDEN_WARP_NPC,5,5,{
end;
OnTouch:
if (countitem(12382))
@@ -1357,33 +1357,33 @@ OnTouch:
mapwarp "job3_arch02","job3_arch01",29,29;
end;
}
-job3_arch02,167,313,0 duplicate(archbjcq2) #arch_2_02 139,5,5
-job3_arch02,127,304,0 duplicate(archbjcq2) #arch_2_03 139,5,5
-job3_arch02,207,279,0 duplicate(archbjcq2) #arch_2_04 139,5,5
-job3_arch02,239,281,0 duplicate(archbjcq2) #arch_2_05 139,5,5
-job3_arch02,269,303,0 duplicate(archbjcq2) #arch_2_06 139,5,5
-job3_arch02,288,283,0 duplicate(archbjcq2) #arch_2_07 139,5,5
-job3_arch02,278,234,0 duplicate(archbjcq2) #arch_2_08 139,5,5
-job3_arch02,234,179,0 duplicate(archbjcq2) #arch_2_09 139,5,5
-job3_arch02,227,169,0 duplicate(archbjcq2) #arch_2_10 139,5,5
-job3_arch02,190,146,0 duplicate(archbjcq2) #arch_2_11 139,5,5
+job3_arch02,167,313,0 duplicate(archbjcq2) #arch_2_02 HIDDEN_WARP_NPC,5,5
+job3_arch02,127,304,0 duplicate(archbjcq2) #arch_2_03 HIDDEN_WARP_NPC,5,5
+job3_arch02,207,279,0 duplicate(archbjcq2) #arch_2_04 HIDDEN_WARP_NPC,5,5
+job3_arch02,239,281,0 duplicate(archbjcq2) #arch_2_05 HIDDEN_WARP_NPC,5,5
+job3_arch02,269,303,0 duplicate(archbjcq2) #arch_2_06 HIDDEN_WARP_NPC,5,5
+job3_arch02,288,283,0 duplicate(archbjcq2) #arch_2_07 HIDDEN_WARP_NPC,5,5
+job3_arch02,278,234,0 duplicate(archbjcq2) #arch_2_08 HIDDEN_WARP_NPC,5,5
+job3_arch02,234,179,0 duplicate(archbjcq2) #arch_2_09 HIDDEN_WARP_NPC,5,5
+job3_arch02,227,169,0 duplicate(archbjcq2) #arch_2_10 HIDDEN_WARP_NPC,5,5
+job3_arch02,190,146,0 duplicate(archbjcq2) #arch_2_11 HIDDEN_WARP_NPC,5,5
/*
// Not in official script.
-job3_arch02,252,267,0 script #arch_2_12 139,5,5,{
+job3_arch02,252,267,0 script #arch_2_12 HIDDEN_WARP_NPC,5,5,{
OnTouch:
mapannounce "job3_arch02","Whispering of an impersonation: It's a crossroad. Let's go to the left side. I have to find my pipe.",bc_map,"0xFFCE00";
end;
}
-job3_arch02,250,290,0 script #arch_2_13 139,5,5,{
+job3_arch02,250,290,0 script #arch_2_13 HIDDEN_WARP_NPC,5,5,{
OnTouch:
mapannounce "job3_arch02","Whispering of an impersonation: I can see a ruined shrine. Take a rest in there.",bc_map,"0xFFCE00";
end;
}
*/
-job3_arch02,206,113,0 script #arch_2_boss 139,5,5,{
+job3_arch02,206,113,0 script #arch_2_boss HIDDEN_WARP_NPC,5,5,{
OnTouch:
if (countitem(12382)) {
delitem 12382,1; //ValkyrieB_Scroll
@@ -1397,7 +1397,7 @@ OnTouch:
end;
}
-job3_arch02,284,159,0 script #arch_3_01 139,20,20,{
+job3_arch02,284,159,0 script #arch_3_01 HIDDEN_WARP_NPC,20,20,{
OnTouch:
if (Class != Job_Priest) {
mapannounce "job3_arch02","Frus: Do you want to see God? Okay, I'll send you to the land of the dead by myself!",bc_map,"0xFF0000";
@@ -1415,7 +1415,7 @@ OnKill:
// end;
}
-job3_arch02,307,200,0 script #arch_3_02 139,5,5,{
+job3_arch02,307,200,0 script #arch_3_02 HIDDEN_WARP_NPC,5,5,{
OnTouch:
if (BaseJob == Job_Priest) {
mapannounce "job3_arch02","Skogul: You are my guest!",bc_map,"0xFF0000";
@@ -1433,7 +1433,7 @@ OnKill:
// end;
}
-job3_arch02,296,216,0 script #arch_3_03 139,5,5,{
+job3_arch02,296,216,0 script #arch_3_03 HIDDEN_WARP_NPC,5,5,{
OnTouch:
mapannounce "job3_arch02","Frus: I like your face... Can I steal it?",bc_map,"0xFF0000";
monster "job3_arch02",296,216,"Frus",1762,1,"#arch_3_03::OnMyMobDead";
@@ -1449,7 +1449,7 @@ OnInit:
end;
}
-job3_arch02,389,390,1 script mob#arch_1 844,{
+job3_arch02,389,390,1 script mob#arch_1 CLEAR_NPC,{
end;
OnEnable:
monster "job3_arch02",100,102,"Shrine Invader",1394,2,"mob#arch_1::OnMyMobDead";
@@ -1470,7 +1470,7 @@ OnKill:
end;
}
-job3_arch02,389,389,1 script mob#arch_2 844,{
+job3_arch02,389,389,1 script mob#arch_2 CLEAR_NPC,{
end;
OnEnable:
monster "job3_arch02",156,321,"Shrine Invader",1480,2,"mob#arch_2::OnMyMobDead";
@@ -1493,7 +1493,7 @@ OnKill:
end;
}
-job3_arch02,389,388,1 script start#arch 844,{
+job3_arch02,389,388,1 script start#arch CLEAR_NPC,{
end;
OnInit:
mapwarp "job3_arch02","job3_arch01",29,29;
@@ -1581,7 +1581,7 @@ OnTimer605000:
end;
}
-job3_arch02,390,388,1 script #arch_2_start 844,{
+job3_arch02,390,388,1 script #arch_2_start CLEAR_NPC,{
end;
OnInit:
disablenpc "#arch_2_01";
@@ -1615,7 +1615,7 @@ OnEnable:
end;
}
-job3_arch02,390,386,1 script #arch_3_start 844,{
+job3_arch02,390,386,1 script #arch_3_start CLEAR_NPC,{
end;
OnEnable:
enablenpc "#arch_3_01";
@@ -1626,14 +1626,14 @@ OnEnable:
end;
}
-job3_arch02,290,221,0 script #arch_end_eff 139,5,5,{
+job3_arch02,290,221,0 script #arch_end_eff HIDDEN_WARP_NPC,5,5,{
OnTouch:
specialeffect EF_MAPPILLAR2,"#arch_end";
end;
}
/*
-job_arch01,26,25,0 script #archremove 139,3,3,{
+job_arch01,26,25,0 script #archremove HIDDEN_WARP_NPC,3,3,{
OnTouch:
if (countitem(6154)) delitem 6154, countitem(6154); //Broken_Horn_Pipe
if (countitem(12381)) delitem 12381, countitem(12381); //ValkyrieA_Scroll
@@ -1643,7 +1643,7 @@ OnTouch:
}
*/
-job3_arch01,1,1,1 script control#arch 844,{
+job3_arch01,1,1,1 script control#arch CLEAR_NPC,{
callfunc "F_GM_NPC";
mes "[Troll]";
mes "Password please.";
@@ -1671,14 +1671,14 @@ job3_arch01,1,1,1 script control#arch 844,{
}
}
-odin_tem02,30,181,0 script #wherearch01 139,10,10,{
+odin_tem02,30,181,0 script #wherearch01 HIDDEN_WARP_NPC,10,10,{
OnTouch:
if (job_arch == 5)
viewpoint 1,282,263,1,0xFFFF99;
end;
}
-odin_tem02,30,335,0 script #wherearch02 139,10,10,{
+odin_tem02,30,335,0 script #wherearch02 HIDDEN_WARP_NPC,10,10,{
OnTouch:
if (job_arch == 5)
viewpoint 1,282,263,1,0xFFFF99;
diff --git a/npc/re/jobs/3-1/guillotine_cross.txt b/npc/re/jobs/3-1/guillotine_cross.txt
index 904c04148..c206599bb 100644
--- a/npc/re/jobs/3-1/guillotine_cross.txt
+++ b/npc/re/jobs/3-1/guillotine_cross.txt
@@ -18,7 +18,7 @@
//= 1.5 Added GM management function. [Euphy]
//============================================================
-que_job01,75,96,3 script Guild Member#3rdgc01 997,{
+que_job01,75,96,3 script Guild Member#3rdgc01 4_M_MOCASS1,{
if (job_3rd_gc == 0) {
if (Class == Job_Assassin || Class == Job_Assassin_Cross || Class == Job_Baby_Assassin) {
if (BaseLevel == 99) {
@@ -222,7 +222,7 @@ function script func_3rdgc {
close;
}
-job3_guil01,82,95,3 script Daora#3rdgc02 940,{
+job3_guil01,82,95,3 script Daora#3rdgc02 4_F_DESERT,{
mes "[Daora]";
if (Class == Job_Assassin || Class == Job_Assassin_Cross || Class == Job_Baby_Assassin) {
if (job_3rd_gc < 4) {
@@ -825,7 +825,7 @@ job3_guil01,82,95,3 script Daora#3rdgc02 940,{
}
}
-job3_guil01,16,20,4 script Mayshell#3rdgc03 894,{
+job3_guil01,16,20,4 script Mayshell#3rdgc03 4_F_KHELLISIA,{
if (!checkweight(1201,2)) {
mes "- You can't continue this quest because you have too many items. -";
close;
@@ -1097,7 +1097,7 @@ job3_guil01,16,20,4 script Mayshell#3rdgc03 894,{
}
}
-ve_in,228,108,3 script Waitress#3rdgc04 80,{
+ve_in,228,108,3 script Waitress#3rdgc04 1_F_PUBGIRL,{
mes "[Waitress]";
if (job_3rd_gc < 6) {
mes "Welcome~";
@@ -1330,7 +1330,7 @@ ve_in,228,108,3 script Waitress#3rdgc04 80,{
}
}
-ve_in,246,303,3 script Young Merchant#3rdgc05 930,{
+ve_in,246,303,3 script Young Merchant#3rdgc05 4_M_RACHMAN2,{
if (job_3rd_gc < 6) {
mes "[Young Merchant]";
mes "If you want to buy stuff, go to this person.";
@@ -1526,7 +1526,7 @@ ve_in,246,303,3 script Young Merchant#3rdgc05 930,{
}
}
-veins,291,215,3 script Vigilante#3rdgc06 939,{
+veins,291,215,3 script Vigilante#3rdgc06 4_DST_SOLDIER,{
if (job_3rd_gc < 6) {
mes "[Vigilante]";
mes "Do you have any inconveniences while you are traveling?";
@@ -1690,7 +1690,7 @@ veins,291,215,3 script Vigilante#3rdgc06 939,{
}
}
-veins,187,143,5 script Peddler#3rdgc07 892,{
+veins,187,143,5 script Peddler#3rdgc07 4_F_HUGRANMA,{
mes "[Peddler]";
if (job_3rd_gc < 6) {
mes "What a huge sandstorm.";
@@ -1793,7 +1793,7 @@ veins,187,143,5 script Peddler#3rdgc07 892,{
}
}
-veins,235,126,3 script Old Man#3rdgc07 945,{
+veins,235,126,3 script Old Man#3rdgc07 4_M_DST_GRAND,{
mes "[Old Man]";
if (job_3rd_gc < 6) {
mes "Haha... I can remember my past when I see a young adventurer like you...";
@@ -1900,7 +1900,7 @@ veins,235,126,3 script Old Man#3rdgc07 945,{
}
}
-veins,223,180,3 script Girl#3rdgc09 941,{
+veins,223,180,3 script Girl#3rdgc09 4_F_DST_CHILD,{
mes "[Melissa]";
if (job_3rd_gc == 8) {
mes "Hi?";
@@ -2071,7 +2071,7 @@ veins,223,180,3 script Girl#3rdgc09 941,{
}
}
-veins,337,284,0 script #ghostestilla_3rdgc 139,3,3,{
+veins,337,284,0 script #ghostestilla_3rdgc HIDDEN_WARP_NPC,3,3,{
end;
OnTouch:
if (job_3rd_gc == 9) {
@@ -2184,7 +2184,7 @@ OnTouch:
end;
}
-veins,341,287,3 script Estillda#3rdgc10 919,{
+veins,341,287,3 script Estillda#3rdgc10 4_F_SHABBY,{
OnInit:
OnDisable:
disablenpc "Estillda#3rdgc10";
@@ -2194,7 +2194,7 @@ OnEnable:
end;
}
-job3_guil01,79,15,1 script Estillda#3rdgc11 919,{
+job3_guil01,79,15,1 script Estillda#3rdgc11 4_F_SHABBY,{
if (job_3rd_gc == 11) {
mes "Estillda is looking around with an anxious expression on her face.";
next;
@@ -2313,7 +2313,7 @@ job3_guil01,79,15,1 script Estillda#3rdgc11 919,{
end;
}
-veins,206,56,0 script #3rdgc_battleroom01 139,1,1,{
+veins,206,56,0 script #3rdgc_battleroom01 HIDDEN_WARP_NPC,1,1,{
end;
OnInit:
set $@3rdgc_room01, 0;
@@ -2352,7 +2352,7 @@ OnTouch:
end;
}
-job3_guil02,34,44,0 script #3rdgc_room01_mag01 139,2,2,{
+job3_guil02,34,44,0 script #3rdgc_room01_mag01 HIDDEN_WARP_NPC,2,2,{
end;
OnEnable:
enablenpc "#3rdgc_room01_mag01";
@@ -2397,7 +2397,7 @@ OnTimer300000:
end;
}
-job3_guil02,51,43,7 script A man with black clothes 456,4,4,{
+job3_guil02,51,43,7 script A man with black clothes 4_M_DSTMAN,4,4,{
end;
OnInit:
OnDisable:
@@ -2452,7 +2452,7 @@ OnMyMobDead:
end;
}
-job3_guil02,1,1,0 script #3rdgc_2nd_timer 844,{
+job3_guil02,1,1,0 script #3rdgc_2nd_timer CLEAR_NPC,{
end;
OnEnable:
initnpctimer;
@@ -2472,7 +2472,7 @@ OnTimer61000:
end;
}
-job3_guil02,49,43,5 script Dandelion#3rdgc12 457,{
+job3_guil02,49,43,5 script Dandelion#3rdgc12 4_M_DSTMANDEAD,{
if (!checkweight(1201,2)) {
mes "- You can't continue this quest because you have too many items. -";
close;
@@ -2517,7 +2517,7 @@ OnEnable:
end;
}
-rachel,115,77,3 script Girke#3rdgc13 85,{
+rachel,115,77,3 script Girke#3rdgc13 4_M_03,{
mes "[Girke]";
mes "Oh~ young man.";
mes "I'm Girke Sara.";
@@ -2564,7 +2564,7 @@ rachel,115,77,3 script Girke#3rdgc13 85,{
close;
}
-ra_in01,175,196,3 script Oresa Rava#3rdgc13 866,{
+ra_in01,175,196,3 script Oresa Rava#3rdgc13 4_M_LGTGRAND,{
mes "[Oresa Rava]";
if (job_3rd_gc == 13) {
mes "I don't know why you are visiting me, but I'm not crafting anymore.";
@@ -2649,7 +2649,7 @@ ra_in01,175,196,3 script Oresa Rava#3rdgc13 866,{
}
//Pre-RE: ve_fild05 (327,308)
-ve_fild02,330,384,3 script Girl#3rdgc14 466,{
+ve_fild02,330,384,3 script Girl#3rdgc14 4_F_GUILLOTINE,{
if (job_3rd_gc > 14 && job_3rd_gc < 18) {
mes "[Renzak]";
if (job_3rd_gc == 15) {
@@ -2728,7 +2728,7 @@ OnInit:
end;
}
-job3_guil03,22,70,0 script #3rdgc_event01 139,3,3,{
+job3_guil03,22,70,0 script #3rdgc_event01 HIDDEN_WARP_NPC,3,3,{
end;
OnEnable:
enablenpc "#3rdgc_event01";
@@ -2763,7 +2763,7 @@ OnTimer902000:
end;
}
-job3_guil03,1,4,0 script #3rdgc_event_master 844,{
+job3_guil03,1,4,0 script #3rdgc_event_master CLEAR_NPC,{
end;
OnEnable:
donpcevent "Barbed-Wire Entanglement::OnEnable";
@@ -2814,7 +2814,7 @@ OnReset:
}
//Original name: Barbed-Wire Entanglements#3rdgc_door01
-job3_guil03,55,79,0 script Barbed-Wire Entanglement 844,1,1,{
+job3_guil03,55,79,0 script Barbed-Wire Entanglement CLEAR_NPC,1,1,{
end;
OnEnable:
enablenpc "Barbed-Wire Entanglement";
@@ -2836,7 +2836,7 @@ OnTouch:
close;
}
-job3_guil03,98,46,0 script #3rdgc_hide01 139,1,4,{
+job3_guil03,98,46,0 script #3rdgc_hide01 HIDDEN_WARP_NPC,1,4,{
end;
OnStop:
killmonster "job3_guil03","#3rdgc_hide01::OnMyMobDead";
@@ -2863,7 +2863,7 @@ OnMyMobDead:
end;
}
-job3_guil03,98,55,0 script #3rdgc_hide02 139,1,4,{
+job3_guil03,98,55,0 script #3rdgc_hide02 HIDDEN_WARP_NPC,1,4,{
end;
OnStop:
killmonster "job3_guil03","#3rdgc_hide02::OnMyMobDead";
@@ -2890,7 +2890,7 @@ OnMyMobDead:
end;
}
-job3_guil03,98,64,0 script #3rdgc_hide03 139,1,4,{
+job3_guil03,98,64,0 script #3rdgc_hide03 HIDDEN_WARP_NPC,1,4,{
end;
OnStop:
killmonster "job3_guil03","#3rdgc_hide03::OnMyMobDead";
@@ -2917,7 +2917,7 @@ OnMyMobDead:
end;
}
-job3_guil03,1,2,0 script #3rdgc_guard 844,{
+job3_guil03,1,2,0 script #3rdgc_guard CLEAR_NPC,{
end;
OnEnable:
initnpctimer;
@@ -2958,7 +2958,7 @@ OnTimer16000:
end;
}
-job3_guil03,1,3,0 script #3rdgc_guardoff 844,{
+job3_guil03,1,3,0 script #3rdgc_guardoff CLEAR_NPC,{
end;
OnDisable:
initnpctimer;
@@ -3033,7 +3033,7 @@ OnEnable:
end;
}
-job3_guil03,93,35,3 script Front Gate Guard#g01 456,5,5,{
+job3_guil03,93,35,3 script Front Gate Guard#g01 4_M_DSTMAN,5,5,{
end;
OnInit:
OnDisable:
@@ -3060,11 +3060,11 @@ OnTouch:
OnMyMobDead:
end;
}
-job3_guil03,93,36,3 duplicate(#3rdgc_guard00) Front Gate Guard#g03 456
-job3_guil03,93,34,3 duplicate(#3rdgc_guard00) Front Gate Guard#g04 456
-job3_guil03,93,33,3 duplicate(#3rdgc_guard00) Front Gate Guard#g05 456
+job3_guil03,93,36,3 duplicate(#3rdgc_guard00) Front Gate Guard#g03 4_M_DSTMAN
+job3_guil03,93,34,3 duplicate(#3rdgc_guard00) Front Gate Guard#g04 4_M_DSTMAN
+job3_guil03,93,33,3 duplicate(#3rdgc_guard00) Front Gate Guard#g05 4_M_DSTMAN
-job3_guil03,133,52,5 script Back Gate Guard#g01 456,5,5,{
+job3_guil03,133,52,5 script Back Gate Guard#g01 4_M_DSTMAN,5,5,{
end;
OnInit:
OnDisable:
@@ -3091,11 +3091,11 @@ OnTouch:
OnMyMobDead:
end;
}
-job3_guil03,133,53,5 duplicate(#3rdgc_guard00) Back Gate Guard#g03 456
-job3_guil03,133,51,5 duplicate(#3rdgc_guard00) Back Gate Guard#g04 456
-job3_guil03,133,50,5 duplicate(#3rdgc_guard00) Back Gate Guard#g05 456
+job3_guil03,133,53,5 duplicate(#3rdgc_guard00) Back Gate Guard#g03 4_M_DSTMAN
+job3_guil03,133,51,5 duplicate(#3rdgc_guard00) Back Gate Guard#g04 4_M_DSTMAN
+job3_guil03,133,50,5 duplicate(#3rdgc_guard00) Back Gate Guard#g05 4_M_DSTMAN
-job3_guil03,117,51,4 script Interior Guard#g01 456,5,5,{
+job3_guil03,117,51,4 script Interior Guard#g01 4_M_DSTMAN,5,5,{
end;
OnInit:
OnDisable:
@@ -3122,11 +3122,11 @@ OnTouch:
OnMyMobDead:
end;
}
-job3_guil03,117,52,4 duplicate(#3rdgc_guard00) Interior Guard#g03 456
-job3_guil03,117,50,4 duplicate(#3rdgc_guard00) Interior Guard#g04 456
-job3_guil03,117,49,4 duplicate(#3rdgc_guard00) Interior Guard#g05 456
+job3_guil03,117,52,4 duplicate(#3rdgc_guard00) Interior Guard#g03 4_M_DSTMAN
+job3_guil03,117,50,4 duplicate(#3rdgc_guard00) Interior Guard#g04 4_M_DSTMAN
+job3_guil03,117,49,4 duplicate(#3rdgc_guard00) Interior Guard#g05 4_M_DSTMAN
-job3_guil03,88,44,4 script Exterior Guard#g01 456,5,5,{
+job3_guil03,88,44,4 script Exterior Guard#g01 4_M_DSTMAN,5,5,{
end;
OnInit:
OnDisable:
@@ -3149,7 +3149,7 @@ OnMyMobDead:
end;
}
-job3_guil03,88,55,4 script Exterior Guard#g02 456,5,5,{
+job3_guil03,88,55,4 script Exterior Guard#g02 4_M_DSTMAN,5,5,{
end;
OnInit:
OnDisable:
@@ -3172,7 +3172,7 @@ OnMyMobDead:
end;
}
-job3_guil03,88,64,4 script Exterior Guard#g03 456,5,5,{
+job3_guil03,88,64,4 script Exterior Guard#g03 4_M_DSTMAN,5,5,{
end;
OnInit:
OnDisable:
@@ -3195,7 +3195,7 @@ OnMyMobDead:
end;
}
-job3_guil03,73,62,4 script Exterior Guard#g04 456,5,5,{
+job3_guil03,73,62,4 script Exterior Guard#g04 4_M_DSTMAN,5,5,{
end;
OnInit:
OnDisable:
@@ -3218,7 +3218,7 @@ OnMyMobDead:
end;
}
-job3_guil03,77,51,4 script Exterior Guard#g05 456,5,5,{
+job3_guil03,77,51,4 script Exterior Guard#g05 4_M_DSTMAN,5,5,{
end;
OnInit:
OnDisable:
@@ -3241,7 +3241,7 @@ OnMyMobDead:
end;
}
-job3_guil03,73,34,4 script Exterior Guard#g06 456,5,5,{
+job3_guil03,73,34,4 script Exterior Guard#g06 4_M_DSTMAN,5,5,{
end;
OnInit:
OnDisable:
@@ -3310,7 +3310,7 @@ OnMyMobDead:
end;
}
-job3_guil03,2,1,0 script #3rdgc_sunchal_nomal 844,{
+job3_guil03,2,1,0 script #3rdgc_sunchal_nomal CLEAR_NPC,{
end;
OnEnable:
monster "job3_guil03",62,35,"Guard",1985,1,"#3rdgc_sunchal_nomal::OnMyMobDead";
@@ -3347,7 +3347,7 @@ OnMyMobDead:
end;
}
-job3_guil03,2,2,0 script #3rdgc_sunchal_kill01 844,{
+job3_guil03,2,2,0 script #3rdgc_sunchal_kill01 CLEAR_NPC,{
end;
OnEnable:
set .@i, atoi(charat(strnpcinfo(0),20));
@@ -3377,10 +3377,10 @@ OnTimer10000:
stopnpctimer;
end;
}
-job3_guil03,2,3,0 duplicate(#3rdgc_sunchal_kill01) #3rdgc_sunchal_kill02 844
-job3_guil03,2,4,0 duplicate(#3rdgc_sunchal_kill01) #3rdgc_sunchal_kill03 844
+job3_guil03,2,3,0 duplicate(#3rdgc_sunchal_kill01) #3rdgc_sunchal_kill02 CLEAR_NPC
+job3_guil03,2,4,0 duplicate(#3rdgc_sunchal_kill01) #3rdgc_sunchal_kill03 CLEAR_NPC
-job3_guil03,64,68,3 script #3rdgc_gojung_kill01 456,7,7,{
+job3_guil03,64,68,3 script #3rdgc_gojung_kill01 4_M_DSTMAN,7,7,{
end;
OnEnable:
enablenpc strnpcinfo(0);
@@ -3415,10 +3415,10 @@ OnTimer10000:
stopnpctimer;
end;
}
-job3_guil03,86,63,1 duplicate(#3rdgc_gojung_kill01) #3rdgc_gojung_kill02 456,8,8
-job3_guil03,83,36,5 duplicate(#3rdgc_gojung_kill01) #3rdgc_gojung_kill03 456,6,6
+job3_guil03,86,63,1 duplicate(#3rdgc_gojung_kill01) #3rdgc_gojung_kill02 4_M_DSTMAN,8,8
+job3_guil03,83,36,5 duplicate(#3rdgc_gojung_kill01) #3rdgc_gojung_kill03 4_M_DSTMAN,6,6
-job3_guil03,88,71,0 script #3rdgc_safezone01 139,1,1,{
+job3_guil03,88,71,0 script #3rdgc_safezone01 HIDDEN_WARP_NPC,1,1,{
end;
OnTouch:
mes "It's a good bush to hide yourself.";
@@ -3440,10 +3440,10 @@ OnTimer:
donpcevent "#3rdgc_guardoff::OnDisable";
end;
}
-job3_guil03,82,45,0 duplicate(#3rdgc_safezone01) #3rdgc_safezone02 139,1,1
-job3_guil03,72,53,0 duplicate(#3rdgc_safezone01) #3rdgc_safezone03 139,1,1
+job3_guil03,82,45,0 duplicate(#3rdgc_safezone01) #3rdgc_safezone02 HIDDEN_WARP_NPC,1,1
+job3_guil03,72,53,0 duplicate(#3rdgc_safezone01) #3rdgc_safezone03 HIDDEN_WARP_NPC,1,1
-job3_guil03,111,51,7 script Priest from Rachel 928,{
+job3_guil03,111,51,7 script Priest from Rachel 4_M_MIDDLE1,{
if (!.on) end;
mes "[Priest from Rachel]";
if (job_3rd_gc == 17) {
@@ -3538,7 +3538,7 @@ OnTimer61500:
end;
}
-job3_guil03,146,70,3 script Renzak#3rdgc16 466,{
+job3_guil03,146,70,3 script Renzak#3rdgc16 4_F_GUILLOTINE,{
mes "[Renzak]";
if (checkquest(7110,HUNTING) == 2) {
mes "My peers will come here to settle this affair.";
@@ -3575,7 +3575,7 @@ OnDisable:
end;
}
-job3_guil01,148,53,3 script Bercasell#3rdgc16 467,{
+job3_guil01,148,53,3 script Bercasell#3rdgc16 4_M_GUILLOTINE,{
if (!checkweight(1201,2)) {
mes "- You can't continue this quest because you have too many items. -";
close;
@@ -3788,7 +3788,7 @@ L_Info:
// Warp Portals
//============================================================
-job3_guil01,80,77,0 script #gate_to_guil05 45,1,1,{
+job3_guil01,80,77,0 script #gate_to_guil05 WARPNPC,1,1,{
end;
OnTouch:
if (job_3rd_gc > 3)
@@ -3801,7 +3801,7 @@ OnTouch:
}
end;
}
-job3_guil01,51,55,0 script #gate_to_guil07 45,1,1,{
+job3_guil01,51,55,0 script #gate_to_guil07 WARPNPC,1,1,{
end;
OnTouch:
if (job_3rd_gc == 4 || job_3rd_gc == 14 || job_3rd_gc > 17)
@@ -3818,7 +3818,7 @@ OnTouch:
}
end;
}
-job3_guil01,51,44,0 script #gate_to_guil09 45,1,1,{
+job3_guil01,51,44,0 script #gate_to_guil09 WARPNPC,1,1,{
end;
OnTouch:
if (job_3rd_gc == 11 || job_3rd_gc == 12)
@@ -3832,7 +3832,7 @@ OnTouch:
end;
}
-job3_guil02,1,3,0 script #GMhelper01_gc 844,{
+job3_guil02,1,3,0 script #GMhelper01_gc CLEAR_NPC,{
callfunc "F_GM_NPC";
mes "What can I do for you?";
next;
@@ -3871,7 +3871,7 @@ job3_guil02,1,3,0 script #GMhelper01_gc 844,{
}
}
-job3_guil03,1,8,0 script #GMhelper02_gc 844,{
+job3_guil03,1,8,0 script #GMhelper02_gc CLEAR_NPC,{
callfunc "F_GM_NPC";
mes "What can I do for you?";
next;
diff --git a/npc/re/jobs/3-1/mechanic.txt b/npc/re/jobs/3-1/mechanic.txt
index 2133a227a..8300576f2 100644
--- a/npc/re/jobs/3-1/mechanic.txt
+++ b/npc/re/jobs/3-1/mechanic.txt
@@ -13,7 +13,7 @@
//= 1.2 Updated script. [Euphy]
//============================================================
-yuno,129,156,3 script Chainheart 923,{
+yuno,129,156,3 script Chainheart 4_M_DOCTOR,{
mes "[Chainheart]";
if (BaseLevel > 99) {
mes "Living as a Mechanic is tough,";
@@ -293,7 +293,7 @@ yuno,129,156,3 script Chainheart 923,{
close;
}
-jupe_cave,37,55,5 script Scholar#Mechanic 883,{
+jupe_cave,37,55,5 script Scholar#Mechanic 4_M_ALCHE_D,{
if (checkweight(1201,1) == 0 || MaxWeight - Weight < 300) {
mes "- Your pack is too heavy. -";
mes "- Lighten your body first -";
@@ -384,7 +384,7 @@ jupe_cave,37,55,5 script Scholar#Mechanic 883,{
close;
}
-jupe_core2,149,273,3 script Ghostfire#1 802,{
+jupe_core2,149,273,3 script Ghostfire#1 4_NFWISP,{
mes "[?]";
if (job__mechanic == 11) {
mes "I've lost my body and all that's left is my spirit in this place.";
@@ -470,7 +470,7 @@ jupe_core2,149,273,3 script Ghostfire#1 802,{
end;
}
-jupe_core2,53,75,3 script Ghostfire#2 802,{
+jupe_core2,53,75,3 script Ghostfire#2 4_NFWISP,{
mes "[?]";
if (job__mechanic > 5) {
mes "Juperos... I...";
@@ -532,7 +532,7 @@ jupe_core2,53,75,3 script Ghostfire#2 802,{
end;
}
-jupe_core2,242,62,3 script Ghostfire#3 802,{
+jupe_core2,242,62,3 script Ghostfire#3 4_NFWISP,{
mes "[?]";
if (job__mechanic > 6) {
mes "I want to know more about the knowledge...";
@@ -573,7 +573,7 @@ jupe_core2,242,62,3 script Ghostfire#3 802,{
end;
}
-jupe_core2,29,150,0 script #Foothold 139,1,1,{
+jupe_core2,29,150,0 script #Foothold HIDDEN_WARP_NPC,1,1,{
OnTouch:
if (job__mechanic == 8) {
percentheal 0,-30;
@@ -612,7 +612,7 @@ OnTouch:
end;
}
-jupe_core2,272,149,0 script #Foothold2 139,1,1,{
+jupe_core2,272,149,0 script #Foothold2 HIDDEN_WARP_NPC,1,1,{
OnTouch:
if (job__mechanic == 9) {
mes "-I had a feeling that power-";
@@ -647,7 +647,7 @@ OnTouch:
end;
}
-jupe_core2,288,142,3 script #Door 844,1,1,{
+jupe_core2,288,142,3 script #Door CLEAR_NPC,1,1,{
end;
OnInit:
OnDisable:
@@ -701,7 +701,7 @@ OnTouch:
end;
}
-jupe_core2,149,34,0 script #Acquiring Knowledge 139,1,0,{
+jupe_core2,149,34,0 script #Acquiring Knowledge HIDDEN_WARP_NPC,1,0,{
OnTouch:
if (job__mechanic == 9) {
mes "-The moment I stepped on-";
@@ -726,6 +726,6 @@ OnTouch:
}
end;
}
-jupe_core2,150,33,0 duplicate(#Acquiring Knowledge) #Acquiring Knowledge2 139,1,0
+jupe_core2,150,33,0 duplicate(#Acquiring Knowledge) #Acquiring Knowledge2 HIDDEN_WARP_NPC,1,0
jupe_core2,0,0,0,0 monster Dimik 1669,100,0,0,0 \ No newline at end of file
diff --git a/npc/re/jobs/3-1/ranger.txt b/npc/re/jobs/3-1/ranger.txt
index b35c8ebfc..0b52df91f 100644
--- a/npc/re/jobs/3-1/ranger.txt
+++ b/npc/re/jobs/3-1/ranger.txt
@@ -21,7 +21,7 @@
//= 1.6 Added GM management function. [Euphy]
//============================================================
-tur_dun01,156,36,5 script Survival Instructor#jr01 59,{
+tur_dun01,156,36,5 script Survival Instructor#jr01 1_M_ORIENT01,{
mes "[Survival Instructor, Rescue]";
if (BaseJob == Job_Hunter) {
if (job_ranger01 < 1) {
@@ -304,7 +304,7 @@ tur_dun01,156,36,5 script Survival Instructor#jr01 59,{
close;
}
-tur_dun01,91,169,3 script Test Instructor#jr02 732,{
+tur_dun01,91,169,3 script Test Instructor#jr02 4_M_JOB_HUNTER,{
mes "[Test Instructor, Teardrop]";
if (BaseJob == Job_Hunter) {
if (job_ranger01 < 3) {
@@ -672,7 +672,7 @@ L_Start:
end;
}
-job3_rang01,30,44,3 script Test Waiting Room#jr_03 88,{
+job3_rang01,30,44,3 script Test Waiting Room#jr_03 4_M_ORIENT01,{
mes "[Staff DTS]";
mes "Please wait at the practical test waiting room to start the test process.";
next;
@@ -798,7 +798,7 @@ OnDisable:
end;
}
-job3_rang02,100,95,0 script Test Supervisor#jr_04 139,{
+job3_rang02,100,95,0 script Test Supervisor#jr_04 HIDDEN_WARP_NPC,{
OnInit:
set $@job_rang_point01,0;
disablenpc "Test Supervisor#jr_04";
@@ -841,7 +841,7 @@ OnTimer18000:
end;
}
-job3_rang02,102,95,0 script First Test Timer#jr_05 139,{
+job3_rang02,102,95,0 script First Test Timer#jr_05 HIDDEN_WARP_NPC,{
OnInit:
disablenpc "First Test Timer#jr_05";
end;
@@ -942,7 +942,7 @@ OnTimer157000:
end;
}
-job3_rang02,104,95,0 script CallCorrectAnswer#jr 139,{
+job3_rang02,104,95,0 script CallCorrectAnswer#jr HIDDEN_WARP_NPC,{
OnInit:
OnDisable:
disablenpc "CallCorrectAnswer#jr";
@@ -969,7 +969,7 @@ OnMyMobDead:
end;
}
-job3_rang02,106,95,0 script CallWrongAnswer#jr 139,{
+job3_rang02,106,95,0 script CallWrongAnswer#jr HIDDEN_WARP_NPC,{
OnInit:
OnDisable:
disablenpc "CallWrongAnswer#jr";
@@ -1059,7 +1059,7 @@ OnMyMobDead:
end;
}
-job3_rang02,100,93,0 script Second Test Timer#jr_08 139,{
+job3_rang02,100,93,0 script Second Test Timer#jr_08 HIDDEN_WARP_NPC,{
OnInit:
disablenpc "Second Test Timer#jr_08";
end;
@@ -1166,7 +1166,7 @@ OnTimer223000:
end;
}
-job3_rang02,111,56,3 script Staff Rust#jr_09 89,{
+job3_rang02,111,56,3 script Staff Rust#jr_09 4_M_ORIENT02,{
if (job_ranger01 == 6) {
if (countitem(12258) < 1) {
percentheal 100,0;
@@ -1211,7 +1211,7 @@ OnDisable:
end;
}
-job3_rang02,136,21,0 script Summon Monster#jr_10 139,5,5,{
+job3_rang02,136,21,0 script Summon Monster#jr_10 HIDDEN_WARP_NPC,5,5,{
OnInit:
disablenpc "Summon Monster#jr_10";
end;
@@ -1260,7 +1260,7 @@ OnMyMobDead:
end;
}
-job3_rang02,180,78,3 script Test Supervisor#jr_11 882,1,1,{
+job3_rang02,180,78,3 script Test Supervisor#jr_11 4_F_SITDOWN,1,1,{
mes "[Test Supervisor, Caution]";
mes "Come, come near, nearer, nearer!!";
close;
@@ -1360,7 +1360,7 @@ OnTimer105000:
end;
}
-job3_rang02,104,93,0 script Third Test Timer#jr_12 139,{
+job3_rang02,104,93,0 script Third Test Timer#jr_12 HIDDEN_WARP_NPC,{
OnInit:
disablenpc "Third Test Timer#jr_12";
end;
@@ -1447,7 +1447,7 @@ OnTimer130000:
end;
}
-job3_rang02,251,49,3 script Test Supervisor#jr_13 732,{
+job3_rang02,251,49,3 script Test Supervisor#jr_13 4_M_JOB_HUNTER,{
mes "[Test Supervisor, Freeze]";
if (job_ranger01 == 6) {
if (checkquest(8261) == -1) {
@@ -1602,23 +1602,23 @@ OnTimer10000:
donpcevent strnpcinfo(0)+"::OnDisable";
end;
}
-job3_rang02,246,42,0 duplicate(Egg Bomb#0) Egg Bomb#14 139
-job3_rang02,249,46,0 duplicate(Egg Bomb#0) Egg Bomb#15 139
-job3_rang02,256,43,0 duplicate(Egg Bomb#0) Egg Bomb#16 139
-job3_rang02,243,54,0 duplicate(Egg Bomb#0) Egg Bomb#17 139
-job3_rang02,246,58,0 duplicate(Egg Bomb#0) Egg Bomb#18 139
-job3_rang02,255,56,0 duplicate(Egg Bomb#0) Egg Bomb#19 139
-job3_rang02,260,48,0 duplicate(Egg Bomb#0) Egg Bomb#20 139
-job3_rang02,244,53,0 duplicate(Egg Bomb#0) Egg Bomb#21 139
-job3_rang02,254,50,0 duplicate(Egg Bomb#0) Egg Bomb#22 139
-job3_rang02,241,41,0 duplicate(Egg Bomb#0) Egg Bomb#23 139
-job3_rang02,259,41,0 duplicate(Egg Bomb#0) Egg Bomb#24 139
-job3_rang02,256,52,0 duplicate(Egg Bomb#0) Egg Bomb#25 139
-job3_rang02,259,58,0 duplicate(Egg Bomb#0) Egg Bomb#26 139
-job3_rang02,254,52,0 duplicate(Egg Bomb#0) Egg Bomb#27 139
-job3_rang02,247,42,0 duplicate(Egg Bomb#0) Egg Bomb#28 139
+job3_rang02,246,42,0 duplicate(Egg Bomb#0) Egg Bomb#14 HIDDEN_WARP_NPC
+job3_rang02,249,46,0 duplicate(Egg Bomb#0) Egg Bomb#15 HIDDEN_WARP_NPC
+job3_rang02,256,43,0 duplicate(Egg Bomb#0) Egg Bomb#16 HIDDEN_WARP_NPC
+job3_rang02,243,54,0 duplicate(Egg Bomb#0) Egg Bomb#17 HIDDEN_WARP_NPC
+job3_rang02,246,58,0 duplicate(Egg Bomb#0) Egg Bomb#18 HIDDEN_WARP_NPC
+job3_rang02,255,56,0 duplicate(Egg Bomb#0) Egg Bomb#19 HIDDEN_WARP_NPC
+job3_rang02,260,48,0 duplicate(Egg Bomb#0) Egg Bomb#20 HIDDEN_WARP_NPC
+job3_rang02,244,53,0 duplicate(Egg Bomb#0) Egg Bomb#21 HIDDEN_WARP_NPC
+job3_rang02,254,50,0 duplicate(Egg Bomb#0) Egg Bomb#22 HIDDEN_WARP_NPC
+job3_rang02,241,41,0 duplicate(Egg Bomb#0) Egg Bomb#23 HIDDEN_WARP_NPC
+job3_rang02,259,41,0 duplicate(Egg Bomb#0) Egg Bomb#24 HIDDEN_WARP_NPC
+job3_rang02,256,52,0 duplicate(Egg Bomb#0) Egg Bomb#25 HIDDEN_WARP_NPC
+job3_rang02,259,58,0 duplicate(Egg Bomb#0) Egg Bomb#26 HIDDEN_WARP_NPC
+job3_rang02,254,52,0 duplicate(Egg Bomb#0) Egg Bomb#27 HIDDEN_WARP_NPC
+job3_rang02,247,42,0 duplicate(Egg Bomb#0) Egg Bomb#28 HIDDEN_WARP_NPC
-job3_rang01,90,43,3 script Ranger Master#jr_29 832,{
+job3_rang01,90,43,3 script Ranger Master#jr_29 4_M_REIDIN_KURS,{
mes "[Ranger Master, Neveragain]";
if (job_ranger01 < 6) {
mes "... ...Huh?";
@@ -1756,7 +1756,7 @@ job3_rang01,90,43,3 script Ranger Master#jr_29 832,{
}
}
-job3_rang01,58,1,0 script Worker#job_ranger 88,{
+job3_rang01,58,1,0 script Worker#job_ranger 4_M_ORIENT01,{
callfunc "F_GM_NPC";
switch(select("Enable Waiting Room:Disable Waiting Room:Enable 1st Test:Disable 1st Test:Enable 2nd Test:Disable 2nd Test:Enable 3rd Test:Disable 3rd Test:Cancel")) {
case 1:
diff --git a/npc/re/jobs/3-1/rune_knight.txt b/npc/re/jobs/3-1/rune_knight.txt
index f9264574a..ffb395e07 100644
--- a/npc/re/jobs/3-1/rune_knight.txt
+++ b/npc/re/jobs/3-1/rune_knight.txt
@@ -17,7 +17,7 @@
//= 1.5 Added GM management function. [Euphy]
//============================================================
-prt_in,162,24,3 script Splendid-Looking Knight 470,2,2,{
+prt_in,162,24,3 script Splendid-Looking Knight 4_M_KNIGHT_SILVER,2,2,{
mes "[Rune Knight Manuel]";
if (Class == Job_Rune_Knight || Class == Job_Rune_Knight_T || Class == Job_Baby_Rune) {
mes "You are now a member of our select brethren. I can still remember when I first met you.";
@@ -125,7 +125,7 @@ prt_in,162,24,3 script Splendid-Looking Knight 470,2,2,{
close;
}
-glast_01,44,363,3 script Guide, Jungberg 468,2,2,{
+glast_01,44,363,3 script Guide, Jungberg 4_M_KNIGHT_BLACK,2,2,{
mes "[Guide, Jungberg]";
if (Class == Job_Rune_Knight || Class == Job_Rune_Knight_T || Class == Job_Baby_Rune) {
mes "Oh, you must be "+strcharinfo(0)+".";
@@ -249,7 +249,7 @@ glast_01,44,363,3 script Guide, Jungberg 468,2,2,{
}
}
-gl_knt02,150,55,3 script Rune Knight Staff 83,2,2,{
+gl_knt02,150,55,3 script Rune Knight Staff 4_M_01,2,2,{
mes "[Rune Knight Staff]";
if (Class == Job_Rune_Knight || Class == Job_Rune_Knight_T || Class == Job_Baby_Rune) {
mes "Welcome, "+strcharinfo(0)+". Are you going to the gathering place?";
@@ -296,7 +296,7 @@ gl_knt02,150,55,3 script Rune Knight Staff 83,2,2,{
close;
}
-job3_rune01,80,60,3 script Rune Knight Captain 470,2,2,{
+job3_rune01,80,60,3 script Rune Knight Captain 4_M_KNIGHT_SILVER,2,2,{
if (checkweight(1201,1) == 0 || MaxWeight - Weight < 1000) {
mes "You've got too many things. You cannot proceed anymore. Please try again after losing some weight.";
close;
@@ -574,7 +574,7 @@ L_Warning:
return;
}
-job3_rune01,90,50,3 script Rune Knight Lunarea 469,2,2,{
+job3_rune01,90,50,3 script Rune Knight Lunarea 4_M_KNIGHT_GOLD,2,2,{
if (Class == Job_Rune_Knight || Class == Job_Rune_Knight_T || Class == Job_Baby_Rune) {
mes "She holds up her chin quietly, nods lightly and notices me.";
next;
@@ -688,7 +688,7 @@ L_Test:
close;
}
-job3_rune01,55,50,3 script Rune Knight, Renoa 469,2,2,{
+job3_rune01,55,50,3 script Rune Knight, Renoa 4_M_KNIGHT_GOLD,2,2,{
mes "[Rune Knight, Renoa]";
if (Class == Job_Rune_Knight || Class == Job_Rune_Knight_T || Class == Job_Baby_Rune) {
mes "Congratulations for becoming one of us. Junior Rune Knight, "+strcharinfo(0)+".";
@@ -904,7 +904,7 @@ job3_rune01,55,50,3 script Rune Knight, Renoa 469,2,2,{
close;
}
-job3_rune01,58,51,1 script Rune Furnace 844,{
+job3_rune01,58,51,1 script Rune Furnace CLEAR_NPC,{
if (job_rune_edq < 15) {
mes "[Rune Knight Renoa]";
mes "You don't want to touch that thing. Believe me, I'm not kidding.";
@@ -976,7 +976,7 @@ job3_rune01,58,51,1 script Rune Furnace 844,{
close;
}
-job3_rune01,40,54,1 script Runes and Rune Knights 844,{
+job3_rune01,40,54,1 script Runes and Rune Knights CLEAR_NPC,{
if (job_rune_edq < 8) {
mes "[Rune Knight Renoa]";
mes "Besides touching stuff in this place without permission. Would you be able to understand the contents of the book?";
@@ -1035,7 +1035,7 @@ job3_rune01,40,54,1 script Runes and Rune Knights 844,{
}
}
-job3_rune01,43,44,1 script The Principles of Runes 844,{
+job3_rune01,43,44,1 script The Principles of Runes CLEAR_NPC,{
if (job_rune_edq < 8) {
mes "[Rune Knight Renoa]";
mes "Besides touching stuff in this place without permission. Would you be able to understand the contents of the book?";
@@ -1082,7 +1082,7 @@ job3_rune01,43,44,1 script The Principles of Runes 844,{
}
}
-job3_rune01,50,36,1 script Runes, Make & Use 844,{
+job3_rune01,50,36,1 script Runes, Make & Use CLEAR_NPC,{
if (job_rune_edq < 8) {
mes "[Rune Knight Renoa]";
mes "Besides touching stuff in this place without permission. Would you be able to understand the contents of the book?";
@@ -1181,7 +1181,7 @@ job3_rune01,50,36,1 script Runes, Make & Use 844,{
}
}
-mid_camp,238,250,3 script Rune Knight Sage Guard 468,2,2,{
+mid_camp,238,250,3 script Rune Knight Sage Guard 4_M_KNIGHT_BLACK,2,2,{
mes "[Rune Knight Sage Guard]";
if (Class == Job_Rune_Knight || Class == Job_Rune_Knight_T || Class == Job_Baby_Rune) {
mes "The sage Serpeone is the one who has been with us since the beginning of the Rune Knights.";
@@ -1208,7 +1208,7 @@ mid_camp,238,250,3 script Rune Knight Sage Guard 468,2,2,{
close;
}
-mid_camp,13,138,3 script Dispatched Rune Knight#1 83,2,2,{
+mid_camp,13,138,3 script Dispatched Rune Knight#1 4_M_01,2,2,{
mes "[Dispatched Rune Knight]";
if (Class == Job_Rune_Knight || Class == Job_Rune_Knight_T || Class == Job_Baby_Rune) {
mes "Thanks for your work. We will continue our mission for the Rune Knight testers.";
@@ -1236,9 +1236,9 @@ mid_camp,13,138,3 script Dispatched Rune Knight#1 83,2,2,{
mes "Shh... Our mission is not something to be revealed to the public. Please just move along.";
close;
}
-spl_fild01,361,327,3 duplicate(Dispatched Rune Knight#1) Dispatched Rune Knight#2 83,2,2
+spl_fild01,361,327,3 duplicate(Dispatched Rune Knight#1) Dispatched Rune Knight#2 4_M_01,2,2
-spl_fild02,13,241,0 script #Barricade1 139,10,10,{
+spl_fild02,13,241,0 script #Barricade1 HIDDEN_WARP_NPC,10,10,{
end;
OnTouch:
if (job_rune_edq > 0 && job_rune_edq < 23) {
@@ -1256,7 +1256,7 @@ OnTouch:
end;
}
-mid_camp,235,250,3 script Sage Serpeone 435,2,2,{
+mid_camp,235,250,3 script Sage Serpeone 4_F_FAIRY,2,2,{
mes "[Sage Serpeone]";
if (Class == Job_Rune_Knight || Class == Job_Rune_Knight_T || Class == Job_Baby_Rune) {
mes "Finally you are an honorable Rune Knight. I'm happy to help you.";
@@ -1420,7 +1420,7 @@ mid_camp,235,250,3 script Sage Serpeone 435,2,2,{
close;
}
-job3_rune01,114,50,3 script Rune Knight Velpino 468,{
+job3_rune01,114,50,3 script Rune Knight Velpino 4_M_KNIGHT_BLACK,{
if (Class == Job_Rune_Knight || Class == Job_Rune_Knight_T || Class == Job_Baby_Rune) {
mes "[Rune Knight Velpino]";
mes "You still smell like a fledging. Bring honor to the Rune Knights and raise your power...";
@@ -1554,7 +1554,7 @@ job3_rune01,114,50,3 script Rune Knight Velpino 468,{
close;
}
-job3_rune02,38,40,0 script #RK Test Hidden Portal 1 139,15,15,{
+job3_rune02,38,40,0 script #RK Test Hidden Portal 1 HIDDEN_WARP_NPC,15,15,{
end;
OnEnable:
enablenpc "#RK Test Hidden Portal 1";
@@ -1588,7 +1588,7 @@ OnTouch:
}
}
-job3_rune02,1,1,0 script job_rune_edq#1st_tb 139,{
+job3_rune02,1,1,0 script job_rune_edq#1st_tb HIDDEN_WARP_NPC,{
end;
OnInit:
disablenpc "job_rune_edq#1st_tb";
@@ -1617,7 +1617,7 @@ OnTimer14000:
end;
}
-job3_rune02,1,2,0 script job_rune_edq#1st_tc 139,{
+job3_rune02,1,2,0 script job_rune_edq#1st_tc HIDDEN_WARP_NPC,{
end;
OnInit:
disablenpc "job_rune_edq#1st_tc";
@@ -1653,7 +1653,7 @@ OnTimer305000:
end;
}
-job3_rune02,3,10,0 script job_rune_edq#1st_tcmc 139,{
+job3_rune02,3,10,0 script job_rune_edq#1st_tcmc HIDDEN_WARP_NPC,{
end;
OnInit:
disablenpc "job_rune_edq#1st_tcmc";
@@ -1706,7 +1706,7 @@ OnMyMobDead:
end;
}
-job3_rune02,3,11,0 script job_rune_edq#1st_tcmc2 139,{
+job3_rune02,3,11,0 script job_rune_edq#1st_tcmc2 HIDDEN_WARP_NPC,{
end;
OnInit:
disablenpc "job_rune_edq#1st_tcmc2";
@@ -1756,7 +1756,7 @@ OnMyMobDead:
end;
}
-job3_rune02,1,10,0 script job_rune_edq#1st_tcnc 139,{
+job3_rune02,1,10,0 script job_rune_edq#1st_tcnc HIDDEN_WARP_NPC,{
end;
OnInit:
disablenpc "job_rune_edq#1st_tcnc";
@@ -1802,7 +1802,7 @@ OnTimer60000:
end;
}
-job3_rune02,34,46,5 script Captain Tigris#jrt1 470,2,2,{
+job3_rune02,34,46,5 script Captain Tigris#jrt1 4_M_KNIGHT_SILVER,2,2,{
if (job_rune_edq != 4 || $@job_rune_test2 != 0) {
donpcevent "job_rune_edq#1st_tcnc::OnUse";
end;
@@ -1848,7 +1848,7 @@ OnTimer5000:
end;
}
-job3_rune02,43,46,3 script Rune Knight Lunarea#jrt1 469,2,2,{
+job3_rune02,43,46,3 script Rune Knight Lunarea#jrt1 4_M_KNIGHT_GOLD,2,2,{
if (job_rune_edq != 4 || $@job_rune_test2 != 0) {
donpcevent "job_rune_edq#1st_tcnc::OnUse";
end;
@@ -1893,7 +1893,7 @@ OnTimer5000:
end;
}
-job3_rune02,43,34,1 script Rune Knight Renoa#jrt1 469,2,2,{
+job3_rune02,43,34,1 script Rune Knight Renoa#jrt1 4_M_KNIGHT_GOLD,2,2,{
if (job_rune_edq != 4 || $@job_rune_test2 != 0) {
donpcevent "job_rune_edq#1st_tcnc::OnUse";
end;
@@ -1939,7 +1939,7 @@ OnTimer5000:
end;
}
-job3_rune02,34,34,7 script Rune Knight Velpino#jrt1 468,2,2,{
+job3_rune02,34,34,7 script Rune Knight Velpino#jrt1 4_M_KNIGHT_BLACK,2,2,{
if (job_rune_edq != 4 || $@job_rune_test2 != 0) {
donpcevent "job_rune_edq#1st_tcnc::OnUse";
end;
@@ -1984,7 +1984,7 @@ OnTimer5000:
end;
}
-job3_rune02,2,1,0 script job_rune_edq#3rd_tb 139,{
+job3_rune02,2,1,0 script job_rune_edq#3rd_tb HIDDEN_WARP_NPC,{
end;
OnInit:
disablenpc "job_rune_edq#3rd_tb";
@@ -2013,7 +2013,7 @@ OnTimer14000:
end;
}
-job3_rune02,2,2,0 script job_rune_edq#3rd_tc 139,{
+job3_rune02,2,2,0 script job_rune_edq#3rd_tc HIDDEN_WARP_NPC,{
end;
OnInit:
disablenpc "job_rune_edq#3rd_tc";
@@ -2050,7 +2050,7 @@ OnTimer482000:
end;
}
-job3_rune02,2,3,0 script job_rune_edq#3rd_tc1 139,{
+job3_rune02,2,3,0 script job_rune_edq#3rd_tc1 HIDDEN_WARP_NPC,{
end;
OnInit:
disablenpc "job_rune_edq#3rd_tc1";
@@ -2074,7 +2074,7 @@ OnMyMobDead:
end;
}
-job3_rune02,2,4,0 script job_rune_edq#3rd_tc2 139,{
+job3_rune02,2,4,0 script job_rune_edq#3rd_tc2 HIDDEN_WARP_NPC,{
end;
OnInit:
disablenpc "job_rune_edq#3rd_tc2";
@@ -2098,7 +2098,7 @@ OnMyMobDead:
end;
}
-job3_rune02,2,5,0 script job_rune_edq#3rd_tc3 139,{
+job3_rune02,2,5,0 script job_rune_edq#3rd_tc3 HIDDEN_WARP_NPC,{
end;
OnInit:
disablenpc "job_rune_edq#3rd_tc3";
@@ -2134,7 +2134,7 @@ OnMyMobDead:
end;
}
-sec_in02,34,167,3 script R.Knight Job Manager 470,1,1,{
+sec_in02,34,167,3 script R.Knight Job Manager 4_M_KNIGHT_SILVER,1,1,{
callfunc "F_GM_NPC";
mes "Enter the Password.";
next;
@@ -2154,4 +2154,4 @@ sec_in02,34,167,3 script R.Knight Job Manager 470,1,1,{
}
close;
}
-job3_rune01,1,1,3 duplicate(R.Knight Job Manager) #renshucheck 844
+job3_rune01,1,1,3 duplicate(R.Knight Job Manager) #renshucheck CLEAR_NPC
diff --git a/npc/re/jobs/3-1/warlock.txt b/npc/re/jobs/3-1/warlock.txt
index 263ccd9b0..0efc323c8 100644
--- a/npc/re/jobs/3-1/warlock.txt
+++ b/npc/re/jobs/3-1/warlock.txt
@@ -66,9 +66,9 @@ OnTouch:
}
end;
}
-//morocc,103,144,0 duplicate(#distorted_space_) #distorted_space_1 139,1,1
-morocc,95,132,0 duplicate(#distorted_space_) #distorted_space_1 139,1,1
-splendide,141,284,0 duplicate(#distorted_space_) #distorted_space_2 139,1,1
+//morocc,103,144,0 duplicate(#distorted_space_) #distorted_space_1 HIDDEN_WARP_NPC,1,1
+morocc,95,132,0 duplicate(#distorted_space_) #distorted_space_1 HIDDEN_WARP_NPC,1,1
+splendide,141,284,0 duplicate(#distorted_space_) #distorted_space_2 HIDDEN_WARP_NPC,1,1
function script F_Warlock {
mes "[Assistant]";
@@ -203,7 +203,7 @@ function script F_Warlock {
end;
}
-spl_in02,77,107,5 script Assistant#Warlock1 446,{
+spl_in02,77,107,5 script Assistant#Warlock1 4_M_FAIRYKID5,{
if (job_wl == 0) {
callfunc "F_Warlock";
end;
@@ -321,7 +321,7 @@ L_Quest:
return;
}
-spl_in02,60,231,5 script Yoop#Warlock 446,{
+spl_in02,60,231,5 script Yoop#Warlock 4_M_FAIRYKID5,{
mes "[Yoop]";
if (job_wl < 4) {
mes "Who are you?";
@@ -450,7 +450,7 @@ spl_in02,60,231,5 script Yoop#Warlock 446,{
}
}
-spl_in02,84,103,3 script Assistant#Warlock2 439,{
+spl_in02,84,103,3 script Assistant#Warlock2 4_F_FAIRYKID4,{
if (job_wl == 0) {
callfunc "F_Warlock";
end;
@@ -541,7 +541,7 @@ spl_in02,84,103,3 script Assistant#Warlock2 439,{
}
}
-spl_in02,78,110,5 script Assistant#Warlock3 437,{
+spl_in02,78,110,5 script Assistant#Warlock3 4_F_FAIRYKID2,{
if (job_wl == 0) {
callfunc "F_Warlock";
end;
@@ -568,7 +568,7 @@ spl_in02,78,110,5 script Assistant#Warlock3 437,{
}
}
-spl_in02,80,108,5 script Guild Master#Warlock 465,{
+spl_in02,80,108,5 script Guild Master#Warlock 4_F_FAIRY1,{
if (job_wl == 0) {
callfunc "F_Warlock";
end;
@@ -710,14 +710,14 @@ spl_in02,80,108,5 script Guild Master#Warlock 465,{
}
}
-job3_war01,22,22,7 script Yoop#WRR 439,{
+job3_war01,22,22,7 script Yoop#WRR 4_F_FAIRYKID4,{
mes "[Yoop]";
mes "If you ask Ebein to be sent to the magical room, he would send you there.";
mes "Wait in the queue to enter the Chamber of Magic.";
close;
}
-job3_war01,29,25,0 script Ebein#WRR 437,{
+job3_war01,29,25,0 script Ebein#WRR 4_F_FAIRYKID2,{
mes "[Ebein]";
mes "Would you like to take a test?";
mes "If you stand by in the waiting room, you'll be able to go into the Chamber of Magic.";
@@ -742,7 +742,7 @@ job3_war01,29,25,0 script Ebein#WRR 437,{
}
}
-job3_war01,29,25,5 script The chamber of magic#1 437,{
+job3_war01,29,25,5 script The chamber of magic#1 4_F_FAIRYKID2,{
end;
OnInit:
disablenpc "The chamber of magic#1";
@@ -1054,7 +1054,7 @@ OnTimer6000:
end;
}
-job3_war01,1,2,0 script Button Girl#wl 66,{
+job3_war01,1,2,0 script Button Girl#wl 1_F_01,{
callfunc "F_GM_NPC";
switch(select("Open Arena:Close Arena:Open the Chamber of Magic:Close the Chamber of Magic:Hollow Stone On:Hollow Stone Off:Cancel")) {
case 1:
diff --git a/npc/re/jobs/3-2/genetic.txt b/npc/re/jobs/3-2/genetic.txt
index 44124a1d8..21dfc943a 100644
--- a/npc/re/jobs/3-2/genetic.txt
+++ b/npc/re/jobs/3-2/genetic.txt
@@ -15,7 +15,7 @@
//= 1.3a Moved warps to separate file. [Euphy]
//============================================================
-alde_alche,35,186,5 script Alchemist Union Member 805,{
+alde_alche,35,186,5 script Alchemist Union Member 1_M_SIGNALCHE,{
mes "[Alchemist Union Member]";
if (BaseLevel > 98 && JobLevel > 49){
if (BaseJob == Job_Alchemist) {
@@ -83,7 +83,7 @@ alde_alche,35,186,5 script Alchemist Union Member 805,{
close;
}
-job3_gen01,25,58,3 script Devries#gen 865,{
+job3_gen01,25,58,3 script Devries#gen 4_LGTSCIENCE,{
if (SkillPoint != 0) {
mes "- You still have some unused skill points. -";
close;
@@ -573,7 +573,7 @@ job3_gen01,25,58,3 script Devries#gen 865,{
close;
}
-job3_gen01,83,72,3 script Delivery Box#generic 111,{
+job3_gen01,83,72,3 script Delivery Box#generic HIDDEN_NPC,{
mes "- There's a big box. -";
if (job_gen == 2) {
next;
@@ -602,7 +602,7 @@ job3_gen01,83,72,3 script Delivery Box#generic 111,{
close;
}
-job3_gen01,12,56,3 script Plant Guide#generic 111,{
+job3_gen01,12,56,3 script Plant Guide#generic HIDDEN_NPC,{
mes "<The Easiest Alchemy in the World>";
mes "Written by Bob Ross.";
next;
@@ -666,32 +666,32 @@ function script Genetic_Job_Plant {
close;
}
-job3_gen01,36,55,3 script Bigibigi Grass#gen 844,{
+job3_gen01,36,55,3 script Bigibigi Grass#gen CLEAR_NPC,{
callfunc "Genetic_Job_Plant",2209,"Bigibigi Grass","The size is quite big to be normal grass so it's called Bigibigi Grass.";
end;
}
-job3_gen01,36,45,3 script Muka Tree#gen 844,{
+job3_gen01,36,45,3 script Muka Tree#gen CLEAR_NPC,{
callfunc "Genetic_Job_Plant",2210,"Muka Tree","This is the Muka Tree which protects its delicate inside with sharp thorns.",1;
end;
}
-job3_gen01,42,55,3 script Bogi Vine#gen 844,{
+job3_gen01,42,55,3 script Bogi Vine#gen CLEAR_NPC,{
callfunc "Genetic_Job_Plant",2211,"Bogi Vine","This is a Bogi Vine which has a very fast growth speed.",1;
end;
}
-job3_gen01,30,58,3 script Aolatura#gen 844,{
+job3_gen01,30,58,3 script Aolatura#gen CLEAR_NPC,{
callfunc "Genetic_Job_Plant",2212,"Aolatura","This is known to blossom then thousand flowers as it only blooms once per lifetime.";
end;
}
-job3_gen01,30,63,3 script Congra#gen 844,{
+job3_gen01,30,63,3 script Congra#gen CLEAR_NPC,{
callfunc "Genetic_Job_Plant",2213,"Congra","It's a plant that has a big and solid stem with enormous leaves.";
end;
}
-job3_gen01,32,38,3 script Sticky Grass#gen 844,{
+job3_gen01,32,38,3 script Sticky Grass#gen CLEAR_NPC,{
callfunc "Genetic_Job_Plant",2214,"Sticky Grass","I may not know the name but it's sticky and can stick to just about anything.";
end;
}
-job3_gen01,7,50,3 script Testing Table#gen 844,{
+job3_gen01,7,50,3 script Testing Table#gen CLEAR_NPC,{
if (job_gen == 7) {
mes "- This is a testing table with a lot of equipment. I think I can study the combinations here with plants. -";
next;
@@ -771,11 +771,11 @@ job3_gen01,7,50,3 script Testing Table#gen 844,{
close;
}
-job3_gen01,21,67,3 script Super Cultivator#gen 844,{
+job3_gen01,21,67,3 script Super Cultivator#gen CLEAR_NPC,{
end;
}
-job3_gen01,91,48,3 script Demi Calberine#gen 982,{
+job3_gen01,91,48,3 script Demi Calberine#gen 4_F_SCIENCE,{
mes "[Demi Calberine]";
if (job_gen < 62) {
mes "Hmm~ Where'd that bolt go?";
@@ -967,15 +967,15 @@ OnTimer7000:
stopnpctimer;
end;
}
-job3_gen01,84,45,3 duplicate(Scattered Stuff#gen) Scattered Stuff#gen1 111
-job3_gen01,77,41,3 duplicate(Scattered Stuff#gen) Scattered Stuff#gen2 111
-job3_gen01,78,57,3 duplicate(Scattered Stuff#gen) Scattered Stuff#gen3 111
-job3_gen01,89,59,3 duplicate(Scattered Stuff#gen) Scattered Stuff#gen4 111
-job3_gen01,90,51,3 duplicate(Scattered Stuff#gen) Scattered Stuff#gen5 111
-job3_gen01,83,27,3 duplicate(Scattered Stuff#gen) Scattered Stuff#gen6 111
-job3_gen01,74,45,3 duplicate(Scattered Stuff#gen) Scattered Stuff#gen7 111
+job3_gen01,84,45,3 duplicate(Scattered Stuff#gen) Scattered Stuff#gen1 HIDDEN_NPC
+job3_gen01,77,41,3 duplicate(Scattered Stuff#gen) Scattered Stuff#gen2 HIDDEN_NPC
+job3_gen01,78,57,3 duplicate(Scattered Stuff#gen) Scattered Stuff#gen3 HIDDEN_NPC
+job3_gen01,89,59,3 duplicate(Scattered Stuff#gen) Scattered Stuff#gen4 HIDDEN_NPC
+job3_gen01,90,51,3 duplicate(Scattered Stuff#gen) Scattered Stuff#gen5 HIDDEN_NPC
+job3_gen01,83,27,3 duplicate(Scattered Stuff#gen) Scattered Stuff#gen6 HIDDEN_NPC
+job3_gen01,74,45,3 duplicate(Scattered Stuff#gen) Scattered Stuff#gen7 HIDDEN_NPC
-job3_gen01,18,39,3 script Warning#gen 837,{
+job3_gen01,18,39,3 script Warning#gen 2_BULLETIN_BOARD,{
mes "= Warning =";
mes "If you bully my spores, I'll scream!!!";
if (job_gen < 75) close;
@@ -992,30 +992,30 @@ job3_gen01,18,39,3 script Warning#gen 837,{
}
}
-job3_gen01,80,12,1 script Stacked Magazines#gen 111,{
+job3_gen01,80,12,1 script Stacked Magazines#gen HIDDEN_NPC,{
mes "- 'Monthly Bang!' magazines are piled up in disorder. -";
close;
}
-job3_gen01,83,20,1 script Bed#gen 111,{
+job3_gen01,83,20,1 script Bed#gen HIDDEN_NPC,{
mes "- A checker patterned blanket set which looks like it was picked carefully is too good for this dirty bed. -";
close;
}
-job3_gen01,85,25,1 script Opened Book#gen 111,{
+job3_gen01,85,25,1 script Opened Book#gen HIDDEN_NPC,{
mes "< Do you want to have my pretty room? Do you have enough zeny? Is there enough room? Run to the Lighthalzen Department Store right away and get the most high-end wall papers and interior accessories! >";
next;
mes "< Luxurious candles that'll lighten up your room, a huge golden mirror that every lady owns, you cannot miss any of them! >";
close;
}
-job3_gen01,81,81,0 script #dbroom 139,2,2,{
+job3_gen01,81,81,0 script #dbroom HIDDEN_WARP_NPC,2,2,{
OnTouch:
mes "- It's a room that looks like a storehouse, thanks to so many parcels piled up in the room. -";
close;
}
-job3_gen01,24,32,0 script The gaze of Devries 139,2,2,{
+job3_gen01,24,32,0 script The gaze of Devries HIDDEN_WARP_NPC,2,2,{
OnTouch:
if (checkquest(2223,HUNTING) == 2) {
mapannounce "job3_gen01","Devries: Whoa? Was there a lost kitty in the spore pen?",bc_map,"0x99CC00"; //FW_NORMAL 12 0 0
diff --git a/npc/re/jobs/3-2/minstrel.txt b/npc/re/jobs/3-2/minstrel.txt
index 5ddb5bf5d..8b9288ad6 100644
--- a/npc/re/jobs/3-2/minstrel.txt
+++ b/npc/re/jobs/3-2/minstrel.txt
@@ -14,7 +14,7 @@
//= 1.3 Updated script. [Euphy]
//============================================================
-alberta,196,133,4 script Bard#job_min 486,{
+alberta,196,133,4 script Bard#job_min 4_M_BARD,{
if (job_min == 0) {
if (BaseJob == Job_Bard && BaseLevel > 98 && JobLevel > 49) {
mes "[Bard]";
@@ -237,7 +237,7 @@ alberta,196,133,4 script Bard#job_min 486,{
close;
}
-prontera,141,97,4 script Warmhearted woman 701,{
+prontera,141,97,4 script Warmhearted woman 4_F_GODEMOM,{
mes "[Warmhearted woman]";
if (job_min == 1) {
mes "Maestro Song?";
@@ -268,7 +268,7 @@ prontera,141,97,4 script Warmhearted woman 701,{
close;
}
-prontera,140,331,6 script Glasses-wearing Man 883,{
+prontera,140,331,6 script Glasses-wearing Man 4_M_ALCHE_D,{
mes "[Glasses-wearing Man]";
if (job_min == 2) {
mes "You mean Maestro Song?";
@@ -301,7 +301,7 @@ prontera,140,331,6 script Glasses-wearing Man 883,{
close;
}
-prontera,146,218,4 script Woman#job_min 90,{
+prontera,146,218,4 script Woman#job_min 4_F_01,{
if (job_min == 3) {
mes "[Woman]";
mes "Do you know who Maestro Song is?";
@@ -340,7 +340,7 @@ prontera,146,218,4 script Woman#job_min 90,{
close;
}
-airplane,222,67,6 script Karian#job_min1 486,{
+airplane,222,67,6 script Karian#job_min1 4_M_BARD,{
mes "[Karian]";
mes "Yup!!!!!!!!!!!!!!!!!!";
next;
@@ -360,7 +360,7 @@ airplane,222,67,6 script Karian#job_min1 486,{
close;
}
-hu_in01,267,5,3 script Karian#job_min2 486,{
+hu_in01,267,5,3 script Karian#job_min2 4_M_BARD,{
mes "[Karian]";
if (job_min == 6) {
mes "Eeeeh it's so painful.";
@@ -485,7 +485,7 @@ hu_in01,267,5,3 script Karian#job_min2 486,{
close;
}
-hu_in01,361,103,3 script Tone-deaf person 995,{
+hu_in01,361,103,3 script Tone-deaf person 4_M_CASMAN1,{
if (job_min == 7) {
mes "[Tone-deaf person]";
mes "Lala~ lala~";
@@ -705,7 +705,7 @@ hu_in01,361,103,3 script Tone-deaf person 995,{
close;
}
-tha_scene01,140,200,0 script #min_receipt 139,3,3,{
+tha_scene01,140,200,0 script #min_receipt HIDDEN_WARP_NPC,3,3,{
OnTouch:
if (job_min == 10 || (job_min == 11 && countitem(6271) == 0)) {
mes "-There is a piece of paper on the ground.-";
@@ -747,7 +747,7 @@ OnTouch:
end;
}
-tha_scene01,139,204,6 script Karian#cmd1 486,{
+tha_scene01,139,204,6 script Karian#cmd1 4_M_BARD,{
end;
OnInit:
disablenpc "Karian#cmd1";
@@ -766,7 +766,7 @@ OnTimer15000:
end;
}
-ve_fild07,129,132,5 script Karian#cmd5 486,{
+ve_fild07,129,132,5 script Karian#cmd5 4_M_BARD,{
end;
OnInit:
disablenpc "Karian#cmd5";
@@ -785,7 +785,7 @@ OnTimer30000:
end;
}
-prontera,155,49,4 script Karian#cmd9 486,{
+prontera,155,49,4 script Karian#cmd9 4_M_BARD,{
end;
OnInit:
disablenpc "Karian#cmd9";
@@ -804,7 +804,7 @@ OnTimer300000:
end;
}
-yuno,146,168,0 script Karian#cmd2 486,{
+yuno,146,168,0 script Karian#cmd2 4_M_BARD,{
end;
OnInit:
disablenpc strnpcinfo(0);
@@ -822,13 +822,13 @@ OnTimer100000:
stopnpctimer;
end;
}
-lighthalzen,160,124,6 duplicate(Karian#cmd2) Karian#cmd3 486
-ra_in01,357,128,0 duplicate(Karian#cmd2) Karian#cmd4 486
-comodo,184,109,0 duplicate(Karian#cmd2) Karian#cmd6 486
-moc_fild16,204,231,0 duplicate(Karian#cmd2) Karian#cmd7 486
-aldebaran,142,128,2 duplicate(Karian#cmd2) Karian#cmd8 486
+lighthalzen,160,124,6 duplicate(Karian#cmd2) Karian#cmd3 4_M_BARD
+ra_in01,357,128,0 duplicate(Karian#cmd2) Karian#cmd4 4_M_BARD
+comodo,184,109,0 duplicate(Karian#cmd2) Karian#cmd6 4_M_BARD
+moc_fild16,204,231,0 duplicate(Karian#cmd2) Karian#cmd7 4_M_BARD
+aldebaran,142,128,2 duplicate(Karian#cmd2) Karian#cmd8 4_M_BARD
-yuno,143,170,6 script Mr. Click#job_min 748,{
+yuno,143,170,6 script Mr. Click#job_min 4_M_ALCHE_A,{
mes "[Mr. Click]";
if (job_min == 11) {
mes "Hi~ welcome~";
@@ -952,7 +952,7 @@ yuno,143,170,6 script Mr. Click#job_min 748,{
close;
}
-lighthalzen,155,119,3 script Little girl#job_min 891,3,3,{
+lighthalzen,155,119,3 script Little girl#job_min 4_F_HUGIRL,3,3,{
OnTouch:
if (checkquest(11145,HUNTING) == 2) {
if (job_min == 12) {
@@ -1082,7 +1082,7 @@ OnTouch:
close;
}
-ice_dun01,157,15,0 script #Minsicecave1 139,2,2,{
+ice_dun01,157,15,0 script #Minsicecave1 HIDDEN_WARP_NPC,2,2,{
OnTouch:
if (job_min == 13) {
mes "-A long time ago-";
@@ -1093,7 +1093,7 @@ OnTouch:
end;
}
-ice_dun01,157,23,0 script #Minsicecave2 139,2,2,{
+ice_dun01,157,23,0 script #Minsicecave2 HIDDEN_WARP_NPC,2,2,{
OnTouch:
if (job_min == 13) {
mes "-The giant born to ice-";
@@ -1104,7 +1104,7 @@ OnTouch:
end;
}
-ice_dun01,141,41,0 script #Minsicecave3 139,2,2,{
+ice_dun01,141,41,0 script #Minsicecave3 HIDDEN_WARP_NPC,2,2,{
OnTouch:
if (job_min == 13) {
mes "-died-";
@@ -1115,7 +1115,7 @@ OnTouch:
end;
}
-ice_dun01,120,35,0 script #Minsicecave4 139,2,2,{
+ice_dun01,120,35,0 script #Minsicecave4 HIDDEN_WARP_NPC,2,2,{
OnTouch:
if (job_min == 13) {
mes "-His body became the ground-";
@@ -1126,7 +1126,7 @@ OnTouch:
end;
}
-ice_dun01,104,30,0 script #Minsicecave5 139,2,2,{
+ice_dun01,104,30,0 script #Minsicecave5 HIDDEN_WARP_NPC,2,2,{
OnTouch:
if (job_min == 13) {
mes "-His bones became a mountain-";
@@ -1137,7 +1137,7 @@ OnTouch:
end;
}
-ice_dun01,86,23,0 script #Minsicecave6 139,2,2,{
+ice_dun01,86,23,0 script #Minsicecave6 HIDDEN_WARP_NPC,2,2,{
OnTouch:
if (job_min == 13) {
mes "-His skin became soil-";
@@ -1148,7 +1148,7 @@ OnTouch:
end;
}
-ice_dun01,75,19,0 script #Minsicecave7 139,2,2,{
+ice_dun01,75,19,0 script #Minsicecave7 HIDDEN_WARP_NPC,2,2,{
OnTouch:
if (job_min == 13) {
mes "-His blood became a river-";
@@ -1159,7 +1159,7 @@ OnTouch:
end;
}
-ice_dun01,56,12,0 script #Minsicecave8 139,2,2,{
+ice_dun01,56,12,0 script #Minsicecave8 HIDDEN_WARP_NPC,2,2,{
OnTouch:
if (job_min == 13) {
mes "-His hair became a plant-";
@@ -1170,7 +1170,7 @@ OnTouch:
end;
}
-ice_dun01,29,26,0 script #Minsicecave9 139,2,2,{
+ice_dun01,29,26,0 script #Minsicecave9 HIDDEN_WARP_NPC,2,2,{
OnTouch:
if (job_min == 13) {
mes "-His head became the sky-";
@@ -1181,7 +1181,7 @@ OnTouch:
end;
}
-ice_dun01,25,46,0 script #Minsicecave10 139,2,2,{
+ice_dun01,25,46,0 script #Minsicecave10 HIDDEN_WARP_NPC,2,2,{
OnTouch:
if (job_min == 13) {
mes "-His tears from his-";
@@ -1192,7 +1192,7 @@ OnTouch:
end;
}
-ice_dun01,20,66,0 script #Minsicecave11 139,2,2,{
+ice_dun01,20,66,0 script #Minsicecave11 HIDDEN_WARP_NPC,2,2,{
OnTouch:
if (job_min == 13) {
mes "-eyes became dew-";
@@ -1203,7 +1203,7 @@ OnTouch:
end;
}
-ice_dun01,22,85,0 script #Minsicecave12 139,2,2,{
+ice_dun01,22,85,0 script #Minsicecave12 HIDDEN_WARP_NPC,2,2,{
OnTouch:
if (job_min == 13) {
mes "-on the leaves-";
@@ -1217,7 +1217,7 @@ OnTouch:
end;
}
-ra_in01,361,129,0 script #jmRachelHotel 139,2,2,{
+ra_in01,361,129,0 script #jmRachelHotel HIDDEN_WARP_NPC,2,2,{
OnTouch:
if (job_min == 14) {
mes "[Old Woman]";
@@ -1232,7 +1232,7 @@ OnTouch:
end;
}
-ra_in01,358,130,4 script Old Woman#job_min 979,{
+ra_in01,358,130,4 script Old Woman#job_min 4_F_CAVE1,{
mes "[Old Woman]";
if (job_min == 14) {
mes "Huu!!";
@@ -1329,7 +1329,7 @@ ra_in01,358,130,4 script Old Woman#job_min 979,{
close;
}
-ve_fild07,131,132,5 script =Notice=#job_min 837,{
+ve_fild07,131,132,5 script =Notice=#job_min 2_BULLETIN_BOARD,{
function Choice;
if (job_min == 16) {
mes "===Notice===";
@@ -1468,7 +1468,7 @@ function Choice;
}
}
-comodo,184,108,0 script #jmComodo Almost Dead 139,2,2,{
+comodo,184,108,0 script #jmComodo Almost Dead HIDDEN_WARP_NPC,2,2,{
OnTouch:
if (job_min == 17) {
mes "["+strcharinfo(0)+"]";
@@ -1508,7 +1508,7 @@ OnTouch:
end;
}
-comodo,192,119,0 script Kayak Master#job_min 98,{
+comodo,192,119,0 script Kayak Master#job_min 4W_M_02,{
mes "[Kayak Master]";
if (job_min == 18) {
mes "What?";
@@ -1533,7 +1533,7 @@ comodo,192,119,0 script Kayak Master#job_min 98,{
close;
}
-comodo,159,316,4 script Woman Roasting Meat 701,{
+comodo,159,316,4 script Woman Roasting Meat 4_F_GODEMOM,{
mes "[Woman Roasting Meat]";
if (job_min == 19) {
mes "Maestro Song?";
@@ -1577,7 +1577,7 @@ comodo,159,316,4 script Woman Roasting Meat 701,{
close;
}
-moc_fild16,206,232,0 script #jmTransfer news 139,3,3,{
+moc_fild16,206,232,0 script #jmTransfer news HIDDEN_WARP_NPC,3,3,{
OnTouch:
if (job_min == 20) {
mes "["+strcharinfo(0)+"]";
@@ -1653,7 +1653,7 @@ OnTouch:
end;
}
-aldebaran,140,130,0 script #jmAldebaran Clock Tower 139,3,3,{
+aldebaran,140,130,0 script #jmAldebaran Clock Tower HIDDEN_WARP_NPC,3,3,{
OnTouch:
if (job_min == 21) {
mes "["+strcharinfo(0)+"]";
@@ -1718,7 +1718,7 @@ OnTouch:
end;
}
-prontera,155,40,0 script #jmprt1 139,2,2,{
+prontera,155,40,0 script #jmprt1 HIDDEN_WARP_NPC,2,2,{
OnTouch:
if (job_min == 22) {
mes "[Karian]";
@@ -1736,7 +1736,7 @@ OnTouch:
end;
}
-prontera,155,42,0 script #prtjm1 139,1,1,{
+prontera,155,42,0 script #prtjm1 HIDDEN_WARP_NPC,1,1,{
OnTouch:
if (job_min == 23) {
mes "-Let me go back to my hometown.-";
@@ -1748,7 +1748,7 @@ OnTouch:
end;
}
-prontera,155,44,0 script #prtjm2 139,1,1,{
+prontera,155,44,0 script #prtjm2 HIDDEN_WARP_NPC,1,1,{
OnTouch:
if (job_min == 24) {
mes "-There are many beautiful flowers.-";
@@ -1760,7 +1760,7 @@ OnTouch:
end;
}
-prontera,155,46,0 script #prtjm3 139,1,1,{
+prontera,155,46,0 script #prtjm3 HIDDEN_WARP_NPC,1,1,{
OnTouch:
if (job_min == 25) {
mes "-The birds sing for me.-";
@@ -1772,7 +1772,7 @@ OnTouch:
end;
}
-prontera,155,48,0 script #prtjm4 139,1,1,{
+prontera,155,48,0 script #prtjm4 HIDDEN_WARP_NPC,1,1,{
OnTouch:
if (job_min == 26 || job_min == 27) {
mes "-It's this old town.-";
@@ -1822,7 +1822,7 @@ OnTouch:
end;
}
-prt_in,94,172,4 script Karian#job_min3 480,{
+prt_in,94,172,4 script Karian#job_min3 4_M_MINSTREL1,{
if (job_min == 27) {
if (checkweight(1201,1) == 0 || MaxWeight - Weight < 3500) {
mes "While you are on a trip, you gain lots of stuff. Make yourself lighter.";
diff --git a/npc/re/jobs/3-2/royal_guard.txt b/npc/re/jobs/3-2/royal_guard.txt
index f98861461..82632ed36 100644
--- a/npc/re/jobs/3-2/royal_guard.txt
+++ b/npc/re/jobs/3-2/royal_guard.txt
@@ -13,7 +13,7 @@
//= 1.2 Added GM management function. [Euphy]
//============================================================
-prt_castle,48,161,3 script Middle-aged Gentleman#rg 57,{
+prt_castle,48,161,3 script Middle-aged Gentleman#rg 1_M_LIBRARYMASTER,{
if (checkweight(1201,1) == 0 || MaxWeight - Weight < 1000) {
mes "- Your pack is too heavy. -";
mes "- Lighten your body first -";
@@ -333,7 +333,7 @@ prt_castle,48,161,3 script Middle-aged Gentleman#rg 57,{
}
}
-glast_01,240,366,5 script Memory of King Schmidtz 844,{
+glast_01,240,366,5 script Memory of King Schmidtz CLEAR_NPC,{
if (checkweight(1201,1) == 0 || MaxWeight - Weight < 1000) {
mes "- Your pack is too heavy. -";
mes "- Lighten your body first -";
@@ -434,7 +434,7 @@ glast_01,240,366,5 script Memory of King Schmidtz 844,{
end;
}
-gl_church,173,88,0 script Delicate trace#01 844,{
+gl_church,173,88,0 script Delicate trace#01 CLEAR_NPC,{
if (job_royal == 4 && countitem(6274) == 0) {
progressbar "ffff00",5;
set .@roy_ran, rand(1,70);
@@ -464,18 +464,18 @@ OnTimer40000:
specialeffect EF_MAPPILLAR;
end;
}
-gl_church,158,103,0 duplicate(Delicate trace#01) Delicate trace#02 844
-gl_church,139,90,0 duplicate(Delicate trace#01) Delicate trace#03 844
-gl_church,126,62,0 duplicate(Delicate trace#01) Delicate trace#04 844
-gl_church,148,5,0 duplicate(Delicate trace#01) Delicate trace#05 844
-gl_church,185,72,0 duplicate(Delicate trace#01) Delicate trace#06 844
-gl_church,185,72,0 duplicate(Delicate trace#01) Delicate trace#07 844
-gl_church,211,94,0 duplicate(Delicate trace#01) Delicate trace#08 844
-gl_church,185,125,0 duplicate(Delicate trace#01) Delicate trace#09 844
-gl_church,143,125,0 duplicate(Delicate trace#01) Delicate trace#10 844
-gl_church,105,115,0 duplicate(Delicate trace#01) Delicate trace#11 844
+gl_church,158,103,0 duplicate(Delicate trace#01) Delicate trace#02 CLEAR_NPC
+gl_church,139,90,0 duplicate(Delicate trace#01) Delicate trace#03 CLEAR_NPC
+gl_church,126,62,0 duplicate(Delicate trace#01) Delicate trace#04 CLEAR_NPC
+gl_church,148,5,0 duplicate(Delicate trace#01) Delicate trace#05 CLEAR_NPC
+gl_church,185,72,0 duplicate(Delicate trace#01) Delicate trace#06 CLEAR_NPC
+gl_church,185,72,0 duplicate(Delicate trace#01) Delicate trace#07 CLEAR_NPC
+gl_church,211,94,0 duplicate(Delicate trace#01) Delicate trace#08 CLEAR_NPC
+gl_church,185,125,0 duplicate(Delicate trace#01) Delicate trace#09 CLEAR_NPC
+gl_church,143,125,0 duplicate(Delicate trace#01) Delicate trace#10 CLEAR_NPC
+gl_church,105,115,0 duplicate(Delicate trace#01) Delicate trace#11 CLEAR_NPC
-gl_church,158,100,0 script #Clue of traces 111,4,4,{
+gl_church,158,100,0 script #Clue of traces HIDDEN_NPC,4,4,{
end;
OnTouch:
if (job_royal == 4 && countitem(6274) == 0) {
@@ -496,7 +496,7 @@ OnTouch:
end;
}
-sec_in02,12,43,3 script sorcereryal 57,1,1,{
+sec_in02,12,43,3 script sorcereryal 1_M_LIBRARYMASTER,1,1,{
callfunc "F_GM_NPC";
switch(select("Royal Guard:Rune Knight:Sorcerer")) {
case 1:
diff --git a/npc/re/jobs/3-2/shadow_chaser.txt b/npc/re/jobs/3-2/shadow_chaser.txt
index 30d10abdb..201a7fb4f 100644
--- a/npc/re/jobs/3-2/shadow_chaser.txt
+++ b/npc/re/jobs/3-2/shadow_chaser.txt
@@ -14,7 +14,7 @@
//= 1.3 Updated to official script. [Euphy]
//============================================================
-morocc,156,70,3 script Girl#sc00 93,3,3,{
+morocc,156,70,3 script Girl#sc00 4_F_04,3,3,{
mes "[Girl]";
if (BaseJob == Job_Rogue) {
if (job_sha == 0) {
@@ -73,7 +73,7 @@ OnTouch:
end;
}
-in_rogue,376,100,5 script Guild Member#sc01 828,{
+in_rogue,376,100,5 script Guild Member#sc01 4_M_ROGUE,{
if (BaseJob == Job_Rogue) {
if (job_sha < 2) {
set @job_sha,0;
@@ -143,7 +143,7 @@ in_rogue,376,100,5 script Guild Member#sc01 828,{
close;
}
-in_rogue,379,99,1 script Guild Member#sc02 747,{
+in_rogue,379,99,1 script Guild Member#sc02 4_F_ROGUE,{
if (BaseJob == Job_Rogue) {
if (job_sha < 2) {
set @job_sha,1;
@@ -173,7 +173,7 @@ in_rogue,379,99,1 script Guild Member#sc02 747,{
close;
}
-in_rogue,379,101,3 script Scary Man#sc03 810,{
+in_rogue,379,101,3 script Scary Man#sc03 1_M_SIGNROGUE,{
if (job_sha == 0) {
if (BaseJob == Job_Rogue && BaseLevel > 98 && JobLevel > 49) {
mes "[Scary man]";
@@ -292,7 +292,7 @@ L_Code:
return;
}
-s_atelier,65,123,5 script Manager#sc04_prt 903,{
+s_atelier,65,123,5 script Manager#sc04_prt 4_M_KHKYEL,{
if (job_sha == 2) {
mes "[Manager]";
mes "Where's Max!?";
@@ -611,7 +611,7 @@ L_Code:
close;
}
-s_atelier,168,65,5 script Manager#sc08_ra 923,{
+s_atelier,168,65,5 script Manager#sc08_ra 4_M_DOCTOR,{
if (job_sha < 10) {
mes "[Manager]";
mes "Who are you?";
@@ -883,7 +883,7 @@ L_Code:
close;
}
-s_atelier,167,129,3 script Manager#sc06_yuno 806,{
+s_atelier,167,129,3 script Manager#sc06_yuno 1_M_SIGNART,{
if (job_sha < 19) {
mes "[Manager]";
mes "What?";
@@ -1118,7 +1118,7 @@ L_Code:
return;
}
-s_atelier,25,75,3 script Manager#sc10_lgt 899,{
+s_atelier,25,75,3 script Manager#sc10_lgt 4_M_HUMAN_02,{
if (job_sha < 26) {
mes "[Manager]";
mes "You are?";
@@ -1312,7 +1312,7 @@ s_atelier,25,75,3 script Manager#sc10_lgt 899,{
close;
}
-s_atelier,73,65,3 script Vicente#sc12_lgt 899,{
+s_atelier,73,65,3 script Vicente#sc12_lgt 4_M_HUMAN_02,{
mes "[Vicente]";
if (job_sha < 29) {
mes "If you don't have anything special to do here, you'd better leave.";
@@ -1338,7 +1338,7 @@ s_atelier,73,65,3 script Vicente#sc12_lgt 899,{
close;
}
-s_atelier,70,66,4 script Dumk#sc13_lgh 481,{
+s_atelier,70,66,4 script Dumk#sc13_lgh 4_M_SHADOWCHASER,{
if (Class == Job_Shadow_Chaser || Class == Job_Shadow_Chaser_T || Class == Job_Baby_Chaser) {
mes "[Dumk]";
mes "What is it?";
@@ -1668,7 +1668,7 @@ s_atelier,70,66,4 script Dumk#sc13_lgh 481,{
// Flames
//============================================================
-tur_dun03,38,209,1 script Blue Flame#sc_f01 802,{
+tur_dun03,38,209,1 script Blue Flame#sc_f01 4_NFWISP,{
if (job_sha == 5) {
mes "A blue flame is roaring.";
mes "The deciphered code means...";
@@ -1753,7 +1753,7 @@ tur_dun03,38,209,1 script Blue Flame#sc_f01 802,{
close;
}
-ice_dun02,206,223,1 script Red Flame#sc_f02 802,{
+ice_dun02,206,223,1 script Red Flame#sc_f02 4_NFWISP,{
if (job_sha < 11) {
mes "An unknown red flame is roaring.";
close;
@@ -1817,7 +1817,7 @@ ice_dun02,206,223,1 script Red Flame#sc_f02 802,{
close;
}
-niflheim,230,276,1 script Red Flame#sc_f03 802,{
+niflheim,230,276,1 script Red Flame#sc_f03 4_NFWISP,{
if (job_sha < 21) {
mes "That's a mysterious flame.";
mes "It looks like cursing.";
@@ -1920,7 +1920,7 @@ niflheim,230,276,1 script Red Flame#sc_f03 802,{
// Boxes
//============================================================
-job3_sha01,22,78,0 script ????#keybox01 844,{
+job3_sha01,22,78,0 script ????#keybox01 CLEAR_NPC,{
if (checkweight(1201,1) == 0) {
mes "- You can't continue on in this quest because you are overweight. -";
close;
@@ -1990,7 +1990,7 @@ job3_sha01,22,78,0 script ????#keybox01 844,{
close;
}
-job3_sha01,25,28,0 script ????#keybox02 844,{
+job3_sha01,25,28,0 script ????#keybox02 CLEAR_NPC,{
if (checkweight(1201,1) == 0) {
mes "- You can't continue on in this quest because you are overweight. -";
close;
@@ -2069,7 +2069,7 @@ job3_sha01,25,28,0 script ????#keybox02 844,{
end;
}
-job3_sha01,73,80,0 script ????#keybox03 844,{
+job3_sha01,73,80,0 script ????#keybox03 CLEAR_NPC,{
if (checkweight(1201,1) == 0) {
mes "- You can't continue on in this quest because you are overweight. -";
close;
@@ -2206,7 +2206,7 @@ job3_sha01,73,80,0 script ????#keybox03 844,{
end;
}
-job3_sha01,71,27,0 script ????#keybox04 844,{
+job3_sha01,71,27,0 script ????#keybox04 CLEAR_NPC,{
if (checkweight(1201,1) == 0) {
mes "- You can't continue on in this quest because you are overweight. -";
close;
@@ -2267,7 +2267,7 @@ job3_sha01,71,27,0 script ????#keybox04 844,{
// Brush Shops
//============================================================
-s_atelier,29,119,3 script Max#sc05_prt 97,{
+s_atelier,29,119,3 script Max#sc05_prt 4W_M_01,{
mes "[Max]";
mes "Welcome~";
if (Class == Job_Shadow_Chaser || Class == Job_Shadow_Chaser_T || Class == Job_Baby_Chaser) {
@@ -2332,7 +2332,7 @@ s_atelier,29,119,3 script Max#sc05_prt 97,{
}
}
-s_atelier,136,70,3 script Titika#sc09_ra 914,{
+s_atelier,136,70,3 script Titika#sc09_ra 4_F_CHILD,{
mes "[Titika]";
mes "Welcome.";
if (Class == Job_Shadow_Chaser || Class == Job_Shadow_Chaser_T || Class == Job_Baby_Chaser) {
@@ -2383,7 +2383,7 @@ s_atelier,136,70,3 script Titika#sc09_ra 914,{
}
}
-s_atelier,124,128,3 script RimiGX#sc07_yuno 862,{
+s_atelier,124,128,3 script RimiGX#sc07_yuno 4_F_LGTGIRL,{
mes "[RimiGX]";
mes "Welcome.";
if (Class == Job_Shadow_Chaser || Class == Job_Shadow_Chaser_T || Class == Job_Baby_Chaser) {
@@ -2432,7 +2432,7 @@ s_atelier,124,128,3 script RimiGX#sc07_yuno 862,{
}
}
-s_atelier,26,68,3 script Vito#sc11_lgt 904,{
+s_atelier,26,68,3 script Vito#sc11_lgt 4_M_KHMAN,{
mes "[Vito]";
mes "Welcome.";
if (Class == Job_Shadow_Chaser || Class == Job_Shadow_Chaser_T || Class == Job_Baby_Chaser) {
@@ -2483,7 +2483,7 @@ s_atelier,26,68,3 script Vito#sc11_lgt 904,{
// Warp Portal
//============================================================
-tha_t01,149,228,0 script #shadowc02 45,2,2,{
+tha_t01,149,228,0 script #shadowc02 WARPNPC,2,2,{
end;
OnTouch:
mes "You can feel weird power.";
diff --git a/npc/re/jobs/3-2/sorcerer.txt b/npc/re/jobs/3-2/sorcerer.txt
index de934d394..af38058a3 100644
--- a/npc/re/jobs/3-2/sorcerer.txt
+++ b/npc/re/jobs/3-2/sorcerer.txt
@@ -13,7 +13,7 @@
//= 1.2 Updated script, optimized. [Euphy]
//============================================================
-gef_tower,102,34,5 script Merito 742,{
+gef_tower,102,34,5 script Merito 2_M_SAGE_B,{
mes "[Merito]";
if (checkweight(1201,1) == 0 || MaxWeight - Weight < 1000) {
mes "You packed so much in your bag. Try again after emptying your bag.";
@@ -125,7 +125,7 @@ gef_tower,102,34,5 script Merito 742,{
}
}
-gef_tower,113,161,5 script Karacas 754,{
+gef_tower,113,161,5 script Karacas 4_M_SAGE_A,{
mes "[Karacas]";
if (checkweight(1201,1) == 0 || MaxWeight - Weight < 1000) {
mes "Oh, it seems that you're too heavy. Empty your bag and then come again.";
@@ -412,7 +412,7 @@ gef_tower,113,161,5 script Karacas 754,{
}
close;
}
-thor_v01,64,252,0 duplicate(Spirit Detecting Staff#0) Spirit Detecting Staff#1 836
-ice_dun01,274,274,0 duplicate(Spirit Detecting Staff#0) Spirit Detecting Staff#2 836
-mjo_dun03,200,141,0 duplicate(Spirit Detecting Staff#0) Spirit Detecting Staff#3 836
-gon_dun02,195,190,0 duplicate(Spirit Detecting Staff#0) Spirit Detecting Staff#4 836 \ No newline at end of file
+thor_v01,64,252,0 duplicate(Spirit Detecting Staff#0) Spirit Detecting Staff#1 2_BOARD2
+ice_dun01,274,274,0 duplicate(Spirit Detecting Staff#0) Spirit Detecting Staff#2 2_BOARD2
+mjo_dun03,200,141,0 duplicate(Spirit Detecting Staff#0) Spirit Detecting Staff#3 2_BOARD2
+gon_dun02,195,190,0 duplicate(Spirit Detecting Staff#0) Spirit Detecting Staff#4 2_BOARD2 \ No newline at end of file
diff --git a/npc/re/jobs/3-2/sura.txt b/npc/re/jobs/3-2/sura.txt
index 240b453e2..8bbc45cfe 100644
--- a/npc/re/jobs/3-2/sura.txt
+++ b/npc/re/jobs/3-2/sura.txt
@@ -14,7 +14,7 @@
//= 1.3 Added GM management function. [Euphy]
//============================================================
-ve_in,237,125,0 script King Crab#job_shu 107,{
+ve_in,237,125,0 script King Crab#job_shu 1_M_PAY_ELDER,{
if (job_shu == 0) {
mes "[King Crab]";
mes "Khh ha ha ha ha ha ha.";
@@ -155,9 +155,9 @@ ve_in,237,125,0 script King Crab#job_shu 107,{
close;
}
}
-ve_in,241,128,4 duplicate(King Crab#job_shu) Sludge Worm#job_shu 110
+ve_in,241,128,4 duplicate(King Crab#job_shu) Sludge Worm#job_shu 4_M_MINISTER
-ve_in,244,126,3 script Waitress#job_shu 69,{
+ve_in,244,126,3 script Waitress#job_shu 1_F_04,{
mes "[Waitress]";
if (job_shu == 0) {
mes "Oh no~";
@@ -192,7 +192,7 @@ ve_in,244,126,3 script Waitress#job_shu 69,{
close;
}
-ve_in,240,131,0 script ???#bcmd 484,{
+ve_in,240,131,0 script ???#bcmd 4_F_SURA,{
end;
OnInit:
disablenpc "???#bcmd";
@@ -211,7 +211,7 @@ OnTimer600000:
end;
}
-ve_in,97,149,0 script #Suraryokan 139,3,3,{
+ve_in,97,149,0 script #Suraryokan HIDDEN_WARP_NPC,3,3,{
OnTouch:
if (job_shu == 1) {
set .@n$, "["+strcharinfo(0)+"]";
@@ -269,7 +269,7 @@ OnTouch:
end;
}
-ve_in,98,159,0 script Fighter#job_shu 484,{
+ve_in,98,159,0 script Fighter#job_shu 4_F_SURA,{
if (job_shu < 2) {
mes "[Fighter]";
mes "Ahhhh~ I'm so tired.";
@@ -431,7 +431,7 @@ ve_in,98,159,0 script Fighter#job_shu 484,{
close;
}
-yuno_fild07,254,176,7 script Buddy#job_shu 753,{
+yuno_fild07,254,176,7 script Buddy#job_shu 4_M_MONK,{
if (job_shu < 4) {
mes "[Buddy]";
mes "Haaap!!! Haaaap!!! Whoo!! Haahhp!!!";
@@ -505,7 +505,7 @@ yuno_fild07,254,176,7 script Buddy#job_shu 753,{
end;
}
-sword_1-1,223,243,4 script Drawing Room 753,{
+sword_1-1,223,243,4 script Drawing Room 4_M_MONK,{
end;
OnInit:
waitingroom "Drawing Room",20,"Drawing Room::OnStartArena",1;
@@ -524,7 +524,7 @@ OnDisable:
end;
}
-sword_1-1,223,243,4 script Buddy#job_shu_Salong 753,{
+sword_1-1,223,243,4 script Buddy#job_shu_Salong 4_M_MONK,{
mes "[Buddy]";
mes "My master doesn't like noise, so please ^f57d7dwait in the living room silently.^000000";
next;
@@ -542,7 +542,7 @@ sword_1-1,223,243,4 script Buddy#job_shu_Salong 753,{
}
}
-sword_2-1,1,1,0 script Buddy#Sura_Salon 66,{
+sword_2-1,1,1,0 script Buddy#Sura_Salon 1_F_01,{
end;
OnInit:
disablenpc "Buddy#Sura_Salon";
@@ -643,7 +643,7 @@ OnTimer320000:
end;
}
-sword_2-1,223,205,7 script Buddy#job_shuaneh 753,{
+sword_2-1,223,205,7 script Buddy#job_shuaneh 4_M_MONK,{
if (job_shu > 4) {
mes "I'll show you the way. This way.";
close2;
@@ -664,7 +664,7 @@ OnEnable:
end;
}
-sword_2-1,223,205,0 script #Sura_garajjom 139,10,10,{
+sword_2-1,223,205,0 script #Sura_garajjom HIDDEN_WARP_NPC,10,10,{
OnTouch:
warp "sword_1-1",216,168;
end;
@@ -677,7 +677,7 @@ OnEnable:
end;
}
-sword_1-1,222,169,5 script Bruno#job_shu 484,{
+sword_1-1,222,169,5 script Bruno#job_shu 4_F_SURA,{
if (job_shu > 4) {
mes "[Bruno]";
mes "Hey~ "+strcharinfo(0)+", what's up?";
@@ -742,7 +742,7 @@ sword_1-1,222,169,5 script Bruno#job_shu 484,{
end;
}
-sword_1-1,223,167,2 script Master#job_shu 483,{
+sword_1-1,223,167,2 script Master#job_shu 4_M_SURA,{
mes "[Master]";
if (job_shu == 5) {
mes "You must have bright eyes to see that you finally came to this room.";
@@ -828,7 +828,7 @@ sword_1-1,223,167,2 script Master#job_shu 483,{
end;
}
-sword_2-1,1,2,0 script Button Girl#sura 66,{
+sword_2-1,1,2,0 script Button Girl#sura 1_F_01,{
callfunc "F_GM_NPC";
switch(select("Turn on arena.:Turn off arena.:Turn on the living room.:Turn on Buddy.:Turn on Gara.:Turn off all.:Close")) {
case 1:
diff --git a/npc/re/jobs/3-2/wanderer.txt b/npc/re/jobs/3-2/wanderer.txt
index 3c6e097c6..5926b7bcb 100644
--- a/npc/re/jobs/3-2/wanderer.txt
+++ b/npc/re/jobs/3-2/wanderer.txt
@@ -15,7 +15,7 @@
//= 1.4 Updated script, optimized. [Euphy]
//============================================================
-xmas,162,209,5 script Aspiring Wanderer, Soy 714,{
+xmas,162,209,5 script Aspiring Wanderer, Soy 4_F_06,{
if (job_wan == 0) {
mes "[Soy]";
mes "Mimi, what should I do?";
@@ -109,9 +109,9 @@ xmas,162,209,5 script Aspiring Wanderer, Soy 714,{
close;
}
}
-xmas,163,209,3 duplicate(Aspiring Wanderer, Soy) Aspiring Wanderer, Mimi 714
+xmas,163,209,3 duplicate(Aspiring Wanderer, Soy) Aspiring Wanderer, Mimi 4_F_06
-xmas,132,143,5 script Performance Manager#wnd 713,{
+xmas,132,143,5 script Performance Manager#wnd 4_M_06,{
mes "[Performance Manager]";
if (job_wan == 0) {
mes "Oh, what should I do?";
@@ -289,7 +289,7 @@ xmas,132,143,5 script Performance Manager#wnd 713,{
close;
}
-comodo,140,86,5 script Cheerless Maestro 479,{
+comodo,140,86,5 script Cheerless Maestro 4_M_MINSTREL,{
if (job_wan < 2) {
mes "[Cheerless Maestro]";
mes "You can dance ~";
@@ -558,7 +558,7 @@ comodo,140,86,5 script Cheerless Maestro 479,{
close;
}
-hu_in01,305,251,5 script Vacant Looking Lady#wnd 879,{
+hu_in01,305,251,5 script Vacant Looking Lady#wnd 4_F_CAPEGIRL,{
if (job_wan < 4) {
mes "[Vacant Looking Lady]";
mes "(blank...)";
@@ -746,7 +746,7 @@ hu_in01,305,251,5 script Vacant Looking Lady#wnd 879,{
close;
}
-hu_fild05,342,130,5 script Dancer Kim#fild 879,{
+hu_fild05,342,130,5 script Dancer Kim#fild 4_F_CAPEGIRL,{
if (job_wan == 6) {
mes "[Dancer Kim]";
mes "Exercising together is good but if we compete for it, I think we'll get a better effect!";
@@ -858,18 +858,18 @@ OnTouch:
}
end;
}
-hu_fild05,81,111,0 duplicate(wandererjcq) #fildshout01 139,20,20
-hu_fild05,193,98,0 duplicate(wandererjcq) #fildshout02 139,20,20
-hu_fild05,252,74,0 duplicate(wandererjcq) #fildshout03 139,20,20
-hu_fild05,323,175,0 duplicate(wandererjcq) #fildshout04 139,20,20
-hu_fild05,334,225,0 duplicate(wandererjcq) #fildshout05 139,20,20
-hu_fild05,301,287,0 duplicate(wandererjcq) #fildshout06 139,20,20
-hu_fild05,229,315,0 duplicate(wandererjcq) #fildshout07 139,20,20
-hu_fild05,146,309,0 duplicate(wandererjcq) #fildshout08 139,20,20
-hu_fild05,80,239,0 duplicate(wandererjcq) #fildshout09 139,20,20
-hu_fild05,69,147,0 duplicate(wandererjcq) #fildshout10 139,20,20
+hu_fild05,81,111,0 duplicate(wandererjcq) #fildshout01 HIDDEN_WARP_NPC,20,20
+hu_fild05,193,98,0 duplicate(wandererjcq) #fildshout02 HIDDEN_WARP_NPC,20,20
+hu_fild05,252,74,0 duplicate(wandererjcq) #fildshout03 HIDDEN_WARP_NPC,20,20
+hu_fild05,323,175,0 duplicate(wandererjcq) #fildshout04 HIDDEN_WARP_NPC,20,20
+hu_fild05,334,225,0 duplicate(wandererjcq) #fildshout05 HIDDEN_WARP_NPC,20,20
+hu_fild05,301,287,0 duplicate(wandererjcq) #fildshout06 HIDDEN_WARP_NPC,20,20
+hu_fild05,229,315,0 duplicate(wandererjcq) #fildshout07 HIDDEN_WARP_NPC,20,20
+hu_fild05,146,309,0 duplicate(wandererjcq) #fildshout08 HIDDEN_WARP_NPC,20,20
+hu_fild05,80,239,0 duplicate(wandererjcq) #fildshout09 HIDDEN_WARP_NPC,20,20
+hu_fild05,69,147,0 duplicate(wandererjcq) #fildshout10 HIDDEN_WARP_NPC,20,20
-xmas,148,131,0 script #wandergogo 139,3,3,{
+xmas,148,131,0 script #wandergogo HIDDEN_WARP_NPC,3,3,{
OnTouch:
if (job_wan == 9) {
enablenpc "Dancer Kim#xmas";
@@ -884,7 +884,7 @@ OnTouch:
end;
}
-xmas,147,135,5 script Dancer Kim#xmas 485,{
+xmas,147,135,5 script Dancer Kim#xmas 4_F_WANDERER,{
if (job_wan == 9) {
if (BaseJob != Job_Dancer && BaseLevel < 99 && JobLevel < 50) {
mes "- You can't continue the quest because the condition for the quest is not appropriate. -";
@@ -1026,10 +1026,10 @@ OnInit:
disablenpc strnpcinfo(0);
end;
}
-xmas,149,135,3 duplicate(#wander_xmas) Guitar Song#xmas 479
-xmas,142,130,7 duplicate(#wander_xmas) Spectator#xmas1 711
-xmas,145,127,7 duplicate(#wander_xmas) Spectator#xmas2 712
-xmas,148,127,7 duplicate(#wander_xmas) Soy#xmas 714
-xmas,149,127,1 duplicate(#wander_xmas) Mimi#xmas 714
-xmas,151,127,1 duplicate(#wander_xmas) Spectator#xmas3 716
-xmas,154,129,1 duplicate(#wander_xmas) Spectator#xmas4 797 \ No newline at end of file
+xmas,149,135,3 duplicate(#wander_xmas) Guitar Song#xmas 4_M_MINSTREL
+xmas,142,130,7 duplicate(#wander_xmas) Spectator#xmas1 4_F_05
+xmas,145,127,7 duplicate(#wander_xmas) Spectator#xmas2 4_M_05
+xmas,148,127,7 duplicate(#wander_xmas) Soy#xmas 4_F_06
+xmas,149,127,1 duplicate(#wander_xmas) Mimi#xmas 4_F_06
+xmas,151,127,1 duplicate(#wander_xmas) Spectator#xmas3 4_M_KID2
+xmas,154,129,1 duplicate(#wander_xmas) Spectator#xmas4 4_M_NFLOSTMAN \ No newline at end of file
diff --git a/npc/re/jobs/novice/novice.txt b/npc/re/jobs/novice/novice.txt
index 95add76e2..b7a4bd492 100644
--- a/npc/re/jobs/novice/novice.txt
+++ b/npc/re/jobs/novice/novice.txt
@@ -77,11 +77,11 @@
close;
}
}
-new_1-1,53,114,3 duplicate(NvSprakkiA) Sprakki#nv1a 90
-new_2-1,53,114,3 duplicate(NvSprakkiA) Sprakki#nv2a 90
-new_3-1,53,114,3 duplicate(NvSprakkiA) Sprakki#nv3a 90
-new_4-1,53,114,3 duplicate(NvSprakkiA) Sprakki#nv4a 90
-new_5-1,53,114,3 duplicate(NvSprakkiA) Sprakki#nv5a 90
+new_1-1,53,114,3 duplicate(NvSprakkiA) Sprakki#nv1a 4_F_01
+new_2-1,53,114,3 duplicate(NvSprakkiA) Sprakki#nv2a 4_F_01
+new_3-1,53,114,3 duplicate(NvSprakkiA) Sprakki#nv3a 4_F_01
+new_4-1,53,114,3 duplicate(NvSprakkiA) Sprakki#nv4a 4_F_01
+new_5-1,53,114,3 duplicate(NvSprakkiA) Sprakki#nv5a 4_F_01
- script Sprakki#newbe05::NvSprakkiB -1,{
if (job_novice_q == 0) {
@@ -208,11 +208,11 @@ new_5-1,53,114,3 duplicate(NvSprakkiA) Sprakki#nv5a 90
end;
}
}
-new_1-2,100,29,4 duplicate(NvSprakkiB) Sprakki#nv1b 90
-new_2-2,100,29,4 duplicate(NvSprakkiB) Sprakki#nv2b 90
-new_3-2,100,29,4 duplicate(NvSprakkiB) Sprakki#nv3b 90
-new_4-2,100,29,4 duplicate(NvSprakkiB) Sprakki#nv4b 90
-new_5-2,100,29,4 duplicate(NvSprakkiB) Sprakki#nv5b 90
+new_1-2,100,29,4 duplicate(NvSprakkiB) Sprakki#nv1b 4_F_01
+new_2-2,100,29,4 duplicate(NvSprakkiB) Sprakki#nv2b 4_F_01
+new_3-2,100,29,4 duplicate(NvSprakkiB) Sprakki#nv3b 4_F_01
+new_4-2,100,29,4 duplicate(NvSprakkiB) Sprakki#nv4b 4_F_01
+new_5-2,100,29,4 duplicate(NvSprakkiB) Sprakki#nv5b 4_F_01
- script Brade#newbe02::NvBradeA -1,{
if (job_novice_q < 2) {
@@ -478,11 +478,11 @@ new_5-2,100,29,4 duplicate(NvSprakkiB) Sprakki#nv5b 90
}
}
}
-new_1-2,100,105,3 duplicate(NvBradeA) Brade#nv1a 733
-new_2-2,100,105,3 duplicate(NvBradeA) Brade#nv2a 733
-new_3-2,100,105,3 duplicate(NvBradeA) Brade#nv3a 733
-new_4-2,100,105,3 duplicate(NvBradeA) Brade#nv4a 733
-new_5-2,100,105,3 duplicate(NvBradeA) Brade#nv5a 733
+new_1-2,100,105,3 duplicate(NvBradeA) Brade#nv1a 4_M_JOB_KNIGHT1
+new_2-2,100,105,3 duplicate(NvBradeA) Brade#nv2a 4_M_JOB_KNIGHT1
+new_3-2,100,105,3 duplicate(NvBradeA) Brade#nv3a 4_M_JOB_KNIGHT1
+new_4-2,100,105,3 duplicate(NvBradeA) Brade#nv4a 4_M_JOB_KNIGHT1
+new_5-2,100,105,3 duplicate(NvBradeA) Brade#nv5a 4_M_JOB_KNIGHT1
- script Jinha#newbe03::NvJinha -1,{
if (job_novice_q < 5) {
@@ -573,11 +573,11 @@ new_5-2,100,105,3 duplicate(NvBradeA) Brade#nv5a 733
close;
}
}
-new_1-2,115,120,3 duplicate(NvJinha) Jinha#nv1 59
-new_2-2,115,120,3 duplicate(NvJinha) Jinha#nv2 59
-new_3-2,115,120,3 duplicate(NvJinha) Jinha#nv3 59
-new_4-2,115,120,3 duplicate(NvJinha) Jinha#nv4 59
-new_5-2,115,120,3 duplicate(NvJinha) Jinha#nv5 59
+new_1-2,115,120,3 duplicate(NvJinha) Jinha#nv1 1_M_ORIENT01
+new_2-2,115,120,3 duplicate(NvJinha) Jinha#nv2 1_M_ORIENT01
+new_3-2,115,120,3 duplicate(NvJinha) Jinha#nv3 1_M_ORIENT01
+new_4-2,115,120,3 duplicate(NvJinha) Jinha#nv4 1_M_ORIENT01
+new_5-2,115,120,3 duplicate(NvJinha) Jinha#nv5 1_M_ORIENT01
// People/Services in Ragnarok
//============================================================
@@ -757,11 +757,11 @@ new_5-2,115,120,3 duplicate(NvJinha) Jinha#nv5 59
}
}
}
-new_1-2,33,172,4 duplicate(NvChocolat) Chocolat#nv1 96
-new_2-2,33,172,4 duplicate(NvChocolat) Chocolat#nv2 96
-new_3-2,33,172,4 duplicate(NvChocolat) Chocolat#nv3 96
-new_4-2,33,172,4 duplicate(NvChocolat) Chocolat#nv4 96
-new_5-2,33,172,4 duplicate(NvChocolat) Chocolat#nv5 96
+new_1-2,33,172,4 duplicate(NvChocolat) Chocolat#nv1 4W_KID
+new_2-2,33,172,4 duplicate(NvChocolat) Chocolat#nv2 4W_KID
+new_3-2,33,172,4 duplicate(NvChocolat) Chocolat#nv3 4W_KID
+new_4-2,33,172,4 duplicate(NvChocolat) Chocolat#nv4 4W_KID
+new_5-2,33,172,4 duplicate(NvChocolat) Chocolat#nv5 4W_KID
- script Kafra Employee#newbe07::NvKafra -1,{
if (job_novice_q < 8) {
@@ -1001,11 +1001,11 @@ L_Services:
}
return;
}
-new_1-2,30,176,4 duplicate(NvKafra) Kafra Employee#nv1 117
-new_2-2,30,176,4 duplicate(NvKafra) Kafra Employee#nv2 117
-new_3-2,30,176,4 duplicate(NvKafra) Kafra Employee#nv3 117
-new_4-2,30,176,4 duplicate(NvKafra) Kafra Employee#nv4 117
-new_5-2,30,176,4 duplicate(NvKafra) Kafra Employee#nv5 117
+new_1-2,30,176,4 duplicate(NvKafra) Kafra Employee#nv1 4_F_KAFRA1
+new_2-2,30,176,4 duplicate(NvKafra) Kafra Employee#nv2 4_F_KAFRA1
+new_3-2,30,176,4 duplicate(NvKafra) Kafra Employee#nv3 4_F_KAFRA1
+new_4-2,30,176,4 duplicate(NvKafra) Kafra Employee#nv4 4_F_KAFRA1
+new_5-2,30,176,4 duplicate(NvKafra) Kafra Employee#nv5 4_F_KAFRA1
- script Cool Event Corp. Staff::NvCool -1,{
if (job_novice_q < 9) {
@@ -1041,11 +1041,11 @@ new_5-2,30,176,4 duplicate(NvKafra) Kafra Employee#nv5 117
close;
}
}
-new_1-2,33,176,4 duplicate(NvCool) Cool Event Corp. Staff::NvCool1 874
-new_2-2,33,176,4 duplicate(NvCool) Cool Event Corp. Staff::NvCool2 874
-new_3-2,33,176,4 duplicate(NvCool) Cool Event Corp. Staff::NvCool3 874
-new_4-2,33,176,4 duplicate(NvCool) Cool Event Corp. Staff::NvCool4 874
-new_5-2,33,176,4 duplicate(NvCool) Cool Event Corp. Staff::NvCool5 874
+new_1-2,33,176,4 duplicate(NvCool) Cool Event Corp. Staff::NvCool1 4_M_ZONDAMAN
+new_2-2,33,176,4 duplicate(NvCool) Cool Event Corp. Staff::NvCool2 4_M_ZONDAMAN
+new_3-2,33,176,4 duplicate(NvCool) Cool Event Corp. Staff::NvCool3 4_M_ZONDAMAN
+new_4-2,33,176,4 duplicate(NvCool) Cool Event Corp. Staff::NvCool4 4_M_ZONDAMAN
+new_5-2,33,176,4 duplicate(NvCool) Cool Event Corp. Staff::NvCool5 4_M_ZONDAMAN
- script Guide::NvGuide -1,{
if (job_novice_q < 10) {
@@ -1095,11 +1095,11 @@ new_5-2,33,176,4 duplicate(NvCool) Cool Event Corp. Staff::NvCool5 874
}
}
}
-new_1-2,36,176,4 duplicate(NvGuide) Guide#nv1 105
-new_2-2,36,176,4 duplicate(NvGuide) Guide#nv2 105
-new_3-2,36,176,4 duplicate(NvGuide) Guide#nv3 105
-new_4-2,36,176,4 duplicate(NvGuide) Guide#nv4 105
-new_5-2,36,176,4 duplicate(NvGuide) Guide#nv5 105
+new_1-2,36,176,4 duplicate(NvGuide) Guide#nv1 8W_SOLDIER
+new_2-2,36,176,4 duplicate(NvGuide) Guide#nv2 8W_SOLDIER
+new_3-2,36,176,4 duplicate(NvGuide) Guide#nv3 8W_SOLDIER
+new_4-2,36,176,4 duplicate(NvGuide) Guide#nv4 8W_SOLDIER
+new_5-2,36,176,4 duplicate(NvGuide) Guide#nv5 8W_SOLDIER
// Real Combat Training
//============================================================
@@ -1309,11 +1309,11 @@ new_5-2,36,176,4 duplicate(NvGuide) Guide#nv5 105
}
}
}
-new_1-3,96,30,4 duplicate(NvBradeB) Brade#nv1b 733
-new_2-3,96,30,4 duplicate(NvBradeB) Brade#nv2b 733
-new_3-3,96,30,4 duplicate(NvBradeB) Brade#nv3b 733
-new_4-3,96,30,4 duplicate(NvBradeB) Brade#nv4b 733
-new_5-3,96,30,4 duplicate(NvBradeB) Brade#nv5b 733
+new_1-3,96,30,4 duplicate(NvBradeB) Brade#nv1b 4_M_JOB_KNIGHT1
+new_2-3,96,30,4 duplicate(NvBradeB) Brade#nv2b 4_M_JOB_KNIGHT1
+new_3-3,96,30,4 duplicate(NvBradeB) Brade#nv3b 4_M_JOB_KNIGHT1
+new_4-3,96,30,4 duplicate(NvBradeB) Brade#nv4b 4_M_JOB_KNIGHT1
+new_5-3,96,30,4 duplicate(NvBradeB) Brade#nv5b 4_M_JOB_KNIGHT1
- script Swordman Guide#newbe10::NvSwordman -1,{
if (job_novice_q < 15) {
@@ -1469,11 +1469,11 @@ new_5-3,96,30,4 duplicate(NvBradeB) Brade#nv5b 733
close;
}
}
-new_1-3,97,41,3 duplicate(NvSwordman) Swordman Guide#nv1 728
-new_2-3,97,41,3 duplicate(NvSwordman) Swordman Guide#nv2 728
-new_3-3,97,41,3 duplicate(NvSwordman) Swordman Guide#nv3 728
-new_4-3,97,41,3 duplicate(NvSwordman) Swordman Guide#nv4 728
-new_5-3,97,41,3 duplicate(NvSwordman) Swordman Guide#nv5 728
+new_1-3,97,41,3 duplicate(NvSwordman) Swordman Guide#nv1 4_F_JOB_KNIGHT
+new_2-3,97,41,3 duplicate(NvSwordman) Swordman Guide#nv2 4_F_JOB_KNIGHT
+new_3-3,97,41,3 duplicate(NvSwordman) Swordman Guide#nv3 4_F_JOB_KNIGHT
+new_4-3,97,41,3 duplicate(NvSwordman) Swordman Guide#nv4 4_F_JOB_KNIGHT
+new_5-3,97,41,3 duplicate(NvSwordman) Swordman Guide#nv5 4_F_JOB_KNIGHT
- script Acolyte Guide#newbe10::NvAcolyte -1,{
if (job_novice_q < 15) {
@@ -1559,11 +1559,11 @@ new_5-3,97,41,3 duplicate(NvSwordman) Swordman Guide#nv5 728
close;
}
}
-new_1-3,101,41,3 duplicate(NvAcolyte) Acolyte Guide#nv1 95
-new_2-3,101,41,3 duplicate(NvAcolyte) Acolyte Guide#nv2 95
-new_3-3,101,41,3 duplicate(NvAcolyte) Acolyte Guide#nv3 95
-new_4-3,101,41,3 duplicate(NvAcolyte) Acolyte Guide#nv4 95
-new_5-3,101,41,3 duplicate(NvAcolyte) Acolyte Guide#nv5 95
+new_1-3,101,41,3 duplicate(NvAcolyte) Acolyte Guide#nv1 4_F_SISTER
+new_2-3,101,41,3 duplicate(NvAcolyte) Acolyte Guide#nv2 4_F_SISTER
+new_3-3,101,41,3 duplicate(NvAcolyte) Acolyte Guide#nv3 4_F_SISTER
+new_4-3,101,41,3 duplicate(NvAcolyte) Acolyte Guide#nv4 4_F_SISTER
+new_5-3,101,41,3 duplicate(NvAcolyte) Acolyte Guide#nv5 4_F_SISTER
- script Thief Guide#newbe10::NvThief -1,{
if (job_novice_q < 15) {
@@ -1696,11 +1696,11 @@ new_5-3,101,41,3 duplicate(NvAcolyte) Acolyte Guide#nv5 95
close;
}
}
-new_1-3,105,41,3 duplicate(NvThief) Thief Guide#nv1 118
-new_2-3,105,41,3 duplicate(NvThief) Thief Guide#nv2 118
-new_3-3,105,41,3 duplicate(NvThief) Thief Guide#nv3 118
-new_4-3,105,41,3 duplicate(NvThief) Thief Guide#nv4 118
-new_5-3,105,41,3 duplicate(NvThief) Thief Guide#nv5 118
+new_1-3,105,41,3 duplicate(NvThief) Thief Guide#nv1 2_M_THIEFMASTER
+new_2-3,105,41,3 duplicate(NvThief) Thief Guide#nv2 2_M_THIEFMASTER
+new_3-3,105,41,3 duplicate(NvThief) Thief Guide#nv3 2_M_THIEFMASTER
+new_4-3,105,41,3 duplicate(NvThief) Thief Guide#nv4 2_M_THIEFMASTER
+new_5-3,105,41,3 duplicate(NvThief) Thief Guide#nv5 2_M_THIEFMASTER
- script Merchant Guide#newbe10::NvMerchant -1,{
if (job_novice_q < 15) {
@@ -1852,11 +1852,11 @@ new_5-3,105,41,3 duplicate(NvThief) Thief Guide#nv5 118
close;
}
}
-new_1-3,109,41,3 duplicate(NvMerchant) Merchant Guide#nv1 97
-new_2-3,109,41,3 duplicate(NvMerchant) Merchant Guide#nv2 97
-new_3-3,109,41,3 duplicate(NvMerchant) Merchant Guide#nv3 97
-new_4-3,109,41,3 duplicate(NvMerchant) Merchant Guide#nv4 97
-new_5-3,109,41,3 duplicate(NvMerchant) Merchant Guide#nv5 97
+new_1-3,109,41,3 duplicate(NvMerchant) Merchant Guide#nv1 4W_M_01
+new_2-3,109,41,3 duplicate(NvMerchant) Merchant Guide#nv2 4W_M_01
+new_3-3,109,41,3 duplicate(NvMerchant) Merchant Guide#nv3 4W_M_01
+new_4-3,109,41,3 duplicate(NvMerchant) Merchant Guide#nv4 4W_M_01
+new_5-3,109,41,3 duplicate(NvMerchant) Merchant Guide#nv5 4W_M_01
- script Archer Guide#newbe10::NvArcher -1,{
if (job_novice_q < 15) {
@@ -1949,11 +1949,11 @@ new_5-3,109,41,3 duplicate(NvMerchant) Merchant Guide#nv5 97
close;
}
}
-new_1-3,113,41,3 duplicate(NvArcher) Archer Guide#nv1 727
-new_2-3,113,41,3 duplicate(NvArcher) Archer Guide#nv2 727
-new_3-3,113,41,3 duplicate(NvArcher) Archer Guide#nv3 727
-new_4-3,113,41,3 duplicate(NvArcher) Archer Guide#nv4 727
-new_5-3,113,41,3 duplicate(NvArcher) Archer Guide#nv5 727
+new_1-3,113,41,3 duplicate(NvArcher) Archer Guide#nv1 4_F_JOB_HUNTER
+new_2-3,113,41,3 duplicate(NvArcher) Archer Guide#nv2 4_F_JOB_HUNTER
+new_3-3,113,41,3 duplicate(NvArcher) Archer Guide#nv3 4_F_JOB_HUNTER
+new_4-3,113,41,3 duplicate(NvArcher) Archer Guide#nv4 4_F_JOB_HUNTER
+new_5-3,113,41,3 duplicate(NvArcher) Archer Guide#nv5 4_F_JOB_HUNTER
- script Mage Guide#newbe10::NvMage -1,{
if (job_novice_q < 15) {
@@ -2099,11 +2099,11 @@ new_5-3,113,41,3 duplicate(NvArcher) Archer Guide#nv5 727
close;
}
}
-new_1-3,117,41,3 duplicate(NvMage) Mage Guide#nv1 123
-new_2-3,117,41,3 duplicate(NvMage) Mage Guide#nv2 123
-new_3-3,117,41,3 duplicate(NvMage) Mage Guide#nv3 123
-new_4-3,117,41,3 duplicate(NvMage) Mage Guide#nv4 123
-new_5-3,117,41,3 duplicate(NvMage) Mage Guide#nv5 123
+new_1-3,117,41,3 duplicate(NvMage) Mage Guide#nv1 2_F_MAGICMASTER
+new_2-3,117,41,3 duplicate(NvMage) Mage Guide#nv2 2_F_MAGICMASTER
+new_3-3,117,41,3 duplicate(NvMage) Mage Guide#nv3 2_F_MAGICMASTER
+new_4-3,117,41,3 duplicate(NvMage) Mage Guide#nv4 2_F_MAGICMASTER
+new_5-3,117,41,3 duplicate(NvMage) Mage Guide#nv5 2_F_MAGICMASTER
- script Bruce#nv::NvBruce -1,{
mes "[Bruce]";
@@ -2162,11 +2162,11 @@ new_5-3,117,41,3 duplicate(NvMage) Mage Guide#nv5 123
}
}
}
-new_1-3,121,41,3 duplicate(NvBruce) Bruce#nv1 57
-new_2-3,121,41,3 duplicate(NvBruce) Bruce#nv2 57
-new_3-3,121,41,3 duplicate(NvBruce) Bruce#nv3 57
-new_4-3,121,41,3 duplicate(NvBruce) Bruce#nv4 57
-new_5-3,121,41,3 duplicate(NvBruce) Bruce#nv5 57
+new_1-3,121,41,3 duplicate(NvBruce) Bruce#nv1 1_M_LIBRARYMASTER
+new_2-3,121,41,3 duplicate(NvBruce) Bruce#nv2 1_M_LIBRARYMASTER
+new_3-3,121,41,3 duplicate(NvBruce) Bruce#nv3 1_M_LIBRARYMASTER
+new_4-3,121,41,3 duplicate(NvBruce) Bruce#nv4 1_M_LIBRARYMASTER
+new_5-3,121,41,3 duplicate(NvBruce) Bruce#nv5 1_M_LIBRARYMASTER
// Eden Group Officer (iRO only)
//============================================================
@@ -2272,11 +2272,11 @@ OnTouch:
emotion e_gasp;
end;
}
-new_1-3,97,50,4 duplicate(NvEden) Eden Group Officer#nv1 729,5,5
-new_2-3,97,50,4 duplicate(NvEden) Eden Group Officer#nv2 729,5,5
-new_3-3,97,50,4 duplicate(NvEden) Eden Group Officer#nv3 729,5,5
-new_4-3,97,50,4 duplicate(NvEden) Eden Group Officer#nv4 729,5,5
-new_5-3,97,50,4 duplicate(NvEden) Eden Group Officer#nv5 729,5,5
+new_1-3,97,50,4 duplicate(NvEden) Eden Group Officer#nv1 4_F_NOVICE,5,5
+new_2-3,97,50,4 duplicate(NvEden) Eden Group Officer#nv2 4_F_NOVICE,5,5
+new_3-3,97,50,4 duplicate(NvEden) Eden Group Officer#nv3 4_F_NOVICE,5,5
+new_4-3,97,50,4 duplicate(NvEden) Eden Group Officer#nv4 4_F_NOVICE,5,5
+new_5-3,97,50,4 duplicate(NvEden) Eden Group Officer#nv5 4_F_NOVICE,5,5
*/
// Trainer
@@ -2337,11 +2337,11 @@ new_5-3,97,50,4 duplicate(NvEden) Eden Group Officer#nv5 729,5,5
close;
}
}
-new_1-3,103,50,4 duplicate(NvBrutus) Level 1 Trainer#nv1 84
-new_2-3,103,50,4 duplicate(NvBrutus) Level 2 Trainer#nv2 84
-new_3-3,103,50,4 duplicate(NvBrutus) Level 3 Trainer#nv3 84
-new_4-3,103,50,4 duplicate(NvBrutus) Level 4 Trainer#nv4 84
-new_5-3,103,50,4 duplicate(NvBrutus) Level 5 Trainer#nv5 84
+new_1-3,103,50,4 duplicate(NvBrutus) Level 1 Trainer#nv1 4_M_02
+new_2-3,103,50,4 duplicate(NvBrutus) Level 2 Trainer#nv2 4_M_02
+new_3-3,103,50,4 duplicate(NvBrutus) Level 3 Trainer#nv3 4_M_02
+new_4-3,103,50,4 duplicate(NvBrutus) Level 4 Trainer#nv4 4_M_02
+new_5-3,103,50,4 duplicate(NvBrutus) Level 5 Trainer#nv5 4_M_02
// Monster Spawns
//============================================================
@@ -2371,13 +2371,13 @@ new_5-3,0,0,0,0 monster Picky 1049,15,0,0,0
// Potato Merchant
//============================================================
-- shop Potato Merchant#newbe09::NvPotato 93,516:-1
+- shop Potato Merchant#newbe09::NvPotato 4_F_04,516:-1
-new_1-3,100,50,3 duplicate(NvPotato) Potato Merchant#nv1 93
-new_2-3,100,50,3 duplicate(NvPotato) Potato Merchant#nv2 93
-new_3-3,100,50,3 duplicate(NvPotato) Potato Merchant#nv3 93
-new_4-3,100,50,3 duplicate(NvPotato) Potato Merchant#nv4 93
-new_5-3,100,50,3 duplicate(NvPotato) Potato Merchant#nv5 93
+new_1-3,100,50,3 duplicate(NvPotato) Potato Merchant#nv1 4_F_04
+new_2-3,100,50,3 duplicate(NvPotato) Potato Merchant#nv2 4_F_04
+new_3-3,100,50,3 duplicate(NvPotato) Potato Merchant#nv3 4_F_04
+new_4-3,100,50,3 duplicate(NvPotato) Potato Merchant#nv4 4_F_04
+new_5-3,100,50,3 duplicate(NvPotato) Potato Merchant#nv5 4_F_04
// Random Stuff
//============================================================
@@ -2387,11 +2387,11 @@ new_5-3,100,50,3 duplicate(NvPotato) Potato Merchant#nv5 93
mes "^FF0000=================================^000000";
close;
}
-new_1-1,66,114,4 duplicate(NvBulletin) Bulletin Board#nv1 111
-new_2-1,66,114,4 duplicate(NvBulletin) Bulletin Board#nv2 111
-new_3-1,66,114,4 duplicate(NvBulletin) Bulletin Board#nv3 111
-new_4-1,66,114,4 duplicate(NvBulletin) Bulletin Board#nv4 111
-new_5-1,66,114,4 duplicate(NvBulletin) Bulletin Board#nv5 111
+new_1-1,66,114,4 duplicate(NvBulletin) Bulletin Board#nv1 HIDDEN_NPC
+new_2-1,66,114,4 duplicate(NvBulletin) Bulletin Board#nv2 HIDDEN_NPC
+new_3-1,66,114,4 duplicate(NvBulletin) Bulletin Board#nv3 HIDDEN_NPC
+new_4-1,66,114,4 duplicate(NvBulletin) Bulletin Board#nv4 HIDDEN_NPC
+new_5-1,66,114,4 duplicate(NvBulletin) Bulletin Board#nv5 HIDDEN_NPC
- script Guard::NvGuardA -1,{
mes "[Training Grounds Guard]";
@@ -2399,11 +2399,11 @@ new_5-1,66,114,4 duplicate(NvBulletin) Bulletin Board#nv5 111
mes "You are now in the outer court yard. Please go inside the castle to begin your training.";
close;
}
-new_1-1,144,116,2 duplicate(NvGuardA) Guard#nv1a 105
-new_2-1,144,116,2 duplicate(NvGuardA) Guard#nv2a 105
-new_3-1,144,116,2 duplicate(NvGuardA) Guard#nv3a 105
-new_4-1,144,116,2 duplicate(NvGuardA) Guard#nv4a 105
-new_5-1,144,116,2 duplicate(NvGuardA) Guard#nv5a 105
+new_1-1,144,116,2 duplicate(NvGuardA) Guard#nv1a 8W_SOLDIER
+new_2-1,144,116,2 duplicate(NvGuardA) Guard#nv2a 8W_SOLDIER
+new_3-1,144,116,2 duplicate(NvGuardA) Guard#nv3a 8W_SOLDIER
+new_4-1,144,116,2 duplicate(NvGuardA) Guard#nv4a 8W_SOLDIER
+new_5-1,144,116,2 duplicate(NvGuardA) Guard#nv5a 8W_SOLDIER
- script Guard::NvGuardB -1,{
mes "[Training Grounds Guard]";
@@ -2416,11 +2416,11 @@ new_5-1,144,116,2 duplicate(NvGuardA) Guard#nv5a 105
}
close;
}
-new_1-1,144,107,2 duplicate(NvGuardB) Guard#nv1b 105
-new_2-1,144,107,2 duplicate(NvGuardB) Guard#nv2b 105
-new_3-1,144,107,2 duplicate(NvGuardB) Guard#nv3b 105
-new_4-1,144,107,2 duplicate(NvGuardB) Guard#nv4b 105
-new_5-1,144,107,2 duplicate(NvGuardB) Guard#nv5b 105
+new_1-1,144,107,2 duplicate(NvGuardB) Guard#nv1b 8W_SOLDIER
+new_2-1,144,107,2 duplicate(NvGuardB) Guard#nv2b 8W_SOLDIER
+new_3-1,144,107,2 duplicate(NvGuardB) Guard#nv3b 8W_SOLDIER
+new_4-1,144,107,2 duplicate(NvGuardB) Guard#nv4b 8W_SOLDIER
+new_5-1,144,107,2 duplicate(NvGuardB) Guard#nv5b 8W_SOLDIER
- script Instructor#Edwin::NvEdwin -1,{
mes "[Edwin]";
@@ -2435,11 +2435,11 @@ new_5-1,144,107,2 duplicate(NvGuardB) Guard#nv5b 105
warp strnpcinfo(4),100,100;
end;
}
-new_1-2,161,182,5 duplicate(NvEdwin) Instructor#nv1 92
-new_2-2,161,182,5 duplicate(NvEdwin) Instructor#nv2 92
-new_3-2,161,182,5 duplicate(NvEdwin) Instructor#nv3 92
-new_4-2,161,182,5 duplicate(NvEdwin) Instructor#nv4 92
-new_5-2,161,182,5 duplicate(NvEdwin) Instructor#nv5 92
+new_1-2,161,182,5 duplicate(NvEdwin) Instructor#nv1 4_F_03
+new_2-2,161,182,5 duplicate(NvEdwin) Instructor#nv2 4_F_03
+new_3-2,161,182,5 duplicate(NvEdwin) Instructor#nv3 4_F_03
+new_4-2,161,182,5 duplicate(NvEdwin) Instructor#nv4 4_F_03
+new_5-2,161,182,5 duplicate(NvEdwin) Instructor#nv5 4_F_03
function script F_NvErase {
if (getarg(0,0)) {
@@ -2653,11 +2653,11 @@ L_Warp:
close;
}
}
-new_1-4,100,29,1 duplicate(NvHanson) Final Tester#nv1 46
-new_2-4,100,29,1 duplicate(NvHanson) Final Tester#nv2 46
-new_3-4,100,29,1 duplicate(NvHanson) Final Tester#nv3 46
-new_4-4,100,29,1 duplicate(NvHanson) Final Tester#nv4 46
-new_5-4,100,29,1 duplicate(NvHanson) Final Tester#nv5 46
+new_1-4,100,29,1 duplicate(NvHanson) Final Tester#nv1 1_ETC_01
+new_2-4,100,29,1 duplicate(NvHanson) Final Tester#nv2 1_ETC_01
+new_3-4,100,29,1 duplicate(NvHanson) Final Tester#nv3 1_ETC_01
+new_4-4,100,29,1 duplicate(NvHanson) Final Tester#nv4 1_ETC_01
+new_5-4,100,29,1 duplicate(NvHanson) Final Tester#nv5 1_ETC_01
// Job Test
//============================================================
@@ -3407,8 +3407,8 @@ new_5-4,100,29,1 duplicate(NvHanson) Final Tester#nv5 46
close;
}
}
-new_1-3,106,50,4 duplicate(NvLark) Job Guide Lark#01 706
-new_2-3,106,50,4 duplicate(NvLark) Job Guide Lark#02 706
-new_3-3,106,50,4 duplicate(NvLark) Job Guide Lark#03 706
-new_4-3,106,50,4 duplicate(NvLark) Job Guide Lark#04 706
-new_5-3,106,50,4 duplicate(NvLark) Job Guide Lark#05 706
+new_1-3,106,50,4 duplicate(NvLark) Job Guide Lark#01 4_M_KID1
+new_2-3,106,50,4 duplicate(NvLark) Job Guide Lark#02 4_M_KID1
+new_3-3,106,50,4 duplicate(NvLark) Job Guide Lark#03 4_M_KID1
+new_4-3,106,50,4 duplicate(NvLark) Job Guide Lark#04 4_M_KID1
+new_5-3,106,50,4 duplicate(NvLark) Job Guide Lark#05 4_M_KID1
diff --git a/npc/re/jobs/novice/supernovice_ex.txt b/npc/re/jobs/novice/supernovice_ex.txt
index 6d570f1c7..3a8dad744 100644
--- a/npc/re/jobs/novice/supernovice_ex.txt
+++ b/npc/re/jobs/novice/supernovice_ex.txt
@@ -57,7 +57,7 @@ function script Esseray_Ex {
else return;
}
-beach_dun2,119,92,4 script Fishing Novice#sp2 567,{
+beach_dun2,119,92,4 script Fishing Novice#sp2 4_M_SIT_NOVICE,{
if (checkquest(5092) >= 0) {
mes "[Fishing Novice]";
mes "Sh --------- !!";
@@ -587,7 +587,7 @@ beach_dun2,119,92,4 script Fishing Novice#sp2 567,{
close;
}
-airplane,33,47,5 script Nudor#sp2 729,{
+airplane,33,47,5 script Nudor#sp2 4_F_NOVICE,{
if (checkquest(5099) >= 0) {
mes "[Nudor]";
mes "Ahhh~ I have no money to buy any food.";
diff --git a/npc/re/jobs/repair.txt b/npc/re/jobs/repair.txt
index 1c49717bc..f1587f55a 100644
--- a/npc/re/jobs/repair.txt
+++ b/npc/re/jobs/repair.txt
@@ -55,7 +55,7 @@ Super Novice: SUPNOV_Q -> job_super
Expanded Super Novice: EXSUPNOV_Q -> job_super2
*/
-prt_in,38,104,4 script Valerie 811,{
+prt_in,38,104,4 script Valerie 4_F_VALKYRIE,{
if (checkweight(1201,1) == 0) {
mes "I think you have too many items. Let's try it again after you take some out.";
close;
@@ -253,30 +253,30 @@ L_Third:
mes "^ff00ffValerie^000000";
close;
}
-in_moc_16,17,33,4 duplicate(Valerie#sign) Valerie#asn 837
-ein_in01,13,28,4 duplicate(Valerie#sign) Valerie#bls 837
-hu_in01,386,377,4 duplicate(Valerie#sign) Valerie#hnt 837
-prt_in,88,108,4 duplicate(Valerie#sign) Valerie#knt 837
-prt_church,19,36,4 duplicate(Valerie#sign) Valerie#prst 837
-gef_tower,110,30,4 duplicate(Valerie#sign) Valerie#wiz 837
-comodo,215,155,4 duplicate(Valerie#sign) Valerie#danc 837
-prt_castle,45,167,4 duplicate(Valerie#sign) Valerie#cru 837
-prt_monk,59,253,4 duplicate(Valerie#sign) Valerie#mnk 837
-moc_ruins,90,104,4 duplicate(Valerie#sign) Valerie#rg 837
-yuno_in02,43,62,4 duplicate(Valerie#sign) Valerie#sag 837
-prt_church,103,86,4 duplicate(Valerie#sign) Valerie#arch 837
-que_job01,75,92,4 duplicate(Valerie#sign) Valerie#gc 837
-yuno,129,150,4 duplicate(Valerie#sign) Valerie#mech 837
-tur_dun01,159,40,4 duplicate(Valerie#sign) Valerie#ran 837
-prt_in,167,24,4 duplicate(Valerie#sign) Valerie#rk 837
-spl_in02,81,102,4 duplicate(Valerie#sign) Valerie#wl 837
-alde_alche,38,181,4 duplicate(Valerie#sign) Valerie#alche 837
-alberta,198,129,4 duplicate(Valerie#sign) Valerie#min 837
-in_rogue,376,104,4 duplicate(Valerie#sign) Valerie#sc 837
-ve_in,244,122,4 duplicate(Valerie#sign) Valerie#shu 837
-xmas,166,209,4 duplicate(Valerie#sign) Valerie#wan 837
+in_moc_16,17,33,4 duplicate(Valerie#sign) Valerie#asn 2_BULLETIN_BOARD
+ein_in01,13,28,4 duplicate(Valerie#sign) Valerie#bls 2_BULLETIN_BOARD
+hu_in01,386,377,4 duplicate(Valerie#sign) Valerie#hnt 2_BULLETIN_BOARD
+prt_in,88,108,4 duplicate(Valerie#sign) Valerie#knt 2_BULLETIN_BOARD
+prt_church,19,36,4 duplicate(Valerie#sign) Valerie#prst 2_BULLETIN_BOARD
+gef_tower,110,30,4 duplicate(Valerie#sign) Valerie#wiz 2_BULLETIN_BOARD
+comodo,215,155,4 duplicate(Valerie#sign) Valerie#danc 2_BULLETIN_BOARD
+prt_castle,45,167,4 duplicate(Valerie#sign) Valerie#cru 2_BULLETIN_BOARD
+prt_monk,59,253,4 duplicate(Valerie#sign) Valerie#mnk 2_BULLETIN_BOARD
+moc_ruins,90,104,4 duplicate(Valerie#sign) Valerie#rg 2_BULLETIN_BOARD
+yuno_in02,43,62,4 duplicate(Valerie#sign) Valerie#sag 2_BULLETIN_BOARD
+prt_church,103,86,4 duplicate(Valerie#sign) Valerie#arch 2_BULLETIN_BOARD
+que_job01,75,92,4 duplicate(Valerie#sign) Valerie#gc 2_BULLETIN_BOARD
+yuno,129,150,4 duplicate(Valerie#sign) Valerie#mech 2_BULLETIN_BOARD
+tur_dun01,159,40,4 duplicate(Valerie#sign) Valerie#ran 2_BULLETIN_BOARD
+prt_in,167,24,4 duplicate(Valerie#sign) Valerie#rk 2_BULLETIN_BOARD
+spl_in02,81,102,4 duplicate(Valerie#sign) Valerie#wl 2_BULLETIN_BOARD
+alde_alche,38,181,4 duplicate(Valerie#sign) Valerie#alche 2_BULLETIN_BOARD
+alberta,198,129,4 duplicate(Valerie#sign) Valerie#min 2_BULLETIN_BOARD
+in_rogue,376,104,4 duplicate(Valerie#sign) Valerie#sc 2_BULLETIN_BOARD
+ve_in,244,122,4 duplicate(Valerie#sign) Valerie#shu 2_BULLETIN_BOARD
+xmas,166,209,4 duplicate(Valerie#sign) Valerie#wan 2_BULLETIN_BOARD
-sec_in02,12,40,5 script Job Repair 57,1,1,{
+sec_in02,12,40,5 script Job Repair 1_M_LIBRARYMASTER,1,1,{
callfunc "F_GM_NPC";
mes "Please input your password.";
next;
generated by cgit v1.2.3-70-g09d2 (git 2.46.0) at 2024-11-02 05:21:09 +0000