summaryrefslogtreecommitdiff
path: root/npc/custom
diff options
context:
space:
mode:
Diffstat (limited to 'npc/custom')
-rw-r--r--npc/custom/battleground/bg_common.txt158
-rw-r--r--npc/custom/battleground/bg_flavius_01.txt70
-rw-r--r--npc/custom/battleground/bg_flavius_02.txt70
-rw-r--r--npc/custom/battleground/bg_kvm01.txt24
-rw-r--r--npc/custom/battleground/bg_kvm02.txt24
-rw-r--r--npc/custom/battleground/bg_kvm03.txt24
-rw-r--r--npc/custom/battleground/bg_tierra_01.txt54
-rw-r--r--npc/custom/battleground/bg_tierra_02.txt54
-rw-r--r--npc/custom/bgqueue/flavius.txt82
-rw-r--r--npc/custom/breeder.txt2
-rw-r--r--npc/custom/card_remover.txt2
-rw-r--r--npc/custom/etc/airplane.txt52
-rw-r--r--npc/custom/etc/bank.txt2
-rw-r--r--npc/custom/etc/bank_kafra.txt10
-rw-r--r--npc/custom/etc/blackjack.txt2
-rw-r--r--npc/custom/etc/lottery.txt2
-rw-r--r--npc/custom/etc/marriage.txt6
-rw-r--r--npc/custom/etc/monster_arena.txt26
-rw-r--r--npc/custom/etc/morroc_raceway.txt42
-rw-r--r--npc/custom/etc/mvp_arena.txt76
-rw-r--r--npc/custom/etc/penal_servitude.txt4
-rw-r--r--npc/custom/etc/quest_warper.txt156
-rw-r--r--npc/custom/etc/rpsroulette.txt2
-rw-r--r--npc/custom/etc/shifty_assassin.txt2
-rw-r--r--npc/custom/etc/stock_market.txt2
-rw-r--r--npc/custom/events/cluckers.txt2
-rw-r--r--npc/custom/events/disguise.txt2
-rw-r--r--npc/custom/events/hallow06.txt2
-rw-r--r--npc/custom/events/uneasy_cemetery.txt2
-rw-r--r--npc/custom/events/valentinesdayexp.txt8
-rw-r--r--npc/custom/events/xmas_rings_event.txt6
-rw-r--r--npc/custom/healer.txt72
-rw-r--r--npc/custom/item_signer.txt2
-rw-r--r--npc/custom/itemmall.txt64
-rw-r--r--npc/custom/jobmaster.txt2
-rw-r--r--npc/custom/platinum_skills.txt2
-rw-r--r--npc/custom/quests/bandit_beard.txt8
-rw-r--r--npc/custom/quests/berzebub.txt2
-rw-r--r--npc/custom/quests/dead_branch.txt2
-rw-r--r--npc/custom/quests/elvenear.txt2
-rw-r--r--npc/custom/quests/event_6_new_hats.txt8
-rw-r--r--npc/custom/quests/hunting_missions.txt2
-rw-r--r--npc/custom/quests/jewel_case.txt2
-rw-r--r--npc/custom/quests/kaho_balmung.txt2
-rw-r--r--npc/custom/quests/kahohorn.txt2
-rw-r--r--npc/custom/quests/kings_items.txt4
-rw-r--r--npc/custom/quests/may_hats.txt2
-rw-r--r--npc/custom/quests/quest_shop.txt2
-rw-r--r--npc/custom/quests/questboard.txt2
-rw-r--r--npc/custom/quests/sphinx_mask.txt2
-rw-r--r--npc/custom/quests/sunglasses.txt4
-rw-r--r--npc/custom/quests/tha_statues.txt30
-rw-r--r--npc/custom/quests/thq/THQS_ChatingNPC.txt10
-rw-r--r--npc/custom/quests/thq/THQS_GuildNPC.txt2
-rw-r--r--npc/custom/quests/thq/THQS_QuestNPC.txt2
-rw-r--r--npc/custom/quests/thq/THQS_Quests.txt72
-rw-r--r--npc/custom/quests/thq/THQS_TTShop.txt2
-rw-r--r--npc/custom/quests/umbalian_language.txt8
-rw-r--r--npc/custom/quests/valhallen.txt2
-rw-r--r--npc/custom/resetnpc.txt2
-rw-r--r--npc/custom/stylist.txt2
-rw-r--r--npc/custom/warper.txt88
-rw-r--r--npc/custom/woe_controller.txt2
63 files changed, 690 insertions, 690 deletions
diff --git a/npc/custom/battleground/bg_common.txt b/npc/custom/battleground/bg_common.txt
index 49e48c293..6f701d582 100644
--- a/npc/custom/battleground/bg_common.txt
+++ b/npc/custom/battleground/bg_common.txt
@@ -5,7 +5,7 @@
// BattleGround Warper - Entrance
// *********************************************************************
-- script Maroll Battle Recruiter::BatRecruit 728,{
+- script Maroll Battle Recruiter::BatRecruit 4_F_JOB_KNIGHT,{
mes "[Maroll Battle Recruiter]";
mes "Good day, adventurer.";
mes "I'm a knight from a far country called Maroll Kingdom.";
@@ -26,17 +26,17 @@
end;
}
-payon,189,104,3 duplicate(BatRecruit) Maroll Battle Recruiter::BatRecruit1 728
-prontera,123,83,5 duplicate(BatRecruit) Maroll Battle Recruiter::BatRecruit2 728
-rachel,149,138,5 duplicate(BatRecruit) Maroll Battle Recruiter::BatRecruit3 728
-moc_ruins,75,162,5 duplicate(BatRecruit) Maroll Battle Recruiter::BatRecruit4 728
-aldebaran,146,109,5 duplicate(BatRecruit) Maroll Battle Recruiter::BatRecruit5 728
-lighthalzen,153,86,5 duplicate(BatRecruit) Maroll Battle Recruiter::BatRecruit6 728
+payon,189,104,3 duplicate(BatRecruit) Maroll Battle Recruiter::BatRecruit1 4_F_JOB_KNIGHT
+prontera,123,83,5 duplicate(BatRecruit) Maroll Battle Recruiter::BatRecruit2 4_F_JOB_KNIGHT
+rachel,149,138,5 duplicate(BatRecruit) Maroll Battle Recruiter::BatRecruit3 4_F_JOB_KNIGHT
+moc_ruins,75,162,5 duplicate(BatRecruit) Maroll Battle Recruiter::BatRecruit4 4_F_JOB_KNIGHT
+aldebaran,146,109,5 duplicate(BatRecruit) Maroll Battle Recruiter::BatRecruit5 4_F_JOB_KNIGHT
+lighthalzen,153,86,5 duplicate(BatRecruit) Maroll Battle Recruiter::BatRecruit6 4_F_JOB_KNIGHT
// BattleGround Warper - Exit
// *********************************************************************
-bat_room,148,150,4 script Teleporter#bat 124,{
+bat_room,148,150,4 script Teleporter#bat 4_F_TELEPORTER,{
mes "[Teleporter]";
mes "Do you wish to leave the battlefield? Use my service to return to town.";
next;
@@ -59,14 +59,14 @@ bat_room,148,150,4 script Teleporter#bat 124,{
// Kafra
// *********************************************************************
-bat_room,148,147,4 script Kafra Staff::kaf_bat 861,{
+bat_room,148,147,4 script Kafra Staff::kaf_bat 4_F_KAFRA9,{
cutin "kafra_09",2;
callfunc "F_Kafra",0,2,1,150,0;
}
// General Guillaume
// *********************************************************************
-bat_room,160,159,3 script General Guillaume 420,{
+bat_room,160,159,3 script General Guillaume 4_M_KY_KIYOM,{
cutin "bat_kiyom2",2;
mes "[General Guillaume]";
mes "Hot-blooded adventurer, we need your ability to win this battle.";
@@ -105,7 +105,7 @@ bat_room,160,159,3 script General Guillaume 420,{
// General Croix
// *********************************************************************
-bat_room,160,140,3 script Prince Croix 416,{
+bat_room,160,140,3 script Prince Croix 4_M_CRU_CRUA,{
cutin "bat_crua1",2;
mes "[Prince Croix]";
mes "Wise adventurer, why don't you lend us your power for victory?";
@@ -171,7 +171,7 @@ function script Time2Str {
// Guillaume Knight - Tierra Valley
// *********************************************************************
-bat_room,159,178,5 script Guillaume Knight#1 417,{
+bat_room,159,178,5 script Guillaume Knight#1 4_M_KY_SOLD,{
mes "[Guillaume Knight]";
mes "Tierra Gorge is a very steep canyon with two forts residing in the north and south ends of the map.";
next;
@@ -190,7 +190,7 @@ bat_room,159,178,5 script Guillaume Knight#1 417,{
// Tierra Officer - Guillaume
// *********************************************************************
-bat_room,156,178,5 script Tierra Valley Officer#1 418,{
+bat_room,156,178,5 script Tierra Valley Officer#1 4_M_KY_KNT,{
mes "[Tierra Officer]";
if( Bat_Team == 2 )
{
@@ -241,7 +241,7 @@ bat_room,156,178,5 script Tierra Valley Officer#1 418,{
// Croix Knight - Tierra Valley
// *********************************************************************
-bat_room,159,121,1 script Croix Knight#1 413,{
+bat_room,159,121,1 script Croix Knight#1 4_M_CRU_SOLD,{
mes "[Croix Knight]";
mes "Tierra Gorge is a very steep canyon with two forts residing in the north and south ends of the map.";
next;
@@ -260,7 +260,7 @@ bat_room,159,121,1 script Croix Knight#1 413,{
// Tierra Officer - Croix
// *********************************************************************
-bat_room,156,121,1 script Tierra Valley Officer#2 414,{
+bat_room,156,121,1 script Tierra Valley Officer#2 4_M_CRU_KNT,{
mes "[Tierra Officer]";
if( Bat_Team == 1 )
{
@@ -311,7 +311,7 @@ bat_room,156,121,1 script Tierra Valley Officer#2 414,{
// Guillaume Knight - Tierra
// *********************************************************************
-bat_room,167,178,5 script Guillaume Knight#2 417,{
+bat_room,167,178,5 script Guillaume Knight#2 4_M_KY_SOLD,{
mes "[Guillaume Knight]";
mes "Tierra Gorge is a very steep canyon with two forts residing in the north and south ends of the map.";
next;
@@ -330,7 +330,7 @@ bat_room,167,178,5 script Guillaume Knight#2 417,{
// Tierra Officer - Guillaume
// *********************************************************************
-bat_room,164,178,5 script Tierra Valley Officer#3 418,{
+bat_room,164,178,5 script Tierra Valley Officer#3 4_M_KY_KNT,{
mes "[Tierra Officer]";
if( Bat_Team == 2 )
{
@@ -381,7 +381,7 @@ bat_room,164,178,5 script Tierra Valley Officer#3 418,{
// Croix Knight - Tierra
// *********************************************************************
-bat_room,167,121,1 script Croix Knight#2 413,{
+bat_room,167,121,1 script Croix Knight#2 4_M_CRU_SOLD,{
mes "[Croix Knight]";
mes "Tierra Gorge is a very steep canyon with two forts residing in the north and south ends of the map.";
next;
@@ -400,7 +400,7 @@ bat_room,167,121,1 script Croix Knight#2 413,{
// Tierra Officer - Croix
// *********************************************************************
-bat_room,164,121,1 script Tierra Valley Officer#4 414,{
+bat_room,164,121,1 script Tierra Valley Officer#4 4_M_CRU_KNT,{
mes "[Tierra Officer]";
if( Bat_Team == 1 )
{
@@ -451,7 +451,7 @@ bat_room,164,121,1 script Tierra Valley Officer#4 414,{
// Guillaune Knight - Flavius
// *********************************************************************
-bat_room,175,178,5 script Guillaume Knight#3 417,{
+bat_room,175,178,5 script Guillaume Knight#3 4_M_KY_SOLD,{
mes "[Guillaume Knight]";
mes "The objective of the Flavius Battle is to score 2 points before your enemy by destroying their crystal.";
next;
@@ -471,7 +471,7 @@ bat_room,175,178,5 script Guillaume Knight#3 417,{
// Flavius Officer - Guillaume
// *********************************************************************
-bat_room,172,178,5 script Flavius Officer#1 418,{
+bat_room,172,178,5 script Flavius Officer#1 4_M_KY_KNT,{
mes "[Flavius Officer]";
if( Bat_Team == 2 )
{
@@ -522,7 +522,7 @@ bat_room,172,178,5 script Flavius Officer#1 418,{
// Croix Knight - Flavius
// *********************************************************************
-bat_room,175,121,1 script Croix Knight#3 413,{
+bat_room,175,121,1 script Croix Knight#3 4_M_CRU_SOLD,{
mes "[Croix Knight]";
mes "The objective of the Flavius Battle is to score 2 points before your enemy by destroying their crystal.";
next;
@@ -542,7 +542,7 @@ bat_room,175,121,1 script Croix Knight#3 413,{
// Flavius Officerer - Croix
// *********************************************************************
-bat_room,172,121,1 script Flavius Officer#2 414,{
+bat_room,172,121,1 script Flavius Officer#2 4_M_CRU_KNT,{
mes "[Flavius Officer]";
if( Bat_Team == 1 )
{
@@ -593,7 +593,7 @@ bat_room,172,121,1 script Flavius Officer#2 414,{
// Guillaune Knight - Flavius
// *********************************************************************
-bat_room,151,178,5 script Guillaume Knight#4 417,{
+bat_room,151,178,5 script Guillaume Knight#4 4_M_KY_SOLD,{
mes "[Guillaume Knight]";
mes "The objective of the Flavius Battle is to score 2 points before your enemy by destroying their crystal.";
next;
@@ -613,7 +613,7 @@ bat_room,151,178,5 script Guillaume Knight#4 417,{
// Flavius Officerer - Guillaume
// *********************************************************************
-bat_room,148,178,5 script Flavius Officer#3 418,{
+bat_room,148,178,5 script Flavius Officer#3 4_M_KY_KNT,{
mes "[Flavius Officer]";
if( Bat_Team == 2 )
{
@@ -664,7 +664,7 @@ bat_room,148,178,5 script Flavius Officer#3 418,{
// Croix Knight - Flavius
// *********************************************************************
-bat_room,151,121,1 script Croix Knight#4 413,{
+bat_room,151,121,1 script Croix Knight#4 4_M_CRU_SOLD,{
mes "[Croix Knight]";
mes "The objective of the Flavius Battle is to score 2 points before your enemy by destroying their crystal.";
next;
@@ -684,7 +684,7 @@ bat_room,151,121,1 script Croix Knight#4 413,{
// Flavius Officerer - Croix
// *********************************************************************
-bat_room,148,121,1 script Flavius Officer#4 414,{
+bat_room,148,121,1 script Flavius Officer#4 4_M_CRU_KNT,{
mes "[Flavius Officer]";
if( Bat_Team == 1 )
{
@@ -735,7 +735,7 @@ bat_room,148,121,1 script Flavius Officer#4 414,{
// Guillaume Knight - KvM
// *********************************************************************
-bat_room,143,178,5 script Guillaume Knight#5 417,{
+bat_room,143,178,5 script Guillaume Knight#5 4_M_KY_SOLD,{
mes "[Guillaume Knight]";
mes "To win the Battle of Kriger Von Midgard you and your team must kill all the other opponents before all of you die.";
next;
@@ -752,7 +752,7 @@ bat_room,143,178,5 script Guillaume Knight#5 417,{
// KvM Officerer - Guillaume
// *********************************************************************
-bat_room,140,178,5 script KVM [80-99] Officer#1 418,{
+bat_room,140,178,5 script KVM [80-99] Officer#1 4_M_KY_KNT,{
mes "[KVM Officer]";
if( Bat_Team == 2 )
{
@@ -803,7 +803,7 @@ bat_room,140,178,5 script KVM [80-99] Officer#1 418,{
// Croix Knight - KvM
// *********************************************************************
-bat_room,143,121,1 script Croix Knight#5 413,{
+bat_room,143,121,1 script Croix Knight#5 4_M_CRU_SOLD,{
mes "[Croix Knight]";
mes "To win the Battle of Kriger Von Midgard you and your team must kill all the other opponents before all of you die.";
next;
@@ -820,7 +820,7 @@ bat_room,143,121,1 script Croix Knight#5 413,{
// KvM Officer - Croix
// *********************************************************************
-bat_room,140,121,1 script KVM [80-99] Officer#2 414,{
+bat_room,140,121,1 script KVM [80-99] Officer#2 4_M_CRU_KNT,{
mes "[KVM Officer]";
if( Bat_Team == 1 )
{
@@ -871,7 +871,7 @@ bat_room,140,121,1 script KVM [80-99] Officer#2 414,{
// Guillaume Knight - KvM
// *********************************************************************
-bat_room,135,178,5 script Guillaume Knight#6 417,{
+bat_room,135,178,5 script Guillaume Knight#6 4_M_KY_SOLD,{
mes "[Guillaume Knight]";
mes "To win the Battle of Kriger Von Midgard you and your team must kill all the other opponents before all of you die.";
next;
@@ -888,7 +888,7 @@ bat_room,135,178,5 script Guillaume Knight#6 417,{
// KvM Officerer - Guillaume
// *********************************************************************
-bat_room,132,178,5 script KVM [60-79] Officer#1 418,{
+bat_room,132,178,5 script KVM [60-79] Officer#1 4_M_KY_KNT,{
mes "[KVM Officer]";
if( Bat_Team == 2 )
{
@@ -939,7 +939,7 @@ bat_room,132,178,5 script KVM [60-79] Officer#1 418,{
// Croix Knight - KvM
// *********************************************************************
-bat_room,135,121,1 script Croix Knight#6 413,{
+bat_room,135,121,1 script Croix Knight#6 4_M_CRU_SOLD,{
mes "[Croix Knight]";
mes "To win the Battle of Kriger Von Midgard you and your team must kill all the other opponents before all of you die.";
next;
@@ -956,7 +956,7 @@ bat_room,135,121,1 script Croix Knight#6 413,{
// KvM Officer - Croix
// *********************************************************************
-bat_room,132,121,1 script KVM [60-79] Officer#2 414,{
+bat_room,132,121,1 script KVM [60-79] Officer#2 4_M_CRU_KNT,{
mes "[KVM Officer]";
if( Bat_Team == 1 )
{
@@ -1007,7 +1007,7 @@ bat_room,132,121,1 script KVM [60-79] Officer#2 414,{
// Guillaume Knight - KvM
// *********************************************************************
-bat_room,127,178,5 script Guillaume Knight#7 417,{
+bat_room,127,178,5 script Guillaume Knight#7 4_M_KY_SOLD,{
mes "[Guillaume Knight]";
mes "To win the Battle of Kriger Von Midgard you and your team must kill all the other opponents before all of you die.";
next;
@@ -1024,7 +1024,7 @@ bat_room,127,178,5 script Guillaume Knight#7 417,{
// KvM Officerer - Guillaume
// *********************************************************************
-bat_room,124,178,5 script KVM [1-59] Officer#1 418,{
+bat_room,124,178,5 script KVM [1-59] Officer#1 4_M_KY_KNT,{
mes "[KVM Officer]";
if( Bat_Team == 2 )
{
@@ -1075,7 +1075,7 @@ bat_room,124,178,5 script KVM [1-59] Officer#1 418,{
// Croix Knight - KvM
// *********************************************************************
-bat_room,127,121,1 script Croix Knight#7 413,{
+bat_room,127,121,1 script Croix Knight#7 4_M_CRU_SOLD,{
mes "[Croix Knight]";
mes "To win the Battle of Kriger Von Midgard you and your team must kill all the other opponents before all of you die.";
next;
@@ -1092,7 +1092,7 @@ bat_room,127,121,1 script Croix Knight#7 413,{
// KvM Officer - Croix
// *********************************************************************
-bat_room,124,121,1 script KVM [1-59] Officer#2 414,{
+bat_room,124,121,1 script KVM [1-59] Officer#2 4_M_CRU_KNT,{
mes "[KVM Officer]";
if( Bat_Team == 1 )
{
@@ -1144,16 +1144,16 @@ bat_room,124,121,1 script KVM [1-59] Officer#2 414,{
// Guard Dummy
// *********************************************************************
-bat_room,161,141,3 script Prince Croix's Aid::bat_aid 415,{ end; }
-bat_room,161,139,3 duplicate(bat_aid) Prince Croix's Aid::bat_aid2 415
-bat_room,161,160,3 duplicate(bat_aid) General Guillaume's Aid::bat_aid3 419
-bat_room,161,158,3 duplicate(bat_aid) General Guillaume's Aid::bat_aid4 419
+bat_room,161,141,3 script Prince Croix's Aid::bat_aid 4_M_CRU_HEAD,{ end; }
+bat_room,161,139,3 duplicate(bat_aid) Prince Croix's Aid::bat_aid2 4_M_CRU_HEAD
+bat_room,161,160,3 duplicate(bat_aid) General Guillaume's Aid::bat_aid3 4_M_KY_HEAD
+bat_room,161,158,3 duplicate(bat_aid) General Guillaume's Aid::bat_aid4 4_M_KY_HEAD
// Flags
// *********************************************************************
-- script Guillaume camp#bat 973,{ end; }
-- script Croix camp#bat 974,{ end; }
+- script Guillaume camp#bat 1_FLAG_LION,{ end; }
+- script Croix camp#bat 1_FLAG_EAGLE,{ end; }
// Exit from Registration
// *********************************************************************
@@ -1167,58 +1167,58 @@ OnTouch:
}
// Flavius bat_b02
-bat_room,57,81,0 duplicate(warp2bat_room) bat1 45,1,1
-bat_room,57,90,0 duplicate(warp2bat_room) bat2 45,1,1
+bat_room,57,81,0 duplicate(warp2bat_room) bat1 WARPNPC,1,1
+bat_room,57,90,0 duplicate(warp2bat_room) bat2 WARPNPC,1,1
// Free BG
-bat_room,57,220,0 duplicate(warp2bat_room) bat3 45,1,1
-bat_room,57,211,0 duplicate(warp2bat_room) bat4 45,1,1
+bat_room,57,220,0 duplicate(warp2bat_room) bat3 WARPNPC,1,1
+bat_room,57,211,0 duplicate(warp2bat_room) bat4 WARPNPC,1,1
// Tierra Valley bat_a02
-bat_room,85,81,0 duplicate(warp2bat_room) bat5 45,1,1
-bat_room,85,90,0 duplicate(warp2bat_room) bat6 45,1,1
+bat_room,85,81,0 duplicate(warp2bat_room) bat5 WARPNPC,1,1
+bat_room,85,90,0 duplicate(warp2bat_room) bat6 WARPNPC,1,1
// Tierra Valley bat_a01
-bat_room,85,220,0 duplicate(warp2bat_room) bat7 45,1,1
-bat_room,85,211,0 duplicate(warp2bat_room) bat8 45,1,1
+bat_room,85,220,0 duplicate(warp2bat_room) bat7 WARPNPC,1,1
+bat_room,85,211,0 duplicate(warp2bat_room) bat8 WARPNPC,1,1
// Free BG
-bat_room,113,81,0 duplicate(warp2bat_room) bat9 45,1,1
-bat_room,113,90,0 duplicate(warp2bat_room) bat10 45,1,1
+bat_room,113,81,0 duplicate(warp2bat_room) bat9 WARPNPC,1,1
+bat_room,113,90,0 duplicate(warp2bat_room) bat10 WARPNPC,1,1
// Free BG
-bat_room,113,220,0 duplicate(warp2bat_room) bat11 45,1,1
-bat_room,113,211,0 duplicate(warp2bat_room) bat12 45,1,1
+bat_room,113,220,0 duplicate(warp2bat_room) bat11 WARPNPC,1,1
+bat_room,113,211,0 duplicate(warp2bat_room) bat12 WARPNPC,1,1
// Free BG
-bat_room,141,81,0 duplicate(warp2bat_room) bat13 45,1,1
-bat_room,141,90,0 duplicate(warp2bat_room) bat14 45,1,1
+bat_room,141,81,0 duplicate(warp2bat_room) bat13 WARPNPC,1,1
+bat_room,141,90,0 duplicate(warp2bat_room) bat14 WARPNPC,1,1
// Free BG
-bat_room,141,220,0 duplicate(warp2bat_room) bat15 45,1,1
-bat_room,141,211,0 duplicate(warp2bat_room) bat16 45,1,1
+bat_room,141,220,0 duplicate(warp2bat_room) bat15 WARPNPC,1,1
+bat_room,141,211,0 duplicate(warp2bat_room) bat16 WARPNPC,1,1
// Free BG
-bat_room,169,81,0 duplicate(warp2bat_room) bat17 45,1,1
-bat_room,169,90,0 duplicate(warp2bat_room) bat18 45,1,1
+bat_room,169,81,0 duplicate(warp2bat_room) bat17 WARPNPC,1,1
+bat_room,169,90,0 duplicate(warp2bat_room) bat18 WARPNPC,1,1
// Free BG
-bat_room,169,220,0 duplicate(warp2bat_room) bat19 45,1,1
-bat_room,169,211,0 duplicate(warp2bat_room) bat20 45,1,1
+bat_room,169,220,0 duplicate(warp2bat_room) bat19 WARPNPC,1,1
+bat_room,169,211,0 duplicate(warp2bat_room) bat20 WARPNPC,1,1
// Free BG
-bat_room,197,81,0 duplicate(warp2bat_room) bat21 45,1,1
-bat_room,197,90,0 duplicate(warp2bat_room) bat22 45,1,1
+bat_room,197,81,0 duplicate(warp2bat_room) bat21 WARPNPC,1,1
+bat_room,197,90,0 duplicate(warp2bat_room) bat22 WARPNPC,1,1
// KvM bat_c03
-bat_room,197,220,0 duplicate(warp2bat_room) bat23 45,1,1
-bat_room,197,211,0 duplicate(warp2bat_room) bat24 45,1,1
+bat_room,197,220,0 duplicate(warp2bat_room) bat23 WARPNPC,1,1
+bat_room,197,211,0 duplicate(warp2bat_room) bat24 WARPNPC,1,1
// Free BG
-bat_room,225,81,0 duplicate(warp2bat_room) bat25 45,1,1
-bat_room,225,90,0 duplicate(warp2bat_room) bat26 45,1,1
+bat_room,225,81,0 duplicate(warp2bat_room) bat25 WARPNPC,1,1
+bat_room,225,90,0 duplicate(warp2bat_room) bat26 WARPNPC,1,1
// KvM bat_c02
-bat_room,225,220,0 duplicate(warp2bat_room) bat27 45,1,1
-bat_room,225,211,0 duplicate(warp2bat_room) bat28 45,1,1
+bat_room,225,220,0 duplicate(warp2bat_room) bat27 WARPNPC,1,1
+bat_room,225,211,0 duplicate(warp2bat_room) bat28 WARPNPC,1,1
// Flavius bat_b01
-bat_room,253,81,0 duplicate(warp2bat_room) bat29 45,1,1
-bat_room,253,90,0 duplicate(warp2bat_room) bat30 45,1,1
+bat_room,253,81,0 duplicate(warp2bat_room) bat29 WARPNPC,1,1
+bat_room,253,90,0 duplicate(warp2bat_room) bat30 WARPNPC,1,1
// KvM bat_c01
-bat_room,253,220,0 duplicate(warp2bat_room) bat31 45,1,1
-bat_room,253,211,0 duplicate(warp2bat_room) bat32 45,1,1
+bat_room,253,220,0 duplicate(warp2bat_room) bat31 WARPNPC,1,1
+bat_room,253,211,0 duplicate(warp2bat_room) bat32 WARPNPC,1,1
// Badges Repairman
// *********************************************************************
-bat_room,138,144,5 script Repairman#bg 99,{
+bat_room,138,144,5 script Repairman#bg 4W_M_03,{
callfunc "repairmain","Repairman";
end;
}
@@ -1226,7 +1226,7 @@ bat_room,138,144,5 script Repairman#bg 99,{
// Badges Exchange
// *********************************************************************
-bat_room,160,150,3 script Erundek 109,{
+bat_room,160,150,3 script Erundek 4_M_MANAGER,{
mes "[Erundek]";
mes "Welcome, mighty warrior.";
mes "What can I do for you today ?";
diff --git a/npc/custom/battleground/bg_flavius_01.txt b/npc/custom/battleground/bg_flavius_01.txt
index 4bb6fa7be..0d2ee8a7e 100644
--- a/npc/custom/battleground/bg_flavius_01.txt
+++ b/npc/custom/battleground/bg_flavius_01.txt
@@ -5,7 +5,7 @@
// Registration NPC's
// *********************************************************************
-bat_room,86,227,4 script Registration::Fl1R_Guillaume 418,{
+bat_room,86,227,4 script Registration::Fl1R_Guillaume 4_M_KY_KNT,{
end;
OnInit:
waitingroom "Battle Station 10 Players",10,"Flavius_BG1::OnGuillaumeJoin",1;
@@ -15,7 +15,7 @@ OnEnterBG:
end;
}
-bat_room,85,204,0 script Registration::Fl1R_Croix 414,{
+bat_room,85,204,0 script Registration::Fl1R_Croix 4_M_CRU_KNT,{
end;
OnInit:
waitingroom "Battle Station 10 Players",10,"Flavius_BG1::OnCroixJoin",1;
@@ -268,7 +268,7 @@ OnReset:
// Battleground rewards
// *********************************************************************
-bat_b01,390,13,5 script Guillaume Vintenar#fl1 419,{
+bat_b01,390,13,5 script Guillaume Vintenar#fl1 4_M_KY_HEAD,{
if( $@FlaviusBG1_Victory )
{
if( $@FlaviusBG1_Victory == Bat_Team )
@@ -299,7 +299,7 @@ bat_b01,390,13,5 script Guillaume Vintenar#fl1 419,{
end;
}
-bat_b01,10,293,5 script Croix Vintenar#fl1 415,{
+bat_b01,10,293,5 script Croix Vintenar#fl1 4_M_CRU_HEAD,{
if( $@FlaviusBG1_Victory )
{
if( $@FlaviusBG1_Victory == Bat_Team )
@@ -333,7 +333,7 @@ bat_b01,10,293,5 script Croix Vintenar#fl1 415,{
// Battleground Therapist
// *********************************************************************
-bat_b01,390,13,5 script Therapist in battle#fl12 95,{
+bat_b01,390,13,5 script Therapist in battle#fl12 4_F_SISTER,{
mes "[Therapist in battle]";
mes "Just close your eyes, and take a deep breathe.";
mes "You can be free from pain.";
@@ -341,7 +341,7 @@ bat_b01,390,13,5 script Therapist in battle#fl12 95,{
close;
}
-bat_b01,10,293,5 script Therapist in battle#fl11 95,{
+bat_b01,10,293,5 script Therapist in battle#fl11 4_F_SISTER,{
mes "[Therapist in battle]";
mes "Just close your eyes, and take a deep breathe.";
mes "You can be free from pain.";
@@ -352,7 +352,7 @@ bat_b01,10,293,5 script Therapist in battle#fl11 95,{
// Battleground Respawn
// *********************************************************************
-bat_b01,390,10,0 script #gfl1_respawn 139,{
+bat_b01,390,10,0 script #gfl1_respawn HIDDEN_WARP_NPC,{
end;
OnBGStart:
@@ -374,7 +374,7 @@ OnTimer25000:
end;
}
-bat_b01,10,290,0 script #cfl1_respawn 139,{
+bat_b01,10,290,0 script #cfl1_respawn HIDDEN_WARP_NPC,{
end;
OnBGStart:
@@ -399,30 +399,30 @@ OnTimer25000:
// Flags
// *********************************************************************
-bat_b01,304,231,1 duplicate(Guillaume camp#bat) Guillaume camp#bat1 973
-bat_b01,319,231,1 duplicate(Guillaume camp#bat) Guillaume camp#bat2 973
-bat_b01,304,218,1 duplicate(Guillaume camp#bat) Guillaume camp#bat3 973
-bat_b01,319,218,1 duplicate(Guillaume camp#bat) Guillaume camp#bat4 973
-bat_b01,304,231,1 duplicate(Guillaume camp#bat) Guillaume camp#bat5 973
-bat_b01,304,231,1 duplicate(Guillaume camp#bat) Guillaume camp#bat6 973
-bat_b01,335,142,1 duplicate(Guillaume camp#bat) Guillaume camp#bat7 973
-bat_b01,335,157,1 duplicate(Guillaume camp#bat) Guillaume camp#bat8 973
-bat_b01,390,16,1 duplicate(Guillaume camp#bat) Guillaume camp#bat9 973
-bat_b01,292,163,1 duplicate(Guillaume camp#bat) Guillaume camp#bat19 973
-bat_b01,292,136,1 duplicate(Guillaume camp#bat) Guillaume camp#bat20 973
-bat_b01,241,185,1 duplicate(Guillaume camp#bat) Guillaume camp#bat21 973
-bat_b01,247,179,1 duplicate(Guillaume camp#bat) Guillaume camp#bat22 973
-
-bat_b01,96,81,1 duplicate(Croix camp#bat) Croix camp#bat1 974
-bat_b01,96,68,1 duplicate(Croix camp#bat) Croix camp#bat2 974
-bat_b01,79,81,1 duplicate(Croix camp#bat) Croix camp#bat3 974
-bat_b01,79,68,1 duplicate(Croix camp#bat) Croix camp#bat4 974
-bat_b01,96,81,1 duplicate(Croix camp#bat) Croix camp#bat5 974
-bat_b01,96,81,1 duplicate(Croix camp#bat) Croix camp#bat6 974
-bat_b01,59,164,1 duplicate(Croix camp#bat) Croix camp#bat7 974
-bat_b01,59,137,1 duplicate(Croix camp#bat) Croix camp#bat8 974
-bat_b01,10,296,1 duplicate(Croix camp#bat) Croix camp#bat9 974
-bat_b01,110,162,1 duplicate(Croix camp#bat) Croix camp#bat18 974
-bat_b01,110,137,1 duplicate(Croix camp#bat) Croix camp#bat19 974
-bat_b01,152,120,1 duplicate(Croix camp#bat) Croix camp#bat20 974
-bat_b01,158,114,1 duplicate(Croix camp#bat) Croix camp#bat21 974
+bat_b01,304,231,1 duplicate(Guillaume camp#bat) Guillaume camp#bat1 1_FLAG_LION
+bat_b01,319,231,1 duplicate(Guillaume camp#bat) Guillaume camp#bat2 1_FLAG_LION
+bat_b01,304,218,1 duplicate(Guillaume camp#bat) Guillaume camp#bat3 1_FLAG_LION
+bat_b01,319,218,1 duplicate(Guillaume camp#bat) Guillaume camp#bat4 1_FLAG_LION
+bat_b01,304,231,1 duplicate(Guillaume camp#bat) Guillaume camp#bat5 1_FLAG_LION
+bat_b01,304,231,1 duplicate(Guillaume camp#bat) Guillaume camp#bat6 1_FLAG_LION
+bat_b01,335,142,1 duplicate(Guillaume camp#bat) Guillaume camp#bat7 1_FLAG_LION
+bat_b01,335,157,1 duplicate(Guillaume camp#bat) Guillaume camp#bat8 1_FLAG_LION
+bat_b01,390,16,1 duplicate(Guillaume camp#bat) Guillaume camp#bat9 1_FLAG_LION
+bat_b01,292,163,1 duplicate(Guillaume camp#bat) Guillaume camp#bat19 1_FLAG_LION
+bat_b01,292,136,1 duplicate(Guillaume camp#bat) Guillaume camp#bat20 1_FLAG_LION
+bat_b01,241,185,1 duplicate(Guillaume camp#bat) Guillaume camp#bat21 1_FLAG_LION
+bat_b01,247,179,1 duplicate(Guillaume camp#bat) Guillaume camp#bat22 1_FLAG_LION
+
+bat_b01,96,81,1 duplicate(Croix camp#bat) Croix camp#bat1 1_FLAG_EAGLE
+bat_b01,96,68,1 duplicate(Croix camp#bat) Croix camp#bat2 1_FLAG_EAGLE
+bat_b01,79,81,1 duplicate(Croix camp#bat) Croix camp#bat3 1_FLAG_EAGLE
+bat_b01,79,68,1 duplicate(Croix camp#bat) Croix camp#bat4 1_FLAG_EAGLE
+bat_b01,96,81,1 duplicate(Croix camp#bat) Croix camp#bat5 1_FLAG_EAGLE
+bat_b01,96,81,1 duplicate(Croix camp#bat) Croix camp#bat6 1_FLAG_EAGLE
+bat_b01,59,164,1 duplicate(Croix camp#bat) Croix camp#bat7 1_FLAG_EAGLE
+bat_b01,59,137,1 duplicate(Croix camp#bat) Croix camp#bat8 1_FLAG_EAGLE
+bat_b01,10,296,1 duplicate(Croix camp#bat) Croix camp#bat9 1_FLAG_EAGLE
+bat_b01,110,162,1 duplicate(Croix camp#bat) Croix camp#bat18 1_FLAG_EAGLE
+bat_b01,110,137,1 duplicate(Croix camp#bat) Croix camp#bat19 1_FLAG_EAGLE
+bat_b01,152,120,1 duplicate(Croix camp#bat) Croix camp#bat20 1_FLAG_EAGLE
+bat_b01,158,114,1 duplicate(Croix camp#bat) Croix camp#bat21 1_FLAG_EAGLE
diff --git a/npc/custom/battleground/bg_flavius_02.txt b/npc/custom/battleground/bg_flavius_02.txt
index 4dc180d14..3e5215faa 100644
--- a/npc/custom/battleground/bg_flavius_02.txt
+++ b/npc/custom/battleground/bg_flavius_02.txt
@@ -5,7 +5,7 @@
// Registration NPC's
// *********************************************************************
-bat_room,142,227,4 script Registration::Fl2R_Guillaume 418,{
+bat_room,142,227,4 script Registration::Fl2R_Guillaume 4_M_KY_KNT,{
end;
OnInit:
waitingroom "Battle Station 10 Players",10,"Flavius_BG2::OnGuillaumeJoin",1;
@@ -15,7 +15,7 @@ OnEnterBG:
end;
}
-bat_room,142,204,0 script Registration::Fl2R_Croix 414,{
+bat_room,142,204,0 script Registration::Fl2R_Croix 4_M_CRU_KNT,{
end;
OnInit:
waitingroom "Battle Station 10 Players",10,"Flavius_BG2::OnCroixJoin",1;
@@ -268,7 +268,7 @@ OnReset:
// Battleground rewards
// *********************************************************************
-bat_b02,390,13,5 script Guillaume Vintenar#fl2 419,{
+bat_b02,390,13,5 script Guillaume Vintenar#fl2 4_M_KY_HEAD,{
if( $@FlaviusBG2_Victory )
{
if( $@FlaviusBG2_Victory == Bat_Team )
@@ -299,7 +299,7 @@ bat_b02,390,13,5 script Guillaume Vintenar#fl2 419,{
end;
}
-bat_b02,10,293,5 script Croix Vintenar#fl2 415,{
+bat_b02,10,293,5 script Croix Vintenar#fl2 4_M_CRU_HEAD,{
if( $@FlaviusBG2_Victory )
{
if( $@FlaviusBG2_Victory == Bat_Team )
@@ -333,7 +333,7 @@ bat_b02,10,293,5 script Croix Vintenar#fl2 415,{
// Battleground Therapist
// *********************************************************************
-bat_b02,390,13,5 script Therapist in battle#fl22 95,{
+bat_b02,390,13,5 script Therapist in battle#fl22 4_F_SISTER,{
mes "[Therapist in battle]";
mes "Just close your eyes, and take a deep breathe.";
mes "You can be free from pain.";
@@ -341,7 +341,7 @@ bat_b02,390,13,5 script Therapist in battle#fl22 95,{
close;
}
-bat_b02,10,293,5 script Therapist in battle#fl21 95,{
+bat_b02,10,293,5 script Therapist in battle#fl21 4_F_SISTER,{
mes "[Therapist in battle]";
mes "Just close your eyes, and take a deep breathe.";
mes "You can be free from pain.";
@@ -352,7 +352,7 @@ bat_b02,10,293,5 script Therapist in battle#fl21 95,{
// Battleground Respawn
// *********************************************************************
-bat_b02,390,10,0 script #gfl2_respawn 139,{
+bat_b02,390,10,0 script #gfl2_respawn HIDDEN_WARP_NPC,{
end;
OnBGStart:
@@ -374,7 +374,7 @@ OnTimer25000:
end;
}
-bat_b02,10,290,0 script #cfl2_respawn 139,{
+bat_b02,10,290,0 script #cfl2_respawn HIDDEN_WARP_NPC,{
end;
OnBGStart:
@@ -399,30 +399,30 @@ OnTimer25000:
// Flags
// *********************************************************************
-bat_b02,304,231,1 duplicate(Guillaume camp#bat) Guillaume camp#bat32 973
-bat_b02,319,231,1 duplicate(Guillaume camp#bat) Guillaume camp#bat33 973
-bat_b02,304,218,1 duplicate(Guillaume camp#bat) Guillaume camp#bat34 973
-bat_b02,319,218,1 duplicate(Guillaume camp#bat) Guillaume camp#bat35 973
-bat_b02,304,231,1 duplicate(Guillaume camp#bat) Guillaume camp#bat36 973
-bat_b02,304,231,1 duplicate(Guillaume camp#bat) Guillaume camp#bat37 973
-bat_b02,335,142,1 duplicate(Guillaume camp#bat) Guillaume camp#bat38 973
-bat_b02,335,157,1 duplicate(Guillaume camp#bat) Guillaume camp#bat39 973
-bat_b02,390,16,1 duplicate(Guillaume camp#bat) Guillaume camp#bat40 973
-bat_b02,292,163,1 duplicate(Guillaume camp#bat) Guillaume camp#bat41 973
-bat_b02,292,136,1 duplicate(Guillaume camp#bat) Guillaume camp#bat42 973
-bat_b02,241,185,1 duplicate(Guillaume camp#bat) Guillaume camp#bat43 973
-bat_b02,247,179,1 duplicate(Guillaume camp#bat) Guillaume camp#bat44 973
-
-bat_b02,96,81,1 duplicate(Croix camp#bat) Croix camp#bat30 974
-bat_b02,96,68,1 duplicate(Croix camp#bat) Croix camp#bat31 974
-bat_b02,79,81,1 duplicate(Croix camp#bat) Croix camp#bat32 974
-bat_b02,79,68,1 duplicate(Croix camp#bat) Croix camp#bat33 974
-bat_b02,96,81,1 duplicate(Croix camp#bat) Croix camp#bat34 974
-bat_b02,96,81,1 duplicate(Croix camp#bat) Croix camp#bat35 974
-bat_b02,59,164,1 duplicate(Croix camp#bat) Croix camp#bat36 974
-bat_b02,59,137,1 duplicate(Croix camp#bat) Croix camp#bat37 974
-bat_b02,10,296,1 duplicate(Croix camp#bat) Croix camp#bat38 974
-bat_b02,110,162,1 duplicate(Croix camp#bat) Croix camp#bat39 974
-bat_b02,110,137,1 duplicate(Croix camp#bat) Croix camp#bat40 974
-bat_b02,152,120,1 duplicate(Croix camp#bat) Croix camp#bat41 974
-bat_b02,158,114,1 duplicate(Croix camp#bat) Croix camp#bat42 974
+bat_b02,304,231,1 duplicate(Guillaume camp#bat) Guillaume camp#bat32 1_FLAG_LION
+bat_b02,319,231,1 duplicate(Guillaume camp#bat) Guillaume camp#bat33 1_FLAG_LION
+bat_b02,304,218,1 duplicate(Guillaume camp#bat) Guillaume camp#bat34 1_FLAG_LION
+bat_b02,319,218,1 duplicate(Guillaume camp#bat) Guillaume camp#bat35 1_FLAG_LION
+bat_b02,304,231,1 duplicate(Guillaume camp#bat) Guillaume camp#bat36 1_FLAG_LION
+bat_b02,304,231,1 duplicate(Guillaume camp#bat) Guillaume camp#bat37 1_FLAG_LION
+bat_b02,335,142,1 duplicate(Guillaume camp#bat) Guillaume camp#bat38 1_FLAG_LION
+bat_b02,335,157,1 duplicate(Guillaume camp#bat) Guillaume camp#bat39 1_FLAG_LION
+bat_b02,390,16,1 duplicate(Guillaume camp#bat) Guillaume camp#bat40 1_FLAG_LION
+bat_b02,292,163,1 duplicate(Guillaume camp#bat) Guillaume camp#bat41 1_FLAG_LION
+bat_b02,292,136,1 duplicate(Guillaume camp#bat) Guillaume camp#bat42 1_FLAG_LION
+bat_b02,241,185,1 duplicate(Guillaume camp#bat) Guillaume camp#bat43 1_FLAG_LION
+bat_b02,247,179,1 duplicate(Guillaume camp#bat) Guillaume camp#bat44 1_FLAG_LION
+
+bat_b02,96,81,1 duplicate(Croix camp#bat) Croix camp#bat30 1_FLAG_EAGLE
+bat_b02,96,68,1 duplicate(Croix camp#bat) Croix camp#bat31 1_FLAG_EAGLE
+bat_b02,79,81,1 duplicate(Croix camp#bat) Croix camp#bat32 1_FLAG_EAGLE
+bat_b02,79,68,1 duplicate(Croix camp#bat) Croix camp#bat33 1_FLAG_EAGLE
+bat_b02,96,81,1 duplicate(Croix camp#bat) Croix camp#bat34 1_FLAG_EAGLE
+bat_b02,96,81,1 duplicate(Croix camp#bat) Croix camp#bat35 1_FLAG_EAGLE
+bat_b02,59,164,1 duplicate(Croix camp#bat) Croix camp#bat36 1_FLAG_EAGLE
+bat_b02,59,137,1 duplicate(Croix camp#bat) Croix camp#bat37 1_FLAG_EAGLE
+bat_b02,10,296,1 duplicate(Croix camp#bat) Croix camp#bat38 1_FLAG_EAGLE
+bat_b02,110,162,1 duplicate(Croix camp#bat) Croix camp#bat39 1_FLAG_EAGLE
+bat_b02,110,137,1 duplicate(Croix camp#bat) Croix camp#bat40 1_FLAG_EAGLE
+bat_b02,152,120,1 duplicate(Croix camp#bat) Croix camp#bat41 1_FLAG_EAGLE
+bat_b02,158,114,1 duplicate(Croix camp#bat) Croix camp#bat42 1_FLAG_EAGLE
diff --git a/npc/custom/battleground/bg_kvm01.txt b/npc/custom/battleground/bg_kvm01.txt
index 36c758f37..ed8e0ad76 100644
--- a/npc/custom/battleground/bg_kvm01.txt
+++ b/npc/custom/battleground/bg_kvm01.txt
@@ -5,7 +5,7 @@
// Registration NPC's
// *********************************************************************
-bat_room,253,227,4 script Registration::KvM01R_Guillaume 418,{ // KvM Guillaume
+bat_room,253,227,4 script Registration::KvM01R_Guillaume 4_M_KY_KNT,{ // KvM Guillaume
end;
OnInit:
@@ -17,7 +17,7 @@ OnEnterBG:
end;
}
-bat_room,253,204,0 script Registration::KvM01R_Croix 414,{ // KvM Croix
+bat_room,253,204,0 script Registration::KvM01R_Croix 4_M_CRU_KNT,{ // KvM Croix
end;
OnInit:
@@ -32,7 +32,7 @@ OnEnterBG:
// Light Effects
// *********************************************************************
-bat_c01,54,123,0 script #bat_c01a 111,{
+bat_c01,54,123,0 script #bat_c01a HIDDEN_NPC,{
end;
OnKvM01LightA: misceffect 54; end;
@@ -40,11 +40,11 @@ OnKvM01LightB: misceffect 55; end;
OnKvM01LightC: misceffect 56; end;
}
-bat_c01,56,125,0 duplicate(#bat_c01a) #bat_c01b 111
-bat_c01,58,127,0 duplicate(#bat_c01a) #bat_c01c 111
-bat_c01,141,56,0 duplicate(#bat_c01a) #bat_c01d 111
-bat_c01,143,58,0 duplicate(#bat_c01a) #bat_c01e 111
-bat_c01,145,60,0 duplicate(#bat_c01a) #bat_c01f 111
+bat_c01,56,125,0 duplicate(#bat_c01a) #bat_c01b HIDDEN_NPC
+bat_c01,58,127,0 duplicate(#bat_c01a) #bat_c01c HIDDEN_NPC
+bat_c01,141,56,0 duplicate(#bat_c01a) #bat_c01d HIDDEN_NPC
+bat_c01,143,58,0 duplicate(#bat_c01a) #bat_c01e HIDDEN_NPC
+bat_c01,145,60,0 duplicate(#bat_c01a) #bat_c01f HIDDEN_NPC
// Battleground Engine
// *********************************************************************
@@ -282,7 +282,7 @@ OnTimer60000:
// Battleground Therapist
// *********************************************************************
-bat_c01,51,130,5 script Therapist in battle::TherapistKvM01a 95,{
+bat_c01,51,130,5 script Therapist in battle::TherapistKvM01a 4_F_SISTER,{
mes "[Therapist in battle]";
mes "Just close your eyes, and take a deep breathe.";
mes "You can be free from pain.";
@@ -290,7 +290,7 @@ bat_c01,51,130,5 script Therapist in battle::TherapistKvM01a 95,{
close;
}
-bat_c01,148,53,1 script Therapist in battle::TherapistKvM01b 95,{
+bat_c01,148,53,1 script Therapist in battle::TherapistKvM01b 4_F_SISTER,{
mes "[Therapist in battle]";
mes "Just close your eyes, and take a deep breathe.";
mes "You can be free from pain.";
@@ -301,7 +301,7 @@ bat_c01,148,53,1 script Therapist in battle::TherapistKvM01b 95,{
// Battleground rewards
// *********************************************************************
-bat_c01,51,130,5 script Guillaume Vintenar::VintenarKvM01a 419,{
+bat_c01,51,130,5 script Guillaume Vintenar::VintenarKvM01a 4_M_KY_HEAD,{
if( $@KvM01BG_Victory )
{
if( $@KvM01BG_Victory == 3 )
@@ -339,7 +339,7 @@ bat_c01,51,130,5 script Guillaume Vintenar::VintenarKvM01a 419,{
end;
}
-bat_c01,148,53,1 script Croix Vintenar::VintenarKvM01b 415,{
+bat_c01,148,53,1 script Croix Vintenar::VintenarKvM01b 4_M_CRU_HEAD,{
if( $@KvM01BG_Victory )
{
if( $@KvM01BG_Victory == 3 )
diff --git a/npc/custom/battleground/bg_kvm02.txt b/npc/custom/battleground/bg_kvm02.txt
index 5bfbba328..919b7a583 100644
--- a/npc/custom/battleground/bg_kvm02.txt
+++ b/npc/custom/battleground/bg_kvm02.txt
@@ -5,7 +5,7 @@
// Registration NPC's
// *********************************************************************
-bat_room,225,227,4 script Registration::KvM02R_Guillaume 418,{ // KvM Guillaume
+bat_room,225,227,4 script Registration::KvM02R_Guillaume 4_M_KY_KNT,{ // KvM Guillaume
end;
OnInit:
@@ -17,7 +17,7 @@ OnEnterBG:
end;
}
-bat_room,225,204,0 script Registration::KvM02R_Croix 414,{ // KvM Croix
+bat_room,225,204,0 script Registration::KvM02R_Croix 4_M_CRU_KNT,{ // KvM Croix
end;
OnInit:
@@ -32,7 +32,7 @@ OnEnterBG:
// Light Effects
// *********************************************************************
-bat_c02,54,123,0 script #bat_c02a 111,{
+bat_c02,54,123,0 script #bat_c02a HIDDEN_NPC,{
end;
OnKvM02LightA: misceffect 54; end;
@@ -40,11 +40,11 @@ OnKvM02LightB: misceffect 55; end;
OnKvM02LightC: misceffect 56; end;
}
-bat_c02,56,125,0 duplicate(#bat_c02a) #bat_c02b 111
-bat_c02,58,127,0 duplicate(#bat_c02a) #bat_c02c 111
-bat_c02,141,56,0 duplicate(#bat_c02a) #bat_c02d 111
-bat_c02,143,58,0 duplicate(#bat_c02a) #bat_c02e 111
-bat_c02,145,60,0 duplicate(#bat_c02a) #bat_c02f 111
+bat_c02,56,125,0 duplicate(#bat_c02a) #bat_c02b HIDDEN_NPC
+bat_c02,58,127,0 duplicate(#bat_c02a) #bat_c02c HIDDEN_NPC
+bat_c02,141,56,0 duplicate(#bat_c02a) #bat_c02d HIDDEN_NPC
+bat_c02,143,58,0 duplicate(#bat_c02a) #bat_c02e HIDDEN_NPC
+bat_c02,145,60,0 duplicate(#bat_c02a) #bat_c02f HIDDEN_NPC
// Battleground Engine
// *********************************************************************
@@ -282,7 +282,7 @@ OnTimer60000:
// Battleground Therapist
// *********************************************************************
-bat_c02,51,130,5 script Therapist in battle::TherapistKvM02a 95,{
+bat_c02,51,130,5 script Therapist in battle::TherapistKvM02a 4_F_SISTER,{
mes "[Therapist in battle]";
mes "Just close your eyes, and take a deep breathe.";
mes "You can be free from pain.";
@@ -290,7 +290,7 @@ bat_c02,51,130,5 script Therapist in battle::TherapistKvM02a 95,{
close;
}
-bat_c02,148,53,1 script Therapist in battle::TherapistKvM02b 95,{
+bat_c02,148,53,1 script Therapist in battle::TherapistKvM02b 4_F_SISTER,{
mes "[Therapist in battle]";
mes "Just close your eyes, and take a deep breathe.";
mes "You can be free from pain.";
@@ -301,7 +301,7 @@ bat_c02,148,53,1 script Therapist in battle::TherapistKvM02b 95,{
// Battleground rewards
// *********************************************************************
-bat_c02,51,130,5 script Guillaume Vintenar::VintenarKvM02a 419,{
+bat_c02,51,130,5 script Guillaume Vintenar::VintenarKvM02a 4_M_KY_HEAD,{
if( $@KvM02BG_Victory )
{
if( $@KvM02BG_Victory == 3 )
@@ -339,7 +339,7 @@ bat_c02,51,130,5 script Guillaume Vintenar::VintenarKvM02a 419,{
end;
}
-bat_c02,148,53,1 script Croix Vintenar::VintenarKvM02b 415,{
+bat_c02,148,53,1 script Croix Vintenar::VintenarKvM02b 4_M_CRU_HEAD,{
if( $@KvM02BG_Victory )
{
if( $@KvM02BG_Victory == 3 )
diff --git a/npc/custom/battleground/bg_kvm03.txt b/npc/custom/battleground/bg_kvm03.txt
index 6efa99e4c..b13624067 100644
--- a/npc/custom/battleground/bg_kvm03.txt
+++ b/npc/custom/battleground/bg_kvm03.txt
@@ -5,7 +5,7 @@
// Registration NPC's
// *********************************************************************
-bat_room,197,227,4 script Registration::KvM03R_Guillaume 418,{ // KvM Guillaume
+bat_room,197,227,4 script Registration::KvM03R_Guillaume 4_M_KY_KNT,{ // KvM Guillaume
end;
OnInit:
@@ -17,7 +17,7 @@ OnEnterBG:
end;
}
-bat_room,197,204,0 script Registration::KvM03R_Croix 414,{ // KvM Croix
+bat_room,197,204,0 script Registration::KvM03R_Croix 4_M_CRU_KNT,{ // KvM Croix
end;
OnInit:
@@ -32,7 +32,7 @@ OnEnterBG:
// Light Effects
// *********************************************************************
-bat_c03,54,123,0 script #bat_c03a 111,{
+bat_c03,54,123,0 script #bat_c03a HIDDEN_NPC,{
end;
OnKvM03LightA: misceffect 54; end;
@@ -40,11 +40,11 @@ OnKvM03LightB: misceffect 55; end;
OnKvM03LightC: misceffect 56; end;
}
-bat_c03,56,125,0 duplicate(#bat_c03a) #bat_c03b 111
-bat_c03,58,127,0 duplicate(#bat_c03a) #bat_c03c 111
-bat_c03,141,56,0 duplicate(#bat_c03a) #bat_c03d 111
-bat_c03,143,58,0 duplicate(#bat_c03a) #bat_c03e 111
-bat_c03,145,60,0 duplicate(#bat_c03a) #bat_c03f 111
+bat_c03,56,125,0 duplicate(#bat_c03a) #bat_c03b HIDDEN_NPC
+bat_c03,58,127,0 duplicate(#bat_c03a) #bat_c03c HIDDEN_NPC
+bat_c03,141,56,0 duplicate(#bat_c03a) #bat_c03d HIDDEN_NPC
+bat_c03,143,58,0 duplicate(#bat_c03a) #bat_c03e HIDDEN_NPC
+bat_c03,145,60,0 duplicate(#bat_c03a) #bat_c03f HIDDEN_NPC
// Battleground Engine
// *********************************************************************
@@ -282,7 +282,7 @@ OnTimer60000:
// Battleground Therapist
// *********************************************************************
-bat_c03,51,130,5 script Therapist in battle::TherapistKvM03a 95,{
+bat_c03,51,130,5 script Therapist in battle::TherapistKvM03a 4_F_SISTER,{
mes "[Therapist in battle]";
mes "Just close your eyes, and take a deep breathe.";
mes "You can be free from pain.";
@@ -290,7 +290,7 @@ bat_c03,51,130,5 script Therapist in battle::TherapistKvM03a 95,{
close;
}
-bat_c03,148,53,1 script Therapist in battle::TherapistKvM03b 95,{
+bat_c03,148,53,1 script Therapist in battle::TherapistKvM03b 4_F_SISTER,{
mes "[Therapist in battle]";
mes "Just close your eyes, and take a deep breathe.";
mes "You can be free from pain.";
@@ -301,7 +301,7 @@ bat_c03,148,53,1 script Therapist in battle::TherapistKvM03b 95,{
// Battleground rewards
// *********************************************************************
-bat_c03,51,130,5 script Guillaume Vintenar::VintenarKvM03a 419,{
+bat_c03,51,130,5 script Guillaume Vintenar::VintenarKvM03a 4_M_KY_HEAD,{
if( $@KvM03BG_Victory )
{
if( $@KvM03BG_Victory == 3 )
@@ -339,7 +339,7 @@ bat_c03,51,130,5 script Guillaume Vintenar::VintenarKvM03a 419,{
end;
}
-bat_c03,148,53,1 script Croix Vintenar::VintenarKvM03b 415,{
+bat_c03,148,53,1 script Croix Vintenar::VintenarKvM03b 4_M_CRU_HEAD,{
if( $@KvM03BG_Victory )
{
if( $@KvM03BG_Victory == 3 )
diff --git a/npc/custom/battleground/bg_tierra_01.txt b/npc/custom/battleground/bg_tierra_01.txt
index 4c65d0462..c6a6c3b36 100644
--- a/npc/custom/battleground/bg_tierra_01.txt
+++ b/npc/custom/battleground/bg_tierra_01.txt
@@ -5,7 +5,7 @@
// Registration NPC's
// *********************************************************************
-bat_room,58,227,4 script Registration::TV1R_Guillaume 418,{
+bat_room,58,227,4 script Registration::TV1R_Guillaume 4_M_KY_KNT,{
end;
OnInit:
waitingroom "Battle Station 10 Players",10,"Tierra_BG1::OnGuillaumeJoin",1;
@@ -15,7 +15,7 @@ OnEnterBG:
end;
}
-bat_room,58,204,0 script Registration::TV1R_Croix 414,{
+bat_room,58,204,0 script Registration::TV1R_Croix 4_M_CRU_KNT,{
end;
OnInit:
waitingroom "Battle Station 10 Players",10,"Tierra_BG1::OnCroixJoin",1;
@@ -241,23 +241,23 @@ OnReset:
// Other Flags
// *********************************************************************
-bat_a01,148,85,1 duplicate(Croix camp#bat) Croix camp#bat10 974
-bat_a01,155,85,1 duplicate(Croix camp#bat) Croix camp#bat11 974
-bat_a01,357,75,1 duplicate(Croix camp#bat) Croix camp#bat12 974
-bat_a01,348,74,1 duplicate(Croix camp#bat) Croix camp#bat13 974
-bat_a01,199,49,1 duplicate(Croix camp#bat) Croix camp#bat14 974
-bat_a01,168,16,1 duplicate(Croix camp#bat) Croix camp#bat15 974
-bat_a01,138,12,1 duplicate(Croix camp#bat) Croix camp#bat16 974
-bat_a01,108,35,1 duplicate(Croix camp#bat) Croix camp#bat17 974
-bat_a01,164,308,1 duplicate(Guillaume camp#bat) Guillaume camp#bat10 973
-bat_a01,157,308,1 duplicate(Guillaume camp#bat) Guillaume camp#bat11 973
-bat_a01,359,327,1 duplicate(Guillaume camp#bat) Guillaume camp#bat12 973
-bat_a01,350,326,1 duplicate(Guillaume camp#bat) Guillaume camp#bat13 973
-bat_a01,209,344,1 duplicate(Guillaume camp#bat) Guillaume camp#bat14 973
-bat_a01,173,380,1 duplicate(Guillaume camp#bat) Guillaume camp#bat15 973
-bat_a01,150,380,1 duplicate(Guillaume camp#bat) Guillaume camp#bat16 973
-bat_a01,118,357,1 duplicate(Guillaume camp#bat) Guillaume camp#bat17 973
-bat_a01,119,336,1 duplicate(Guillaume camp#bat) Guillaume camp#bat18 973
+bat_a01,148,85,1 duplicate(Croix camp#bat) Croix camp#bat10 1_FLAG_EAGLE
+bat_a01,155,85,1 duplicate(Croix camp#bat) Croix camp#bat11 1_FLAG_EAGLE
+bat_a01,357,75,1 duplicate(Croix camp#bat) Croix camp#bat12 1_FLAG_EAGLE
+bat_a01,348,74,1 duplicate(Croix camp#bat) Croix camp#bat13 1_FLAG_EAGLE
+bat_a01,199,49,1 duplicate(Croix camp#bat) Croix camp#bat14 1_FLAG_EAGLE
+bat_a01,168,16,1 duplicate(Croix camp#bat) Croix camp#bat15 1_FLAG_EAGLE
+bat_a01,138,12,1 duplicate(Croix camp#bat) Croix camp#bat16 1_FLAG_EAGLE
+bat_a01,108,35,1 duplicate(Croix camp#bat) Croix camp#bat17 1_FLAG_EAGLE
+bat_a01,164,308,1 duplicate(Guillaume camp#bat) Guillaume camp#bat10 1_FLAG_LION
+bat_a01,157,308,1 duplicate(Guillaume camp#bat) Guillaume camp#bat11 1_FLAG_LION
+bat_a01,359,327,1 duplicate(Guillaume camp#bat) Guillaume camp#bat12 1_FLAG_LION
+bat_a01,350,326,1 duplicate(Guillaume camp#bat) Guillaume camp#bat13 1_FLAG_LION
+bat_a01,209,344,1 duplicate(Guillaume camp#bat) Guillaume camp#bat14 1_FLAG_LION
+bat_a01,173,380,1 duplicate(Guillaume camp#bat) Guillaume camp#bat15 1_FLAG_LION
+bat_a01,150,380,1 duplicate(Guillaume camp#bat) Guillaume camp#bat16 1_FLAG_LION
+bat_a01,118,357,1 duplicate(Guillaume camp#bat) Guillaume camp#bat17 1_FLAG_LION
+bat_a01,119,336,1 duplicate(Guillaume camp#bat) Guillaume camp#bat18 1_FLAG_LION
// Barricades
// *********************************************************************
@@ -317,7 +317,7 @@ OnWall:
// Battleground rewards
// *********************************************************************
-bat_a01,45,19,3 script Croix Vintenar#tv1 415,{
+bat_a01,45,19,3 script Croix Vintenar#tv1 4_M_CRU_HEAD,{
if( $@TierraBG1_Victory )
{
if( $@TierraBG1_Victory == Bat_Team )
@@ -348,7 +348,7 @@ bat_a01,45,19,3 script Croix Vintenar#tv1 415,{
end;
}
-bat_a01,53,377,3 script Guillaume Vintenar#tv1 419,{
+bat_a01,53,377,3 script Guillaume Vintenar#tv1 4_M_KY_HEAD,{
if( $@TierraBG1_Victory )
{
if( $@TierraBG1_Victory == Bat_Team )
@@ -382,14 +382,14 @@ bat_a01,53,377,3 script Guillaume Vintenar#tv1 419,{
// Battleground Therapist
// *********************************************************************
-bat_a01,60,216,3 script Ghost#tv13 950,{
+bat_a01,60,216,3 script Ghost#tv13 4_GHOSTRING,{
mes "[Ghost in valley]";
mes "Boo...Boo...";
specialeffect2 312;
close;
}
-bat_a01,53,377,3 script Therapist in battle#tv12 95,{
+bat_a01,53,377,3 script Therapist in battle#tv12 4_F_SISTER,{
mes "[Therapist in battle]";
mes "Just close your eyes, and take a deep breathe.";
mes "You can be free from pain.";
@@ -397,7 +397,7 @@ bat_a01,53,377,3 script Therapist in battle#tv12 95,{
close;
}
-bat_a01,45,18,3 script Therapist in battle#tv11 95,{
+bat_a01,45,18,3 script Therapist in battle#tv11 4_F_SISTER,{
mes "[Therapist in battle]";
mes "Just close your eyes, and take a deep breathe.";
mes "You can be free from pain.";
@@ -408,7 +408,7 @@ bat_a01,45,18,3 script Therapist in battle#tv11 95,{
// Battleground Respawn
// *********************************************************************
-bat_a01,57,213,0 script #ntv1_respawn 139,{
+bat_a01,57,213,0 script #ntv1_respawn HIDDEN_WARP_NPC,{
end;
OnBGStart:
@@ -430,7 +430,7 @@ OnTimer20000:
end;
}
-bat_a01,50,374,0 script #gtv1_respawn 139,{
+bat_a01,50,374,0 script #gtv1_respawn HIDDEN_WARP_NPC,{
end;
OnBGStart:
@@ -452,7 +452,7 @@ OnTimer25000:
end;
}
-bat_a01,42,16,0 script #ctv1_respawn 139,{
+bat_a01,42,16,0 script #ctv1_respawn HIDDEN_WARP_NPC,{
end;
OnBGStart:
diff --git a/npc/custom/battleground/bg_tierra_02.txt b/npc/custom/battleground/bg_tierra_02.txt
index 7f72cdb3d..23b58dffd 100644
--- a/npc/custom/battleground/bg_tierra_02.txt
+++ b/npc/custom/battleground/bg_tierra_02.txt
@@ -5,7 +5,7 @@
// Registration NPC's
// *********************************************************************
-bat_room,114,227,4 script Registration::TV2R_Guillaume 418,{
+bat_room,114,227,4 script Registration::TV2R_Guillaume 4_M_KY_KNT,{
end;
OnInit:
waitingroom "Battle Station 10 Players",10,"Tierra_BG2::OnGuillaumeJoin",1;
@@ -15,7 +15,7 @@ OnEnterBG:
end;
}
-bat_room,114,204,0 script Registration::TV2R_Croix 414,{
+bat_room,114,204,0 script Registration::TV2R_Croix 4_M_CRU_KNT,{
end;
OnInit:
waitingroom "Battle Station 10 Players",10,"Tierra_BG2::OnCroixJoin",1;
@@ -241,23 +241,23 @@ OnReset:
// Other Flags
// *********************************************************************
-bat_a02,148,85,1 duplicate(Croix camp#bat) Croix camp#bat22 974
-bat_a02,155,85,1 duplicate(Croix camp#bat) Croix camp#bat23 974
-bat_a02,357,75,1 duplicate(Croix camp#bat) Croix camp#bat24 974
-bat_a02,348,74,1 duplicate(Croix camp#bat) Croix camp#bat25 974
-bat_a02,199,49,1 duplicate(Croix camp#bat) Croix camp#bat26 974
-bat_a02,168,16,1 duplicate(Croix camp#bat) Croix camp#bat27 974
-bat_a02,138,12,1 duplicate(Croix camp#bat) Croix camp#bat28 974
-bat_a02,108,35,1 duplicate(Croix camp#bat) Croix camp#bat29 974
-bat_a02,164,308,1 duplicate(Guillaume camp#bat) Guillaume camp#bat23 973
-bat_a02,157,308,1 duplicate(Guillaume camp#bat) Guillaume camp#bat24 973
-bat_a02,359,327,1 duplicate(Guillaume camp#bat) Guillaume camp#bat25 973
-bat_a02,350,326,1 duplicate(Guillaume camp#bat) Guillaume camp#bat26 973
-bat_a02,209,344,1 duplicate(Guillaume camp#bat) Guillaume camp#bat27 973
-bat_a02,173,380,1 duplicate(Guillaume camp#bat) Guillaume camp#bat28 973
-bat_a02,150,380,1 duplicate(Guillaume camp#bat) Guillaume camp#bat29 973
-bat_a02,118,357,1 duplicate(Guillaume camp#bat) Guillaume camp#bat30 973
-bat_a02,119,336,1 duplicate(Guillaume camp#bat) Guillaume camp#bat31 973
+bat_a02,148,85,1 duplicate(Croix camp#bat) Croix camp#bat22 1_FLAG_EAGLE
+bat_a02,155,85,1 duplicate(Croix camp#bat) Croix camp#bat23 1_FLAG_EAGLE
+bat_a02,357,75,1 duplicate(Croix camp#bat) Croix camp#bat24 1_FLAG_EAGLE
+bat_a02,348,74,1 duplicate(Croix camp#bat) Croix camp#bat25 1_FLAG_EAGLE
+bat_a02,199,49,1 duplicate(Croix camp#bat) Croix camp#bat26 1_FLAG_EAGLE
+bat_a02,168,16,1 duplicate(Croix camp#bat) Croix camp#bat27 1_FLAG_EAGLE
+bat_a02,138,12,1 duplicate(Croix camp#bat) Croix camp#bat28 1_FLAG_EAGLE
+bat_a02,108,35,1 duplicate(Croix camp#bat) Croix camp#bat29 1_FLAG_EAGLE
+bat_a02,164,308,1 duplicate(Guillaume camp#bat) Guillaume camp#bat23 1_FLAG_LION
+bat_a02,157,308,1 duplicate(Guillaume camp#bat) Guillaume camp#bat24 1_FLAG_LION
+bat_a02,359,327,1 duplicate(Guillaume camp#bat) Guillaume camp#bat25 1_FLAG_LION
+bat_a02,350,326,1 duplicate(Guillaume camp#bat) Guillaume camp#bat26 1_FLAG_LION
+bat_a02,209,344,1 duplicate(Guillaume camp#bat) Guillaume camp#bat27 1_FLAG_LION
+bat_a02,173,380,1 duplicate(Guillaume camp#bat) Guillaume camp#bat28 1_FLAG_LION
+bat_a02,150,380,1 duplicate(Guillaume camp#bat) Guillaume camp#bat29 1_FLAG_LION
+bat_a02,118,357,1 duplicate(Guillaume camp#bat) Guillaume camp#bat30 1_FLAG_LION
+bat_a02,119,336,1 duplicate(Guillaume camp#bat) Guillaume camp#bat31 1_FLAG_LION
// Barricades
// *********************************************************************
@@ -317,7 +317,7 @@ OnWall:
// Battleground rewards
// *********************************************************************
-bat_a02,45,19,3 script Croix Vintenar#tv2 415,{
+bat_a02,45,19,3 script Croix Vintenar#tv2 4_M_CRU_HEAD,{
if( $@TierraBG2_Victory )
{
if( $@TierraBG2_Victory == Bat_Team )
@@ -348,7 +348,7 @@ bat_a02,45,19,3 script Croix Vintenar#tv2 415,{
end;
}
-bat_a02,53,377,3 script Guillaume Vintenar#tv2 419,{
+bat_a02,53,377,3 script Guillaume Vintenar#tv2 4_M_KY_HEAD,{
if( $@TierraBG2_Victory )
{
if( $@TierraBG2_Victory == Bat_Team )
@@ -382,14 +382,14 @@ bat_a02,53,377,3 script Guillaume Vintenar#tv2 419,{
// Battleground Therapist
// *********************************************************************
-bat_a02,60,216,3 script Ghost#tv23 950,{
+bat_a02,60,216,3 script Ghost#tv23 4_GHOSTRING,{
mes "[Ghost in valley]";
mes "Boo...Boo...";
specialeffect2 312;
close;
}
-bat_a02,53,377,3 script Therapist in battle#tv22 95,{
+bat_a02,53,377,3 script Therapist in battle#tv22 4_F_SISTER,{
mes "[Therapist in battle]";
mes "Just close your eyes, and take a deep breathe.";
mes "You can be free from pain.";
@@ -397,7 +397,7 @@ bat_a02,53,377,3 script Therapist in battle#tv22 95,{
close;
}
-bat_a02,45,18,3 script Therapist in battle#tv21 95,{
+bat_a02,45,18,3 script Therapist in battle#tv21 4_F_SISTER,{
mes "[Therapist in battle]";
mes "Just close your eyes, and take a deep breathe.";
mes "You can be free from pain.";
@@ -408,7 +408,7 @@ bat_a02,45,18,3 script Therapist in battle#tv21 95,{
// Battleground Respawn
// *********************************************************************
-bat_a02,57,213,0 script #ntv2_respawn 139,{
+bat_a02,57,213,0 script #ntv2_respawn HIDDEN_WARP_NPC,{
end;
OnBGStart:
@@ -430,7 +430,7 @@ OnTimer20000:
end;
}
-bat_a02,50,374,0 script #gtv2_respawn 139,{
+bat_a02,50,374,0 script #gtv2_respawn HIDDEN_WARP_NPC,{
end;
OnBGStart:
@@ -452,7 +452,7 @@ OnTimer25000:
end;
}
-bat_a02,42,16,0 script #ctv2_respawn 139,{
+bat_a02,42,16,0 script #ctv2_respawn HIDDEN_WARP_NPC,{
end;
OnBGStart:
diff --git a/npc/custom/bgqueue/flavius.txt b/npc/custom/bgqueue/flavius.txt
index 4b2a9b250..b3db9f81d 100644
--- a/npc/custom/bgqueue/flavius.txt
+++ b/npc/custom/bgqueue/flavius.txt
@@ -19,7 +19,7 @@
//Tacham, while the script is under testings the original will remain, meaning if you wanna test this you need to disable the other, or they'll conflict.
-bat_b01,15,15,3 script start#bat_b01 844,{
+bat_b01,15,15,3 script start#bat_b01 CLEAR_NPC,{
OnInit:
mapwarp "bat_b01","bat_room",154,150;
end;
@@ -131,7 +131,7 @@ OnMatchOver:
end;
}
-bat_b01,1,1,3 script OBJ#bat_b01_a 844,{
+bat_b01,1,1,3 script OBJ#bat_b01_a CLEAR_NPC,{
OnEnable:
bg_monster $@FlaviusBG1_id1,"bat_b01",61,150,"Pink Crystal",1915,"OBJ#bat_b01_a::OnMyMobDead";
end;
@@ -162,7 +162,7 @@ OnMyMobDead:
}
end;
}
-bat_b01,1,2,3 script OBJ#bat_b01_b 844,{
+bat_b01,1,2,3 script OBJ#bat_b01_b CLEAR_NPC,{
OnEnable:
bg_monster $@FlaviusBG1_id2,"bat_b01",328,150,"Blue Crystal",1914,"OBJ#bat_b01_b::OnMyMobDead";
end;
@@ -194,7 +194,7 @@ OnMyMobDead:
end;
}
-bat_b01,1,3,3 script guardian#bat_b01_a 844,{
+bat_b01,1,3,3 script guardian#bat_b01_a CLEAR_NPC,{
OnEnable:
bg_monster $@FlaviusBG1_id1,"bat_b01",108,159,"Guillaume Camp Guardian",1949,"guardian#bat_b01_a::OnMyMobDead";
bg_monster $@FlaviusBG1_id1,"bat_b01",108,141,"Guillaume Camp Guardian",1949,"guardian#bat_b01_a::OnMyMobDead";
@@ -212,7 +212,7 @@ OnMyMobDead:
end;
}
-bat_b01,1,3,3 script guardian#bat_b01_b 844,{
+bat_b01,1,3,3 script guardian#bat_b01_b CLEAR_NPC,{
OnEnable:
bg_monster $@FlaviusBG1_id2,"bat_b01",307,160,"Croix Camp Guardian",1949,"guardian#bat_b01_b::OnMyMobDead";
bg_monster $@FlaviusBG1_id2,"bat_b01",307,138,"Croix Camp Guardian",1949,"guardian#bat_b01_b::OnMyMobDead";
@@ -230,7 +230,7 @@ OnMyMobDead:
end;
}
-bat_b01,1,4,3 script cell#bat_b01_a 844,{
+bat_b01,1,4,3 script cell#bat_b01_a CLEAR_NPC,{
Onred:
setcell "bat_b01",62,149,60,151,cell_basilica,1;
setcell "bat_b01",62,149,60,151,cell_walkable,0;
@@ -242,7 +242,7 @@ Ongreen:
end;
}
-bat_b01,1,5,3 script cell#bat_b01_b 844,{
+bat_b01,1,5,3 script cell#bat_b01_b CLEAR_NPC,{
Onred:
setcell "bat_b01",327,151,329,149,cell_basilica,1;
setcell "bat_b01",327,151,329,149,cell_walkable,0;
@@ -254,7 +254,7 @@ Ongreen:
end;
}
-bat_b01,1,6,1 script time#bat_b01 844,{
+bat_b01,1,6,1 script time#bat_b01 CLEAR_NPC,{
OnEnable:
donpcevent "Battle Therapist#b01_a::OnEnable";
donpcevent "Battle Therapist#b01_b::OnEnable";
@@ -266,7 +266,7 @@ Onstop:
end;
}
-bat_b01,10,294,3 script Battle Therapist#b01_a 95,{
+bat_b01,10,294,3 script Battle Therapist#b01_a 4_F_SISTER,{
specialeffect2 EF_HEAL;
mes "[Battle Therapist]";
mes "Just close your eyes,";
@@ -300,7 +300,7 @@ Onstop:
end;
}
-bat_b01,10,290,0 script bat_b01_rp1_a_warp 45,10,10,{
+bat_b01,10,290,0 script bat_b01_rp1_a_warp WARPNPC,10,10,{
OnInit:
disablenpc "bat_b01_rp1_a_warp";
end;
@@ -311,7 +311,7 @@ OnTouch:
end;
}
-bat_b01,389,14,3 script Battle Therapist#b01_b 95,{
+bat_b01,389,14,3 script Battle Therapist#b01_b 4_F_SISTER,{
specialeffect2 EF_HEAL;
mes "[Battle Therapist]";
mes "Just close your eyes,";
@@ -345,7 +345,7 @@ Onstop:
end;
}
-bat_b01,389,10,0 script bat_b01_rp1_b_warp 45,9,9,{
+bat_b01,389,10,0 script bat_b01_rp1_b_warp WARPNPC,9,9,{
OnInit:
disablenpc "bat_b01_rp1_a_warp";
end;
@@ -370,7 +370,7 @@ OnTouch:
end;
}
-bat_b01,10,294,3 script Guillaume Vintenar#b01_a 934,{
+bat_b01,10,294,3 script Guillaume Vintenar#b01_a 4_M_RASWORD,{
if ($@FlaviusBG1_id1 == getcharid(4)) {
if ($@FlaviusBG1_Victory == 1) {
set .@your_medal,countitem(7829);
@@ -422,7 +422,7 @@ OnInit:
end;
}
-bat_b01,389,14,3 script Croix Vintenar#b01_b 934,{
+bat_b01,389,14,3 script Croix Vintenar#b01_b 4_M_RASWORD,{
if ($@FlaviusBG1_id2 == getcharid(4)) {
if ($@FlaviusBG1_Victory == 2) {
set .@your_medal,countitem(7829);
@@ -474,7 +474,7 @@ OnInit:
end;
}
-bat_b01,1,5,3 script countdown#bat_b01 844,{
+bat_b01,1,5,3 script countdown#bat_b01 CLEAR_NPC,{
OnInit:
stopnpctimer;
end;
@@ -531,31 +531,31 @@ OnTimer1900000:
end;
}
-bat_b01,81,83,3 script Guillaume Camp#flag21 973,{ end; }
-bat_b01,94,83,3 script Guillaume Camp#flag22 973,{ end; }
-bat_b01,81,66,3 script Guillaume Camp#flag23 973,{ end; }
-bat_b01,94,66,3 script Guillaume Camp#flag24 973,{ end; }
-bat_b01,139,142,3 script Guillaume Camp#flag25 973,{ end; }
-bat_b01,139,158,3 script Guillaume Camp#flag26 973,{ end; }
-bat_b01,110,161,3 script Guillaume Camp#flag27 973,{ end; }
-bat_b01,110,137,3 script Guillaume Camp#flag28 973,{ end; }
-bat_b01,63,135,3 script Guillaume Camp#flag29 973,{ end; }
-bat_b01,63,165,3 script Guillaume Camp#flag30 973,{ end; }
-bat_b01,10,296,3 script Guillaume Camp#flag31 973,{ end; }
-
-bat_b01,306,233,3 script Croix Camp#flag21 974,{ end; }
-bat_b01,317,233,3 script Croix Camp#flag22 974,{ end; }
-bat_b01,306,216,3 script Croix Camp#flag23 974,{ end; }
-bat_b01,317,216,3 script Croix Camp#flag24 974,{ end; }
-bat_b01,257,158,3 script Croix Camp#flag25 974,{ end; }
-bat_b01,257,141,3 script Croix Camp#flag26 974,{ end; }
-bat_b01,297,164,3 script Croix Camp#flag27 974,{ end; }
-bat_b01,297,136,3 script Croix Camp#flag28 974,{ end; }
-bat_b01,336,161,3 script Croix Camp#flag29 974,{ end; }
-bat_b01,336,139,3 script Croix Camp#flag30 974,{ end; }
-bat_b01,389,16,3 script Croix Camp#flag31 974,{ end; }
-
-bat_b01,10,294,3 script Vintenar#bat_b01_aover 419,{
+bat_b01,81,83,3 script Guillaume Camp#flag21 1_FLAG_LION,{ end; }
+bat_b01,94,83,3 script Guillaume Camp#flag22 1_FLAG_LION,{ end; }
+bat_b01,81,66,3 script Guillaume Camp#flag23 1_FLAG_LION,{ end; }
+bat_b01,94,66,3 script Guillaume Camp#flag24 1_FLAG_LION,{ end; }
+bat_b01,139,142,3 script Guillaume Camp#flag25 1_FLAG_LION,{ end; }
+bat_b01,139,158,3 script Guillaume Camp#flag26 1_FLAG_LION,{ end; }
+bat_b01,110,161,3 script Guillaume Camp#flag27 1_FLAG_LION,{ end; }
+bat_b01,110,137,3 script Guillaume Camp#flag28 1_FLAG_LION,{ end; }
+bat_b01,63,135,3 script Guillaume Camp#flag29 1_FLAG_LION,{ end; }
+bat_b01,63,165,3 script Guillaume Camp#flag30 1_FLAG_LION,{ end; }
+bat_b01,10,296,3 script Guillaume Camp#flag31 1_FLAG_LION,{ end; }
+
+bat_b01,306,233,3 script Croix Camp#flag21 1_FLAG_EAGLE,{ end; }
+bat_b01,317,233,3 script Croix Camp#flag22 1_FLAG_EAGLE,{ end; }
+bat_b01,306,216,3 script Croix Camp#flag23 1_FLAG_EAGLE,{ end; }
+bat_b01,317,216,3 script Croix Camp#flag24 1_FLAG_EAGLE,{ end; }
+bat_b01,257,158,3 script Croix Camp#flag25 1_FLAG_EAGLE,{ end; }
+bat_b01,257,141,3 script Croix Camp#flag26 1_FLAG_EAGLE,{ end; }
+bat_b01,297,164,3 script Croix Camp#flag27 1_FLAG_EAGLE,{ end; }
+bat_b01,297,136,3 script Croix Camp#flag28 1_FLAG_EAGLE,{ end; }
+bat_b01,336,161,3 script Croix Camp#flag29 1_FLAG_EAGLE,{ end; }
+bat_b01,336,139,3 script Croix Camp#flag30 1_FLAG_EAGLE,{ end; }
+bat_b01,389,16,3 script Croix Camp#flag31 1_FLAG_EAGLE,{ end; }
+
+bat_b01,10,294,3 script Vintenar#bat_b01_aover 4_M_KY_HEAD,{
set .@A_B_gap,$@Guill_ScoreBG1 - $@Croix_ScoreBG1;
if ($@FlaviusBG1_id1 == getcharid(4)) {
if (.@A_B_gap > 0) {
@@ -633,7 +633,7 @@ OnInit:
end;
}
-bat_b01,389,14,3 script Vintenar#bat_b01_bover 415,{
+bat_b01,389,14,3 script Vintenar#bat_b01_bover 4_M_CRU_HEAD,{
set .@A_B_gap,$@Guill_ScoreBG1 - $@Croix_ScoreBG1;
if ($@FlaviusBG1_id2 == getcharid(4)) {
if (.@A_B_gap > 0) {
diff --git a/npc/custom/breeder.txt b/npc/custom/breeder.txt
index a3d8c7a93..3eef8af0a 100644
--- a/npc/custom/breeder.txt
+++ b/npc/custom/breeder.txt
@@ -10,7 +10,7 @@
//= Fixed 'close' issues. [Joseph]
//============================================================
-prontera,124,201,1 script Universal Rental NPC 726,{
+prontera,124,201,1 script Universal Rental NPC 4_F_JOB_BLACKSMITH,{
if (ismounting()) {
message strcharinfo(0),"You must first remove your mount.";
end;
diff --git a/npc/custom/card_remover.txt b/npc/custom/card_remover.txt
index 9424827bb..6c8a1b8b5 100644
--- a/npc/custom/card_remover.txt
+++ b/npc/custom/card_remover.txt
@@ -12,7 +12,7 @@
//= 1.2a Added 'disable_items' command. [Euphy]
//============================================================
-prt_in,28,73,4 script Wise Old Woman#eAcustom 78,{
+prt_in,28,73,4 script Wise Old Woman#eAcustom 1_F_ORIENT_04,{
set .zenycost,200000; // Set base cost in zeny of the card remover services
set .percardcost,25000; // set cost per card of the card remover services
diff --git a/npc/custom/etc/airplane.txt b/npc/custom/etc/airplane.txt
index 637d38e61..ebf626b98 100644
--- a/npc/custom/etc/airplane.txt
+++ b/npc/custom/etc/airplane.txt
@@ -264,84 +264,84 @@ Itin:
callfunc "F_Itin";
}
-airport,153,43,5 script Airport Porter 774,{
+airport,153,43,5 script Airport Porter 4_M_TWBOY,{
callfunc "F_Porter",0;
}
-prt_fild08,206,279,5 script Porter#01 774,{
+prt_fild08,206,279,5 script Porter#01 4_M_TWBOY,{
callfunc "F_Porter",1;
}
-gef_fild00,50,364,5 script Porter#02 774,{
+gef_fild00,50,364,5 script Porter#02 4_M_TWBOY,{
callfunc "F_Porter",5;
}
-moc_fild10,163,173,5 script Porter#03 774,{
+moc_fild10,163,173,5 script Porter#03 4_M_TWBOY,{
callfunc "F_Porter",6;
}
-mjolnir_12,61,380,5 script Porter#04 774,{
+mjolnir_12,61,380,5 script Porter#04 4_M_TWBOY,{
callfunc "F_Porter",3;
}
-pay_fild08,159,91,5 script Porter#05 774,{
+pay_fild08,159,91,5 script Porter#05 4_M_TWBOY,{
callfunc "F_Porter",2;
}
-pay_fild03,194,181,5 script Porter#06 774,{
+pay_fild03,194,181,5 script Porter#06 4_M_TWBOY,{
callfunc "F_Porter",4;
}
-glast_01,196,326,1 script Porter#07 774,{
+glast_01,196,326,1 script Porter#07 4_M_TWBOY,{
callfunc "F_Porter",7;
}
-umbala,188,98,3 script Porter#08 774,{
+umbala,188,98,3 script Porter#08 4_M_TWBOY,{
callfunc "F_Porter",8;
}
-comodo,203,75,8 script Porter#09 774,{
+comodo,203,75,8 script Porter#09 4_M_TWBOY,{
callfunc "F_Porter",9;
}
-amatsu,115,78,8 script Porter#10 774,{
+amatsu,115,78,8 script Porter#10 4_M_TWBOY,{
callfunc "F_Porter",10;
}
-niflheim,132,242,5 script Porter#11 774,{
+niflheim,132,242,5 script Porter#11 4_M_TWBOY,{
callfunc "F_Porter",11;
}
-xmas,232,309,5 script Porter#12 774,{
+xmas,232,309,5 script Porter#12 4_M_TWBOY,{
callfunc "F_Porter",12;
}
-louyang,35,279,8 script Porter#13 774,{
+louyang,35,279,8 script Porter#13 4_M_TWBOY,{
callfunc "F_Porter",13;
}
-gonryun,82,95,7 script Porter#14 774,{
+gonryun,82,95,7 script Porter#14 4_M_TWBOY,{
callfunc "F_Porter",14;
}
-yuno,58,195,4 script Porter#15 774,{
+yuno,58,195,4 script Porter#15 4_M_TWBOY,{
callfunc "F_Porter",15;
}
-moc_fild04,210,326,2 script Porter#16 774,{
+moc_fild04,210,326,2 script Porter#16 4_M_TWBOY,{
callfunc "F_Porter",16;
}
-jawaii,247,174,7 script Porter#17 774,{
+jawaii,247,174,7 script Porter#17 4_M_TWBOY,{
callfunc "F_Porter",17;
}
-gef_fild10,159,95,2 script Porter#18 774,{
+gef_fild10,159,95,2 script Porter#18 4_M_TWBOY,{
callfunc "F_Porter",18;
}
-mjolnir_02,76,364,5 script Porter#19 774,{
+mjolnir_02,76,364,5 script Porter#19 4_M_TWBOY,{
callfunc "F_Porter",19;
}
-gefenia01,97,22,6 script Porter#20 774,{
+gefenia01,97,22,6 script Porter#20 4_M_TWBOY,{
callfunc "F_Porter",20;
}
-ayothaya,182,105,5 script Porter#21 774,{
+ayothaya,182,105,5 script Porter#21 4_M_TWBOY,{
callfunc "F_Porter",21;
}
-lighthalzen,99,241,4 script Porter#22 774,{
+lighthalzen,99,241,4 script Porter#22 4_M_TWBOY,{
callfunc "F_Porter",22;
}
-jupe_gate,46,18,7 script Porter#23 774,{
+jupe_gate,46,18,7 script Porter#23 4_M_TWBOY,{
callfunc "F_Porter",23;
}
-airport,141,43,5 script Itinerary Schedule 837,{
+airport,141,43,5 script Itinerary Schedule 2_BULLETIN_BOARD,{
mes "^FF0000[Itinerary]^000000";
callfunc "F_Itin";
}
-airplane,102,68,5 script Docker 852,{
+airplane,102,68,5 script Docker 4_M_EIN_SOLDIER,{
if($destination == 250) goto Nowhere;
mes "^FF0000[Airplane Attendant]^000000";
if($destination == 250)goto Notime;
diff --git a/npc/custom/etc/bank.txt b/npc/custom/etc/bank.txt
index b004aacf3..51e3e7e74 100644
--- a/npc/custom/etc/bank.txt
+++ b/npc/custom/etc/bank.txt
@@ -13,7 +13,7 @@
//= Version 2.0: Optimized and brought the script up to standard. [Jguy]
//============================================================
-prontera,132,217,5 script Banker 109,{
+prontera,132,217,5 script Banker 4_M_MANAGER,{
set @cost,500;
mes "[Banker]";
mes "Welcome to the First Bank of Prontera. How can I help you today?";
diff --git a/npc/custom/etc/bank_kafra.txt b/npc/custom/etc/bank_kafra.txt
index 12f35aff5..e2020155f 100644
--- a/npc/custom/etc/bank_kafra.txt
+++ b/npc/custom/etc/bank_kafra.txt
@@ -18,7 +18,7 @@
// 1.2a Corrected bad duplicate names. (bugreport:921) [Samuray22]
//============================================================
-- script Bank Clerk::bankg 833,{
+- script Bank Clerk::bankg 4_M_ZONDAOYAJI,{
mes"[Maniss]";
mes strcharinfo(0)+", welcome to the 2nd Bank of Prontera!";
@@ -108,7 +108,7 @@ B_EXIT2:
close;
}
-prontera,131,190,1 duplicate(bankg) Bank Clerk#1-1 833
-geffen,125,73,3 duplicate(bankg) Bank Clerk#2-1 833
-izlude,145,107,1 duplicate(bankg) Bank Clerk#3-1 833
-morocc,147,84,7 duplicate(bankg) Bank Clerk#4-1 833
+prontera,131,190,1 duplicate(bankg) Bank Clerk#1-1 4_M_ZONDAOYAJI
+geffen,125,73,3 duplicate(bankg) Bank Clerk#2-1 4_M_ZONDAOYAJI
+izlude,145,107,1 duplicate(bankg) Bank Clerk#3-1 4_M_ZONDAOYAJI
+morocc,147,84,7 duplicate(bankg) Bank Clerk#4-1 4_M_ZONDAOYAJI
diff --git a/npc/custom/etc/blackjack.txt b/npc/custom/etc/blackjack.txt
index 15e74865c..8fe70ad72 100644
--- a/npc/custom/etc/blackjack.txt
+++ b/npc/custom/etc/blackjack.txt
@@ -15,7 +15,7 @@
//=
//============================================================
-cmd_in02,188,89,1 script Black Jack Dealer 57,{
+cmd_in02,188,89,1 script Black Jack Dealer 1_M_LIBRARYMASTER,{
mes "[Dealer]";
mes "Hello there! Would you like to play a game of Black Jack?";
M_Menu:
diff --git a/npc/custom/etc/lottery.txt b/npc/custom/etc/lottery.txt
index 3988a7d7b..eec2efd0d 100644
--- a/npc/custom/etc/lottery.txt
+++ b/npc/custom/etc/lottery.txt
@@ -86,7 +86,7 @@ L_Rigged_Draw:
goto L_Broadcast;
}
-prontera,141,182,5 script Lottery 76,{
+prontera,141,182,5 script Lottery 1_F_ORIENT_02,{
L_Begin:
mes "[Lottery]";
mes "Winning Lotto Numbers ("+$LID2+"):";
diff --git a/npc/custom/etc/marriage.txt b/npc/custom/etc/marriage.txt
index 5f94eef88..0549502cd 100644
--- a/npc/custom/etc/marriage.txt
+++ b/npc/custom/etc/marriage.txt
@@ -52,7 +52,7 @@ OnInit:
// $@divorcee id of the partner, who has to accept the divorce and pay.
//The Priest - official iRO sprite & in-dialog name (on-map name not confirmed)
-prt_church,100,123,4 script Vomars 60,{
+prt_church,100,123,4 script Vomars 1_M_PASTOR,{
set @name$,"Vomars";
function SF_wed_end;
@@ -433,7 +433,7 @@ OnInit:
}
//Registration & Status
-prt_church,106,99,3 script Happy Marry 67,{
+prt_church,106,99,3 script Happy Marry 1_F_02,{
set @name$,"Marry";
if (getpartnerid() > 0) {
mes "["+@name$+"]";
@@ -809,7 +809,7 @@ function SF_Procedure {
}
}
-prt_church,94,99,4 script Sister Lisa 79,{
+prt_church,94,99,4 script Sister Lisa 1_F_PRIEST,{
set @name$,"Lisa";
function SF_DivorceEnd;
diff --git a/npc/custom/etc/monster_arena.txt b/npc/custom/etc/monster_arena.txt
index 2d2f76324..51304c1a0 100644
--- a/npc/custom/etc/monster_arena.txt
+++ b/npc/custom/etc/monster_arena.txt
@@ -22,7 +22,7 @@
//============================================================
// Entrance //
-prontera,158,193,6 script Monster Arena 702,{
+prontera,158,193,6 script Monster Arena 4_F_GON,{
mes "[Monster Arena]";
mes "Would you like to enter the Monster Arena?";
mes "Currently ^FF0000" + getmapusers("gon_test") + "^000000 players";
@@ -96,7 +96,7 @@ function script monstersummon {
}
// Referee //
-- script monsterreferee 61,{
+- script monsterreferee 1_M_PUBMASTER,{
if (@fighting == 1) end;
if (@battle == 1) goto L_Start;
end;
@@ -193,11 +193,11 @@ L_Exit:
mes "Alright";
close;
}
-gon_test,56,91,6 duplicate(monsterreferee) Referee#01 61
+gon_test,56,91,6 duplicate(monsterreferee) Referee#01 1_M_PUBMASTER
// Usher //
-gon_test,58,94,6 script Usher 86,{
+gon_test,58,94,6 script Usher 4_M_04,{
set @marena,1;
mes "[Usher]";
mes "What would you like to do?";
@@ -274,7 +274,7 @@ L_Cancel:
}
// Monster Trainer //
-gon_test,52,103,6 script Monster Trainer 87,{
+gon_test,52,103,6 script Monster Trainer 4_M_BARBER,{
mes "[Monster Trainer]";
if (#monster != 0) goto L_Mon;
@@ -731,7 +731,7 @@ function script illegalkill {
}
// Healer //
-gon_test,55,103,6 script Nurse 90,{
+gon_test,55,103,6 script Nurse 4_F_01,{
if (@battle == 1 || #heal == 0) goto L_NoHeal;
if (#heal == 1 && @healing < 100) goto L_Heal; //Total healing required
set @fighting,0;
@@ -752,14 +752,14 @@ L_NoHeal:
}
// Warps players //
-gon_test,57,86,5 script Summon Pad 1::SummonPad 111,2,2,{
+gon_test,57,86,5 script Summon Pad 1::SummonPad HIDDEN_NPC,2,2,{
end;
OnTouch:
set @marena,1;
warp "gon_test",57,99;
}
-gon_test,43,87,5 duplicate(SummonPad) Summon Pad 2 111,2,2
-gon_test,72,87,5 duplicate(SummonPad) Summon Pad 3 111,2,2
+gon_test,43,87,5 duplicate(SummonPad) Summon Pad 2 HIDDEN_NPC,2,2
+gon_test,72,87,5 duplicate(SummonPad) Summon Pad 3 HIDDEN_NPC,2,2
@@ -767,7 +767,7 @@ gon_test,72,87,5 duplicate(SummonPad) Summon Pad 3 111,2,2
gon_test mapflag noskill
// Duel Arena //
-gon_test,58,103,5 script Duel Master#01 92,{
+gon_test,58,103,5 script Duel Master#01 4_F_03,{
if ($@duelist1$ == "") set @duel,0;
if ($@monster1 == "") set @duel,0;
set @marena,1;
@@ -859,7 +859,7 @@ L_NeedHeal:
}
// Duel Exit //
-gon_test,42,8,5 script Duel Master#02 92,{
+gon_test,42,8,5 script Duel Master#02 4_F_03,{
mes "[Duel Master]";
mes "Would you like to return?";
menu "Yes",L_Leave,"No",-;
@@ -891,5 +891,5 @@ L_Leave2:
goto L_Leave3;
}
-gon_test,49,5,5 duplicate(SummonPad) Summon Pad 4 111,2,2
-gon_test,55,8,6 duplicate(monsterreferee) Referee#02 61
+gon_test,49,5,5 duplicate(SummonPad) Summon Pad 4 HIDDEN_NPC,2,2
+gon_test,55,8,6 duplicate(monsterreferee) Referee#02 1_M_PUBMASTER
diff --git a/npc/custom/etc/morroc_raceway.txt b/npc/custom/etc/morroc_raceway.txt
index 7edd069e0..48ee8e47e 100644
--- a/npc/custom/etc/morroc_raceway.txt
+++ b/npc/custom/etc/morroc_raceway.txt
@@ -19,7 +19,7 @@
//============================================================
//Warps you into race way
-morocc,166,105,6 script Race Girl#01 116,{
+morocc,166,105,6 script Race Girl#01 4_F_KAFRA2,{
mes "[Race Girl]";
mes "Would you like to visit ^0000FFMorroc Raceway^000000?";
next;
@@ -33,7 +33,7 @@ L_Warp:
}
//Warps you out of raceway
-pvp_y_1-5,169,265,5 script Race Girl#02 116,{
+pvp_y_1-5,169,265,5 script Race Girl#02 4_F_KAFRA2,{
mes "[Race Girl]";
mes "Welcome to Morroc Raceway!";
next;
@@ -56,7 +56,7 @@ L_Cancel:
}
//Counts down and starts race
-pvp_y_1-5,145,269,5 script Starter 733,{
+pvp_y_1-5,145,269,5 script Starter 4_M_JOB_KNIGHT1,{
if ($@race != 0) goto L_Started;
if ($@counting != 0) goto L_Started;
if ($@racecount == 1) goto L_Started;
@@ -110,7 +110,7 @@ OnInit:
}
//Checkpoint 1
-pvp_y_1-5,144,262,5 script Check Point 1 111,0,5,{
+pvp_y_1-5,144,262,5 script Check Point 1 HIDDEN_NPC,0,5,{
end;
OnTouch:
if (@raceid != $@raceid) goto L_Started;
@@ -128,7 +128,7 @@ L_Finished:
}
//Checkpoint 2
-pvp_y_1-5,73,247,5 script Check Point 2 111,6,6,{
+pvp_y_1-5,73,247,5 script Check Point 2 HIDDEN_NPC,6,6,{
end;
OnTouch:
if (@race != 1) goto L_Miss;
@@ -141,7 +141,7 @@ L_Miss:
}
//Checkpoint 3
-pvp_y_1-5,77,44,5 script Check Point 3 111,6,6,{
+pvp_y_1-5,77,44,5 script Check Point 3 HIDDEN_NPC,6,6,{
end;
OnTouch:
if (@race != 2) goto L_Miss;
@@ -154,7 +154,7 @@ L_Miss:
}
//Checkpoint 3
-pvp_y_1-5,249,60,5 script Check Point 4 111,6,6,{
+pvp_y_1-5,249,60,5 script Check Point 4 HIDDEN_NPC,6,6,{
end;
OnTouch:
if (@race != 3) goto L_Miss;
@@ -167,7 +167,7 @@ L_Miss:
}
//Checkpoint 4
-pvp_y_1-5,255,256,5 script Check Point 5 111,6,6,{
+pvp_y_1-5,255,256,5 script Check Point 5 HIDDEN_NPC,6,6,{
end;
OnTouch:
if (@race != 4) goto L_Miss;
@@ -180,7 +180,7 @@ L_Miss:
}
//Finish Line
-pvp_y_1-5,174,244,5 script Finish Line 111,6,6,{
+pvp_y_1-5,174,244,5 script Finish Line HIDDEN_NPC,6,6,{
end;
OnTouch:
if (@raceid != $@raceid) goto L_WrongRace;
@@ -198,39 +198,39 @@ L_WrongRace:
}
//Check Point Marker Flags
-pvp_y_1-5,144,267,4 script Check Point 1#01 722,{
+pvp_y_1-5,144,267,4 script Check Point 1#01 GUILD_FLAG,{
end;
}
-pvp_y_1-5,144,257,4 script Check Point 1#02 722,{
+pvp_y_1-5,144,257,4 script Check Point 1#02 GUILD_FLAG,{
end;
}
-pvp_y_1-5,70,252,3 script Check Point 2#01 722,{
+pvp_y_1-5,70,252,3 script Check Point 2#01 GUILD_FLAG,{
end;
}
-pvp_y_1-5,77,243,3 script Check Point 2#02 722,{
+pvp_y_1-5,77,243,3 script Check Point 2#02 GUILD_FLAG,{
end;
}
-pvp_y_1-5,81,48,1 script Check Point 3#01 722,{
+pvp_y_1-5,81,48,1 script Check Point 3#01 GUILD_FLAG,{
end;
}
-pvp_y_1-5,72,40,1 script Check Point 3#02 722,{
+pvp_y_1-5,72,40,1 script Check Point 3#02 GUILD_FLAG,{
end;
}
-pvp_y_1-5,244,65,7 script Check Point 4#01 722,{
+pvp_y_1-5,244,65,7 script Check Point 4#01 GUILD_FLAG,{
end;
}
-pvp_y_1-5,252,57,7 script Check Point 4#02 722,{
+pvp_y_1-5,252,57,7 script Check Point 4#02 GUILD_FLAG,{
end;
}
-pvp_y_1-5,259,260,5 script Check Point 5#01 722,{
+pvp_y_1-5,259,260,5 script Check Point 5#01 GUILD_FLAG,{
end;
}
-pvp_y_1-5,251,252,5 script Check Point 5#02 722,{
+pvp_y_1-5,251,252,5 script Check Point 5#02 GUILD_FLAG,{
end;
}
-pvp_y_1-5,174,249,4 script Finish Line#01 722,{
+pvp_y_1-5,174,249,4 script Finish Line#01 GUILD_FLAG,{
end;
}
-pvp_y_1-5,174,238,4 script Finish Line#02 722,{
+pvp_y_1-5,174,238,4 script Finish Line#02 GUILD_FLAG,{
end;
}
diff --git a/npc/custom/etc/mvp_arena.txt b/npc/custom/etc/mvp_arena.txt
index b06e5025d..3a1249274 100644
--- a/npc/custom/etc/mvp_arena.txt
+++ b/npc/custom/etc/mvp_arena.txt
@@ -15,7 +15,7 @@
//============================================================
// Entrance
-prontera,154,197,3 script MVP Warper 768,{
+prontera,154,197,3 script MVP Warper 8_M_JPNMASTER,{
mes "[ ^0065DFMVP Warper^000000 ]";
mes "Would you like to enter";
mes "the MVP Arena?";
@@ -25,7 +25,7 @@ prontera,154,197,3 script MVP Warper 768,{
}
// Information
-quiz_00,49,31,4 script MVP Arena Guide 778,{
+quiz_00,49,31,4 script MVP Arena Guide 4_M_TWTEAMAN,{
mes "[ ^0065DFMVP Arena Guide^000000 ]";
mes "Welcome and behold this sacred place. Here you will find out if you truly have what it takes to call yourself a warrior.";
next;
@@ -64,10 +64,10 @@ function script Keeper {
warp "pvp_n_"+.@i+"-"+getarg(0),102,102;
close;
}
-quiz_00,56,31,4 script Alpha MVP 770,{ callfunc "Keeper",2; }
-quiz_00,58,31,4 script Beta MVP 773,{ callfunc "Keeper",3; }
-quiz_00,60,31,4 script Theta MVP 774,{ callfunc "Keeper",4; }
-quiz_00,62,31,4 script Epsilon MVP 776,{ callfunc "Keeper",5; }
+quiz_00,56,31,4 script Alpha MVP 4_F_TWGIRL,{ callfunc "Keeper",2; }
+quiz_00,58,31,4 script Beta MVP 4_F_TWMIDWOMAN,{ callfunc "Keeper",3; }
+quiz_00,60,31,4 script Theta MVP 4_M_TWBOY,{ callfunc "Keeper",4; }
+quiz_00,62,31,4 script Epsilon MVP 4_M_TWMIDMAN,{ callfunc "Keeper",5; }
// Protectors
function script Protector {
@@ -85,38 +85,38 @@ function script Protector {
end;
}
}
-pvp_n_1-2,100,100,4 script MVP-Protector#01 727,{ callfunc "Protector","pvp_n_2-2"; }
-pvp_n_2-2,100,100,4 script MVP-Protector#02 727,{ callfunc "Protector","pvp_n_3-2"; }
-pvp_n_3-2,100,100,4 script MVP-Protector#03 727,{ callfunc "Protector","pvp_n_4-2"; }
-pvp_n_4-2,100,100,4 script MVP-Protector#04 727,{ callfunc "Protector","pvp_n_5-2"; }
-pvp_n_5-2,100,100,4 script MVP-Protector#05 727,{ callfunc "Protector","pvp_n_6-2"; }
-pvp_n_6-2,100,100,4 script MVP-Protector#06 727,{ callfunc "Protector","pvp_n_7-2"; }
-pvp_n_7-2,100,100,4 script MVP-Protector#07 727,{ callfunc "Protector","pvp_n_8-2"; }
-pvp_n_8-2,100,100,4 script MVP-Protector#08 727,{ callfunc "Protector",""; }
-pvp_n_1-3,100,100,4 script MVP-Protector#09 727,{ callfunc "Protector","pvp_n_2-3"; }
-pvp_n_2-3,100,100,4 script MVP-Protector#10 727,{ callfunc "Protector","pvp_n_3-3"; }
-pvp_n_3-3,100,100,4 script MVP-Protector#11 727,{ callfunc "Protector","pvp_n_4-3"; }
-pvp_n_4-3,100,100,4 script MVP-Protector#12 727,{ callfunc "Protector","pvp_n_5-3"; }
-pvp_n_5-3,100,100,4 script MVP-Protector#13 727,{ callfunc "Protector","pvp_n_6-3"; }
-pvp_n_6-3,100,100,4 script MVP-Protector#14 727,{ callfunc "Protector","pvp_n_7-3"; }
-pvp_n_7-3,100,100,4 script MVP-Protector#15 727,{ callfunc "Protector","pvp_n_8-3"; }
-pvp_n_8-3,100,100,4 script MVP-Protector#16 727,{ callfunc "Protector",""; }
-pvp_n_1-4,100,100,4 script MVP-Protector#17 727,{ callfunc "Protector","pvp_n_2-4"; }
-pvp_n_2-4,100,100,4 script MVP-Protector#18 727,{ callfunc "Protector","pvp_n_3-4"; }
-pvp_n_3-4,100,100,4 script MVP-Protector#19 727,{ callfunc "Protector","pvp_n_4-4"; }
-pvp_n_4-4,100,100,4 script MVP-Protector#20 727,{ callfunc "Protector","pvp_n_5-4"; }
-pvp_n_5-4,100,100,4 script MVP-Protector#21 727,{ callfunc "Protector","pvp_n_6-4"; }
-pvp_n_6-4,100,100,4 script MVP-Protector#22 727,{ callfunc "Protector","pvp_n_7-4"; }
-pvp_n_7-4,100,100,4 script MVP-Protector#23 727,{ callfunc "Protector","pvp_n_8-4"; }
-pvp_n_8-4,100,100,4 script MVP-Protector#24 727,{ callfunc "Protector",""; }
-pvp_n_1-5,100,100,4 script MVP-Protector#25 727,{ callfunc "Protector","pvp_n_2-5"; }
-pvp_n_2-5,100,100,4 script MVP-Protector#26 727,{ callfunc "Protector","pvp_n_3-5"; }
-pvp_n_3-5,100,100,4 script MVP-Protector#27 727,{ callfunc "Protector","pvp_n_4-5"; }
-pvp_n_4-5,100,100,4 script MVP-Protector#28 727,{ callfunc "Protector","pvp_n_5-5"; }
-pvp_n_5-5,100,100,4 script MVP-Protector#29 727,{ callfunc "Protector","pvp_n_6-5"; }
-pvp_n_6-5,100,100,4 script MVP-Protector#30 727,{ callfunc "Protector","pvp_n_7-5"; }
-pvp_n_7-5,100,100,4 script MVP-Protector#31 727,{ callfunc "Protector","pvp_n_8-5"; }
-pvp_n_8-5,100,100,4 script MVP-Protector#32 727,{ callfunc "Protector",""; }
+pvp_n_1-2,100,100,4 script MVP-Protector#01 4_F_JOB_HUNTER,{ callfunc "Protector","pvp_n_2-2"; }
+pvp_n_2-2,100,100,4 script MVP-Protector#02 4_F_JOB_HUNTER,{ callfunc "Protector","pvp_n_3-2"; }
+pvp_n_3-2,100,100,4 script MVP-Protector#03 4_F_JOB_HUNTER,{ callfunc "Protector","pvp_n_4-2"; }
+pvp_n_4-2,100,100,4 script MVP-Protector#04 4_F_JOB_HUNTER,{ callfunc "Protector","pvp_n_5-2"; }
+pvp_n_5-2,100,100,4 script MVP-Protector#05 4_F_JOB_HUNTER,{ callfunc "Protector","pvp_n_6-2"; }
+pvp_n_6-2,100,100,4 script MVP-Protector#06 4_F_JOB_HUNTER,{ callfunc "Protector","pvp_n_7-2"; }
+pvp_n_7-2,100,100,4 script MVP-Protector#07 4_F_JOB_HUNTER,{ callfunc "Protector","pvp_n_8-2"; }
+pvp_n_8-2,100,100,4 script MVP-Protector#08 4_F_JOB_HUNTER,{ callfunc "Protector",""; }
+pvp_n_1-3,100,100,4 script MVP-Protector#09 4_F_JOB_HUNTER,{ callfunc "Protector","pvp_n_2-3"; }
+pvp_n_2-3,100,100,4 script MVP-Protector#10 4_F_JOB_HUNTER,{ callfunc "Protector","pvp_n_3-3"; }
+pvp_n_3-3,100,100,4 script MVP-Protector#11 4_F_JOB_HUNTER,{ callfunc "Protector","pvp_n_4-3"; }
+pvp_n_4-3,100,100,4 script MVP-Protector#12 4_F_JOB_HUNTER,{ callfunc "Protector","pvp_n_5-3"; }
+pvp_n_5-3,100,100,4 script MVP-Protector#13 4_F_JOB_HUNTER,{ callfunc "Protector","pvp_n_6-3"; }
+pvp_n_6-3,100,100,4 script MVP-Protector#14 4_F_JOB_HUNTER,{ callfunc "Protector","pvp_n_7-3"; }
+pvp_n_7-3,100,100,4 script MVP-Protector#15 4_F_JOB_HUNTER,{ callfunc "Protector","pvp_n_8-3"; }
+pvp_n_8-3,100,100,4 script MVP-Protector#16 4_F_JOB_HUNTER,{ callfunc "Protector",""; }
+pvp_n_1-4,100,100,4 script MVP-Protector#17 4_F_JOB_HUNTER,{ callfunc "Protector","pvp_n_2-4"; }
+pvp_n_2-4,100,100,4 script MVP-Protector#18 4_F_JOB_HUNTER,{ callfunc "Protector","pvp_n_3-4"; }
+pvp_n_3-4,100,100,4 script MVP-Protector#19 4_F_JOB_HUNTER,{ callfunc "Protector","pvp_n_4-4"; }
+pvp_n_4-4,100,100,4 script MVP-Protector#20 4_F_JOB_HUNTER,{ callfunc "Protector","pvp_n_5-4"; }
+pvp_n_5-4,100,100,4 script MVP-Protector#21 4_F_JOB_HUNTER,{ callfunc "Protector","pvp_n_6-4"; }
+pvp_n_6-4,100,100,4 script MVP-Protector#22 4_F_JOB_HUNTER,{ callfunc "Protector","pvp_n_7-4"; }
+pvp_n_7-4,100,100,4 script MVP-Protector#23 4_F_JOB_HUNTER,{ callfunc "Protector","pvp_n_8-4"; }
+pvp_n_8-4,100,100,4 script MVP-Protector#24 4_F_JOB_HUNTER,{ callfunc "Protector",""; }
+pvp_n_1-5,100,100,4 script MVP-Protector#25 4_F_JOB_HUNTER,{ callfunc "Protector","pvp_n_2-5"; }
+pvp_n_2-5,100,100,4 script MVP-Protector#26 4_F_JOB_HUNTER,{ callfunc "Protector","pvp_n_3-5"; }
+pvp_n_3-5,100,100,4 script MVP-Protector#27 4_F_JOB_HUNTER,{ callfunc "Protector","pvp_n_4-5"; }
+pvp_n_4-5,100,100,4 script MVP-Protector#28 4_F_JOB_HUNTER,{ callfunc "Protector","pvp_n_5-5"; }
+pvp_n_5-5,100,100,4 script MVP-Protector#29 4_F_JOB_HUNTER,{ callfunc "Protector","pvp_n_6-5"; }
+pvp_n_6-5,100,100,4 script MVP-Protector#30 4_F_JOB_HUNTER,{ callfunc "Protector","pvp_n_7-5"; }
+pvp_n_7-5,100,100,4 script MVP-Protector#31 4_F_JOB_HUNTER,{ callfunc "Protector","pvp_n_8-5"; }
+pvp_n_8-5,100,100,4 script MVP-Protector#32 4_F_JOB_HUNTER,{ callfunc "Protector",""; }
// Alpha
pvp_n_1-2,0,0,0,0 monster Eddga 1115,3,60000,66000
diff --git a/npc/custom/etc/penal_servitude.txt b/npc/custom/etc/penal_servitude.txt
index 7cfc55ee1..61dd80676 100644
--- a/npc/custom/etc/penal_servitude.txt
+++ b/npc/custom/etc/penal_servitude.txt
@@ -14,7 +14,7 @@
// 1.2 Stricted the conditions a bit
//============================================================
-sec_pri,36,58,1 script Chief Warder 105,{
+sec_pri,36,58,1 script Chief Warder 8W_SOLDIER,{
mes "[Saddeus]";
emotion 1;
if(sex) {
@@ -127,7 +127,7 @@ M_NO_THANKS:
close;
}
-sec_in02,137,57,1 script Overseer 708,{
+sec_in02,137,57,1 script Overseer 4_M_PAY_SOLDIER,{
mes "[Oliver]";
delitem 4002,countitem(4002);//Items: Fabre_Card,
diff --git a/npc/custom/etc/quest_warper.txt b/npc/custom/etc/quest_warper.txt
index da9b6b0c9..0caa9b82c 100644
--- a/npc/custom/etc/quest_warper.txt
+++ b/npc/custom/etc/quest_warper.txt
@@ -678,7 +678,7 @@ function script QWS_MMarray {
// QWS_Make_Town_Menu 0; // Use a free number (last used is 30, Eclage)
//
// Adding a warpra:
-// map,x,y,facing script Warpra#example 113,{
+// map,x,y,facing script Warpra#example 4_F_KAFRA5,{
// callfunc "QWS_Town_Warpra",<town number>,"Your Town";
// close;
// }
@@ -1022,7 +1022,7 @@ menu_item:
// QWS_Make_Dungeon_Menu 0; // Use a free number (last used is 28, Kiel Dungeon)
//
// Adding a warpra:
-// map,x,y,facing script Warpra Helper#example 112,{
+// map,x,y,facing script Warpra Helper#example 4_F_KAFRA6,{
// callfunc "QWS_Dungeon_Warpra",<dungeon number>,"Your Dungeon";
// close;
// }
@@ -1612,79 +1612,79 @@ binget:
//============================Warpras==============================
- script Warpra#0 -1,{ callfunc "Q_Warpra",1; }
-alb2trea,73,101,4 duplicate(Warpra#0) Warpra#1 113
-ama_fild01,178,325,1 duplicate(Warpra#0) Warpra#2 113
-gef_fild10,71,339,4 duplicate(Warpra#0) Warpra#3 113
-izlu2dun,104,82,4 duplicate(Warpra#0) Warpra#4 113
-mjolnir_02,85,363,4 duplicate(Warpra#0) Warpra#5 113
-moc_fild04,207,331,4 duplicate(Warpra#0) Warpra#6 113
-moc_fild19,106,97,4 duplicate(Warpra#0) Warpra#7 113
-moc_ruins,64,166,4 duplicate(Warpra#0) Warpra#8 113
-niflheim,197,192,3 duplicate(Warpra#0) Warpra#9 113
-pay_arche,39,135,4 duplicate(Warpra#0) Warpra#10 113
-prt_fild05,273,215,4 duplicate(Warpra#0) Warpra#11 113
-tur_dun01,148,239,4 duplicate(Warpra#0) Warpra#12 113
-valkyrie,48,35,8 duplicate(Warpra#0) Warpra#13 113
-yuno_fild03,37,135,4 duplicate(Warpra#0) Warpra#14 113
-
-alberta,32,240,4 script Warpra#15 113,{ callfunc "QWS_Town_Warpra",1,"Alberta Town"; close; }
-aldebaran,146,118,4 script Warpra#16 113,{ callfunc "QWS_Town_Warpra",2,"Aldebaran Town"; close; }
-ayothaya,216,171,5 script Warpra#17 113,{ callfunc "QWS_Town_Warpra",4,"Ayotaya Town"; close; }
-amatsu,193,81,1 script Warpra#18 113,{ callfunc "QWS_Town_Warpra",3,"Amatsu Town"; close; }
-comodo,195,158,4 script Warpra#19 113,{ callfunc "QWS_Town_Warpra",5,"Comodo Town"; close; }
-einbroch,229,196,5 script Warpra#20 113,{ callfunc "QWS_Town_Warpra",7,"Einbroch Town"; close; }
-einbech,173,131,5 script Warpra#21 113,{ callfunc "QWS_Town_Warpra",6,"Einbech Town"; close; }
-geffen,116,66,4 script Warpra#22 113,{ callfunc "QWS_Town_Warpra",8,"Geffen Town"; close; }
-gonryun,152,130,4 script Warpra#23 113,{ callfunc "QWS_Town_Warpra",9,"Gonryun Town"; close; }
-hugel,90,127,5 script Warpra#24 113,{ callfunc "QWS_Town_Warpra",10,"Hugel Town"; close; }
-jawaii,107,182,5 script Warpra#25 113,{ callfunc "QWS_Town_Warpra",12,"Jawaii Town"; close; }
-izlude,132,116,4 script Warpra#26 113,{ callfunc "QWS_Town_Warpra",11,"Izlude Town"; close; }
-lighthalzen,153,100,5 script Warpra#27 113,{ callfunc "QWS_Town_Warpra",13,"Lighthalzen Town"; close; }
-louyang,211,106,4 script Warpra#28 113,{ callfunc "QWS_Town_Warpra",14,"Louyang Town"; close; }
-morocc,157,95,4 script Warpra#29 113,{ callfunc "QWS_Town_Warpra",16,"Morroc Town"; close; }
-nif_fild01,319,77,1 script Warpra#30 113,{ callfunc "QWS_Town_Warpra",17,"Niflheim Town"; close; }
-payon,183,110,4 script Warpra#31 113,{ callfunc "QWS_Town_Warpra",18,"Payon Town"; close; }
-prontera,147,172,5 script Warpra#32 113,{ callfunc "QWS_Town_Warpra",0,"Prontera Town"; close; }
-umbala,133,130,4 script Warpra#33 113,{ callfunc "QWS_Town_Warpra",19,"Umbala Town"; close; }
-xmas,151,136,4 script Warpra#34 113,{ callfunc "QWS_Town_Warpra",15,"Lutie Town"; close; }
-yuno,138,162,4 script Warpra#35 113,{ callfunc "QWS_Town_Warpra",20,"Yuno Town"; close; }
-brasilis,201,222,4 script Warpra#36 113,{ callfunc "QWS_Town_Warpra",21,"Brasilis Town"; close; }
-dicastes01,194,194,6 script Warpra#37 113,{ callfunc "QWS_Town_Warpra",22,"El Dicastes Town"; close; }
-manuk,262,177,4 script Warpra#38 113,{ callfunc "QWS_Town_Warpra",23,"Manuk Town"; close; }
-mora,110,100,4 script Warpra#39 113,{ callfunc "QWS_Town_Warpra",24,"Mora Town"; close; }
-moscovia,216,196,6 script Warpra#40 113,{ callfunc "QWS_Town_Warpra",25,"Moscovia Town"; close; }
-rachel,135,116,4 script Warpra#41 113,{ callfunc "QWS_Town_Warpra",26,"Rachel Town"; close; }
-splendide,205,153,4 script Warpra#42 113,{ callfunc "QWS_Town_Warpra",27,"Splendide Town"; close; }
-veins,214,123,4 script Warpra#43 113,{ callfunc "QWS_Town_Warpra",28,"Veins Town"; close; }
-dewata,194,178,6 script Warpra#44 113,{ callfunc "QWS_Town_Warpra",29,"Dewata Town"; close; }
-eclage,107,37,4 script Warpra#45 113,{ callfunc "QWS_Town_Warpra",30,"Eclage Town"; close; }
-
-abyss_02,274,266,1 script Warpra Helper#0 112,{ callfunc "QWS_Dungeon_Warpra",0,"Abyss Lake"; close; }
-ama_dun02,192,118,5 script Warpra Helper#1 112,{ callfunc "QWS_Dungeon_Warpra",1,"Amatsu Dungeon"; close; }
-anthell02,170,165,3 script Warpra Helper#2 112,{ callfunc "QWS_Dungeon_Warpra",2,"Ant Hell Dungeon"; close; }
-ayo_dun02,258,193,5 script Warpra Helper#3 112,{ callfunc "QWS_Dungeon_Warpra",3,"Ayotaya Dungeon"; close; }
-ein_dun02,292,282,1 script Warpra Helper#4 112,{ callfunc "QWS_Dungeon_Warpra",8,"Einbech Dungeon"; close; }
-iz_dun03,202,47,2 script Warpra Helper#5 112,{ callfunc "QWS_Dungeon_Warpra",4,"Byalan Dungeon"; close; }
-c_tower3,129,106,4 script Warpra Helper#6 112,{ callfunc "QWS_Dungeon_Warpra",5,"Clock Tower Dungeon"; close; }
-mjo_dun02,39,25,4 script Warpra Helper#7 112,{ callfunc "QWS_Dungeon_Warpra",6,"Coal Mine Dungeon"; close; }
-prt_sewb2,176,30,3 script Warpra Helper#8 112,{ callfunc "QWS_Dungeon_Warpra",7,"Culvert Dungeon"; close; }
-gefenia03,137,34,0 script Warpra Helper#9 112,{ callfunc "QWS_Dungeon_Warpra",9,"Gefenia Dungeon"; close; }
-gef_dun02,218,61,2 script Warpra Helper#10 112,{ callfunc "QWS_Dungeon_Warpra",10,"Gefen Dungeon"; close; }
-glast_01,371,308,3 script Warpra Helper#11 112,{ callfunc "QWS_Dungeon_Warpra",11,"Glast Heim Dungeon"; close; }
-gon_dun01,167,273,4 script Warpra Helper#12 112,{ callfunc "QWS_Dungeon_Warpra",12,"Gonryun Dungeon"; close; }
-juperos_02,127,154,5 script Warpra Helper#13 112,{ callfunc "QWS_Dungeon_Warpra",14,"Juperos Cave"; close; }
-kh_dun01,14,224,3 script Warpra Helper#14 112,{ callfunc "QWS_Dungeon_Warpra",28,"Kiel Dungeon"; close; }
-lhz_dun02,156,151,5 script Warpra Helper#15 112,{ callfunc "QWS_Dungeon_Warpra",15,"Lighthalzen Bio Lab"; close; }
-lou_dun02,168,264,4 script Warpra Helper#16 112,{ callfunc "QWS_Dungeon_Warpra",16,"Louyang Dungeon"; close; }
-mag_dun02,46,41,3 script Warpra Helper#17 112,{ callfunc "QWS_Dungeon_Warpra",17,"Magma Dungeon"; close; }
-odin_tem01,115,148,3 script Warpra Helper#18 112,{ callfunc "QWS_Dungeon_Warpra",18,"Odin Temple"; close; }
-orcsdun01,185,11,3 script Warpra Helper#19 112,{ callfunc "QWS_Dungeon_Warpra",19,"Orc Dungeon"; close; }
-pay_dun03,162,143,3 script Warpra Helper#20 112,{ callfunc "QWS_Dungeon_Warpra",20,"Payon Dungeon"; close; }
-moc_pryd02,101,95,3 script Warpra Helper#21 112,{ callfunc "QWS_Dungeon_Warpra",21,"Pyramides Dungeon"; close; }
-in_sphinx2,274,268,1 script Warpra Helper#22 112,{ callfunc "QWS_Dungeon_Warpra",22,"Sphinx Dungeon"; close; }
-tha_t07,111,162,3 script Warpra Helper#23 112,{ callfunc "QWS_Dungeon_Warpra",24,"Thanatos Tower"; close; }
-treasure02,104,40,3 script Warpra Helper#24 112,{ callfunc "QWS_Dungeon_Warpra",23,"Sunken Ship Dungeon"; close; }
-xmas_dun02,124,131,3 script Warpra Helper#25 112,{ callfunc "QWS_Dungeon_Warpra",25,"Toy Factory Dungeon"; close; }
-um_dun02,44,28,3 script Warpra Helper#26 112,{ callfunc "QWS_Dungeon_Warpra",27,"Umbala Dungeon"; close; }
-tur_dun02,162,23,3 script Warpra Helper#27 112,{ callfunc "QWS_Dungeon_Warpra",26,"Turtle Island Dungeon"; close; }
-prt_maze02,102,69,4 script Warpra Helper#28 112,{ callfunc "QWS_Dungeon_Warpra",13,"Hidden Dungeon"; close; }
+alb2trea,73,101,4 duplicate(Warpra#0) Warpra#1 4_F_KAFRA5
+ama_fild01,178,325,1 duplicate(Warpra#0) Warpra#2 4_F_KAFRA5
+gef_fild10,71,339,4 duplicate(Warpra#0) Warpra#3 4_F_KAFRA5
+izlu2dun,104,82,4 duplicate(Warpra#0) Warpra#4 4_F_KAFRA5
+mjolnir_02,85,363,4 duplicate(Warpra#0) Warpra#5 4_F_KAFRA5
+moc_fild04,207,331,4 duplicate(Warpra#0) Warpra#6 4_F_KAFRA5
+moc_fild19,106,97,4 duplicate(Warpra#0) Warpra#7 4_F_KAFRA5
+moc_ruins,64,166,4 duplicate(Warpra#0) Warpra#8 4_F_KAFRA5
+niflheim,197,192,3 duplicate(Warpra#0) Warpra#9 4_F_KAFRA5
+pay_arche,39,135,4 duplicate(Warpra#0) Warpra#10 4_F_KAFRA5
+prt_fild05,273,215,4 duplicate(Warpra#0) Warpra#11 4_F_KAFRA5
+tur_dun01,148,239,4 duplicate(Warpra#0) Warpra#12 4_F_KAFRA5
+valkyrie,48,35,8 duplicate(Warpra#0) Warpra#13 4_F_KAFRA5
+yuno_fild03,37,135,4 duplicate(Warpra#0) Warpra#14 4_F_KAFRA5
+
+alberta,32,240,4 script Warpra#15 4_F_KAFRA5,{ callfunc "QWS_Town_Warpra",1,"Alberta Town"; close; }
+aldebaran,146,118,4 script Warpra#16 4_F_KAFRA5,{ callfunc "QWS_Town_Warpra",2,"Aldebaran Town"; close; }
+ayothaya,216,171,5 script Warpra#17 4_F_KAFRA5,{ callfunc "QWS_Town_Warpra",4,"Ayotaya Town"; close; }
+amatsu,193,81,1 script Warpra#18 4_F_KAFRA5,{ callfunc "QWS_Town_Warpra",3,"Amatsu Town"; close; }
+comodo,195,158,4 script Warpra#19 4_F_KAFRA5,{ callfunc "QWS_Town_Warpra",5,"Comodo Town"; close; }
+einbroch,229,196,5 script Warpra#20 4_F_KAFRA5,{ callfunc "QWS_Town_Warpra",7,"Einbroch Town"; close; }
+einbech,173,131,5 script Warpra#21 4_F_KAFRA5,{ callfunc "QWS_Town_Warpra",6,"Einbech Town"; close; }
+geffen,116,66,4 script Warpra#22 4_F_KAFRA5,{ callfunc "QWS_Town_Warpra",8,"Geffen Town"; close; }
+gonryun,152,130,4 script Warpra#23 4_F_KAFRA5,{ callfunc "QWS_Town_Warpra",9,"Gonryun Town"; close; }
+hugel,90,127,5 script Warpra#24 4_F_KAFRA5,{ callfunc "QWS_Town_Warpra",10,"Hugel Town"; close; }
+jawaii,107,182,5 script Warpra#25 4_F_KAFRA5,{ callfunc "QWS_Town_Warpra",12,"Jawaii Town"; close; }
+izlude,132,116,4 script Warpra#26 4_F_KAFRA5,{ callfunc "QWS_Town_Warpra",11,"Izlude Town"; close; }
+lighthalzen,153,100,5 script Warpra#27 4_F_KAFRA5,{ callfunc "QWS_Town_Warpra",13,"Lighthalzen Town"; close; }
+louyang,211,106,4 script Warpra#28 4_F_KAFRA5,{ callfunc "QWS_Town_Warpra",14,"Louyang Town"; close; }
+morocc,157,95,4 script Warpra#29 4_F_KAFRA5,{ callfunc "QWS_Town_Warpra",16,"Morroc Town"; close; }
+nif_fild01,319,77,1 script Warpra#30 4_F_KAFRA5,{ callfunc "QWS_Town_Warpra",17,"Niflheim Town"; close; }
+payon,183,110,4 script Warpra#31 4_F_KAFRA5,{ callfunc "QWS_Town_Warpra",18,"Payon Town"; close; }
+prontera,147,172,5 script Warpra#32 4_F_KAFRA5,{ callfunc "QWS_Town_Warpra",0,"Prontera Town"; close; }
+umbala,133,130,4 script Warpra#33 4_F_KAFRA5,{ callfunc "QWS_Town_Warpra",19,"Umbala Town"; close; }
+xmas,151,136,4 script Warpra#34 4_F_KAFRA5,{ callfunc "QWS_Town_Warpra",15,"Lutie Town"; close; }
+yuno,138,162,4 script Warpra#35 4_F_KAFRA5,{ callfunc "QWS_Town_Warpra",20,"Yuno Town"; close; }
+brasilis,201,222,4 script Warpra#36 4_F_KAFRA5,{ callfunc "QWS_Town_Warpra",21,"Brasilis Town"; close; }
+dicastes01,194,194,6 script Warpra#37 4_F_KAFRA5,{ callfunc "QWS_Town_Warpra",22,"El Dicastes Town"; close; }
+manuk,262,177,4 script Warpra#38 4_F_KAFRA5,{ callfunc "QWS_Town_Warpra",23,"Manuk Town"; close; }
+mora,110,100,4 script Warpra#39 4_F_KAFRA5,{ callfunc "QWS_Town_Warpra",24,"Mora Town"; close; }
+moscovia,216,196,6 script Warpra#40 4_F_KAFRA5,{ callfunc "QWS_Town_Warpra",25,"Moscovia Town"; close; }
+rachel,135,116,4 script Warpra#41 4_F_KAFRA5,{ callfunc "QWS_Town_Warpra",26,"Rachel Town"; close; }
+splendide,205,153,4 script Warpra#42 4_F_KAFRA5,{ callfunc "QWS_Town_Warpra",27,"Splendide Town"; close; }
+veins,214,123,4 script Warpra#43 4_F_KAFRA5,{ callfunc "QWS_Town_Warpra",28,"Veins Town"; close; }
+dewata,194,178,6 script Warpra#44 4_F_KAFRA5,{ callfunc "QWS_Town_Warpra",29,"Dewata Town"; close; }
+eclage,107,37,4 script Warpra#45 4_F_KAFRA5,{ callfunc "QWS_Town_Warpra",30,"Eclage Town"; close; }
+
+abyss_02,274,266,1 script Warpra Helper#0 4_F_KAFRA6,{ callfunc "QWS_Dungeon_Warpra",0,"Abyss Lake"; close; }
+ama_dun02,192,118,5 script Warpra Helper#1 4_F_KAFRA6,{ callfunc "QWS_Dungeon_Warpra",1,"Amatsu Dungeon"; close; }
+anthell02,170,165,3 script Warpra Helper#2 4_F_KAFRA6,{ callfunc "QWS_Dungeon_Warpra",2,"Ant Hell Dungeon"; close; }
+ayo_dun02,258,193,5 script Warpra Helper#3 4_F_KAFRA6,{ callfunc "QWS_Dungeon_Warpra",3,"Ayotaya Dungeon"; close; }
+ein_dun02,292,282,1 script Warpra Helper#4 4_F_KAFRA6,{ callfunc "QWS_Dungeon_Warpra",8,"Einbech Dungeon"; close; }
+iz_dun03,202,47,2 script Warpra Helper#5 4_F_KAFRA6,{ callfunc "QWS_Dungeon_Warpra",4,"Byalan Dungeon"; close; }
+c_tower3,129,106,4 script Warpra Helper#6 4_F_KAFRA6,{ callfunc "QWS_Dungeon_Warpra",5,"Clock Tower Dungeon"; close; }
+mjo_dun02,39,25,4 script Warpra Helper#7 4_F_KAFRA6,{ callfunc "QWS_Dungeon_Warpra",6,"Coal Mine Dungeon"; close; }
+prt_sewb2,176,30,3 script Warpra Helper#8 4_F_KAFRA6,{ callfunc "QWS_Dungeon_Warpra",7,"Culvert Dungeon"; close; }
+gefenia03,137,34,0 script Warpra Helper#9 4_F_KAFRA6,{ callfunc "QWS_Dungeon_Warpra",9,"Gefenia Dungeon"; close; }
+gef_dun02,218,61,2 script Warpra Helper#10 4_F_KAFRA6,{ callfunc "QWS_Dungeon_Warpra",10,"Gefen Dungeon"; close; }
+glast_01,371,308,3 script Warpra Helper#11 4_F_KAFRA6,{ callfunc "QWS_Dungeon_Warpra",11,"Glast Heim Dungeon"; close; }
+gon_dun01,167,273,4 script Warpra Helper#12 4_F_KAFRA6,{ callfunc "QWS_Dungeon_Warpra",12,"Gonryun Dungeon"; close; }
+juperos_02,127,154,5 script Warpra Helper#13 4_F_KAFRA6,{ callfunc "QWS_Dungeon_Warpra",14,"Juperos Cave"; close; }
+kh_dun01,14,224,3 script Warpra Helper#14 4_F_KAFRA6,{ callfunc "QWS_Dungeon_Warpra",28,"Kiel Dungeon"; close; }
+lhz_dun02,156,151,5 script Warpra Helper#15 4_F_KAFRA6,{ callfunc "QWS_Dungeon_Warpra",15,"Lighthalzen Bio Lab"; close; }
+lou_dun02,168,264,4 script Warpra Helper#16 4_F_KAFRA6,{ callfunc "QWS_Dungeon_Warpra",16,"Louyang Dungeon"; close; }
+mag_dun02,46,41,3 script Warpra Helper#17 4_F_KAFRA6,{ callfunc "QWS_Dungeon_Warpra",17,"Magma Dungeon"; close; }
+odin_tem01,115,148,3 script Warpra Helper#18 4_F_KAFRA6,{ callfunc "QWS_Dungeon_Warpra",18,"Odin Temple"; close; }
+orcsdun01,185,11,3 script Warpra Helper#19 4_F_KAFRA6,{ callfunc "QWS_Dungeon_Warpra",19,"Orc Dungeon"; close; }
+pay_dun03,162,143,3 script Warpra Helper#20 4_F_KAFRA6,{ callfunc "QWS_Dungeon_Warpra",20,"Payon Dungeon"; close; }
+moc_pryd02,101,95,3 script Warpra Helper#21 4_F_KAFRA6,{ callfunc "QWS_Dungeon_Warpra",21,"Pyramides Dungeon"; close; }
+in_sphinx2,274,268,1 script Warpra Helper#22 4_F_KAFRA6,{ callfunc "QWS_Dungeon_Warpra",22,"Sphinx Dungeon"; close; }
+tha_t07,111,162,3 script Warpra Helper#23 4_F_KAFRA6,{ callfunc "QWS_Dungeon_Warpra",24,"Thanatos Tower"; close; }
+treasure02,104,40,3 script Warpra Helper#24 4_F_KAFRA6,{ callfunc "QWS_Dungeon_Warpra",23,"Sunken Ship Dungeon"; close; }
+xmas_dun02,124,131,3 script Warpra Helper#25 4_F_KAFRA6,{ callfunc "QWS_Dungeon_Warpra",25,"Toy Factory Dungeon"; close; }
+um_dun02,44,28,3 script Warpra Helper#26 4_F_KAFRA6,{ callfunc "QWS_Dungeon_Warpra",27,"Umbala Dungeon"; close; }
+tur_dun02,162,23,3 script Warpra Helper#27 4_F_KAFRA6,{ callfunc "QWS_Dungeon_Warpra",26,"Turtle Island Dungeon"; close; }
+prt_maze02,102,69,4 script Warpra Helper#28 4_F_KAFRA6,{ callfunc "QWS_Dungeon_Warpra",13,"Hidden Dungeon"; close; }
diff --git a/npc/custom/etc/rpsroulette.txt b/npc/custom/etc/rpsroulette.txt
index 1755bba21..fccb365ef 100644
--- a/npc/custom/etc/rpsroulette.txt
+++ b/npc/custom/etc/rpsroulette.txt
@@ -11,7 +11,7 @@
//= 1.2 Fixes by Blackthunder and me [Poki#3]
//============================================================
-cmd_in02,182,126,2 script Crazy Boris 85,{
+cmd_in02,182,126,2 script Crazy Boris 4_M_03,{
mes "Crazy Boris";
set @counter,1;
mes "Hey you! Up for Rock Scissors Roulette?";
diff --git a/npc/custom/etc/shifty_assassin.txt b/npc/custom/etc/shifty_assassin.txt
index c60a565d5..4a4f7338d 100644
--- a/npc/custom/etc/shifty_assassin.txt
+++ b/npc/custom/etc/shifty_assassin.txt
@@ -11,7 +11,7 @@
//= 1.1.2 Updated WoE Check. [Paradox924X]
//============================================================
-morocc,148,86,5 script Shifty Assassin 725,{
+morocc,148,86,5 script Shifty Assassin 4_F_JOB_ASSASSIN,{
set $ninja_price,250000;
// STARTS THE MENU //
diff --git a/npc/custom/etc/stock_market.txt b/npc/custom/etc/stock_market.txt
index 122524063..b805d7895 100644
--- a/npc/custom/etc/stock_market.txt
+++ b/npc/custom/etc/stock_market.txt
@@ -170,7 +170,7 @@ S_Fluc:
end;
}
-prontera,140,181,5 script Stock Market::stockmarket 109,{
+prontera,140,181,5 script Stock Market::stockmarket 4_M_MANAGER,{
// Ensures no trading when default prices have not been set //
set @stotal,$S1+$S2+$S3+$S4+$S5+$S6+$S7+$S8+$S9+$S10;
if (@stotal > 0) goto S_Start;
diff --git a/npc/custom/events/cluckers.txt b/npc/custom/events/cluckers.txt
index 7f3dd598f..1db4c2251 100644
--- a/npc/custom/events/cluckers.txt
+++ b/npc/custom/events/cluckers.txt
@@ -16,7 +16,7 @@
//= 1.2a Switched 'atcommand' to 'unitskilluseid'.
//============================================================
-prontera,156,219,4 script Cluckers 800,{
+prontera,156,219,4 script Cluckers 4_NFCOCK,{
set .@GMAccess,80; // GM level required to access NPC
diff --git a/npc/custom/events/disguise.txt b/npc/custom/events/disguise.txt
index a091281ef..1b46e9b16 100644
--- a/npc/custom/events/disguise.txt
+++ b/npc/custom/events/disguise.txt
@@ -10,7 +10,7 @@
//= 5.1 Cleaned and standardized, mostly. [Euphy]
//============================================================
-prontera,160,155,4 script Disguise Event 795,{
+prontera,160,155,4 script Disguise Event 4_M_NFDEADMAN,{
// Currently set to run every two hours.
// To change times, edit the OnClock labels below.
diff --git a/npc/custom/events/hallow06.txt b/npc/custom/events/hallow06.txt
index 71b63e983..01a122320 100644
--- a/npc/custom/events/hallow06.txt
+++ b/npc/custom/events/hallow06.txt
@@ -11,7 +11,7 @@
//= 1.2 fixed bugs, optimized. Now uses 1 var instead of 3 [Lupus]
//============================================================
-prontera,151,190,5 script Hallows' Eve Event 807,{
+prontera,151,190,5 script Hallows' Eve Event 1_M_SIGNMCNT,{
mes "[Hallows' Eve Event]";
if(Class == Job_Novice){
mes "I am sorry but you have to got a job to complete the event.";
diff --git a/npc/custom/events/uneasy_cemetery.txt b/npc/custom/events/uneasy_cemetery.txt
index d026792b0..ac8124bd1 100644
--- a/npc/custom/events/uneasy_cemetery.txt
+++ b/npc/custom/events/uneasy_cemetery.txt
@@ -64,7 +64,7 @@ L_Start_Undead:
mapannounce "prontera","[Mother Mathana]: The cememtery has become restless! In the name of Odin, hurry to the Sanctuary! Save the city of Prontera!",0;
}
-prontera,257,313,5 script Mother Mathana 79,{
+prontera,257,313,5 script Mother Mathana 1_F_PRIEST,{
mes "[Mother Mathana]";
if ($UNEASY_DL <= 0) goto L_Undead_Walk;
mes "I'm afraid there's something wrong with our old cemetery...";
diff --git a/npc/custom/events/valentinesdayexp.txt b/npc/custom/events/valentinesdayexp.txt
index ec8464338..c60c6f3a6 100644
--- a/npc/custom/events/valentinesdayexp.txt
+++ b/npc/custom/events/valentinesdayexp.txt
@@ -14,7 +14,7 @@
//============================================================
// Tine - Valentine Event Chocolate Even Guide ------------------
-prontera,156,172,4 script Tine 58,{
+prontera,156,172,4 script Tine 1_M_MERCHANT,{
// Debug info for item effects and tricky conditions 8)
// mes "@dsv: "+@dsv;
// mes "ispartneron()=="+ispartneron();
@@ -72,7 +72,7 @@ OnInit:
}
// Stephen - Valentine Event Chocolate seller ------------------
-alberta,26,243,4 script Stephen#val1 58,{
+alberta,26,243,4 script Stephen#val1 1_M_MERCHANT,{
mes "[Stephen]";
mes "Guess what I've got?";
mes "A tasty treat not easily found in Rune-Midgard....";
@@ -127,7 +127,7 @@ L_NOTENO:
}
// Jainie -- Gives information about Valentine Event ------------------------
-alberta,29,243,4 script Jainie#val1 53,{
+alberta,29,243,4 script Jainie#val1 1_M_INNKEEPER,{
mes "[Jainie]";
mes "You know what? The chocolate that my boyfriend sells are from me!";
mes "I made them by myself. Now I need some Milk for my special White Chocolate.";
@@ -195,7 +195,7 @@ L_NOMILK:
}
// Carl Orleans -- Valentine Event Chocolate maker ------------------
-prt_castle,54,34,4 script Carl Orleans#val1 47,{
+prt_castle,54,34,4 script Carl Orleans#val1 1_M_01,{
mes "[Carl Orleans]";
mes "Yes? What can I cook for you?";
next;
diff --git a/npc/custom/events/xmas_rings_event.txt b/npc/custom/events/xmas_rings_event.txt
index 959e3a1a9..8d8be443b 100644
--- a/npc/custom/events/xmas_rings_event.txt
+++ b/npc/custom/events/xmas_rings_event.txt
@@ -12,7 +12,7 @@
//= 1.2 Fixed double quotes not being escaped [brianluau]
//============================================================
-prontera,156,174,4 script Snower 713,{
+prontera,156,174,4 script Snower 4_M_06,{
mes "[Snower]";
if(Q_XMSRINGS==2){
mes "Oh.. is it true? You've helped my sis Sneewy? Thank you.";
@@ -97,7 +97,7 @@ OnInit:
end;
}
-louyang,224,249,4 script Sneewy 717,{
+louyang,224,249,4 script Sneewy 4_F_KID3,{
mes "[Sneewy]";
if(Q_XMSRINGS==0){
mes "Hi! I'm waithing for my sister's birdy with mail...";
@@ -140,7 +140,7 @@ M_END:
close;
}
-izlu2dun,133,160,2 script Snoowy 714,{
+izlu2dun,133,160,2 script Snoowy 4_F_06,{
mes "[Snoowy]";
if(Q_XMSRINGS==0){
mes "Helloooou! Do you know my bro and sis? How so? My brother Snower's well known in Prontera!! Just ask any child there.";
diff --git a/npc/custom/healer.txt b/npc/custom/healer.txt
index 4aee802d8..1b1d94d91 100644
--- a/npc/custom/healer.txt
+++ b/npc/custom/healer.txt
@@ -36,42 +36,42 @@
// Duplicates
//============================================================
-alberta,25,240,6 duplicate(Healer) Healer#alb 909
-aldebaran,135,118,6 duplicate(Healer) Healer#alde 909
-amatsu,200,79,4 duplicate(Healer) Healer#ama 909
-ayothaya,207,169,6 duplicate(Healer) Healer#ayo 909
-comodo,184,158,6 duplicate(Healer) Healer#com 909
-einbech,57,36,6 duplicate(Healer) Healer#einbe 909
-einbroch,57,202,6 duplicate(Healer) Healer#einbr 909
-geffen,115,72,6 duplicate(Healer) Healer#gef 909
-gonryun,156,122,6 duplicate(Healer) Healer#gon 909
-hugel,89,150,6 duplicate(Healer) Healer#hug 909
-izlude,125,118,5 duplicate(Healer) Healer#izl 909
-jawaii,250,139,4 duplicate(Healer) Healer#jaw 909
-lighthalzen,152,100,6 duplicate(Healer) Healer#lhz 909
-louyang,226,103,4 duplicate(Healer) Healer#lou 909
-manuk,272,144,6 duplicate(Healer) Healer#man 909
-mid_camp,203,289,6 duplicate(Healer) Healer#mid 909
-moc_ruins,72,164,4 duplicate(Healer) Healer#moc 909
-morocc,153,97,6 duplicate(Healer) Healer#mor 909
-moscovia,220,191,4 duplicate(Healer) Healer#mos 909
-niflheim,212,182,5 duplicate(Healer) Healer#nif 909
-payon,179,106,4 duplicate(Healer) Healer#pay 909
-prontera,162,193,4 duplicate(Healer) Healer#prt 909
-rachel,125,116,6 duplicate(Healer) Healer#rac 909
-splendide,201,153,4 duplicate(Healer) Healer#spl 909
-thor_camp,249,74,4 duplicate(Healer) Healer#thor 909
-umbala,105,148,3 duplicate(Healer) Healer#umb 909
-veins,217,121,4 duplicate(Healer) Healer#ve 909
-xmas,143,136,4 duplicate(Healer) Healer#xmas 909
-yuno,164,45,4 duplicate(Healer) Healer#yuno 909
+alberta,25,240,6 duplicate(Healer) Healer#alb 4_PORING
+aldebaran,135,118,6 duplicate(Healer) Healer#alde 4_PORING
+amatsu,200,79,4 duplicate(Healer) Healer#ama 4_PORING
+ayothaya,207,169,6 duplicate(Healer) Healer#ayo 4_PORING
+comodo,184,158,6 duplicate(Healer) Healer#com 4_PORING
+einbech,57,36,6 duplicate(Healer) Healer#einbe 4_PORING
+einbroch,57,202,6 duplicate(Healer) Healer#einbr 4_PORING
+geffen,115,72,6 duplicate(Healer) Healer#gef 4_PORING
+gonryun,156,122,6 duplicate(Healer) Healer#gon 4_PORING
+hugel,89,150,6 duplicate(Healer) Healer#hug 4_PORING
+izlude,125,118,5 duplicate(Healer) Healer#izl 4_PORING
+jawaii,250,139,4 duplicate(Healer) Healer#jaw 4_PORING
+lighthalzen,152,100,6 duplicate(Healer) Healer#lhz 4_PORING
+louyang,226,103,4 duplicate(Healer) Healer#lou 4_PORING
+manuk,272,144,6 duplicate(Healer) Healer#man 4_PORING
+mid_camp,203,289,6 duplicate(Healer) Healer#mid 4_PORING
+moc_ruins,72,164,4 duplicate(Healer) Healer#moc 4_PORING
+morocc,153,97,6 duplicate(Healer) Healer#mor 4_PORING
+moscovia,220,191,4 duplicate(Healer) Healer#mos 4_PORING
+niflheim,212,182,5 duplicate(Healer) Healer#nif 4_PORING
+payon,179,106,4 duplicate(Healer) Healer#pay 4_PORING
+prontera,162,193,4 duplicate(Healer) Healer#prt 4_PORING
+rachel,125,116,6 duplicate(Healer) Healer#rac 4_PORING
+splendide,201,153,4 duplicate(Healer) Healer#spl 4_PORING
+thor_camp,249,74,4 duplicate(Healer) Healer#thor 4_PORING
+umbala,105,148,3 duplicate(Healer) Healer#umb 4_PORING
+veins,217,121,4 duplicate(Healer) Healer#ve 4_PORING
+xmas,143,136,4 duplicate(Healer) Healer#xmas 4_PORING
+yuno,164,45,4 duplicate(Healer) Healer#yuno 4_PORING
// Duplicates (Renewal)
//============================================================
-brasilis,194,221,6 duplicate(Healer) Healer#bra 909
-dewata,195,187,4 duplicate(Healer) Healer#dew 909
-dicastes01,201,194,4 duplicate(Healer) Healer#dic 909
-ecl_in01,45,60,4 duplicate(Healer) Healer#ecl 909
-malangdo,132,114,6 duplicate(Healer) Healer#mal 909
-malaya,205,205,6 duplicate(Healer) Healer#ma 909
-mora,55,152,4 duplicate(Healer) Healer#mora 909
+brasilis,194,221,6 duplicate(Healer) Healer#bra 4_PORING
+dewata,195,187,4 duplicate(Healer) Healer#dew 4_PORING
+dicastes01,201,194,4 duplicate(Healer) Healer#dic 4_PORING
+ecl_in01,45,60,4 duplicate(Healer) Healer#ecl 4_PORING
+malangdo,132,114,6 duplicate(Healer) Healer#mal 4_PORING
+malaya,205,205,6 duplicate(Healer) Healer#ma 4_PORING
+mora,55,152,4 duplicate(Healer) Healer#mora 4_PORING
diff --git a/npc/custom/item_signer.txt b/npc/custom/item_signer.txt
index 41bddb1f4..fad2f92f9 100644
--- a/npc/custom/item_signer.txt
+++ b/npc/custom/item_signer.txt
@@ -11,7 +11,7 @@
//= 1.1a Added 'disable_items' command. [Euphy]
//============================================================
-prt_in,24,61,7 script Perchik 47,{
+prt_in,24,61,7 script Perchik 1_M_01,{
setarray .@Item[0],644,3; // Item requirements: <ID>,<Count>{,...} (0 to disable)
setarray .@Cost[0],0,5000; // Zeny requirements: <base price>,<price per refine>
diff --git a/npc/custom/itemmall.txt b/npc/custom/itemmall.txt
index 954b69621..7e1aa1199 100644
--- a/npc/custom/itemmall.txt
+++ b/npc/custom/itemmall.txt
@@ -8,35 +8,35 @@
//= Street shops in Prontera.
//============================================================
-prontera,147,240,5 shop Armor 99,2304:10000,2306:20000,2308:20000,2310:50000,2311:50000,2313:50000,2315:75000,2317:100000,2322:20000,2326:60000,2331:75000,2342:100000,2353:75000,2364:150000,2367:100000,2399:50000
-prontera,147,242,5 shop Shield 99,2102:10000,2106:60000,2108:60000,2110:85000,2114:30000,2116:30000,2123:50000,2124:50000
-prontera,147,244,5 shop Footgear 99,2404:10000,2406:20000,2409:30000,2412:50000,2417:50000,2418:50000,2424:50000,2425:20000
-prontera,147,246,5 shop Mace 99,1502:10000,1505:20000,1511:20000,1514:-1,1517:-1,1520:50000,1522:100000,1523:25000,1528:50000,1529:50000,1531:50000
-prontera,147,248,5 shop Knuckle 494,1802:20000,1804:50000,1806:60000,1808:75000,1810:70000,1812:60000,1813:100000,1814:100000,1822:150000
-prontera,147,250,5 shop Whips 494,1951:10000,1953:20000,1955:30000,1962:20000,1963:50000,1972:10000,1974:10000,1976:50000
-prontera,147,252,5 shop Instruments 494,1902:10000,1904:20000,1906:-1,1908:50000,1913:50000,1914:50000,1915:50000,1916:50000,1917:50000
-prontera,147,254,5 shop Books 494,1550:30000,1551:60000,1552:51000,1559:25000,1561:75000,1564:25000,1568:70000,1569:70000,1570:70000,1571:70000,1572:50000
-prontera,147,256,5 shop Guns 497,13103:60000,13105:100000,13106:200000,13101:10000,13150:6000,13152:30000,13153:50000,13155:60000,13156:100000,13154:30000,13159:250000,13157:150000,13161:300000,13162:500000
-prontera,147,258,5 shop Fuuma Shuriken 497,7522:500,7521:500,7523:500
-prontera,147,260,5 shop One-Handed Swords 497,1108:10000,1117:10000,1120:100000,1124:50000,1130:100000,1131:50000,1133:50000,1138:200000,1139:200000,1145:-1,1149:50000
-prontera,147,262,5 shop Two-Handed Swords 497,1155:50000,1158:90000,1163:120000,1164:50000,1165:50000,1166:75000,1168:50000,1169:500000,1172:200000,1175:75000
-prontera,147,264,5 shop Spears 731,1405:20000,1408:50000,1415:100000,1417:75000,1421:75000,1422:25000
-prontera,147,238,1 shop Dagger 731,1208:20000,1211:20000,1217:20000,1223:50000,1231:75000,1235:75000,1236:75000,1237:75000
-prontera,164,264,4 shop Axes 731,1302:10000,1306:20000,1307:45000,1309:75000,1352:20000,1355:30000,1358:75000,1363:50000,1364:50000,1365:50000,1366:50000,1371:100000
-prontera,164,262,4 shop Accessories 731,2621:-1,2622:-1,2624:30000,2618:10000,2625:30000,2626:30000,2674:10000,2648:50000,2649:50000,2627:-1,2701:75000
-prontera,164,260,4 shop Bows 731,1702:20000,1705:50000,1708:20000,1720:50000,1723:75000,1724:75000,1725:75000
-prontera,164,258,4 shop Staffs / Rods 731,1602:20000,1605:20000,1608:20000,1611:45000,1618:85000,1620:85000,1622:50000,1624:50000,1625:50000,1626:50000
-prontera,164,256,4 shop Garments 405,2504:10000,2506:40000,2507:82000,2508:56000,2514:50000,2518:60000,2519:60000,2528:85000,2531:10000,2553:10000
-prontera,164,254,4 shop Katars 405,1251:50000,1253:100000,1255:75000,1261:125000,1262:20000,1263:20000,1265:100000,1275:100000,1276:100000,1277:100000,1278:100000
-prontera,164,252,4 shop Lower Headgear 405,2218:10000,5054:30000,2267:5000,5107:100000,2265:5000,2266:50000,2269:50000,2270:50000
-prontera,164,250,4 shop Middle Headgear 405,2201:5000,2203:4000,2205:3500,2212:5000,2225:10000,2229:50000,2231:50000,2234:50000,2235:50000,2281:25000,2292:50000,2296:50000
-prontera,164,248,4 shop Upper Headgear 405,2210:1000,2211:1000,2213:10000,2214:20000,2217:10000,2221:5000,2223:10000,2246:75000,2256:75000,2264:100000,2280:20000,2299:30000
-prontera,164,246,4 shop Headgear 01 832,5380:40000,5382:40000,2269:5000,2270:5000,5107:15000,5110:15000,2247:30000:5206:10000,2245:30000,2286:35000,2296:15000,2258:45000,5161:200000,5104:40000,2295:20000,5026:30000,5032:100000,5038:30000,5229:65000,5227:65000,5228:65000,5198:50000,5058:300000,5253:80000,5252:60000,5296:100000,5231:300000,5232:300000,5233:300000,5230:300000,5234:300000,5076:50000
-prontera,164,244,4 shop Headgear 02 832,5059:100000,5235:75000,5236:75000,5237:75000,5293:150000,5303:35000,5304:65000,5312:65000,5315:45000,5317:45000,5319:75000,5320:120000,5323:588888,5336:50000,5337:50000,5338:50000,5339:50000,5346:50000
-prontera,164,242,4 shop Headgear 03 832,5181:300000,5102:500000,5016:75000,5349:150000,5013:700000,5022:500000,5171:1250000,5135:500000,5029:50000,5033:65000,5040:100000,5047:35000,5065:65000,5068:50000,5074:50000,5084:75000,5086:150000,5108:350000,5121:100000,5133:50000,5137:100000,5138:150000,5140:55000,5146:75000,5151:75000,5152:150000,5170:150000,5173:75000,5174:75000,5175:75000,5184:50000,5185:45000,5187:75000,5188:50000,5191:25000,5192:25000,5193:25000,5194:25000,5195:25000,5196:25000,5197:25000
-prontera,164,240,4 shop Headgear 04 832,5200:75000,5205:100000,5211:75000,5226:50000,5238:75000,5239:75000,5240:75000,5241:75000,5242:75000,5243:50000,5325:75000,5254:100000,5255:65000,5257:50000,5297:100000,2202:45000,5258:35000,5298:50000,5276:50000,5273:50000,5275:50000,5274:50000,5259:50000,5271:250000,5272:50000,5284:50000,5286:75000,5288:50000,5289:50000,5291:55000,5292:55000,5294:55000,5352:50000,5324:100000,5359:50000,5360:50000
-prontera,164,238,4 shop Headgear 05 832,5340:50000,5341:50000,5342:50000,5343:50000,5344:50000,5345:50000,5354:50000,5355:50000,5361:65000,5365:50000,5373:75000,5374:350000,5379:50000,5383:60000,5384:88888,5390:88888,5388:50000,5411:50000,5393:75000,5397:35000,5399:50000,5800:175000,5801:300000,5802:150000
-prontera,151,284,4 shop Ammunition 880,1766:50,1755:20,1750:10,1754:20,1761:20,1752:20,1760:20,1759:20,1772:100,1757:30,1770:20,1769:30,1765:40,1763:30,1762:30,1767:30,1764:30,1751:20,1768:30,1753:30,1756:30,1758:30,1771:1000,13200:50,13202:100,13201:300,13206:500,13203:500,13207:500,13204:500,13205:500,13252:50,13254:500,13251:100,13253:300,13250:50,13256:50,13259:50,13258:50,13255:50,13257:50
-prontera,153,284,4 shop Alchemist Dealer 880,715:600,716:600,717:600,1025:200,7136:500,7135:500,7137:500,7138:500,7139:500
-prontera,155,284,4 shop Street Dealer 880,678:5000,505:-1,506:40,610:4000,545:150,546:600,547:1650
-prontera,157,284,4 shop Sheepy Gonzales 895,12028:1000,12262:500,12016:750
+prontera,147,240,5 shop Armor 4W_M_03,2304:10000,2306:20000,2308:20000,2310:50000,2311:50000,2313:50000,2315:75000,2317:100000,2322:20000,2326:60000,2331:75000,2342:100000,2353:75000,2364:150000,2367:100000,2399:50000
+prontera,147,242,5 shop Shield 4W_M_03,2102:10000,2106:60000,2108:60000,2110:85000,2114:30000,2116:30000,2123:50000,2124:50000
+prontera,147,244,5 shop Footgear 4W_M_03,2404:10000,2406:20000,2409:30000,2412:50000,2417:50000,2418:50000,2424:50000,2425:20000
+prontera,147,246,5 shop Mace 4W_M_03,1502:10000,1505:20000,1511:20000,1514:-1,1517:-1,1520:50000,1522:100000,1523:25000,1528:50000,1529:50000,1531:50000
+prontera,147,248,5 shop Knuckle 4_M_ROKI,1802:20000,1804:50000,1806:60000,1808:75000,1810:70000,1812:60000,1813:100000,1814:100000,1822:150000
+prontera,147,250,5 shop Whips 4_M_ROKI,1951:10000,1953:20000,1955:30000,1962:20000,1963:50000,1972:10000,1974:10000,1976:50000
+prontera,147,252,5 shop Instruments 4_M_ROKI,1902:10000,1904:20000,1906:-1,1908:50000,1913:50000,1914:50000,1915:50000,1916:50000,1917:50000
+prontera,147,254,5 shop Books 4_M_ROKI,1550:30000,1551:60000,1552:51000,1559:25000,1561:75000,1564:25000,1568:70000,1569:70000,1570:70000,1571:70000,1572:50000
+prontera,147,256,5 shop Guns 4_M_CATMAN1,13103:60000,13105:100000,13106:200000,13101:10000,13150:6000,13152:30000,13153:50000,13155:60000,13156:100000,13154:30000,13159:250000,13157:150000,13161:300000,13162:500000
+prontera,147,258,5 shop Fuuma Shuriken 4_M_CATMAN1,7522:500,7521:500,7523:500
+prontera,147,260,5 shop One-Handed Swords 4_M_CATMAN1,1108:10000,1117:10000,1120:100000,1124:50000,1130:100000,1131:50000,1133:50000,1138:200000,1139:200000,1145:-1,1149:50000
+prontera,147,262,5 shop Two-Handed Swords 4_M_CATMAN1,1155:50000,1158:90000,1163:120000,1164:50000,1165:50000,1166:75000,1168:50000,1169:500000,1172:200000,1175:75000
+prontera,147,264,5 shop Spears 4_M_JOB_BLACKSMITH,1405:20000,1408:50000,1415:100000,1417:75000,1421:75000,1422:25000
+prontera,147,238,1 shop Dagger 4_M_JOB_BLACKSMITH,1208:20000,1211:20000,1217:20000,1223:50000,1231:75000,1235:75000,1236:75000,1237:75000
+prontera,164,264,4 shop Axes 4_M_JOB_BLACKSMITH,1302:10000,1306:20000,1307:45000,1309:75000,1352:20000,1355:30000,1358:75000,1363:50000,1364:50000,1365:50000,1366:50000,1371:100000
+prontera,164,262,4 shop Accessories 4_M_JOB_BLACKSMITH,2621:-1,2622:-1,2624:30000,2618:10000,2625:30000,2626:30000,2674:10000,2648:50000,2649:50000,2627:-1,2701:75000
+prontera,164,260,4 shop Bows 4_M_JOB_BLACKSMITH,1702:20000,1705:50000,1708:20000,1720:50000,1723:75000,1724:75000,1725:75000
+prontera,164,258,4 shop Staffs / Rods 4_M_JOB_BLACKSMITH,1602:20000,1605:20000,1608:20000,1611:45000,1618:85000,1620:85000,1622:50000,1624:50000,1625:50000,1626:50000
+prontera,164,256,4 shop Garments 4_M_YOUNGKNIGHT,2504:10000,2506:40000,2507:82000,2508:56000,2514:50000,2518:60000,2519:60000,2528:85000,2531:10000,2553:10000
+prontera,164,254,4 shop Katars 4_M_YOUNGKNIGHT,1251:50000,1253:100000,1255:75000,1261:125000,1262:20000,1263:20000,1265:100000,1275:100000,1276:100000,1277:100000,1278:100000
+prontera,164,252,4 shop Lower Headgear 4_M_YOUNGKNIGHT,2218:10000,5054:30000,2267:5000,5107:100000,2265:5000,2266:50000,2269:50000,2270:50000
+prontera,164,250,4 shop Middle Headgear 4_M_YOUNGKNIGHT,2201:5000,2203:4000,2205:3500,2212:5000,2225:10000,2229:50000,2231:50000,2234:50000,2235:50000,2281:25000,2292:50000,2296:50000
+prontera,164,248,4 shop Upper Headgear 4_M_YOUNGKNIGHT,2210:1000,2211:1000,2213:10000,2214:20000,2217:10000,2221:5000,2223:10000,2246:75000,2256:75000,2264:100000,2280:20000,2299:30000
+prontera,164,246,4 shop Headgear 01 4_M_REIDIN_KURS,5380:40000,5382:40000,2269:5000,2270:5000,5107:15000,5110:15000,2247:30000:5206:10000,2245:30000,2286:35000,2296:15000,2258:45000,5161:200000,5104:40000,2295:20000,5026:30000,5032:100000,5038:30000,5229:65000,5227:65000,5228:65000,5198:50000,5058:300000,5253:80000,5252:60000,5296:100000,5231:300000,5232:300000,5233:300000,5230:300000,5234:300000,5076:50000
+prontera,164,244,4 shop Headgear 02 4_M_REIDIN_KURS,5059:100000,5235:75000,5236:75000,5237:75000,5293:150000,5303:35000,5304:65000,5312:65000,5315:45000,5317:45000,5319:75000,5320:120000,5323:588888,5336:50000,5337:50000,5338:50000,5339:50000,5346:50000
+prontera,164,242,4 shop Headgear 03 4_M_REIDIN_KURS,5181:300000,5102:500000,5016:75000,5349:150000,5013:700000,5022:500000,5171:1250000,5135:500000,5029:50000,5033:65000,5040:100000,5047:35000,5065:65000,5068:50000,5074:50000,5084:75000,5086:150000,5108:350000,5121:100000,5133:50000,5137:100000,5138:150000,5140:55000,5146:75000,5151:75000,5152:150000,5170:150000,5173:75000,5174:75000,5175:75000,5184:50000,5185:45000,5187:75000,5188:50000,5191:25000,5192:25000,5193:25000,5194:25000,5195:25000,5196:25000,5197:25000
+prontera,164,240,4 shop Headgear 04 4_M_REIDIN_KURS,5200:75000,5205:100000,5211:75000,5226:50000,5238:75000,5239:75000,5240:75000,5241:75000,5242:75000,5243:50000,5325:75000,5254:100000,5255:65000,5257:50000,5297:100000,2202:45000,5258:35000,5298:50000,5276:50000,5273:50000,5275:50000,5274:50000,5259:50000,5271:250000,5272:50000,5284:50000,5286:75000,5288:50000,5289:50000,5291:55000,5292:55000,5294:55000,5352:50000,5324:100000,5359:50000,5360:50000
+prontera,164,238,4 shop Headgear 05 4_M_REIDIN_KURS,5340:50000,5341:50000,5342:50000,5343:50000,5344:50000,5345:50000,5354:50000,5355:50000,5361:65000,5365:50000,5373:75000,5374:350000,5379:50000,5383:60000,5384:88888,5390:88888,5388:50000,5411:50000,5393:75000,5397:35000,5399:50000,5800:175000,5801:300000,5802:150000
+prontera,151,284,4 shop Ammunition 4_M_MASKMAN,1766:50,1755:20,1750:10,1754:20,1761:20,1752:20,1760:20,1759:20,1772:100,1757:30,1770:20,1769:30,1765:40,1763:30,1762:30,1767:30,1764:30,1751:20,1768:30,1753:30,1756:30,1758:30,1771:1000,13200:50,13202:100,13201:300,13206:500,13203:500,13207:500,13204:500,13205:500,13252:50,13254:500,13251:100,13253:300,13250:50,13256:50,13259:50,13258:50,13255:50,13257:50
+prontera,153,284,4 shop Alchemist Dealer 4_M_MASKMAN,715:600,716:600,717:600,1025:200,7136:500,7135:500,7137:500,7138:500,7139:500
+prontera,155,284,4 shop Street Dealer 4_M_MASKMAN,678:5000,505:-1,506:40,610:4000,545:150,546:600,547:1650
+prontera,157,284,4 shop Sheepy Gonzales 4_F_KHELLY,12028:1000,12262:500,12016:750
diff --git a/npc/custom/jobmaster.txt b/npc/custom/jobmaster.txt
index cd07cf443..ed55b4d87 100644
--- a/npc/custom/jobmaster.txt
+++ b/npc/custom/jobmaster.txt
@@ -12,7 +12,7 @@
//= 1.3 Kagerou/Oboro added. [Euphy]
//============================================================
-prontera,153,193,6 script Job Master 123,{
+prontera,153,193,6 script Job Master 2_F_MAGICMASTER,{
function Job_Menu; function A_An;
mes "[Job Master]";
diff --git a/npc/custom/platinum_skills.txt b/npc/custom/platinum_skills.txt
index 9295d122f..da35da389 100644
--- a/npc/custom/platinum_skills.txt
+++ b/npc/custom/platinum_skills.txt
@@ -18,7 +18,7 @@
//= 2.8 Clustered conditionals replaced with switch to include all Upper types. [Euphy]
//============================================================
-prontera,128,200,6 script Platinum Skill NPC 94,{
+prontera,128,200,6 script Platinum Skill NPC 4_F_MAID,{
mes "[Platinum Skill NPC]";
mes "I can give you the special skills available to your job.";
mes "Would you like these skills now?";
diff --git a/npc/custom/quests/bandit_beard.txt b/npc/custom/quests/bandit_beard.txt
index 6cf47ef25..ebb74afc7 100644
--- a/npc/custom/quests/bandit_beard.txt
+++ b/npc/custom/quests/bandit_beard.txt
@@ -15,7 +15,7 @@
//= 1.3 Removed duplicates [L0ne_W0lf]
//============================================================
-umbala,126,129,4 script Bearded Man#bandit 120,{
+umbala,126,129,4 script Bearded Man#bandit 2_M_PHARMACIST,{
if(BEARD_QUEST == 4 ) goto L_MAKE;
if(BEARD_QUEST >= 5 ) goto L_DONE;
if(BEARD_QUEST >= 1 ) goto L_THREAD;
@@ -100,7 +100,7 @@ L_NOITEMS:
}
//Master Tailor----------
-izlude_in,123,175,4 script Master Tailor#bandit 50,{
+izlude_in,123,175,4 script Master Tailor#bandit 1_M_04,{
mes "[Master Tailor]";
mes "Good evening! I am the Master Tailor!";
if(BEARD_QUEST != 1 ) close;
@@ -117,7 +117,7 @@ izlude_in,123,175,4 script Master Tailor#bandit 50,{
close;
}
// Karfa Thread Clerk---
-aldeba_in,70,179,5 script Karfa Clerk#bandit 113,{
+aldeba_in,70,179,5 script Karfa Clerk#bandit 4_F_KAFRA5,{
mes "[Karfa Clerk]";
if(BEARD_QUEST == 3 ) goto L_REPEAT;
if(BEARD_QUEST > 3 ) goto L_DONE;
@@ -155,7 +155,7 @@ L_DONE:
}
//Thread Merchant ------
-alberta,65,123,6 script Man#bandit 85,{
+alberta,65,123,6 script Man#bandit 4_M_03,{
if(BEARD_QUEST == 3 && $@beardMobD) goto L_KILLED;
if(BEARD_QUEST > 3) goto L_DONE;
diff --git a/npc/custom/quests/berzebub.txt b/npc/custom/quests/berzebub.txt
index 6f58870eb..8827329d9 100644
--- a/npc/custom/quests/berzebub.txt
+++ b/npc/custom/quests/berzebub.txt
@@ -11,7 +11,7 @@
//= 1.2 Optimized. [Euphy]
//============================================================
-prontera,165,178,8 script Old Woman 103,{
+prontera,165,178,8 script Old Woman 8_F_GRANDMOTHER,{
setarray .@Items[0],714,25,1061,100,1095,200,618,10,1551,2,1614,1,727,20;
set .@n$,"[Old Woman]";
diff --git a/npc/custom/quests/dead_branch.txt b/npc/custom/quests/dead_branch.txt
index 13daa244b..95f0a95b7 100644
--- a/npc/custom/quests/dead_branch.txt
+++ b/npc/custom/quests/dead_branch.txt
@@ -12,7 +12,7 @@
//= 1.1 Optimized, added Bloody Branch with 0.01% chance [Lupus]
//============================================================
-niflheim,204,179,3 script Mister Mobry 121,{
+niflheim,204,179,3 script Mister Mobry 2_M_MOLGENSTEIN,{
mes "[Mister Mobry]";
mes "Trees possess spirits you know...";
diff --git a/npc/custom/quests/elvenear.txt b/npc/custom/quests/elvenear.txt
index e412fcb67..25eb12080 100644
--- a/npc/custom/quests/elvenear.txt
+++ b/npc/custom/quests/elvenear.txt
@@ -11,7 +11,7 @@
//= 1.2 Fixed exploit [Lupus]
//============================================================
-geffen,127,49,5 script Elven Ears Quest 84,{
+geffen,127,49,5 script Elven Ears Quest 4_M_02,{
mes "[Elven Ears Quest]";
mes "Hi, today's quest is....";
mes "Ah, the ^61B031Elven Ears ^000000Quest!";
diff --git a/npc/custom/quests/event_6_new_hats.txt b/npc/custom/quests/event_6_new_hats.txt
index ce3885be3..7352beef1 100644
--- a/npc/custom/quests/event_6_new_hats.txt
+++ b/npc/custom/quests/event_6_new_hats.txt
@@ -22,7 +22,7 @@
//= 1.4 Fixed exploits. 1.4a fixed wrong item ID [Lupus]
//============================================================
-prt_in,130,66,5 script Zac 704,{
+prt_in,130,66,5 script Zac 4_M_BIBI,{
mes "[Zac]";
mes "I am the oldest and strongest of the 4 brothers that makes all the newer hats. You will need to bring me the correct items for each hat, so I can make them.";
next;
@@ -82,7 +82,7 @@ L3:
close;
}
-prt_in,162,131,5 script Blac 732,{
+prt_in,162,131,5 script Blac 4_M_JOB_HUNTER,{
mes "[Blac]";
mes "I am the youngest and sexiest of the 4 brothers that makes all the newer hats. You will need to bring me the correct items for each hat, so I can make them.";
next;
@@ -136,7 +136,7 @@ L3:
close;
}
-prt_in,53,56,5 script Jac 107,{
+prt_in,53,56,5 script Jac 1_M_PAY_ELDER,{
mes "[Jac]";
mes "I am the 2nd oldest and calmest of the 4 brothers that makes all the newer hats. You will need to bring me the correct items for each hat, so I can make them.";
next;
@@ -220,7 +220,7 @@ L3:
close;
}
-prt_in,45,113,5 script Pac 705,{
+prt_in,45,113,5 script Pac 4_M_GEF_SOLDIER,{
mes "[Pac]";
mes "I am 3rd oldest and wisest of the 4 brothers that makes all the newer hats. You will need to bring me the correct items for each hat so I can make them.";
next;
diff --git a/npc/custom/quests/hunting_missions.txt b/npc/custom/quests/hunting_missions.txt
index c1b2b62e2..d07ebb0d0 100644
--- a/npc/custom/quests/hunting_missions.txt
+++ b/npc/custom/quests/hunting_missions.txt
@@ -16,7 +16,7 @@
//= 1.3a Added mission reset options.
//============================================================
-prontera,152,187,6 script Hunting Missions 951,{
+prontera,152,187,6 script Hunting Missions 4_F_EDEN_MASTER,{
function Chk; function Cm;
mes "[Hunting Missions]";
mes "Hello, "+strcharinfo(0)+"!";
diff --git a/npc/custom/quests/jewel_case.txt b/npc/custom/quests/jewel_case.txt
index 27770cb6b..d725a33f1 100644
--- a/npc/custom/quests/jewel_case.txt
+++ b/npc/custom/quests/jewel_case.txt
@@ -9,7 +9,7 @@
//= with Jewel Case as a reward.
//============================================================
-lighthalzen,108,229,2 script La Fenn 766,{
+lighthalzen,108,229,2 script La Fenn 4_M_JPNOJI,{
mes "[La Fenn]";
if(BaseLevel<99) {
if(Q_99LVL) {
diff --git a/npc/custom/quests/kaho_balmung.txt b/npc/custom/quests/kaho_balmung.txt
index 4da28bc38..fac8b85ff 100644
--- a/npc/custom/quests/kaho_balmung.txt
+++ b/npc/custom/quests/kaho_balmung.txt
@@ -11,7 +11,7 @@
//= 1.1 Cleaned and optimized. [Euphy]
//============================================================
-prontera,158,356,4 script Royal Messenger 105,{
+prontera,158,356,4 script Royal Messenger 8W_SOLDIER,{
setarray .@Req1[0],1161,999,120,984,10,996,10,994,10,995,10,997,10;
setarray .@Req2[0],5013,2298,1,1001,10,996,10,994,10,995,10,997,10;
diff --git a/npc/custom/quests/kahohorn.txt b/npc/custom/quests/kahohorn.txt
index 4677dea8c..ea1916e50 100644
--- a/npc/custom/quests/kahohorn.txt
+++ b/npc/custom/quests/kahohorn.txt
@@ -10,7 +10,7 @@
//= 1.1 Optimized, and fixed some requirements. [Euphy]
//============================================================
-geffen,115,107,5 script Lord Kaho's Servant 61,{
+geffen,115,107,5 script Lord Kaho's Servant 1_M_PUBMASTER,{
setarray .@Items[0],7005, 968, 923, 734, 724,2268,7036,7020,5053,7018,741,742,743,750,751,752,753,754;
setarray .@Drops[0],1272,1087,1039,1260,1046,1115,1252,1147,1038,1059;
diff --git a/npc/custom/quests/kings_items.txt b/npc/custom/quests/kings_items.txt
index de908ab9e..b8c7a5538 100644
--- a/npc/custom/quests/kings_items.txt
+++ b/npc/custom/quests/kings_items.txt
@@ -11,7 +11,7 @@
//= 1.1 Optimized. [Euphy]
//============================================================
-prt_castle,80,170,4 script King of Prontera 108,{
+prt_castle,80,170,4 script King of Prontera 1_M_PRON_KING,{
mes "[King of Prontera]";
mes "Hello, can you help me?";
next;
@@ -62,7 +62,7 @@ prt_castle,80,170,4 script King of Prontera 108,{
}
}
-prt_castle,84,170,4 script King's Daughter 62,{
+prt_castle,84,170,4 script King's Daughter 1_M_SIZ,{
mes "[King's Daughter]";
mes "Hmph, I hate my dad right now!!";
next;
diff --git a/npc/custom/quests/may_hats.txt b/npc/custom/quests/may_hats.txt
index c354c6ae9..eda6b2aa6 100644
--- a/npc/custom/quests/may_hats.txt
+++ b/npc/custom/quests/may_hats.txt
@@ -12,7 +12,7 @@
//= 1.01 translated the rest of dialogues
//============================================================
-gonryun,187,140,4 script Yakima 850,{
+gonryun,187,140,4 script Yakima 4_F_EINWOMAN,{
mes "[Yakima]";
mes callfunc("F_Hi");
mes "I can make some items for you.";
diff --git a/npc/custom/quests/quest_shop.txt b/npc/custom/quests/quest_shop.txt
index c4794c341..9398826ba 100644
--- a/npc/custom/quests/quest_shop.txt
+++ b/npc/custom/quests/quest_shop.txt
@@ -21,7 +21,7 @@
// Shop NPCs -- supplying no argument displays entire menu.
// callfunc "qshop"{,<shop ID>{,<shop ID>{,...}}};
//============================================================
-prontera,164,203,6 script Quest Shop#1 998,{ callfunc "qshop"; }
+prontera,164,203,6 script Quest Shop#1 4_M_MOCASS2,{ callfunc "qshop"; }
// Script Core
diff --git a/npc/custom/quests/questboard.txt b/npc/custom/quests/questboard.txt
index 265b24c60..28a25cc28 100644
--- a/npc/custom/quests/questboard.txt
+++ b/npc/custom/quests/questboard.txt
@@ -15,7 +15,7 @@
// 1.4.4 Added Quest delay
//============================================================
-prontera,129,215,5 script Questboard 857,{
+prontera,129,215,5 script Questboard 4_BOARD3,{
if(c_run==1){
mes "[^FF7700Questboard^000000]";
diff --git a/npc/custom/quests/sphinx_mask.txt b/npc/custom/quests/sphinx_mask.txt
index 2d4cc8f94..b4e9c118c 100644
--- a/npc/custom/quests/sphinx_mask.txt
+++ b/npc/custom/quests/sphinx_mask.txt
@@ -11,7 +11,7 @@
//= 1.3 Optimized, and coordinates moved. [Euphy]
//============================================================
-morocc,208,90,6 script Turban Thief 58,{
+morocc,208,90,6 script Turban Thief 1_M_MERCHANT,{
mes "[Turban Thief]";
if(event_umbala < 2) {
mes "What do you wan te withz me? Be gone!";
diff --git a/npc/custom/quests/sunglasses.txt b/npc/custom/quests/sunglasses.txt
index e58639cb1..a4c828457 100644
--- a/npc/custom/quests/sunglasses.txt
+++ b/npc/custom/quests/sunglasses.txt
@@ -15,7 +15,7 @@
//= 1.8 Cleaning. [Euphy]
//============================================================
-alberta,88,193,5 script Sunglasses Trader 73,{
+alberta,88,193,5 script Sunglasses Trader 1_F_MERCHANT_01,{
mes "[Sunglasses Trader]";
if(SG_QUEST1 == 1) {
mes "There is nothing more I can tell you.";
@@ -67,7 +67,7 @@ alberta,88,193,5 script Sunglasses Trader 73,{
close;
}
-moc_fild07,334,186,5 script Maseph 702,{
+moc_fild07,334,186,5 script Maseph 4_F_GON,{
mes "[Maseph]";
if(SG_QUEST1 != 1) {
mes "Lovely day, isn't it ?";
diff --git a/npc/custom/quests/tha_statues.txt b/npc/custom/quests/tha_statues.txt
index d072179f3..283615be9 100644
--- a/npc/custom/quests/tha_statues.txt
+++ b/npc/custom/quests/tha_statues.txt
@@ -13,7 +13,7 @@
//Statue (NPC)(U: UP, D: DOWN, R: RIGHT, L: LEFT) :
// Explain Npc
-tha_t08,69,106,4 script Statue 111,{
+tha_t08,69,106,4 script Statue HIDDEN_NPC,{
mes "You can read on the back of the statue:";
mes "'By the spirit of olds, the walls are closed";
mes "Upper floors or foreign taboo";
@@ -28,7 +28,7 @@ tha_t08,69,106,4 script Statue 111,{
//(Mediane)(D,R)-->tha_t09,84,99,4
//Script:
-tha_t09,17,158,4 script Thalos 111,{
+tha_t09,17,158,4 script Thalos HIDDEN_NPC,{
if(TSQ_CHK == 1) goto done;
mes "[Thalos]";
mes "You must find the 2nd Statue now.";
@@ -41,7 +41,7 @@ done:
}
-tha_t09,84,99,4 script Mediane 111,{
+tha_t09,84,99,4 script Mediane HIDDEN_NPC,{
if(TSQ_CHK != 1) goto nook;
mes "[Mediane]";
mes "Okay, i am warping you to the next floor now.";
@@ -61,7 +61,7 @@ nook:
//(Veriaelle)(D,L)-->tha_t10,99,97,4
//Script:
-tha_t10,130,159,4 script Melkor 111,{
+tha_t10,130,159,4 script Melkor HIDDEN_NPC,{
if(TSQ_CHK == 1) goto done;
mes "[Melkor]";
mes "You must find the other Spirits now.";
@@ -74,7 +74,7 @@ done:
close;
}
-tha_t10,160,98,4 script Zebrus 111,{
+tha_t10,160,98,4 script Zebrus HIDDEN_NPC,{
if(TSQ_CHK != 1) goto nook;
mes "[Zebrus]";
mes "Keep on this way, There is one Spirit left";
@@ -88,7 +88,7 @@ nook:
close;
}
-tha_t10,99,97,4 script Veriaelle 111,{
+tha_t10,99,97,4 script Veriaelle HIDDEN_NPC,{
if(TSQ_CHK != 2) goto nook;
mes "[Veriaelle]";
mes "Okay, i am warping you to the next floor.";
@@ -111,7 +111,7 @@ nook:
//(Seranes)(U,R)-->tha_t11,85,85,4
//Script:
-tha_t11,16,85,4 script Throtre 111,{
+tha_t11,16,85,4 script Throtre HIDDEN_NPC,{
if(TSQ_CHK == 1) goto done;
mes "[Throtre]";
mes "You got my authorization for the next floor";
@@ -124,7 +124,7 @@ done:
close;
}
-tha_t11,85,16,4 script Klermaz 111,{
+tha_t11,85,16,4 script Klermaz HIDDEN_NPC,{
if(TSQ_CHK != 1) goto nook;
mes "[Klermaz]";
mes "Hmm it seems that Throtre allowed you to pass.";
@@ -139,7 +139,7 @@ nook:
close;
}
-tha_t11,16,16,4 script Mihane 111,{
+tha_t11,16,16,4 script Mihane HIDDEN_NPC,{
if(TSQ_CHK != 2) goto nook;
mes "[Mihane]";
mes "Keep on this way, Only 1 Left.";
@@ -153,7 +153,7 @@ nook:
close;
}
-tha_t11,85,85,4 script Seranes 111,{
+tha_t11,85,85,4 script Seranes HIDDEN_NPC,{
if(TSQ_CHK != 3 ) goto nook;
mes "[Seranes]";
mes "Perfect, it seems that the other spirits grants you the access.";
@@ -178,7 +178,7 @@ nook:
//(Sox)(U)-->tha_t12,128,88,4
//Script:
-tha_t12,103,18,4 script Nox 111,{
+tha_t12,103,18,4 script Nox HIDDEN_NPC,{
if(TSQ_CHK == 1 ) goto done;
mes "[Nox]";
mes "Fine, 4 Spirits left.";
@@ -190,7 +190,7 @@ done:
close;
}
-tha_t12,162,58,4 script Vox 111,{
+tha_t12,162,58,4 script Vox HIDDEN_NPC,{
if(TSQ_CHK != 1 ) goto nook;
mes "[Vox]";
mes "Keep on this way, 3 Spirits remaining !";
@@ -204,7 +204,7 @@ nook:
close;
}
-tha_t12,96,57,4 script Hox 111,{
+tha_t12,96,57,4 script Hox HIDDEN_NPC,{
if(TSQ_CHK != 2 ) goto nook;
mes "[Hox]";
mes "You are on the good way, 2 Spirits remaining !";
@@ -218,7 +218,7 @@ nook:
close;
}
-tha_t12,153,17,4 script Dox 111,{
+tha_t12,153,17,4 script Dox HIDDEN_NPC,{
if(TSQ_CHK != 3 ) goto nook;
mes "[Dox]";
mes "Perfect, 1 Spirit left.";
@@ -232,7 +232,7 @@ nook:
close;
}
-tha_t12,128,88,4 script Sox 111,{
+tha_t12,128,88,4 script Sox HIDDEN_NPC,{
if(TSQ_CHK != 4 ) goto nook;
mes "[Sox]";
mes "You have just passed the test successfully.";
diff --git a/npc/custom/quests/thq/THQS_ChatingNPC.txt b/npc/custom/quests/thq/THQS_ChatingNPC.txt
index 5fce4d13d..a8cb49b9f 100644
--- a/npc/custom/quests/thq/THQS_ChatingNPC.txt
+++ b/npc/custom/quests/thq/THQS_ChatingNPC.txt
@@ -12,7 +12,7 @@
//============================================================
//Entrance Flags
-yuno,48,101,6 script Notice 722,{
+yuno,48,101,6 script Notice GUILD_FLAG,{
mes "^FF0000[ Treasure Hunter Guild House ]^000000";
mes " ";
mes "Welcome to the Treasure Hunter's Guild House.";
@@ -24,7 +24,7 @@ yuno,48,101,6 script Notice 722,{
close;
}
//Saver Girl;
-yuno_in01,32,178,3 script Ahlma 94,{
+yuno_in01,32,178,3 script Ahlma 4_F_MAID,{
mes "[Ahlma]";
if (Event_THQS == 0) goto N_Member;
mes "Welcome to The Treasure Hunter Guild.";
@@ -44,7 +44,7 @@ N_Member:
close;
}
//Retired Smile mask girl;
-yuno_in01,33,162,3 script Smile Helper 92,{
+yuno_in01,33,162,3 script Smile Helper 4_F_03,{
mes "[Smile Gal]";
mes "Oh man...I am so sick of";
mes "trading Mr. Smile masks for crap.";
@@ -53,7 +53,7 @@ yuno_in01,33,162,3 script Smile Helper 92,{
close;
}
//Usless Female Assasin;
-yuno_in01,22,162,6 script Female Assasin 725,{
+yuno_in01,22,162,6 script Female Assasin 4_F_JOB_ASSASSIN,{
mes "[Sharlet]";
if (Event_THQS > 0) goto N_Member;
mes "Umm sorry I'm not gona waste my time talking to you if you arn't even a member!";
@@ -74,7 +74,7 @@ N_Chat2:
close;
}
//another usless member
-yuno_in01,25,162,6 script Female Wizard 123,{
+yuno_in01,25,162,6 script Female Wizard 2_F_MAGICMASTER,{
mes "[Sasha]";
if (Event_THQS > 0) goto N_Member;
mes "Umm sorry I'm not gona waste my time talking to you if you arn't even a member!";
diff --git a/npc/custom/quests/thq/THQS_GuildNPC.txt b/npc/custom/quests/thq/THQS_GuildNPC.txt
index 0e13645b7..a49c92ed3 100644
--- a/npc/custom/quests/thq/THQS_GuildNPC.txt
+++ b/npc/custom/quests/thq/THQS_GuildNPC.txt
@@ -11,7 +11,7 @@
//= #Treasure_Token - used to keep track of tokens
//============================================================
-yuno_in01,124,164,6 script Guild Leader 108,{
+yuno_in01,124,164,6 script Guild Leader 1_M_PRON_KING,{
mes "[Keegan]";
mes "What brings you here? Have something to say?";
next;
diff --git a/npc/custom/quests/thq/THQS_QuestNPC.txt b/npc/custom/quests/thq/THQS_QuestNPC.txt
index 0bd234be2..b89279aec 100644
--- a/npc/custom/quests/thq/THQS_QuestNPC.txt
+++ b/npc/custom/quests/thq/THQS_QuestNPC.txt
@@ -16,7 +16,7 @@
//= 1.4 Fixed typos. (bugreport:2607) [Kisuka]
//============================================================
-yuno_in01,112,151,6 script Quest Manager 62,{
+yuno_in01,112,151,6 script Quest Manager 1_M_SIZ,{
mes "[Guy]";
mes "Welcome to the Treasure Hunters Guild "+strcharinfo(0)+".";
next;
diff --git a/npc/custom/quests/thq/THQS_Quests.txt b/npc/custom/quests/thq/THQS_Quests.txt
index 114a6bea5..40e89c18b 100644
--- a/npc/custom/quests/thq/THQS_Quests.txt
+++ b/npc/custom/quests/thq/THQS_Quests.txt
@@ -19,7 +19,7 @@
///////Job list 1///////
//1-1
-mjolnir_09,187,189,6 script Old Man 107,{
+mjolnir_09,187,189,6 script Old Man 1_M_PAY_ELDER,{
if (one_qset==1) goto N_QuestStart;
mes "[Old Man]";
mes "Eh! Can't and old man walk in peace anymore?!";
@@ -37,7 +37,7 @@ N_QuestStart:
close;
}
//1-2;
-pay_arche,86,129,6 script Archer 732,{
+pay_arche,86,129,6 script Archer 4_M_JOB_HUNTER,{
if (one_qset == 2) goto N_QuestStart;
mes "[Kieth]";
mes "Sorry can't talk, I'm a busy man, I'm waiting for my package.";
@@ -58,7 +58,7 @@ N_QuestStart:
close;
}
//1-3
-prt_fild06,37,192,6 script Farmer 125,{
+prt_fild06,37,192,6 script Farmer 4_M_TELEPORTER,{
if (one_qset == 3 && countitem(909) > 19 && countitem(955) > 19 && countitem(914) > 19 && countitem(705) > 19) goto N_QuestComp;
if (one_qset==3) goto N_QuestStart;
mes "[Billy-Bob]";
@@ -85,7 +85,7 @@ N_QuestStart:
close;
}
//1-4
-prontera,264,353,6 script Old Lady#thq 103,{
+prontera,264,353,6 script Old Lady#thq 8_F_GRANDMOTHER,{
if (one_qset == 4 && countitem(934) > 14) goto N_QuestComp;
if (one_qset == 4) goto N_QuestStart;
mes "[Old Lady]";
@@ -114,7 +114,7 @@ N_QuestStart:
}
///////Job list 2///////
//2-1;
-morocc,59,109,6 script Erika 700,{
+morocc,59,109,6 script Erika 8_F_GIRL,{
if (two_qset == 1 && countitem(1072) > 0) goto N_QuestComp;
if (two_qset == 1) goto N_QuestStart;
mes "[Erika]";
@@ -149,7 +149,7 @@ N_QuestStart:
close;
}
//2-2;
-in_moc_16,15,30,6 script Jeramiah 730,{
+in_moc_16,15,30,6 script Jeramiah 4_M_JOB_ASSASSIN,{
if (two_qset == 2 && countitem(1998) > 0) goto N_QuestComp;
if (two_qset == 2) goto N_QuestStart;
mes "[Jeramiah]";
@@ -172,7 +172,7 @@ N_QuestStart:
close;
}
//2-3;
-prt_fild07,316,263,6 script Marsh Man 84,{
+prt_fild07,316,263,6 script Marsh Man 4_M_02,{
if (two_qset == 3 && countitem(518) > 19) goto N_QuestComp;
if (two_qset == 3) goto N_QuestStart;
mes "[Lenith]";
@@ -197,7 +197,7 @@ N_QuestStart:
close;
}
//2-4;
-payon,161,72,6 script Molly 714,{
+payon,161,72,6 script Molly 4_F_06,{
if (two_qset == 4 && countitem(7005) > 0) goto N_QuestComp;
if (two_qset == 4) goto N_QuestStart;
mes "[Molly]";
@@ -227,7 +227,7 @@ N_QuestStart:
}
///////Job list 3///////
//3-1;
-moc_fild04,208,322,6 script Clark 65,{
+moc_fild04,208,322,6 script Clark 1_M_YOUNGKNIGHT,{
if (three_qset == 1 && countitem(1040) > 29) goto N_QuestComp;
if (three_qset == 1) goto N_QuestStart;
mes "[Clark]";
@@ -256,7 +256,7 @@ N_QuestStart:
close;
}
//3-2;
-yuno_fild01,186,162,6 script Flank 73,{
+yuno_fild01,186,162,6 script Flank 1_F_MERCHANT_01,{
if (three_qset == 2 && countitem(1082) > 0) goto N_QuestComp;
if (three_qset == 2) goto N_QuestStart;
mes "[Flank]";
@@ -281,7 +281,7 @@ N_QuestStart:
close;
}
//3-3 Goes to 7-3 using callfunc
-prt_sewb1,120,245,6 script Sewer Managment Knight 705,{
+prt_sewb1,120,245,6 script Sewer Managment Knight 4_M_GEF_SOLDIER,{
if (three_qset == 3 && countitem(955) > 149) goto N_QuestComp;
if (three_qset == 3) goto N_QuestStart;
if (seven_qset == 3) goto N_QuestStart2;
@@ -309,7 +309,7 @@ N_QuestStart2:
close;
}
//3-4
-mjolnir_02,87,357,6 script Man#01 51,{
+mjolnir_02,87,357,6 script Man#01 1_M_BARD,{
if (three_qset == 4 && countitem(1041) > 49) goto N_QuestComp;
if (three_qset == 4) goto N_QuestStart;
mes "[Rudolfo]";
@@ -337,7 +337,7 @@ N_QuestStart:
}
///////Job list 4///////
//4-1;
-pay_arche,45,138,6 script Flora 724,{
+pay_arche,45,138,6 script Flora 4_F_07,{
if (four_qset == 1 && countitem(957) > 49) goto N_QuestComp;
if (four_qset == 1) goto N_QuestStart;
mes "[Flora]";
@@ -371,7 +371,7 @@ OnMobDead:
end;
}
//4-2;
-yuno,45,138,6 script Zed 735,{
+yuno,45,138,6 script Zed 4_M_JOB_WIZARD,{
if (four_qset == 2 && countitem(1999) > 0) goto N_QuestComp;
if (four_qset == 2) goto N_QuestStart;
mes "[Zed]";
@@ -396,7 +396,7 @@ N_QuestStart:
close;
}
//4-3;
-prontera,176,204,6 script Dassy 95,{
+prontera,176,204,6 script Dassy 4_F_SISTER,{
if (four_qset == 3 && countitem(711) > 19) goto N_QuestComp;
if (four_qset == 3) goto N_QuestStart;
mes "[Dassy]";
@@ -422,7 +422,7 @@ N_QuestStart:
close;
}
//4-4;
-prt_gld,157,99,6 script Czhore 752,{
+prt_gld,157,99,6 script Czhore 4_M_CRU_OLD,{
if (four_qset == 4 && countitem(714) > 0) goto N_QuestComp;
if (four_qset == 4) goto N_QuestStart;
mes "[Czhore]";
@@ -455,7 +455,7 @@ N_QuestStart:
}
///////Job list 5///////
//5-1;
-prt_maze01,18,184,6 script Lithin#01 752,{
+prt_maze01,18,184,6 script Lithin#01 4_M_CRU_OLD,{
if (five_qset == 1 && countitem(1028) > 14) goto N_QuestComp;
if (five_qset == 1) goto N_QuestStart;
mes "[Lithin]";
@@ -482,7 +482,7 @@ N_QuestStart:
close;
}
//5-2 goes to 6-2 using callfunc;
-moc_ruins,75,167,6 script Lithin#02 87,{
+moc_ruins,75,167,6 script Lithin#02 4_M_BARBER,{
if (five_qset == 2 && countitem(932) > 29) goto N_QuestComp;
if (five_qset == 2) goto N_QuestStart;
if (six_qset == 2) goto N_QuestStart2;
@@ -510,7 +510,7 @@ N_QuestStart2:
callfunc "six_qset2";
}
//5-3;
-geffen,57,130,6 script Blonde Girl 724,{
+geffen,57,130,6 script Blonde Girl 4_F_07,{
if (five_qset == 3 && countitem(744) > 0) goto N_QuestComp;
if (five_qset == 3) goto N_QuestStart;
mes "[Blonde Girl]";
@@ -534,7 +534,7 @@ N_QuestStart:
close;
}
//5-4;
-gef_tower,49,27,6 script Wizard#01 735,{
+gef_tower,49,27,6 script Wizard#01 4_M_JOB_WIZARD,{
if (five_qset == 4 && countitem(1059) > 49) goto N_QuestComp;
if (five_qset == 4) goto N_QuestStart;
mes "[Wizard]";
@@ -562,7 +562,7 @@ N_QuestStart:
}
///////Job list 6///////
//6-1;
-moc_prydb1,47,132,6 script Thief 48,{
+moc_prydb1,47,132,6 script Thief 1_M_02,{
if (six_qset == 1 && countitem(1083) > 0) goto N_QuestComp;
if (six_qset == 1) goto N_QuestStart;
mes "[Thief]";
@@ -608,7 +608,7 @@ N_QuestComp2:
close;
}
//6-3;
-xmas,144,136,6 script Chirach 48,{
+xmas,144,136,6 script Chirach 1_M_02,{
if (six_qset == 3 && countitem(1083) > 0) goto N_QuestComp;
if (six_qset == 3) goto N_QuestStart;
mes "[Chirach]";
@@ -631,7 +631,7 @@ N_QuestStart:
close;
}
//6-4;
-gef_tower,52,87,6 script Wizard#02 735,{
+gef_tower,52,87,6 script Wizard#02 4_M_JOB_WIZARD,{
if (six_qset == 4 && countitem(944) > 19) goto N_QuestComp;
if (six_qset == 4) goto N_QuestStart;
mes "[Zuuzuu]";
@@ -663,7 +663,7 @@ N_QuestStart:
}
///////Job list 7///////
//7-1 goes to 8-1 using callfunc;
-prontera,123,208,6 script Little Girl#thq 717,{
+prontera,123,208,6 script Little Girl#thq 4_F_KID3,{
if (seven_qset == 1 && countitem(531) > 4) goto N_QuestComp;
if (seven_qset == 1) goto N_QuestStart;
if (eight_qset == 1) goto N_QuestStart2;
@@ -690,7 +690,7 @@ N_QuestStart2:
callfunc "eight_qset1";
}
//7-2;
-alberta,101,84,6 script Charles 48,{
+alberta,101,84,6 script Charles 1_M_02,{
if (seven_qset == 2 && countitem(1082) > 0) goto N_QuestComp;
if (seven_qset == 2) goto N_QuestStart;
mes "[Charles]";
@@ -733,7 +733,7 @@ N_QuestComp2:
close;
}
//7-4;
-alb2trea,94,102,6 script Scarlet 725,{
+alb2trea,94,102,6 script Scarlet 4_F_JOB_ASSASSIN,{
if (seven_qset == 4 && countitem(1127) > 0) goto N_QuestComp;
if (seven_qset == 4) goto N_QuestStart;
mes "[Scarlet]";
@@ -778,7 +778,7 @@ N_QuestComp2:
close;
}
//8-2;
-morocc,165,55,6 script Klye 48,{
+morocc,165,55,6 script Klye 1_M_02,{
if (eight_qset == 2 && countitem(1081) > 0) goto N_QuestComp;
if (eight_qset == 2) goto N_QuestStart;
mes "[Klye]";
@@ -802,7 +802,7 @@ N_QuestStart:
}
//8-3;
-prt_maze02,103,86,6 script Zack 751,{
+prt_maze02,103,86,6 script Zack 4_M_CRU,{
if (eight_qset == 3 && countitem(923) > 0) goto N_QuestComp;
if (eight_qset == 3) goto N_QuestStart;
mes "[Zack]";
@@ -828,7 +828,7 @@ N_QuestStart:
close;
}
//8-4;
-payon,136,129,6 script Flower 703,{
+payon,136,129,6 script Flower 4_F_KID2,{
if (eight_qset == 4 && countitem(746) > 9) goto N_QuestComp;
if (eight_qset == 4) goto N_QuestStart;
mes "[Flower]";
@@ -854,7 +854,7 @@ N_QuestStart:
}
///////Job list 9///////
//9-1;
-geffen_in,168,124,6 script Mage 48,{
+geffen_in,168,124,6 script Mage 1_M_02,{
if (nine_qset == 1 && countitem(1082) > 0) goto N_QuestComp;
if (nine_qset == 1) goto N_QuestStart;
mes "[Mage]";
@@ -877,7 +877,7 @@ N_QuestStart:
close;
}
//9-2;
-pay_arche,98,74,6 script School Girl 703,{
+pay_arche,98,74,6 script School Girl 4_F_KID2,{
if (nine_qset == 2 && countitem(1020) > 19) goto N_QuestComp;
if (nine_qset == 2) goto N_QuestStart;
mes "[School Girl]";
@@ -905,7 +905,7 @@ N_QuestStart:
close;
}
//9-3
-payon_in02,19,33,6 script Jack 740,{
+payon_in02,19,33,6 script Jack 2_M_ALCHE,{
if (nine_qset == 3 && countitem(1022) > 0) goto N_QuestComp;
if (nine_qset == 3) goto N_QuestStart;
if (nine_qset == 4) goto N_QuestStart2;
@@ -951,7 +951,7 @@ N_QuestComp2:
}
///////Job list 10///////
//10-1
-morocc,193,51,6 script Kreg 48,{
+morocc,193,51,6 script Kreg 1_M_02,{
if (ten_qset == 1 && countitem(1082) > 0) goto N_QuestComp;
if (ten_qset == 1) goto N_QuestStart;
mes "[Kreg]";
@@ -974,7 +974,7 @@ N_QuestStart:
close;
}
//10-2;
-pay_fild10,145,252,6 script Man#02 122,{
+pay_fild10,145,252,6 script Man#02 2_M_DYEINGER,{
if (ten_qset == 2 && countitem(1029) > 0) goto N_QuestComp;
if (ten_qset == 2) goto N_QuestStart;
mes "[Man]";
@@ -999,7 +999,7 @@ N_QuestStart:
close;
}
//10-3;
-cmd_fild08,328,349,4 script Caral 119,{
+cmd_fild08,328,349,4 script Caral 2_M_SWORDMASTER,{
if (ten_qset == 3 && countitem(1015) > 0) goto N_QuestComp;
if (ten_qset == 3) goto N_QuestStart;
mes "[Caral]";
@@ -1024,7 +1024,7 @@ N_QuestStart:
close;
}
//10-4
-moc_fild15,250,251,6 script Jeni 727,{
+moc_fild15,250,251,6 script Jeni 4_F_JOB_HUNTER,{
if (ten_qset == 4 && countitem(1096) > 0) goto N_QuestComp;
if (ten_qset == 4) goto N_QuestStart;
mes "[Jeni]";
diff --git a/npc/custom/quests/thq/THQS_TTShop.txt b/npc/custom/quests/thq/THQS_TTShop.txt
index 39038671e..c764de852 100644
--- a/npc/custom/quests/thq/THQS_TTShop.txt
+++ b/npc/custom/quests/thq/THQS_TTShop.txt
@@ -16,7 +16,7 @@
prt_in,159,172,0 warp thqwrp 3,3,yuno_in01,123,155
-prt_in,164,174,1 script Treasure Hunter's Shop 65,{
+prt_in,164,174,1 script Treasure Hunter's Shop 1_M_YOUNGKNIGHT,{
mes "[Ash]";
mes "Ahh, "+strcharinfo(0)+"! Welcome to the Offical Treasure Hunter's Guild Shop.";
mes "You currently have ^FF0000"+#Treasure_Token+"^000000 treasure tokens!!!";
diff --git a/npc/custom/quests/umbalian_language.txt b/npc/custom/quests/umbalian_language.txt
index 6552f2b78..70ae07d28 100644
--- a/npc/custom/quests/umbalian_language.txt
+++ b/npc/custom/quests/umbalian_language.txt
@@ -8,7 +8,7 @@
//= 1.1 Removed it from offical Umbala Quests [Lupus]
//============================================================
-prontera,145,290,5 script Mason 742,{
+prontera,145,290,5 script Mason 2_M_SAGE_B,{
mes "[Mason]";
if(umb_lang==0) goto L_NOT_GOT_QUEST;
if(umb_lang==2 || umb_mason==1) goto L_AGAIN;
@@ -89,7 +89,7 @@ M_NO:
close;
}
-aldebaran,153,212,1 script Mojo 740,{
+aldebaran,153,212,1 script Mojo 2_M_ALCHE,{
mes "[Mojo]";
if(umb_lang!=1) goto L_NOT_GOT_QUEST;
mes "Oh no! I lost my teacher's ^FF0000old magic book^000000!";
@@ -102,7 +102,7 @@ L_NOT_GOT_QUEST:
close;
}
-amatsu,267,189,4 script Marie 744,{
+amatsu,267,189,4 script Marie 4_F_ALCHE,{
mes "[Marie]";
if(umb_lang==0) goto L_NOT_GOT_QUEST;
if(umb_lang==2 || umb_marie==1) goto L_AGAIN;
@@ -152,7 +152,7 @@ L_AGAIN:
close;
}
-yuno,157,366,2 script Wise Man Fabius 743,{
+yuno,157,366,2 script Wise Man Fabius 2_M_SAGE_OLD,{
mes "[Fabius]";
if(event_umbala >= 3) set umb_lang,2; //You already learnt Umbalian language from Umbalian Chief. So this Quest is disabled
if(umb_lang<2) goto L_QUEST;
diff --git a/npc/custom/quests/valhallen.txt b/npc/custom/quests/valhallen.txt
index b32b03acf..bb84e73e5 100644
--- a/npc/custom/quests/valhallen.txt
+++ b/npc/custom/quests/valhallen.txt
@@ -11,7 +11,7 @@
//= 1.1 Optimized. [Euphy]
//============================================================
-prontera,147,171,5 script Lenneth 811,{
+prontera,147,171,5 script Lenneth 4_F_VALKYRIE,{
mes "[Lenneth]";
mes "I come from Valhalla to aid you.";
mes "I can transmute for you many of the Valhallen items,";
diff --git a/npc/custom/resetnpc.txt b/npc/custom/resetnpc.txt
index cbb633e6a..757f0da66 100644
--- a/npc/custom/resetnpc.txt
+++ b/npc/custom/resetnpc.txt
@@ -13,7 +13,7 @@
//= 1.3 All statuses removed upon skill reset. [Euphy]
//============================================================
-prontera,150,193,4 script Reset Girl 124,{
+prontera,150,193,4 script Reset Girl 4_F_TELEPORTER,{
set .@ResetStat,5000; // Zeny for stat reset
set .@ResetSkill,5000; // Zeny for skill reset
diff --git a/npc/custom/stylist.txt b/npc/custom/stylist.txt
index 23f65b22d..387c876c2 100644
--- a/npc/custom/stylist.txt
+++ b/npc/custom/stylist.txt
@@ -10,7 +10,7 @@
//= 1.1 Switched to 'getbattleflag', credits to Saithis. [Euphy]
//============================================================
-prontera,170,180,1 script Stylist#custom_stylist 122,{
+prontera,170,180,1 script Stylist#custom_stylist 2_M_DYEINGER,{
setarray .@Styles[1],getbattleflag("max_cloth_color"),getbattleflag("max_hair_style"),getbattleflag("max_hair_color");
setarray .@Look[1],7,1,6;
diff --git a/npc/custom/warper.txt b/npc/custom/warper.txt
index 7c2b3b75e..b2cabd1fc 100644
--- a/npc/custom/warper.txt
+++ b/npc/custom/warper.txt
@@ -445,51 +445,51 @@ S8: Go("turbo_room",99,114);
// --------------------------------------------------
// Duplicates:
// --------------------------------------------------
-alb2trea,57,70,6 duplicate(Warper) Warper#tre 811
-alberta,28,240,4 duplicate(Warper) Warper#alb 811
-aldebaran,145,118,4 duplicate(Warper) Warper#alde 811
-amatsu,203,87,4 duplicate(Warper) Warper#ama 811
-ayothaya,209,169,6 duplicate(Warper) Warper#ayo 811
-comodo,194,158,4 duplicate(Warper) Warper#com 811
-einbech,59,38,6 duplicate(Warper) Warper#einbe 811
-einbroch,69,202,4 duplicate(Warper) Warper#einbr 811
-gef_fild10,71,339,4 duplicate(Warper) Warper#orc 811
-geffen,124,72,4 duplicate(Warper) Warper#gef 811
-glast_01,372,308,4 duplicate(Warper) Warper#glh 811
-gonryun,162,122,4 duplicate(Warper) Warper#gon 811
-hugel,101,151,4 duplicate(Warper) Warper#hug 811
-izlu2dun,110,92,4 duplicate(Warper) Warper#izd 811
-izlude,132,120,4 duplicate(Warper) Warper#izl 811
-jawaii,253,138,4 duplicate(Warper) Warper#jaw 811
-lighthalzen,162,102,4 duplicate(Warper) Warper#lhz 811
-louyang,208,103,6 duplicate(Warper) Warper#lou 811
-manuk,274,146,6 duplicate(Warper) Warper#man 811
-mid_camp,216,288,4 duplicate(Warper) Warper#mid 811
-mjolnir_02,85,364,4 duplicate(Warper) Warper#mjo 811
-moc_ruins,64,164,4 duplicate(Warper) Warper#moc 811
-morocc,159,97,4 duplicate(Warper) Warper#mor 811
-moscovia,229,191,4 duplicate(Warper) Warper#mos 811
-nameless_n,259,213,4 duplicate(Warper) Warper#nam 811
-niflheim,205,179,4 duplicate(Warper) Warper#nif 811
-pay_arche,42,134,4 duplicate(Warper) Warper#arc 811
-payon,182,108,4 duplicate(Warper) Warper#pay 811
-prontera,159,192,4 duplicate(Warper) Warper#prt 811
-prt_fild05,279,223,6 duplicate(Warper) Warper#cul 811
-rachel,135,116,4 duplicate(Warper) Warper#rac 811
-splendide,205,153,4 duplicate(Warper) Warper#spl 811
-thor_camp,249,76,4 duplicate(Warper) Warper#thor 811
-umbala,106,150,3 duplicate(Warper) Warper#umb 811
-veins,214,123,4 duplicate(Warper) Warper#ve 811
-xmas,150,136,6 duplicate(Warper) Warper#xmas 811
-yuno,162,47,4 duplicate(Warper) Warper#yuno 811
+alb2trea,57,70,6 duplicate(Warper) Warper#tre 4_F_VALKYRIE
+alberta,28,240,4 duplicate(Warper) Warper#alb 4_F_VALKYRIE
+aldebaran,145,118,4 duplicate(Warper) Warper#alde 4_F_VALKYRIE
+amatsu,203,87,4 duplicate(Warper) Warper#ama 4_F_VALKYRIE
+ayothaya,209,169,6 duplicate(Warper) Warper#ayo 4_F_VALKYRIE
+comodo,194,158,4 duplicate(Warper) Warper#com 4_F_VALKYRIE
+einbech,59,38,6 duplicate(Warper) Warper#einbe 4_F_VALKYRIE
+einbroch,69,202,4 duplicate(Warper) Warper#einbr 4_F_VALKYRIE
+gef_fild10,71,339,4 duplicate(Warper) Warper#orc 4_F_VALKYRIE
+geffen,124,72,4 duplicate(Warper) Warper#gef 4_F_VALKYRIE
+glast_01,372,308,4 duplicate(Warper) Warper#glh 4_F_VALKYRIE
+gonryun,162,122,4 duplicate(Warper) Warper#gon 4_F_VALKYRIE
+hugel,101,151,4 duplicate(Warper) Warper#hug 4_F_VALKYRIE
+izlu2dun,110,92,4 duplicate(Warper) Warper#izd 4_F_VALKYRIE
+izlude,132,120,4 duplicate(Warper) Warper#izl 4_F_VALKYRIE
+jawaii,253,138,4 duplicate(Warper) Warper#jaw 4_F_VALKYRIE
+lighthalzen,162,102,4 duplicate(Warper) Warper#lhz 4_F_VALKYRIE
+louyang,208,103,6 duplicate(Warper) Warper#lou 4_F_VALKYRIE
+manuk,274,146,6 duplicate(Warper) Warper#man 4_F_VALKYRIE
+mid_camp,216,288,4 duplicate(Warper) Warper#mid 4_F_VALKYRIE
+mjolnir_02,85,364,4 duplicate(Warper) Warper#mjo 4_F_VALKYRIE
+moc_ruins,64,164,4 duplicate(Warper) Warper#moc 4_F_VALKYRIE
+morocc,159,97,4 duplicate(Warper) Warper#mor 4_F_VALKYRIE
+moscovia,229,191,4 duplicate(Warper) Warper#mos 4_F_VALKYRIE
+nameless_n,259,213,4 duplicate(Warper) Warper#nam 4_F_VALKYRIE
+niflheim,205,179,4 duplicate(Warper) Warper#nif 4_F_VALKYRIE
+pay_arche,42,134,4 duplicate(Warper) Warper#arc 4_F_VALKYRIE
+payon,182,108,4 duplicate(Warper) Warper#pay 4_F_VALKYRIE
+prontera,159,192,4 duplicate(Warper) Warper#prt 4_F_VALKYRIE
+prt_fild05,279,223,6 duplicate(Warper) Warper#cul 4_F_VALKYRIE
+rachel,135,116,4 duplicate(Warper) Warper#rac 4_F_VALKYRIE
+splendide,205,153,4 duplicate(Warper) Warper#spl 4_F_VALKYRIE
+thor_camp,249,76,4 duplicate(Warper) Warper#thor 4_F_VALKYRIE
+umbala,106,150,3 duplicate(Warper) Warper#umb 4_F_VALKYRIE
+veins,214,123,4 duplicate(Warper) Warper#ve 4_F_VALKYRIE
+xmas,150,136,6 duplicate(Warper) Warper#xmas 4_F_VALKYRIE
+yuno,162,47,4 duplicate(Warper) Warper#yuno 4_F_VALKYRIE
// --------------------------------------------------
// Duplicates (Renewal):
// --------------------------------------------------
-brasilis,201,222,4 duplicate(Warper) Warper#bra 811
-dewata,204,186,6 duplicate(Warper) Warper#dew 811
-dicastes01,194,194,6 duplicate(Warper) Warper#dic 811
-ecl_in01,51,60,4 duplicate(Warper) Warper#ecl 811
-malangdo,134,117,6 duplicate(Warper) Warper#mal 811
-malaya,210,205,4 duplicate(Warper) Warper#ma 811
-mora,57,152,4 duplicate(Warper) Warper#mora 811
+brasilis,201,222,4 duplicate(Warper) Warper#bra 4_F_VALKYRIE
+dewata,204,186,6 duplicate(Warper) Warper#dew 4_F_VALKYRIE
+dicastes01,194,194,6 duplicate(Warper) Warper#dic 4_F_VALKYRIE
+ecl_in01,51,60,4 duplicate(Warper) Warper#ecl 4_F_VALKYRIE
+malangdo,134,117,6 duplicate(Warper) Warper#mal 4_F_VALKYRIE
+malaya,210,205,4 duplicate(Warper) Warper#ma 4_F_VALKYRIE
+mora,57,152,4 duplicate(Warper) Warper#mora 4_F_VALKYRIE
diff --git a/npc/custom/woe_controller.txt b/npc/custom/woe_controller.txt
index e5fa84fa1..74faa45e0 100644
--- a/npc/custom/woe_controller.txt
+++ b/npc/custom/woe_controller.txt
@@ -17,7 +17,7 @@
// Information NPC
//============================================================
-prontera,149,193,4 script WOE Information 835,{
+prontera,149,193,4 script WOE Information 2_BOARD1,{
doevent "WOE_CONTROL::OnMenu";
end;
OnAgitStart: