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/1-1/merchant.txt | |
| 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/1-1/merchant.txt')
| -rw-r--r-- | npc/jobs/1-1/merchant.txt | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/npc/jobs/1-1/merchant.txt b/npc/jobs/1-1/merchant.txt index cec41e4f3..9ad6b5a33 100644 --- a/npc/jobs/1-1/merchant.txt +++ b/npc/jobs/1-1/merchant.txt @@ -3,7 +3,7 @@ //===== By: ==================================================
//= kobra_k88
//===== Current Version: =====================================
-//= 1.6
+//= 1.7
//===== Compatible With: =====================================
//= eAthena 1.0 +
//===== Description: =========================================
@@ -15,6 +15,7 @@ //= v1.4 Optimised and moved first checker to Jfunc1-1 [massdriller]
//= 1.5 Changed Prontera->Izlude teleport price to 600 [Lupus]
//= 1.6 Now saves/restores all quest skills [Lupus]
+//= 1.7 Removed Duplicates [Silent]
//============================================================
@@ -687,7 +688,7 @@ L_WrongDest: }
// -- Kafra(Prontera) --
-prontera.gat,248,42,8 script Kafra 115,{
+prontera.gat,248,42,8 script Kafra#01 115,{
cutin "kafra_03",2;
if(BaseJob==Job_Novice && job_merchant_q3>0) goto L_Start;
L_Other:
|