summaryrefslogtreecommitdiff
path: root/npc/cities
diff options
context:
space:
mode:
authortoms <toms@54d463be-8e91-2dee-dedb-b68131a5f0ec>2006-09-01 22:11:36 +0000
committertoms <toms@54d463be-8e91-2dee-dedb-b68131a5f0ec>2006-09-01 22:11:36 +0000
commita9b1f06e98367bda11817d0c64ae2e8af4471f2b (patch)
tree4f1af08f496e625726497e6522310cf81fbbab72 /npc/cities
parent911c0ea64888157f7a9496a4a5c516af92c0d11c (diff)
downloadhercules-a9b1f06e98367bda11817d0c64ae2e8af4471f2b.tar.gz
hercules-a9b1f06e98367bda11817d0c64ae2e8af4471f2b.tar.bz2
hercules-a9b1f06e98367bda11817d0c64ae2e8af4471f2b.tar.xz
hercules-a9b1f06e98367bda11817d0c64ae2e8af4471f2b.zip
Tried to remove all duplicates (in default NPCs)
( hope nothing is broken ;) ) git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@8581 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'npc/cities')
-rw-r--r--npc/cities/gonryun.txt9
-rw-r--r--npc/cities/lighthalzen.txt5
-rw-r--r--npc/cities/umbala.txt5
3 files changed, 11 insertions, 8 deletions
diff --git a/npc/cities/gonryun.txt b/npc/cities/gonryun.txt
index 150d095ff..29a30510c 100644
--- a/npc/cities/gonryun.txt
+++ b/npc/cities/gonryun.txt
@@ -12,13 +12,14 @@
// May be missing npc's and dialogue.
//= 1.1 Fixed Typo’s [Nexon]
//= 1.2 Removed Duplicates [Silent]
+//= 1.3 Max NPC Name is 23 [Toms]
//============================================================
//Event–˘’˛¸I
-alberta.gat,245,69,4 script Gonryun Public Relations Official#01 776,{
+alberta.gat,245,69,4 script Public Relations#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.";
@@ -58,7 +59,7 @@ alberta.gat,245,69,4 script Gonryun Public Relations Official#01 776,{
//===============================================================================
-gon_fild01.gat,255,79,6 script Gonryun Public Relations Official#02 776,{
+gon_fild01.gat,255,79,6 script Public Relations#02 776,{
mes "[Waba]";
mes "We are ready to head back as soon as the conditions are favorable.";
next;
@@ -74,7 +75,7 @@ gon_fild01.gat,255,79,6 script Gonryun Public Relations Official#02 776,{
//===============================================================================
-gon_fild01.gat,187,239,4 script Gonryun Public Relations Official#03 776,{
+gon_fild01.gat,187,239,4 script Public Relations#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.";
@@ -83,7 +84,7 @@ gon_fild01.gat,187,239,4 script Gonryun Public Relations Official#03 776,{
//===============================================================================
-gonryun.gat,153,64,0 script Gonryun Public Relations Official#04 776,{
+gonryun.gat,153,64,0 script Public Relations#04 776,{
mes "[Choseryu]";
mes "If you're ready to set sail I can send you back to the harbor.";
next;
diff --git a/npc/cities/lighthalzen.txt b/npc/cities/lighthalzen.txt
index a18b4db36..3564084d3 100644
--- a/npc/cities/lighthalzen.txt
+++ b/npc/cities/lighthalzen.txt
@@ -3,7 +3,7 @@
//===== By: ==================================================
//= erKURITA
//===== Current Version: =====================================
-//= 0.8
+//= 0.9
//===== Compatible With: =====================================
//= eAthena 1.0
//===== Description: =========================================
@@ -17,6 +17,7 @@
//= 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]
+//= 0.9 Removed Duplicates [Toms]
//=============================================================
lighthalzen.gat,198,285,5 script Jiwon 862,{
@@ -1908,7 +1909,7 @@ lhz_in01.gat,173,28,4 script Guard#01::LhzRekGuard 868,{
}
-lhz_in01.gat,180,28,4 duplicate(LhzRekGuard) Guard#02 868
+lhz_in01.gat,180,28,4 duplicate(LhzRekGuard) Guard#03 868
lhz_in01.gat,72,209,4 script Guide#01 862,{
diff --git a/npc/cities/umbala.txt b/npc/cities/umbala.txt
index 49b71609b..c0ae1e84d 100644
--- a/npc/cities/umbala.txt
+++ b/npc/cities/umbala.txt
@@ -20,6 +20,7 @@
//= 1.7 - Fixed bugs and exploits [Lupus]
//= 1.8 - Warps you to Niff with 1HP [Lance]
//= 1.9 - Moved Umbala Event, Create Essence/Dismantle Stone, and Skeletal Gate to npc/quests/quests_umbala.txt [Evera]
+//= 2.0 - Removed duplicates, max NPC name length is 23, so Utan Tribe Young Adult#1, the 1 is skipped [Toms]
//============================================================
@@ -530,7 +531,7 @@ LumWord:
}
//=====================================================================
-umbala.gat,140,157,6 script Utan Tribe Young Adult#1 785,{
+umbala.gat,140,157,6 script Utan Tribe Young Adult::UtanTribeYougAdult1 785,{
if(event_umbala < 3) goto LumWord;
mes "[Seirutan]";
mes "Bungy jumping is extremely dangerous.";
@@ -668,7 +669,7 @@ LumWord:
}
//=====================================================================
-umbala.gat,139,205,4 script Utan Tribe Young Adult#5 785,{
+umbala.gat,139,205,4 script Utan Tribe Young Adult::UtanTribeYougAdult5 785,{
if(event_umbala < 3) goto LumWord;
mes "[Tsunitan]";
mes "Awesome! I haven't seen an outsider in some time.";