summaryrefslogtreecommitdiff
path: root/npc/cities
diff options
context:
space:
mode:
authorPlaytester <Playtester@54d463be-8e91-2dee-dedb-b68131a5f0ec>2006-06-16 10:02:18 +0000
committerPlaytester <Playtester@54d463be-8e91-2dee-dedb-b68131a5f0ec>2006-06-16 10:02:18 +0000
commite07326b0aa71a74cacd425e30745bb01a60b153f (patch)
treeb72f1f4ada283ca5f02885e957c5e194eb1652a7 /npc/cities
parente4bb98fd9afd36dcd42a4135a55ad8930e2acf01 (diff)
downloadhercules-e07326b0aa71a74cacd425e30745bb01a60b153f.tar.gz
hercules-e07326b0aa71a74cacd425e30745bb01a60b153f.tar.bz2
hercules-e07326b0aa71a74cacd425e30745bb01a60b153f.tar.xz
hercules-e07326b0aa71a74cacd425e30745bb01a60b153f.zip
* Commited Silent's Fix to the duplicate NPCs
- needs testing - can't be fully fixed because of length limitation of names git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@7200 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'npc/cities')
-rw-r--r--npc/cities/alberta.txt11
-rw-r--r--npc/cities/aldebaran.txt13
-rw-r--r--npc/cities/amatsu.txt37
-rw-r--r--npc/cities/ayothaya.txt17
-rw-r--r--npc/cities/comodo.txt13
-rw-r--r--npc/cities/einbech.txt9
-rw-r--r--npc/cities/einbroch.txt29
-rw-r--r--npc/cities/geffen.txt17
-rw-r--r--npc/cities/gonryun.txt19
-rw-r--r--npc/cities/izlude.txt7
-rw-r--r--npc/cities/lighthalzen.txt43
-rw-r--r--npc/cities/louyang.txt41
-rw-r--r--npc/cities/morocc.txt7
-rw-r--r--npc/cities/niflheim.txt5
-rw-r--r--npc/cities/payon.txt17
-rw-r--r--npc/cities/prontera.txt5
-rw-r--r--npc/cities/valkyrie.txt5
17 files changed, 156 insertions, 139 deletions
diff --git a/npc/cities/alberta.txt b/npc/cities/alberta.txt
index 0930d9e7a..47cf01ca1 100644
--- a/npc/cities/alberta.txt
+++ b/npc/cities/alberta.txt
@@ -3,7 +3,7 @@
//===== By: ==================================================
//= kobra_k88
//===== Current Version: =====================================
-//= 1.8
+//= 2.0
//===== Compatible With: =====================================
//= eAthena SVN
//===== Description: =========================================
@@ -19,12 +19,13 @@
//= 1.7 Fixed Phelix bugs [Lupus]
//= 1.8 Got rid of 2 useless variables, fixed Turtle Island Quest exploit [Lupus]
//= 1.9 Added two NPCs shown at RO Magazine [Playtester]
+//= 2.0 Removed Duplicates [Silent]
//============================================================
//NewsPaper(?)
alberta.gat,148,53,1 script Newspaper Girl 831,{end;}
//???
-alberta.gat,148,60,3 script Man 833,{end;}
+alberta.gat,148,60,3 script Man#03 833,{end;}
// Young Man -----------------------------------------------------------
alberta_in.gat,20,183,6 script Young Man 49,{
@@ -34,7 +35,7 @@ alberta_in.gat,20,183,6 script Young Man 49,{
}
// Merchant -------------------------------------------------
-alberta.gat,97,51,7 script Merchant 84,{
+alberta.gat,97,51,7 script Merchant#01 84,{
mes "[Merchant]";
mes "When you travel to many places like I do, you often here a lot of rumors. There is one rumor I heard that is really interesting.";
next;
@@ -48,7 +49,7 @@ alberta.gat,97,51,7 script Merchant 84,{
}
// Merchant ---------------------------------------------------------
-alberta.gat,53,39,8 script Merchant 74,{
+alberta.gat,53,39,8 script Merchant#02 74,{
mes "[Merchant]";
mes "Oh, you look like a stranger. Welcome to Alberta.";
emotion e_gasp;
@@ -67,7 +68,7 @@ alberta.gat,53,39,8 script Merchant 74,{
}
// Merchant -------------------------------------------------
-alberta.gat,58,80,8 script Merchant 99,{
+alberta.gat,58,80,8 script Merchant#03 99,{
mes "[Merchant]";
if(rand(2)) goto R_1;
mes "We merchants can open a roadside stand and do business. With the ^0000ffDiscount skill^000000 we can buy goods from stores for low prices.";
diff --git a/npc/cities/aldebaran.txt b/npc/cities/aldebaran.txt
index 2961a8a8c..f3314168c 100644
--- a/npc/cities/aldebaran.txt
+++ b/npc/cities/aldebaran.txt
@@ -3,7 +3,7 @@
//===== By: ==================================================
//= eAthena dev team
//===== Current Version: =====================================
-//= 1.7
+//= 1.8
//===== Compatible With: =====================================
//= eAthena 1.0
//===== Description: =========================================
@@ -20,6 +20,7 @@
//= also changed typo Orange Potions -> Red Potions [Lupus]
//= 1.6 Fixed bug (missing label), optimized all menus [Lupus]
//= 1.7 Fixed exploits [Lupus]
+//= 1.8 Removed Duplicates [Silent]
//============================================================
@@ -568,7 +569,7 @@ aldeba_in.gat,152,47,4 script Giddy Fellow 97,{
}
// Master ----------------------------------------------------------
-aldeba_in.gat,156,179,4 script Master 61,{
+aldeba_in.gat,156,179,4 script Master#02 61,{
mes "[Master]";
if(sex==0) mes "Oh hello. Don't mind me, I'm just a perverted old man.... la di da.......";
if(sex==0) close;
@@ -817,7 +818,7 @@ aldeba_in.gat,24,245,4 script Kafra Jasmine 115,{
}
// Special Reserve ----------------------------------------------
-aldeba_in.gat,79,161,6 script Kafra 115,{
+aldeba_in.gat,79,161,6 script Kafra#04 115,{
cutin "kafra_03",2;
mes "[Kafra]";
mes "Welcome, ^6666FF" + strcharinfo(0) + "^000000. This is where you can trade in your special reserve points for useful items and cool prizes.";
@@ -1004,7 +1005,7 @@ M_Menu:
}
// Special Reserve 2 ----------------------------------------------
-aldeba_in.gat,88,161,3 script Kafra 115,{
+aldeba_in.gat,88,161,3 script Kafra#05 115,{
cutin "kafra_03",2;
mes "[Kafra]";
mes "Welcome ^5577FF"+strcharinfo(0)+"^000000. We are currently having a special event for our customers.";
@@ -1356,7 +1357,7 @@ aldebaran.gat,143,136,4 script Clock Keeper 89,{
}
// Gatekeeper Riku -------------------------------------------------------------------
-c_tower3.gat,10,249,4 script Gatekeeper 84,{
+c_tower3.gat,10,249,4 script Gatekeeper#01 84,{
mes "[Gatekeeper Riku]";
mes "Welcome to ";
mes "Kinase - Blue Gallino";
@@ -1450,7 +1451,7 @@ c_tower3.gat,10,249,4 script Gatekeeper 84,{
}
//<======================================== Al De Baran Dungeon ==========================================>\\
-alde_dun03.gat,264,16,4 script Gatekeeper 101,{
+alde_dun03.gat,264,16,4 script Gatekeeper#02 101,{
mes "[Gatekeeper Boy]";
mes "Welcome to";
mes "Kinase - Blue Gallino";
diff --git a/npc/cities/amatsu.txt b/npc/cities/amatsu.txt
index 466c6b22b..24d4e7398 100644
--- a/npc/cities/amatsu.txt
+++ b/npc/cities/amatsu.txt
@@ -3,7 +3,7 @@
//===== By: ==================================================
//= Some people & eAthena Dev Team
//===== Current Version: =====================================
-//= 1.07
+//= 1.08
//===== Compatible With: =====================================
//= Any eAthena Version; Niflheim Required
//===== Description: =========================================
@@ -18,8 +18,9 @@
// 1.05 Changed all breaks to ends. [Skotlex]
// 1.06 The Captain now uses iRO dialog [MasterOfMuppets]
// 1.07 Implemented a missing NPC [MasterOfMuppets]
+// 1.08 Removed Duplicates [Silent]
//=====================================================================
-alberta.gat,245,93,4 script Sea Captain 709,{
+alberta.gat,245,93,4 script Sea Captain#01 709,{
mes "[Walter Moers]";
mes "Hey, there.";
mes "Have you ever heard that there";
@@ -138,7 +139,7 @@ alberta.gat,245,93,4 script Sea Captain 709,{
close;
}
//=====================================================================
-amatsu.gat,194,79,4 script Sea Captain 709,{
+amatsu.gat,194,79,4 script Sea Captain#02 709,{
mes "[Walter Moers]";
mes "You came... Did you enjoy";
mes "your trip to Amatsu...?";
@@ -472,7 +473,7 @@ amatsu.gat,230,160,4 script Lady 757,{
close;
}
//=====================================================================
-amatsu.gat,171,174,4 script Guard Soldier 767,{
+amatsu.gat,171,174,4 script Guard Soldier#01 767,{
if ((event_amatsu == 0) || (event_amatsu == 1)) goto L0;
if (event_amatsu == 6) goto L1;
if (event_amatsu == 7) goto L2;
@@ -511,7 +512,7 @@ L2:
close;
}
//=====================================================================
-amatsu.gat,164,174,4 script Guard Soldier 767,{
+amatsu.gat,164,174,4 script Guard Soldier#02 767,{
if (event_amatsu == 0) goto LOnce;
if ((event_amatsu >= 2) && (event_amatsu <= 5)) goto L2;
if (event_amatsu == 6) goto L3;
@@ -555,7 +556,7 @@ L4:
close;
}
//=====================================================================
-amatsu.gat,119,164,4 script Guard Soldier 767,{
+amatsu.gat,119,164,4 script Guard Soldier#03 767,{
mes "[Guard Soldier]";
mes "Are you from Rune-Midgard?";
mes "Welcome to the town of Amatsu.";
@@ -571,7 +572,7 @@ amatsu.gat,119,164,4 script Guard Soldier 767,{
close;
}
//=====================================================================
-amatsu.gat,112,164,4 script Guard Soldier 767,{
+amatsu.gat,112,164,4 script Guard Soldier#04 767,{
mes "[Guard Soldier]";
mes "This is the best castle in Amatsu,";
mes "called the East Lake Castle.";
@@ -587,7 +588,7 @@ amatsu.gat,112,164,4 script Guard Soldier 767,{
}
//=====================================================================
-ama_in01.gat,22,111,0 script Old Lady 761,{
+ama_in01.gat,22,111,0 script Old Lady#01 761,{
if (event_amatsu == 5) goto LStart2;
if (event_amatsu == 6) goto LStart3;
if (event_amatsu == 7) goto LStart4;
@@ -725,7 +726,7 @@ LStart4:
}
//=====================================================================
-ama_in02.gat,207,40,6 script Guard Soldier 767,{
+ama_in02.gat,207,40,6 script Guard Soldier#05 767,{
mes "[Guard Soldier]";
mes "Welcome,";
mes "The Master specifically allowed";
@@ -737,7 +738,7 @@ ama_in02.gat,207,40,6 script Guard Soldier 767,{
close;
}
//=====================================================================
-ama_in02.gat,207,49,6 script Guard Soldier 767,{
+ama_in02.gat,207,49,6 script Guard Soldier#06 767,{
mes "[Guard Soldier]";
mes "The master is really a great guy.";
mes "Who would have thought that anyone could";
@@ -752,7 +753,7 @@ ama_in02.gat,207,49,6 script Guard Soldier 767,{
close;
}
//=====================================================================
-ama_in02.gat,187,57,2 script Soldier 767,{
+ama_in02.gat,187,57,2 script Soldier#01 767,{
mes "[Ichiro]";
mes "Welcome, our master";
mes "has already prepared a place";
@@ -767,7 +768,7 @@ ama_in02.gat,187,57,2 script Soldier 767,{
close;
}
//=====================================================================
-ama_in02.gat,170,62,4 script Soldier 767,{
+ama_in02.gat,170,62,4 script Soldier#02 767,{
mes "[Kyro]";
mes "My name is Kyro. In this town";
mes "I handle all the administrative work.";
@@ -824,7 +825,7 @@ L3:
}
//=====================================================================
-ama_in02.gat,37,157,4 script Soldier 767,{
+ama_in02.gat,37,157,4 script Soldier#03 767,{
mes "[Sbarro]";
mes "This is our soldier's";
mes "training ground.";
@@ -872,7 +873,7 @@ ama_in02.gat,32,51,6 script Shiro 767,{
close;
}
//=====================================================================
-ama_in02.gat,40,167,3 script Soldier 767,{
+ama_in02.gat,40,167,3 script Soldier#04 767,{
mes "[Kuro]";
mes "Shh... customer, please be quiet.";
mes "I will tell you a story";
@@ -925,7 +926,7 @@ ama_in02.gat,32,167,5 script Kukuro 767,{
close;
}
//=====================================================================
-ama_in02.gat,42,34,2 script Soldier 767,{
+ama_in02.gat,42,34,2 script Soldier#05 767,{
mes "[Hakiro]";
mes "Rest for a while before leaving,";
mes "master has already prepared";
@@ -943,7 +944,7 @@ ama_in02.gat,42,34,2 script Soldier 767,{
}
//=====================================================================
-ama_in02.gat,203,156,4 script Soldier 767,{
+ama_in02.gat,203,156,4 script Soldier#06 767,{
mes "[Hakiro]";
mes "Master is in there.";
mes "If you want to go greet him,";
@@ -958,7 +959,7 @@ ama_in02.gat,203,156,4 script Soldier 767,{
}
//=====================================================================
-ama_in02.gat,195,156,4 script Soldier 767,{
+ama_in02.gat,195,156,4 script Soldier#07 767,{
mes "[Kuro]";
mes "Damn, maybe the master";
mes "is having a hard time right now.";
@@ -1053,7 +1054,7 @@ Lnoflag:
mes "I hope you have a good time...";
close;
}
-ama_dun01.gat,229,7,0 script Soldier 767,{
+ama_dun01.gat,229,7,0 script Soldier#08 767,{
mes "[Juro]";
mes "Ready to leave?";
next;
diff --git a/npc/cities/ayothaya.txt b/npc/cities/ayothaya.txt
index 54b298438..9e47f52c8 100644
--- a/npc/cities/ayothaya.txt
+++ b/npc/cities/ayothaya.txt
@@ -3,7 +3,7 @@
//===== By: ==================================================
//= MasterOfMuppets
//===== Current Version: =====================================
-//= 1.2
+//= 1.3
//===== Compatible With: =====================================
//= Any eAthena +
//===== Description: =========================================
@@ -21,9 +21,10 @@
//= 1.1 Missing delitem fixed by Poki#3 [Lupus]
//= 1.1a Fixed a typo and clarified a comment at the bottom of the script [MasterOfMuppets]
//= 1.2 Fixed exploits [Lupus]
+//= 1.3 Removed Duplicates [Silent]
//============================================================
-ayothaya.gat,152,68,1 script Aibakthing 843,{
+ayothaya.gat,152,68,1 script Aibakthing#01 843,{
mes "[Aibakthing]";
mes "Hoo! Hah! Hmm! Hah!";
mes "So, how did you like Ayothaya? Did you get a chance to try Tom Yum Goong? When you're ready, I shall take you back home.";
@@ -41,7 +42,7 @@ s_Cancel:
close;
}
-alberta.gat,247,42,3 script Aibakthing 843,{
+alberta.gat,247,42,3 script Aibakthing#02 843,{
mes "[Aibakthing]";
mes "Hoo! Hah! Hoo! Hah!";
mes "Let me take you away to a distant spiritual place, a land of exotic mystery, my hometown Ayothaya.";
@@ -262,7 +263,7 @@ s_Shrimp2:
close;
}
-ayothaya.gat,143,102,5 script Old Man 842,{
+ayothaya.gat,143,102,5 script Old Man#01 842,{
mes "[Villager]";
mes "Ummm.";
mes "Hmmmmm...";
@@ -838,7 +839,7 @@ s_Yes:
end;
}
-ayothaya.gat,193,171,3 script Old Man 842,{
+ayothaya.gat,193,171,3 script Old Man#02 842,{
mes "[Tham]";
mes "Ah~";
mes "I've got this craving for Ms. Mali the Spicy's food, especially her 'Tom Yum Goong.'";
@@ -1511,7 +1512,7 @@ s_Win2:
close;
}
-ayothaya.gat,197,188,5 script Young Man 841,{
+ayothaya.gat,197,188,5 script Young Man#01 841,{
mes "[Kwan]";
mes "Phew, isn't it";
mes "soooo hot today?";
@@ -1535,7 +1536,7 @@ ayothaya.gat,197,188,5 script Young Man 841,{
close;
}
-ayothaya.gat,241,264,5 script Young Man 843,{
+ayothaya.gat,241,264,5 script Young Man#02 843,{
mes "[Eik]";
mes "Hey...";
@@ -1561,7 +1562,7 @@ s_Sure:
close;
}
-ayothaya.gat,213,142,5 script Young Man 843,{
+ayothaya.gat,213,142,5 script Young Man#03 843,{
mes "[Detzi]";
mes "In Ayothaya, we have our own traditional martial arts. We, the young men of the village, practice our traditional martial arts in order to become strong.";
next;
diff --git a/npc/cities/comodo.txt b/npc/cities/comodo.txt
index 8a6e5f04e..a7bd795d5 100644
--- a/npc/cities/comodo.txt
+++ b/npc/cities/comodo.txt
@@ -3,7 +3,7 @@
//===== By: ==================================================
//= eAthena dev team
//===== Current Version: =====================================
-//= 1.4
+//= 1.5
//===== Compatible With: =====================================
//= eAthena 1.0
//===== Description: =========================================
@@ -15,6 +15,7 @@
//= 1.2b Added Baby Class support [Lupus]
//= 1.3 Spell Checked and Fixed [massdriller]
//= 1.4 Fixed typos [Nexon]
+//= 1.5 Removed Duplicates [Silent]
//============================================================
@@ -193,7 +194,7 @@ cmd_in02.gat,73,81,4 script Martine 48,{
}
//=============================================================
-cmd_in02.gat,64,43,4 script Roberto 709,{
+cmd_in02.gat,64,43,4 script Roberto#01 709,{
mes "[Roberto]";
mes "Muhahaha... What a stupid man! Now that's easy money! (~counts his money~)";
emotion e_gg;
@@ -1226,7 +1227,7 @@ L_4:
//============================================================================//
//==================================================
-cmd_fild07.gat,192,58,4 script Light House Guard 100,{
+cmd_fild07.gat,192,58,4 script Light House Guard#01 100,{
mes "[Rahasu]";
mes "Good morning, I am Rahasu, your guide to the";
mes "^3355FF`lighthouses'^000000";
@@ -1250,7 +1251,7 @@ cmd_fild07.gat,192,58,4 script Light House Guard 100,{
}
//=========================================================
-cmd_fild07.gat,52,280,4 script Light House Guard 100,{
+cmd_fild07.gat,52,280,4 script Light House Guard#02 100,{
mes "[Hallosu]";
mes "That's correct, this is one of the two lighthouses in this area.";
mes "However, I can not let anyone go in yet because the lighthouse's interior is still under reconstruction.";
@@ -1262,7 +1263,7 @@ cmd_fild07.gat,52,280,4 script Light House Guard 100,{
}
//=========================================================
-cmd_fild07.gat,299,83,4 script Sailor 100,{
+cmd_fild07.gat,299,83,4 script Sailor#01 100,{
mes "[Zain]";
mes "Hello my friend, where do you wish to go?";
next;
@@ -1290,7 +1291,7 @@ cmd_fild07.gat,299,83,4 script Sailor 100,{
}
//=========================================================
-cmd_fild07.gat,94,134,4, script Sailor 100,{
+cmd_fild07.gat,94,134,4, script Sailor#02 100,{
mes "[Sarumane]";
mes "Hello my friend, where do you wish to go?";
next;
diff --git a/npc/cities/einbech.txt b/npc/cities/einbech.txt
index b0fd9fb80..b02a139ee 100644
--- a/npc/cities/einbech.txt
+++ b/npc/cities/einbech.txt
@@ -3,7 +3,7 @@
//===== By: ==================================================
//= Muad_dib
//===== Current Version: =====================================
-//= 1.0
+//= 1.2
//===== Compatible With: =====================================
//= eAthena Revision 3000+
//===== Description: =========================================
@@ -19,6 +19,7 @@
//= all credits to muad_dib for scripting them.
//= 1.1 Made some changes according to the Shinokas quest, [MasterOfMuppets]
//= thanks to Dj-Yhn for scripting them.
+//= 1.2 Removed Duplicates [Silent]
//============================================================
@@ -383,7 +384,7 @@ einbech.gat,105,218,6 script Gushenmu 848,{
close;
}
-einbech.gat,57,210,4 script Young Man 854,{
+einbech.gat,57,210,4 script Young Man#04 854,{
mes "[Young Man]";
mes "Behind the pub,";
mes "you'll see this old man";
@@ -1425,7 +1426,7 @@ L_NNotify:
close;
}
-ein_in01.gat,281,85,2 script Drunken Man 849,{
+ein_in01.gat,281,85,2 script Drunken Man#01 849,{
mes "[Drunken Man]";
mes "...*Hiccup*...";
mes "*Hiccup*...";
@@ -1512,7 +1513,7 @@ ein_in01.gat,279,92,2 script Tavern Lady 854,{
close;
}
-einbech.gat,197,139,4 script Young Man 855,{
+einbech.gat,197,139,4 script Young Man#05 855,{
mes "[Heinz]";
mes "Wow...";
mes "And adventurer from";
diff --git a/npc/cities/einbroch.txt b/npc/cities/einbroch.txt
index e3e7b7e8b..eac1047b9 100644
--- a/npc/cities/einbroch.txt
+++ b/npc/cities/einbroch.txt
@@ -3,7 +3,7 @@
//===== By: ==================================================
//= Nexon
//===== Current Version: =====================================
-//= 0.8
+//= 0.9
//===== Compatible With: =====================================
//= eAthena Revision 3000+
//===== Description: =========================================
@@ -20,16 +20,17 @@
//= 0.7 Implemented an inn NPC [MasterOfMuppets]
//= 0.8 Implemented the Shinokas quest, thanks to [MasterOfMuppets]
//= Dj-Yhn for scripting it.
+//= 0.9 Removed Duplicates [Silent]
//============================================================
//== some boards, signs ======================
-einbroch.gat,220,208,5 script Notice Board 858,{
+einbroch.gat,220,208,5 script Notice Board#01 858,{
mes "[Weapon Shop Entrance]";
close;
}
-einbroch.gat,183,174,5 script Bulletin Board 858,{
+einbroch.gat,183,174,5 script Bulletin Board#01 858,{
mes "East - Weapon Shop, Hotel";
mes "South - Factory";
mes "Southwest - Airship Repair Shop,";
@@ -38,19 +39,19 @@ einbroch.gat,183,174,5 script Bulletin Board 858,{
close;
}
-einbroch.gat,244,255,5 script Bulletin Board 858,{
+einbroch.gat,244,255,5 script Bulletin Board#02 858,{
mes " ";
mes " Train Station";
close;
}
-einbroch.gat,68,206,5 script Bulletin Board 858,{
+einbroch.gat,68,206,5 script Bulletin Board#03 858,{
mes " ";
mes " Airship Airport";
close;
}
-einbroch.gat,162,256,5 script Bulletin Board 858,{
+einbroch.gat,162,256,5 script Bulletin Board#04 858,{
mes "East - Train Station";
mes "Southeast - Hotel";
mes "South - Weapon Shop, Factory";
@@ -59,7 +60,7 @@ einbroch.gat,162,256,5 script Bulletin Board 858,{
close;
}
-einbroch.gat,235,141,5 script Bulletin Board 858,{
+einbroch.gat,235,141,5 script Bulletin Board#05 858,{
mes "Southwest- Airship Repair Shop,";
mes "Laboratory";
mes "Northwest- Airport";
@@ -273,7 +274,7 @@ einbroch.gat,259,327,5 script Leslie 846,{
close;
}
-einbroch.gat,232,272,3 script Train Station Staff::EinbrochTrain 852,{
+einbroch.gat,232,272,3 script Train Station Staff#01::EinbrochTrain 852,{
mes "[Staff]";
mes "Welcome to";
mes "the Train Station.";
@@ -329,7 +330,7 @@ s_Enviroment:
close;
}
-einbroch.gat,252,301,3 duplicate(EinbrochTrain) Train Station Staff 852
+einbroch.gat,252,301,3 duplicate(EinbrochTrain) Train Station Staff#02 852
einbroch.gat,228,121,5 script Little Toby 855,{
mes "[Little Toby]";
@@ -1444,7 +1445,7 @@ if(EinFactory == 5)
}
end;
}
-ein_in01.gat,47,197,4 script Conveyor 111,{
+ein_in01.gat,47,197,4 script Conveyor#01 111,{
if(EinFactory == 7)
{
@@ -1478,7 +1479,7 @@ if(EinFactory == 9)
end;
}
-ein_in01.gat,95,238,4 script Conveyor 111,{
+ein_in01.gat,95,238,4 script Conveyor#02 111,{
if(EinFactory == 11)
{
@@ -2737,14 +2738,14 @@ L_SCFail:
mes "check. Access denied.";
close;
}
-einbroch.gat,51,56,6 script Laboratory Soldier 852,{
+einbroch.gat,51,56,6 script Laboratory Soldier#01 852,{
mes "[Laboratory Soldier]";
mes "This area is off limits.";
mes "Please leave";
mes "immediately";
close;
}
-einbroch.gat,51,47,6 script Laboratory Soldier 852,{
+einbroch.gat,51,47,6 script Laboratory Soldier#02 852,{
mes "[Laboratory Soldier]";
mes "This area is off limits.";
mes "Please leave";
@@ -2823,7 +2824,7 @@ ein_in01.gat,266,26,1 script Unknown Stuff 111,{
close;
}
-airplane.gat,31,77,4 script Drunken Man 853,{
+airplane.gat,31,77,4 script Drunken Man#03 853,{
if (ein_lab == 2) goto L_Done;
mes "[Drunken Man]";
mes "Okay okay...";
diff --git a/npc/cities/geffen.txt b/npc/cities/geffen.txt
index 9b7ff90ec..8dcf8887c 100644
--- a/npc/cities/geffen.txt
+++ b/npc/cities/geffen.txt
@@ -3,7 +3,7 @@
//===== By: ==================================================
//= kobra_k88
//===== Current Version: =====================================
-//= 1.3
+//= 1.4
//===== Compatible With: =====================================
//= eAthena 7.15 +
//===== Description: =========================================
@@ -13,11 +13,12 @@
//= 1.1 - Spell Checked [massdriller]
//= 1.2 Fixed more typos [Nexon]
//= 1.3 added a Level 4 weapon quest related NPC [MasterOfMuppets]
+//= 1.4 Removed Duplicates [Silent]
//============================================================
// Lady -------------------------------------------------------
-geffen.gat,59,143,8 script Lady 91,{
+geffen.gat,59,143,8 script Lady#01 91,{
mes "[Lady]";
mes "Oh, you must be a Stranger here.";
next;
@@ -82,7 +83,7 @@ geffen.gat,156,190,8 script Researcher 57,{
}
// Young Man --------------------------------------------------------------------------
-geffen.gat,147,26,0 script "Young man" 97,{
+geffen.gat,147,26,0 script Young man#06 97,{
mes "[Young Man]";
mes "I heard that somewhere in this world, there is a rare staff which transforms its owner's psychic power into physical powers, and endows with destructive force also...";
mes "With this, everybody could be as strong as Hercules, despite their lack of muscles. Haw haw...I will take it.";
@@ -95,7 +96,7 @@ geffen.gat,147,26,0 script "Young man" 97,{
}
// Young Man -----------------------------------------------------------------------
-geffen_in.gat,34,170,0 script "Young man" 47,{
+geffen_in.gat,34,170,0 script Young man#07 47,{
mes "[Young Man]";
mes "Hello? Isn't it wonderful, today? I am a promising young Mage. Ahem.";
mes "Nowadays, my mental anguish about magic things keeps me awake every night..sigh...Especially, about the weak point of magic, you know.";
@@ -112,7 +113,7 @@ geffen_in.gat,34,170,0 script "Young man" 47,{
//<============================================ Inn =====================================================>\\
// Waitress ---------------------------------------------------------------------------
-geffen_in.gat,70,67,5 script Waitress 80,{
+geffen_in.gat,70,67,5 script Waitress#01 80,{
mes "[Waitress]";
mes "Ugh!! SO annoying! Why would you drink here when you could drink at the pub!? This is an Inn, not a pub!!";
mes "That man!... every time he drinks... he gets like that! Ugh!!";
@@ -224,7 +225,7 @@ M_Menu:
}
// Drunkard -------------------------------------------------------------------
-geffen_in.gat,59,62,2 script Drunkard 120,{
+geffen_in.gat,59,62,2 script Drunkard#01 120,{
mes "[Drunkard]";
mes "Hmm... You're Joshua's friend too??";
next;
@@ -285,7 +286,7 @@ geffen_in.gat,113,73,4 script Schubaltzwald Merchant 709,{
//<============================================== Pub ==================================================>\\
// Waitress -----------------------------------------------------------------
-geffen_in.gat,28,134,4 script Waitress 69,{
+geffen_in.gat,28,134,4 script Waitress#03 69,{
mes "[Waitress]";
mes "Meh! ALWAYS drinking and ALWAYS fighting..... HEY Mister! This is a place of BUSINESS!!";
emotion e_an;
@@ -325,7 +326,7 @@ M_Menu:
}
// Drunkard ----------------------------------------------------------------------------
-geffen_in.gat,21,125,5 script Drunkard 52,{
+geffen_in.gat,21,125,5 script Drunkard#02 52,{
mes "[Drunkard]";
mes "You want to be an idiotic magician? Is that why you came here??";
emotion e_what;
diff --git a/npc/cities/gonryun.txt b/npc/cities/gonryun.txt
index c526894f9..150d095ff 100644
--- a/npc/cities/gonryun.txt
+++ b/npc/cities/gonryun.txt
@@ -3,7 +3,7 @@
//===== By: ==================================================
//= edited by x[tsk] 4/30/04
//===== Current Version: =====================================
-//= 1.1
+//= 1.2
//===== Compatible With: =====================================
//= eAthena 1.0
//===== Description: =========================================
@@ -11,13 +11,14 @@
//===== Additional Comments: =================================
// May be missing npc's and dialogue.
//= 1.1 Fixed Typos [Nexon]
+//= 1.2 Removed Duplicates [Silent]
//============================================================
//EventI
-alberta.gat,245,69,4 script Gonryun Public Relations Official 776,{
+alberta.gat,245,69,4 script Gonryun Public Relations Official#01 776,{
mes "[Waba]";
mes "Hello there! I have traveled far from the Kingdom of Gonryun, my hometown.";
mes "I invite all to visit and celebrate the diversity of Gonryun! We welcome all sorts of visitors.";
@@ -57,7 +58,7 @@ alberta.gat,245,69,4 script Gonryun Public Relations Official 776,{
//===============================================================================
-gon_fild01.gat,255,79,6 script Gonryun Public Relations Official 776,{
+gon_fild01.gat,255,79,6 script Gonryun Public Relations Official#02 776,{
mes "[Waba]";
mes "We are ready to head back as soon as the conditions are favorable.";
next;
@@ -73,7 +74,7 @@ gon_fild01.gat,255,79,6 script Gonryun Public Relations Official 776,{
//===============================================================================
-gon_fild01.gat,187,239,4 script Gonryun Public Relations Official 776,{
+gon_fild01.gat,187,239,4 script Gonryun Public Relations Official#03 776,{
mes "[Choseryu]";
mes "The sacred pillar of light connects this island to Gonryun Kingdom. There's no time to idly chit chat now, be on your way.";
mes "I hope you will have many fond memories of Gonryun before you leave.";
@@ -82,7 +83,7 @@ gon_fild01.gat,187,239,4 script Gonryun Public Relations Official 776,{
//===============================================================================
-gonryun.gat,153,64,0 script Gonryun Public Relations Official 776,{
+gonryun.gat,153,64,0 script Gonryun Public Relations Official#04 776,{
mes "[Choseryu]";
mes "If you're ready to set sail I can send you back to the harbor.";
next;
@@ -148,7 +149,7 @@ gon_in.gat,165,16,4 script Drunkard 748,{
//===============================================================================
-gonryun.gat,139,142,6 script Girl 772,{
+gonryun.gat,139,142,6 script Girl#08 772,{
mes "[Sanfayon]";
mes "................";
mes "It's been great having new visitors come to the village, but........ ever since I was robbed by that Thief.......";
@@ -161,7 +162,7 @@ gonryun.gat,139,142,6 script Girl 772,{
//===============================================================================
-gonryun.gat,113,135,6 script Guardsman 780,{
+gonryun.gat,113,135,6 script Guardsman#01 780,{
mes "[Guardsman]";
mes "Welcome to Gonryun. This is the home of our governor, Sayoumun.";
next;
@@ -175,7 +176,7 @@ gonryun.gat,113,135,6 script Guardsman 780,{
//===============================================================================
-gonryun.gat,113,127,6 script Guardsman 780,{
+gonryun.gat,113,127,6 script Guardsman#02 780,{
mes "[Guardsman]";
mes "Welcome to Gonryun. This is the home of our elder, Sayoumun. He rules all of Gonryun.";
next;
@@ -299,7 +300,7 @@ gonryun.gat,51,101,4 script Gaiysonchoru 778,{
//===============================================================================
-gonryun.gat,166,196,4 script Soldier 780,{
+gonryun.gat,166,196,4 script Soldier#17 780,{
mes "[Wagou]";
mes "Do you know what this is?";
next;
diff --git a/npc/cities/izlude.txt b/npc/cities/izlude.txt
index e30d29cc7..b58557dbe 100644
--- a/npc/cities/izlude.txt
+++ b/npc/cities/izlude.txt
@@ -3,7 +3,7 @@
//===== By: ==================================================
//= kobra_k88
//===== Current Version: =====================================
-//= 1.5
+//= 1.6
//===== Compatible With: =====================================
//= eAthena 7.15 +
//===== Description: =========================================
@@ -16,6 +16,7 @@
//= 1.4 Added a Jawaii related npc. 1.4a Fixed a small bug to
//= the Jawaii warper, thanks to reddozen and Silent [MasterOfMuppets]
//= 1.5 Replaced iz_move_alberta with MISC_QUEST & 16 [Lupus]
+//= 1.6 Removed Duplicates [Silent]
//============================================================
@@ -898,7 +899,7 @@ M_Menu:
}
//Sailor-------------------------------------------------------------------------------------
-izlude.gat,201,181,2 script Sailor 100,{
+izlude.gat,201,181,2 script Sailor#06 100,{
mes "[Sailor]";
mes "Hey Everybody!";
mes "Attention, attention!";
@@ -931,7 +932,7 @@ izlude.gat,201,181,2 script Sailor 100,{
}
//Sailor-------------------------------------------------------------------------------------
-izlu2dun.gat,108,27,4 script Sailor 100,{
+izlu2dun.gat,108,27,4 script Sailor#07 100,{
mes "[Sailor]";
mes "Wanna";
mes "head back?";
diff --git a/npc/cities/lighthalzen.txt b/npc/cities/lighthalzen.txt
index e61a8141a..3c55cfc8d 100644
--- a/npc/cities/lighthalzen.txt
+++ b/npc/cities/lighthalzen.txt
@@ -3,7 +3,7 @@
//===== By: ==================================================
//= erKURITA
//===== Current Version: =====================================
-//= 0.5
+//= 0.8
//===== Compatible With: =====================================
//= eAthena 1.0
//===== Description: =========================================
@@ -16,6 +16,7 @@
//= 0.5 Added a BIG load of Lighthalzen NPCs. [musashiden]
//= 0.6 Fixed some typos+Coordinates. [Musashiden]
//= 0.7 Implemented some more crap NPCs and the second entrance to biolabs [MasterOfMuppets]
+//= 0.8 Removed Duplicates [Silent]
//=============================================================
lighthalzen.gat,198,285,5 script Jiwon 862,{
@@ -665,7 +666,7 @@ lighthalzen.gat,147,105,3 script Laqumet 869,{
}
-lhz_in02.gat,230,284,4 script Hotel Employee 86,{
+lhz_in02.gat,230,284,4 script Hotel Employee#01 86,{
mes "[Hotel Employee]";
mes "Welcome to";
@@ -713,7 +714,7 @@ s_NEnoughZ:
close;
}
-lhz_in02.gat,241,172,8 script Hotel Employee 868,{
+lhz_in02.gat,241,172,8 script Hotel Employee#02 868,{
mes "[Hotel Employee]";
mes "Please use the stairs";
@@ -766,7 +767,7 @@ lhz_in02.gat,201,181,6 script Safwat Fahmy 853,{
}
-lhz_in02.gat,251,212,2 script Hotel Employee 868,{
+lhz_in02.gat,251,212,2 script Hotel Employee#03 868,{
mes "[Hotel Employee]";
mes "This is the Couple Suite.";
@@ -834,7 +835,7 @@ lhz_in02.gat,221,276,4 script Harp 869,{
}
-lhz_in02.gat,238,275,4 script Hotel Employee 869,{
+lhz_in02.gat,238,275,4 script Hotel Employee#04 869,{
mes "[Hotel Employee]";
mes "\"Hospitality with a smile";
@@ -847,7 +848,7 @@ lhz_in02.gat,238,275,4 script Hotel Employee 869,{
}
-lhz_in02.gat,247,275,4 script Hotel Employee 868,{
+lhz_in02.gat,247,275,4 script Hotel Employee#05 868,{
mes "[Hotel Employee]";
mes "Welcome to the";
@@ -866,7 +867,7 @@ lhz_in02.gat,247,275,4 script Hotel Employee 868,{
}
-lhz_in02.gat,271,281,2 script Citizen 47,{
+lhz_in02.gat,271,281,2 script Citizen#01 47,{
mes "[Hachi]";
mes "Oh yeah. I love-love-love";
@@ -898,7 +899,7 @@ lhz_in02.gat,277,285,4 script Bartender 61,{
}
-lhz_in02.gat,281,280,6 script Customer 816,{
+lhz_in02.gat,281,280,6 script Customer#01 816,{
mes "[Rona]";
mes "I hate it when guys";
@@ -917,7 +918,7 @@ lhz_in02.gat,281,280,6 script Customer 816,{
}
-lhz_in02.gat,287,282,4 script Customer 853,{
+lhz_in02.gat,287,282,4 script Customer#02 853,{
mes "[Greenfield]";
mes "I don't believe it...";
@@ -1449,7 +1450,7 @@ lhz_in01.gat,116,45,6 script Joshua 704,{
// ---------------------------------------------------------------------------
-lhz_in01.gat,93,45,4 script Researcher 865,{
+lhz_in01.gat,93,45,4 script Researcher#02 865,{
mes "[Researcher]";
mes "You know what's weird?";
@@ -1614,7 +1615,7 @@ lhz_in03.gat,192,19,2 script Haggar 855,{
// ---------------------------------------------------------------------------
-lhz_in03.gat,193,25,2 script Bartender 61,{
+lhz_in03.gat,193,25,2 script Bartender#01 61,{
mes "[Tony]";
mes "Hey man, I know this";
@@ -1709,7 +1710,7 @@ lhz_in03.gat,192,93,2 script City Girl#City_Girl 862,{
// ---------------------------------------------------------------------------
-lhz_in03.gat,189,87,4 script Drunken Man#Drunken_Man 869,{
+lhz_in03.gat,189,87,4 script Drunken Man#04 869,{
mes "[Enku]";
mes "*Sob* I just got";
@@ -1731,7 +1732,7 @@ lhz_in03.gat,189,87,4 script Drunken Man#Drunken_Man 869,{
// ---------------------------------------------------------------------------
-lhz_in03.gat,183,82,6 script Drunken Man#Drunken_Man2 870,{
+lhz_in03.gat,183,82,6 script Drunken Man#05 870,{
mes "[Linus]";
mes "After ten years";
@@ -1751,7 +1752,7 @@ lhz_in03.gat,183,82,6 script Drunken Man#Drunken_Man2 870,{
// ---------------------------------------------------------------------------
-lhz_in03.gat,180,83,6 script Citizen 86,{
+lhz_in03.gat,180,83,6 script Citizen#02 86,{
mes "[Mitchell]";
mes "You know, everyone";
@@ -1894,7 +1895,7 @@ s_B:
lhz_in01.gat,26,247,2 duplicate(LhzRep) Representative 71
-lhz_in01.gat,173,28,4 script Guard::LhzRekGuard 868,{
+lhz_in01.gat,173,28,4 script Guard#01::LhzRekGuard 868,{
mes "[Guard]";
mes "This is a";
@@ -1907,9 +1908,9 @@ lhz_in01.gat,173,28,4 script Guard::LhzRekGuard 868,{
}
-lhz_in01.gat,180,28,4 duplicate(LhzRekGuard) Guard 868
+lhz_in01.gat,180,28,4 duplicate(LhzRekGuard) Guard#02 868
-lhz_in01.gat,72,209,4 script Guide 862,{
+lhz_in01.gat,72,209,4 script Guide#01 862,{
mes "[Lasoei]";
mes "Oh phooey.";
@@ -1927,7 +1928,7 @@ lhz_in01.gat,72,209,4 script Guide 862,{
}
-lhz_in01.gat,72,195,8 script Guide 90,{
+lhz_in01.gat,72,195,8 script Guide#02 90,{
mes "[Geonuii]";
mes "Greetings. This path";
@@ -1940,7 +1941,7 @@ lhz_in01.gat,72,195,8 script Guide 90,{
}
-lhz_in01.gat,73,188,4 script Guide 862,{
+lhz_in01.gat,73,188,4 script Guide#03 862,{
mes "[Bonnie]";
mes "Oh no...";
@@ -1949,7 +1950,7 @@ lhz_in01.gat,73,188,4 script Guide 862,{
}
-lhz_in01.gat,34,226,4 script Rekenber Guard 867,{
+lhz_in01.gat,34,226,4 script Rekenber Guard#01 867,{
if(getequipid(10) == 2241 && getequipid(9) == 2243)goto s_Staff;
mes "[Rekenber Guard]";
@@ -2010,7 +2011,7 @@ s_Staff:
lhz_in01.gat,23,137,0 duplicate(LhzTrig) LhzHiddenTrg2 -1,1,1
-lhz_in01.gat,24,131,2 duplicate(LhzTrig) Rekenber Guard 867
+lhz_in01.gat,24,131,2 duplicate(LhzTrig) Rekenber Guard#02 867
lhz_in01.gat,25,141,4 script Regenschirm Guard 868,{
diff --git a/npc/cities/louyang.txt b/npc/cities/louyang.txt
index 37798a543..06209266a 100644
--- a/npc/cities/louyang.txt
+++ b/npc/cities/louyang.txt
@@ -7,7 +7,7 @@
//= Mass Zero (1.3)
//= MasterOfMuppets (2.0)
//===== Current Version: =====================================
-//= 2.4
+//= 2.6
//===== Compatible With: =====================================
//= Any eAthena Version
//===== Description: =========================================
@@ -29,9 +29,10 @@
//= 2.3 A small fix, the code is so messy I can't believe I scripted it >.< [MasterOfMuppets]
//= 2.4 Implemented a few more npcs, thanks to Prometheus for them. [MasterOfMuppets]
//= 2.5 Implemented the Poison King quest, beware of potential bugs. [MasterOfMuppets]
+//= 2.6 Removed Duplicates [Silent]
//============================================================
-alberta.gat,245,45,4 script Girl 815,{
+alberta.gat,245,45,4 script Girl#02 815,{
mes "[Girl]";
mes "La la la la~";
mes "I feel so good today~";
@@ -108,7 +109,7 @@ M_CANCEL2:
close;
}
-lou_fild01.gat,190,100,1 script Girl 815,{
+lou_fild01.gat,190,100,1 script Girl#03 815,{
mes "[Girl]";
mes "You'd like to go back to Alberta?";
next;
@@ -133,7 +134,7 @@ M_CANCEL:
close;
}
-louyang.gat,224,104,4 script Representative 818,{
+louyang.gat,224,104,4 script Representative#01 818,{
mes "[Representative]";
mes "Welcome to Louyang,";
mes "an ancient land with";
@@ -228,7 +229,7 @@ M_CANCEL:
close;
}
-louyang.gat,213,214,4 script Soldier 825,{
+louyang.gat,213,214,4 script Soldier#10 825,{
mes "[Soldier]";
mes "Welcome to louyang, a city with a long and colorful history.";
next;
@@ -322,7 +323,7 @@ M_CANCEL:
close;
}
-lou_fild01.gat,195,177,4 script Jiu Lian Bu 819,{
+lou_fild01.gat,195,177,4 script Jiu Lian Bu#01 819,{
if(QL_SOUP2) goto L_DONE;
if(QL_SOUPQUEST)goto L_WHERE;
if(QL_GOTFAKESOUP) goto L_FAKE;
@@ -501,7 +502,7 @@ L_WHERE:
end;
}
-lou_fild01.gat,175,174,4 script Jiu Lian Bu 819,{
+lou_fild01.gat,175,174,4 script Jiu Lian Bu#02 819,{
if(QL_SOUPQUEST < 1) goto L_DOQUEST;
if(QL_SOUP2 < 1) goto L_1STTIME;
mes "[Jiu Lian Bu]";
@@ -602,7 +603,7 @@ L_1STTIME:
close;
}
-lou_in02.gat,61,175,2 script Employee 818,2,2{
+lou_in02.gat,61,175,2 script Employee#01 818,2,2{
mes "[Ya Hua]";
mes "^6A6A6A*Yawn...*";
close;
@@ -630,13 +631,13 @@ S_CAUGHT:
close;
}
-lou_in02.gat,54,174,6 script Employee 822,{
+lou_in02.gat,54,174,6 script Employee#02 822,{
mes "[Chang Pai]";
mes "^6A6A6A*Yawn...*";
close;
}
-lou_in02.gat,50,185,4 script Pot 111,{
+lou_in02.gat,50,185,4 script Pot#01 111,{
if(QL_SOUPQUEST == 1) goto L_EMPTY;
if(QL_ACCEPTSOUP < 1) goto L_NORMAL;
mes "^3131FFBeneath the shadows, you find a large pot filled with dark, red liquid. What do you want to do?";
@@ -674,7 +675,7 @@ L_EMPTY:
close;
}
-lou_in02.gat,49,185,4 script Pot 111,{
+lou_in02.gat,49,185,4 script Pot#02 111,{
if(QL_SOUPQUEST == 1) goto L_EMPTY;
if(QL_ACCEPTSOUP < 1) goto L_NORMAL;
mes "^3131FFBeneath the shadows, you find a large pot filled with dark, red liquid. What do you want to do?";
@@ -844,7 +845,7 @@ lou_in02.gat,43,169,8 script Jiang Rong 827,{
close;
}
-lou_in02.gat,76,181,2 script Employee 822,{
+lou_in02.gat,76,181,2 script Employee#03 822,{
mes "[Huang Jia Xian]";
mes "Ehhhh...";
mes "Forgive me...";
@@ -1731,7 +1732,7 @@ L_NOTENOUGH:
goto L_INGREDIENT;
}
-lou_fild01.gat,224,348,7 script Lady 817,{
+lou_fild01.gat,224,348,7 script Lady#04 817,{
emotion 30;
mes "[Lady]";
@@ -1924,7 +1925,7 @@ s_Journal:
}
-lou_in01.gat,111,151,4 script Soldier 825,{
+lou_in01.gat,111,151,4 script Soldier#11 825,{
mes "[Soldier]";
mes "*Yawn* It's so boring here";
mes "nowadays. Although, I hear that";
@@ -1940,7 +1941,7 @@ lou_in01.gat,111,151,4 script Soldier 825,{
close;
}
-lou_in01.gat,91,151,4 script Soldier 825,{
+lou_in01.gat,91,151,4 script Soldier#12 825,{
mes "[Soldier]";
mes "....z..Z..z...";
next;
@@ -1964,7 +1965,7 @@ lou_in01.gat,91,151,4 script Soldier 825,{
close;
}
-lou_in01.gat,82,139,6 script Soldier 825,{
+lou_in01.gat,82,139,6 script Soldier#13 825,{
mes "[Soldier]";
mes "There is nothing much, but if you";
mes "wish to look around this room,";
@@ -1972,7 +1973,7 @@ lou_in01.gat,82,139,6 script Soldier 825,{
close;
}
-lou_in01.gat,45,138,4 script Soldier 825,{
+lou_in01.gat,45,138,4 script Soldier#14 825,{
mes "[Soldier]";
mes "It's strange to see outsiders in";
mes "this kind of place. We don't have";
@@ -1981,7 +1982,7 @@ lou_in01.gat,45,138,4 script Soldier 825,{
close;
}
-lou_in01.gat,102,144,4 script Soldier 825,{
+lou_in01.gat,102,144,4 script Soldier#15 825,{
mes "[Soldier]";
mes "People have been";
mes "saying that there's";
@@ -1996,7 +1997,7 @@ lou_in01.gat,102,144,4 script Soldier 825,{
close;
}
-lou_in01.gat,99,144,4 script Soldier 825,{
+lou_in01.gat,99,144,4 script Soldier#16 825,{
mes "[Soldier]";
mes "Ah, don't bother";
mes "to listen to this";
@@ -2087,7 +2088,7 @@ lou_in02.gat,272,55,1 script Familiar-Looking Patient 86,{
close;
}
-lou_in02.gat,253,45,4 script Employee 822,{
+lou_in02.gat,253,45,4 script Employee#04 822,{
if(QL_POISONKING == 30)goto s_NoGoodIdea;
if(QL_POISONKING == 18)goto s_Busy;
diff --git a/npc/cities/morocc.txt b/npc/cities/morocc.txt
index 2f329318d..c46a13ee9 100644
--- a/npc/cities/morocc.txt
+++ b/npc/cities/morocc.txt
@@ -3,7 +3,7 @@
//===== By: ==================================================
//= kobra_k88
//===== Current Version: =====================================
-//= 1.6
+//= 1.7
//===== Compatible With: =====================================
//= eAthena 7.15 +
//===== Description: =========================================
@@ -17,6 +17,7 @@
//= 1.4 Fixed typos [Nexon]
//= 1.5 Added a lvl 4 weapon quest related NPC [MasterOfMuppets]
//= 1.6 Added Bartender NPC, made by Persian69 [Vicious_Pucca]
+//= 1.7 Removed Duplicates [Silent]
//============================================================
@@ -362,7 +363,7 @@ M_Menu:
}
//Bartender
-morocc_in.gat,166,76,3 script Bartender 46,{
+morocc_in.gat,166,76,3 script Bartender#02 46,{
mes "[Bartender]";
mes "What are you going to order?";
next;
@@ -401,7 +402,7 @@ Nomoney:
// Lvl 4 weapon quest related NPC ================================
-morocc.gat,289,230,3 script Citizen 92, {
+morocc.gat,289,230,3 script Citizen#06 92, {
mes "[Citizen]";
mes "Meeting a dead man is basically";
mes "impossible.";
diff --git a/npc/cities/niflheim.txt b/npc/cities/niflheim.txt
index 45c768c75..a60b4f701 100644
--- a/npc/cities/niflheim.txt
+++ b/npc/cities/niflheim.txt
@@ -4,7 +4,7 @@
//= Fyrien, Dizzy, PKGINGO
//= Official NPCs translated and re-edited by Celest
//===== Current Version: =====================================
-//= 1.1
+//= 1.2
//===== Compatible With: =====================================
//= Any eAthena Version; Niflheim Required
//===== Description: =========================================
@@ -20,6 +20,7 @@
//= 1.08 Commented "Traveler" out as it is not official & we have correct Bungee quest in.
//= Also removed TODO, as they are already done. [Vicious_Pucca]
//= 1.1 Replaced nif_q_done with MISC_QUEST & 32. nif_t -> @nif_t [Lupus]
+//= 1.2 Removed Duplicates [Silent]
//============================================================
//prontera.gat,164,161,4 script Traveler::NifTrav 68,{
@@ -71,7 +72,7 @@ niflheim.gat,130,176,0 duplicate(spirits) Spirit#7 802
niflheim.gat,173,110,0 duplicate(spirits) Spirit#8 802
niflheim.gat,182,167,0 duplicate(spirits) Spirit#9 802
-niflheim.gat,184,199,5 script Little Girl 793,{
+niflheim.gat,184,199,5 script Little Girl#02 793,{
mes "[Sairin]";
if(niflheimlost2 == 1) goto L_thanks;
if(niflheimlost == 1) goto L_foundhim;
diff --git a/npc/cities/payon.txt b/npc/cities/payon.txt
index 50225e69a..16499fd55 100644
--- a/npc/cities/payon.txt
+++ b/npc/cities/payon.txt
@@ -4,7 +4,7 @@
//= Muad Dib (1.0) Darkchild (1.1) Muad Dib (1.2)
//= Darkchild (1.3) DracoRPG (1.5)
//===== Current Version: =====================================
-//= 1.7
+//= 1.8
//===== Compatible With: =====================================
//= Any eAthena Mod
//===== Description: =========================================
@@ -18,9 +18,10 @@
//= 1.5b2 added adv.classes/baby classes support [Lupus]
//= 1.6 Fixed typos [Nexon]
//= 1.7 Fixed bugs and exploits V__V [Lupus]
+//= 1.8 Removed Duplicates [Silent]
//============================================================
-payon.gat,190,115,0 script Lady 90,{
+payon.gat,190,115,0 script Lady#05 90,{
mes "[Lady]";
mes "Did you know that in the past Payon was not as prosperous as it is now? Back then we had difficulty making a living for ourselves.";
emotion e_gasp;
@@ -45,7 +46,7 @@ payon.gat,190,115,0 script Lady 90,{
mes "It is a very tragic situation, for those zombies were at one time beloved members of the Payon community.";
close;
}
-payon_in01.gat,177,91,5 script Young Man 88,{
+payon_in01.gat,177,91,5 script Young Man#06 88,{
mes "[Young Man]";
mes "I can see you are a stranger from the appearance of your traveling outfit. You must be a well-experienced fighter otherwise you couldn't successfully arrive at this steep place with all tough those creatures outside.";
mes "However you miss something important for fights. You can't defeat those monsters only with might.";
@@ -56,7 +57,7 @@ payon_in01.gat,177,91,5 script Young Man 88,{
close;
}
-payon.gat,104,62,5 script Young Man 88,{
+payon.gat,104,62,5 script Young Man#07 88,{
mes "[Young Man]";
mes "I still remember the story my grandfather told me long ago about the Amulet that possessed an Evil Power within it.";
next;
@@ -154,7 +155,7 @@ L_Menu4:
close;
}
-payon.gat,193,116,1 script Woman 66,{
+payon.gat,193,116,1 script Woman#05 66,{
mes "[Woman]";
mes "Welcome to Payon. You must have had a hard time getting through the thick forest? I hope you didn't run into too much trouble?";
next;
@@ -211,7 +212,7 @@ L_Menu3:
close;
}
-payon.gat,190,119,5 script Woman 66,{
+payon.gat,190,119,5 script Woman#06 66,{
mes "[Jim's Mother]";
mes "Oh boy there she goes again. She is a confirmed gossip. Please don't mistake her for being a typical Payon citizen.";
emotion e_dots;
@@ -646,7 +647,7 @@ payon_in03.gat,96,117,4 script PayonGuard2TriggerArea 139,3,2,{
close;
}
-payon_in03.gat,102,185,4 script Guard 708,{
+payon_in03.gat,102,185,4 script Guard#06 708,{
mes "[Guard]";
mes "Hey...!";
mes "You're not";
@@ -737,7 +738,7 @@ payon.gat,160,185,0 script Billboard 111,{
close;
}
-payon.gat,173,238,5 script Jade 754,{
+payon.gat,173,238,5 script Jade#01 754,{
mes "[Jade]";
mes "Bring me two";
mes "Gemstones of the";
diff --git a/npc/cities/prontera.txt b/npc/cities/prontera.txt
index 22701b18b..77d06a5f5 100644
--- a/npc/cities/prontera.txt
+++ b/npc/cities/prontera.txt
@@ -3,7 +3,7 @@
//===== By: ==================================================
//= kobra_k88
//===== Current Version: =====================================
-//= 1.6
+//= 1.7
//===== Compatible With: =====================================
//= eAthena 7.15 +
//===== Description: =========================================
@@ -15,6 +15,7 @@
//= 1.4 Optimized. Novices > 20 BaseJob can go to Culvert, too [Lupus]
//= 1.5a Added a Jawaii related npc [MasterOfMuppets]
//= 1.6 Replaced sewer_prt with (MISC_QUEST & 8) [Lupus]
+//= 1.7 Removed Duplicates [Silent]
//============================================================
@@ -460,7 +461,7 @@ prt_in.gat,173,24,2 script Shevild 85,{
}
// Bartender ---------------------------------------------------------
-prt_in.gat,181,21,2 script Bartender 61,{
+prt_in.gat,181,21,2 script Bartender#03 61,{
mes "[Bartender]";
mes "Phew~ more and more people a crawling in these days.";
mes "I am getting more and more tired everyday, though business has never been better...";
diff --git a/npc/cities/valkyrie.txt b/npc/cities/valkyrie.txt
index c80f76c9e..0aee061cb 100644
--- a/npc/cities/valkyrie.txt
+++ b/npc/cities/valkyrie.txt
@@ -4,7 +4,7 @@
//= Nana, fixes by Poki
//= finished, optimized and tested by Lupus
//===== Current Version: =====================================
-//= 2.2
+//= 2.3
//===== Compatible With: =====================================
//= eAthena 1.0 +
//===== Description: =========================================
@@ -27,6 +27,7 @@
//= 2.0b Fixed. TODO: add new Quest Skills [Lupus]
//= 2.1 Changed all numbers into constants. [Vicious]
//= 2.2 Now ALL quests skills are saved/restored [Lupus]
+//= 2.3 Removed Duplicates [Silent]
//============================================================
@@ -141,7 +142,7 @@ yuno_in05.gat,50,44,0 script Heart of Ymir 111,{
}
// -== Researcher of the Book of Ymir ==-
-yuno_in02.gat,90,77,4 script Researcher 744,{
+yuno_in02.gat,90,77,4 script Researcher#06 744,{
mes "[Researcher]";
mes "Argh, where is it!?";
mes "They said that it would be around here somewhere...";
generated by cgit v1.2.3-60-g2f50 (git 2.42.0) at 2024-07-01 08:52:01 +0000