summaryrefslogtreecommitdiff
path: root/npc/custom/etc
diff options
context:
space:
mode:
Diffstat (limited to 'npc/custom/etc')
-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
14 files changed, 192 insertions, 192 deletions
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;
generated by cgit v1.2.3-70-g09d2 (git 2.46.0) at 2024-12-29 04:51:36 +0000