diff options
| author | Playtester <Playtester@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2006-06-16 10:02:18 +0000 |
|---|---|---|
| committer | Playtester <Playtester@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2006-06-16 10:02:18 +0000 |
| commit | e07326b0aa71a74cacd425e30745bb01a60b153f (patch) | |
| tree | b72f1f4ada283ca5f02885e957c5e194eb1652a7 /npc/jobs/2-1 | |
| parent | e4bb98fd9afd36dcd42a4135a55ad8930e2acf01 (diff) | |
| download | hercules-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/jobs/2-1')
| -rw-r--r-- | npc/jobs/2-1/assassin.txt | 7 | ||||
| -rw-r--r-- | npc/jobs/2-1/blacksmith.txt | 5 | ||||
| -rw-r--r-- | npc/jobs/2-1/hunter.txt | 5 |
3 files changed, 10 insertions, 7 deletions
diff --git a/npc/jobs/2-1/assassin.txt b/npc/jobs/2-1/assassin.txt index 76dc4a00a..6b9596fd7 100644 --- a/npc/jobs/2-1/assassin.txt +++ b/npc/jobs/2-1/assassin.txt @@ -3,7 +3,7 @@ //===== By: ==================================================
//= kobra_k88
//===== Current Version: =====================================
-//= 2.0
+//= 2.1
//===== Compatible With: =====================================
//= eAthena RC4
//===== Description: =========================================
@@ -26,6 +26,7 @@ //= 2nd Job Quests again. It also guides adv classes where
//= to go. [Lupus]
//= 2.0 Changed numbers to constants. [Vicious]
+//= 2.1 Removed Duplicates [Silent]
//============================================================
@@ -1432,7 +1433,7 @@ in_moc_16.gat,167,114,3 script guildmaster_Trig#0 139,4,0,{ }
// Guild Master -----------------------------------------------------------------------------
-in_moc_16.gat,149,80,4 script Guild Master 106,1,1,{
+in_moc_16.gat,149,80,4 script Guild Master#01 106,1,1,{
end;
OnTouch:
@@ -1842,7 +1843,7 @@ in_moc_16.gat,186,107,0 script maze_trig#9 139,0,0,{ //================================================//
// Decoy Chief
//================================================//
-in_moc_16.gat,186,81,0 script Guild Master#2 55,{
+in_moc_16.gat,186,81,0 script Guild Master#02 55,{
mes "[Guild Master Botogun]";
mes "I'm sorry but I am not the person in charge here.";
mes "The real Guild Chief is on the other side.";
diff --git a/npc/jobs/2-1/blacksmith.txt b/npc/jobs/2-1/blacksmith.txt index cbaae1c8c..ce76d0772 100644 --- a/npc/jobs/2-1/blacksmith.txt +++ b/npc/jobs/2-1/blacksmith.txt @@ -7,7 +7,7 @@ //= Optimized and further edited by kobra_k88.
//= Further bugfixed and tested by Lupus
//===== Current Version: =====================================
-//= 2.0
+//= 2.1
//===== Compatible With: =====================================
//= eAthena 1.0+
//===== Description: =========================================
@@ -25,6 +25,7 @@ //= 1.7 item quantity/ids typos fix
//= 1.8 Moved the Quest to Einbroch [Poki#3]
//= 2.0 Changed numbers to constants. [Vicious]
+//= 2.1 Removed Duplicates [Silent]
==============================================================
@@ -1415,7 +1416,7 @@ L_Result: //=========================== NPC that tells you, that the Guild moved
//=========================== She's there on kRO, but the current text is custom ^^
-geffen_in.gat,110,169,4 script Guildsman 726,{
+geffen_in.gat,110,169,4 script Guildsman#01 726,{
mes "[Blacksmith Guildsman]";
mes "Welcome! We're the masters of the metal, blacksmiths!";
mes "Our skills in creating weapons, in a way, is almost an art form!.";
diff --git a/npc/jobs/2-1/hunter.txt b/npc/jobs/2-1/hunter.txt index 19d4267a9..bb424fd66 100644 --- a/npc/jobs/2-1/hunter.txt +++ b/npc/jobs/2-1/hunter.txt @@ -5,7 +5,7 @@ //= Converted by kobra_k88
//= Further bugfixed and tested by Lupus
//===== Current Version: =====================================
-//= 2.0
+//= 2.1
//===== Compatible With: =====================================
//= eAthena 1.0
//===== Description: =========================================
@@ -27,6 +27,7 @@ //= reported the bug) [Lupus]
//= 1.7 Moved the Job QUest to Hugel [Poki#3]
//= 2.0 Changed numbers to constants. [Vicious]
+//= 2.1 Removed Duplicates [Silent]
//============================================================
//<====================================== Job Changer ========================================>\\
@@ -488,7 +489,7 @@ L_Done: //<=============================== Guild Master: Last Test =================================>\\
-payon_in02.gat,21,31,1 script Guild Master 59,{
+payon_in02.gat,21,31,1 script Guild Master#03 59,{
if(BaseJob == Job_Archer) goto L_Archer;
if(BaseJob == Job_Hunter) goto L_Hnt;
|