summaryrefslogtreecommitdiff
path: root/npc/re/other
diff options
context:
space:
mode:
Diffstat (limited to 'npc/re/other')
-rw-r--r--npc/re/other/bulletin_boards.txt10
-rw-r--r--npc/re/other/item_merge.txt2
-rw-r--r--npc/re/other/mail.txt8
-rw-r--r--npc/re/other/mercenary_rent.txt20
-rw-r--r--npc/re/other/pvp.txt14
-rw-r--r--npc/re/other/resetskill.txt10
-rw-r--r--npc/re/other/stone_change.txt2
-rw-r--r--npc/re/other/turbo_track.txt2
8 files changed, 34 insertions, 34 deletions
diff --git a/npc/re/other/bulletin_boards.txt b/npc/re/other/bulletin_boards.txt
index ecfaaf9ca..1d0dbb904 100644
--- a/npc/re/other/bulletin_boards.txt
+++ b/npc/re/other/bulletin_boards.txt
@@ -29,9 +29,9 @@
mes "From Izlude, ^3355FFProntera^000000 is located to the Northwest, and ^006600Payon^000000 is located to the South. Enjoy your travels in the Rune-Midgarts Kingdom.";
close;
}
-izlude,25,103,0 duplicate(BulletinBoard_iz) Bulletin Board#5 837
-izlude_a,25,103,0 duplicate(BulletinBoard_iz) Bulletin Board#5_a 837
-izlude_b,25,103,0 duplicate(BulletinBoard_iz) Bulletin Board#5_b 837
-izlude_c,25,103,0 duplicate(BulletinBoard_iz) Bulletin Board#5_c 837
-izlude_d,25,103,0 duplicate(BulletinBoard_iz) Bulletin Board#5_d 837
+izlude,25,103,0 duplicate(BulletinBoard_iz) Bulletin Board#5 2_BULLETIN_BOARD
+izlude_a,25,103,0 duplicate(BulletinBoard_iz) Bulletin Board#5_a 2_BULLETIN_BOARD
+izlude_b,25,103,0 duplicate(BulletinBoard_iz) Bulletin Board#5_b 2_BULLETIN_BOARD
+izlude_c,25,103,0 duplicate(BulletinBoard_iz) Bulletin Board#5_c 2_BULLETIN_BOARD
+izlude_d,25,103,0 duplicate(BulletinBoard_iz) Bulletin Board#5_d 2_BULLETIN_BOARD
*/
diff --git a/npc/re/other/item_merge.txt b/npc/re/other/item_merge.txt
index 55004785f..f823f5c3c 100644
--- a/npc/re/other/item_merge.txt
+++ b/npc/re/other/item_merge.txt
@@ -12,7 +12,7 @@
//= 1.0 First version, currently useless/disabled.
//============================================================
-prontera,146,95,3 script Mergician#pron 64,{
+prontera,146,95,3 script Mergician#pron 1_M_WIZARD,{
if (checkweight(1301,1) == 0) {
mes "- Wait a second !! -";
mes "- You are carrying too many items -";
diff --git a/npc/re/other/mail.txt b/npc/re/other/mail.txt
index 3aa040ea2..42c26db6f 100644
--- a/npc/re/other/mail.txt
+++ b/npc/re/other/mail.txt
@@ -13,7 +13,7 @@
// Izlude
//============================================================
-izlude_a,136,94,0 duplicate(MailBox) Mailbox#iz_a 888
-izlude_b,136,94,0 duplicate(MailBox) Mailbox#iz_b 888
-izlude_c,136,94,0 duplicate(MailBox) Mailbox#iz_c 888
-izlude_d,136,94,0 duplicate(MailBox) Mailbox#iz_d 888
+izlude_a,136,94,0 duplicate(MailBox) Mailbox#iz_a 2_POSTBOX
+izlude_b,136,94,0 duplicate(MailBox) Mailbox#iz_b 2_POSTBOX
+izlude_c,136,94,0 duplicate(MailBox) Mailbox#iz_c 2_POSTBOX
+izlude_d,136,94,0 duplicate(MailBox) Mailbox#iz_d 2_POSTBOX
diff --git a/npc/re/other/mercenary_rent.txt b/npc/re/other/mercenary_rent.txt
index 9056d56f7..09c2a24ce 100644
--- a/npc/re/other/mercenary_rent.txt
+++ b/npc/re/other/mercenary_rent.txt
@@ -12,14 +12,14 @@
//= 1.1 Added Izlude duplicates. [Euphy]
//============================================================
-izlude,47,170,4 duplicate(Mercenary Manager#main) Mercenary Manager#Sword 734
-izlude_a,47,170,4 duplicate(Mercenary Manager#main) Mercenary Manager#Swo_a 734
-izlude_b,47,170,4 duplicate(Mercenary Manager#main) Mercenary Manager#Swo_b 734
-izlude_c,47,170,4 duplicate(Mercenary Manager#main) Mercenary Manager#Swo_c 734
-izlude_d,47,170,4 duplicate(Mercenary Manager#main) Mercenary Manager#Swo_d 734
+izlude,47,170,4 duplicate(Mercenary Manager#main) Mercenary Manager#Sword 4_M_JOB_KNIGHT2
+izlude_a,47,170,4 duplicate(Mercenary Manager#main) Mercenary Manager#Swo_a 4_M_JOB_KNIGHT2
+izlude_b,47,170,4 duplicate(Mercenary Manager#main) Mercenary Manager#Swo_b 4_M_JOB_KNIGHT2
+izlude_c,47,170,4 duplicate(Mercenary Manager#main) Mercenary Manager#Swo_c 4_M_JOB_KNIGHT2
+izlude_d,47,170,4 duplicate(Mercenary Manager#main) Mercenary Manager#Swo_d 4_M_JOB_KNIGHT2
-izlude,55,170,4 duplicate(MercMerchant) Mercenary Merchant#Sword 892
-izlude_a,55,170,4 duplicate(MercMerchant) Mercenary Merchant#Swo_a 892
-izlude_b,55,170,4 duplicate(MercMerchant) Mercenary Merchant#Swo_b 892
-izlude_c,55,170,4 duplicate(MercMerchant) Mercenary Merchant#Swo_c 892
-izlude_d,55,170,4 duplicate(MercMerchant) Mercenary Merchant#Swo_d 892
+izlude,55,170,4 duplicate(MercMerchant) Mercenary Merchant#Sword 4_F_HUGRANMA
+izlude_a,55,170,4 duplicate(MercMerchant) Mercenary Merchant#Swo_a 4_F_HUGRANMA
+izlude_b,55,170,4 duplicate(MercMerchant) Mercenary Merchant#Swo_b 4_F_HUGRANMA
+izlude_c,55,170,4 duplicate(MercMerchant) Mercenary Merchant#Swo_c 4_F_HUGRANMA
+izlude_d,55,170,4 duplicate(MercMerchant) Mercenary Merchant#Swo_d 4_F_HUGRANMA
diff --git a/npc/re/other/pvp.txt b/npc/re/other/pvp.txt
index deebc7b72..61e0817fa 100644
--- a/npc/re/other/pvp.txt
+++ b/npc/re/other/pvp.txt
@@ -13,7 +13,7 @@
// PVP Warpers
//============================================================
-pvp_y_room,30,85,4 script Fight Square Reception#1 105,{ //5,5
+pvp_y_room,30,85,4 script Fight Square Reception#1 8W_SOLDIER,{ //5,5
callfunc "F_PVP_FSRS",50,69;
end;
@@ -22,7 +22,7 @@ OnInit:
end;
}
-pvp_y_room,38,85,4 script Fight Square Reception#2 105,{ //5,5
+pvp_y_room,38,85,4 script Fight Square Reception#2 8W_SOLDIER,{ //5,5
callfunc "F_PVP_FSRS",70,89;
end;
@@ -31,7 +31,7 @@ OnInit:
end;
}
-pvp_y_room,46,85,4 script Fight Square Reception#3 105,{ //5,5
+pvp_y_room,46,85,4 script Fight Square Reception#3 8W_SOLDIER,{ //5,5
callfunc "F_PVP_FSRS",90,99;
end;
@@ -40,7 +40,7 @@ OnInit:
end;
}
-pvp_y_room,54,85,4 script Fight Square Reception#8 105,{
+pvp_y_room,54,85,4 script Fight Square Reception#8 8W_SOLDIER,{
callfunc "F_PVP_FSRS";
end;
@@ -49,7 +49,7 @@ OnInit:
end;
}
-pvp_y_room,62,85,4 script Fight Square Reception#4 105,{
+pvp_y_room,62,85,4 script Fight Square Reception#4 8W_SOLDIER,{
//if (ADVJOB > 0) {
if (Upper == 1) {
mes "[PVP Fight Square Reception Staff]";
@@ -65,7 +65,7 @@ OnInit:
end;
}
-pvp_y_room,70,85,4 script Fight Square Reception#5 105,{
+pvp_y_room,70,85,4 script Fight Square Reception#5 8W_SOLDIER,{
//if (ADVJOB == 0) {
if (Upper != 1) {
mes "[PVP Fight Square Reception Staff]";
@@ -81,7 +81,7 @@ OnInit:
end;
}
-pvp_n_room,86,85,4 script Fight Square Reception#n 105,{
+pvp_n_room,86,85,4 script Fight Square Reception#n 8W_SOLDIER,{
callfunc "F_PVP_FSRS";
end;
diff --git a/npc/re/other/resetskill.txt b/npc/re/other/resetskill.txt
index 7e14c9537..f3415e6c9 100644
--- a/npc/re/other/resetskill.txt
+++ b/npc/re/other/resetskill.txt
@@ -13,7 +13,7 @@
//= 1.1 Added Izlude duplicates. [Euphy]
//============================================================
-izlude,127,175,3 script Hypnotist#novice 124,{
+izlude,127,175,3 script Hypnotist#novice 4_F_TELEPORTER,{
mes "[Hypnotist]";
mes "Greetings, adventurer.";
mes "I'm a member of the Hypnotist";
@@ -141,7 +141,7 @@ izlude,127,175,3 script Hypnotist#novice 124,{
close;
}
}
-izlude_a,127,175,3 duplicate(Hypnotist#novice) Hypnotist#novice_a 124
-izlude_b,127,175,3 duplicate(Hypnotist#novice) Hypnotist#novice_b 124
-izlude_c,127,175,3 duplicate(Hypnotist#novice) Hypnotist#novice_c 124
-izlude_d,127,175,3 duplicate(Hypnotist#novice) Hypnotist#novice_d 124
+izlude_a,127,175,3 duplicate(Hypnotist#novice) Hypnotist#novice_a 4_F_TELEPORTER
+izlude_b,127,175,3 duplicate(Hypnotist#novice) Hypnotist#novice_b 4_F_TELEPORTER
+izlude_c,127,175,3 duplicate(Hypnotist#novice) Hypnotist#novice_c 4_F_TELEPORTER
+izlude_d,127,175,3 duplicate(Hypnotist#novice) Hypnotist#novice_d 4_F_TELEPORTER
diff --git a/npc/re/other/stone_change.txt b/npc/re/other/stone_change.txt
index a6b903273..cfb2aa5eb 100644
--- a/npc/re/other/stone_change.txt
+++ b/npc/re/other/stone_change.txt
@@ -11,7 +11,7 @@
//= 1.0 First version.
//============================================================
-geffen_in,99,174,5 script Ore Tester#sorty 700,{
+geffen_in,99,174,5 script Ore Tester#sorty 8_F_GIRL,{
mes "[Ore Tester Sorty]";
mes "Do you have ^3131FFany same type of ores in your inventories^000000 which take many spaces?";
mes "I can distinguish your ores and organize them right away~!";
diff --git a/npc/re/other/turbo_track.txt b/npc/re/other/turbo_track.txt
index 129f4bcc8..b975093a8 100644
--- a/npc/re/other/turbo_track.txt
+++ b/npc/re/other/turbo_track.txt
@@ -11,4 +11,4 @@
//= 1.0 Split Mount Manager NPC.
//============================================================
-alde_gld,181,199,5 duplicate(MountManager_turbo) Mount Manager 845
+alde_gld,181,199,5 duplicate(MountManager_turbo) Mount Manager 4_F_RACING
generated by cgit v1.2.3-70-g09d2 (git 2.46.0) at 2024-12-28 00:23:16 +0000