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 | |
| 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')
| -rw-r--r-- | npc/jobs/1-1/merchant.txt | 5 | ||||
| -rw-r--r-- | npc/jobs/1-1/swordman.txt | 23 |
2 files changed, 15 insertions, 13 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:
diff --git a/npc/jobs/1-1/swordman.txt b/npc/jobs/1-1/swordman.txt index 76ec9d464..ec3cd7c42 100644 --- a/npc/jobs/1-1/swordman.txt +++ b/npc/jobs/1-1/swordman.txt @@ -3,7 +3,7 @@ //===== By: ==================================================
//= kobra_k88
//===== Current Version: =====================================
-//= 1.7
+//= 1.8
//===== Compatible With: =====================================
//= eAthena 1.0 +
//===== Description: =========================================
@@ -18,6 +18,7 @@ //= v1.5 Optimised and moved first checker to Jfunc1-1 [massdriller]
//= 1.6 Fixed possible EXP abuse [Lupus]
//= 1.7 Now saves/restores all quest skills [Lupus]
+//= 1.8 Removed Duplicates [Silent]
//============================================================
@@ -183,13 +184,13 @@ L_Done: }
// -- Swordsman --
-izlude_in.gat,65,171,5 script Swordsman 85,{
+izlude_in.gat,65,171,5 script Swordsman#01 85,{
doevent "Swordsman::OnStart";
end;
}
// -- Hidden Npc --
-izlude_in.gat,65,171,5 script Swordsman -1,{
+izlude_in.gat,65,171,5 script Swordsman#02 -1,{
OnStart:
mes "[Swordsman]";
@@ -323,7 +324,7 @@ sword_1-1.gat,1,1,0 script TimerSwrdmn -1,{ // -- Medic 1 --
-sword_1-1.gat,230,245,2 script Medic 105,{
+sword_1-1.gat,230,245,2 script Medic#01 105,{
mes "[Medic]";
mes "This is the 1st check point! You're doing great!";
percentheal 100, 100;
@@ -331,7 +332,7 @@ sword_1-1.gat,230,245,2 script Medic 105,{ }
// -- Test Hall Staff 2 --
-sword_1-1.gat,230,242,2 script Test Hall Staff 105,{
+sword_1-1.gat,230,242,2 script Test Hall Staff#01 105,{
mes "[Test Hall Staff]";
mes "Do you surrender?";
next;
@@ -347,7 +348,7 @@ sword_1-1.gat,230,242,2 script Test Hall Staff 105,{ }
// -- Medic 2 --
-sword_1-1.gat,230,207,2 script Medic 105,{
+sword_1-1.gat,230,207,2 script Medic#02 105,{
mes "[Medic]";
mes "This is the 2nd check point! Keep up the good work!";
percentheal 100, 100;
@@ -355,7 +356,7 @@ sword_1-1.gat,230,207,2 script Medic 105,{ }
// -- Test Hall Staff 3 --
-sword_1-1.gat,230,204,2 script Test Hall Staff 105,{
+sword_1-1.gat,230,204,2 script Test Hall Staff#02 105,{
mes "[Test Hall Staff]";
mes "Do you surrender?";
next;
@@ -562,9 +563,9 @@ sword_1-1.gat,16,251,4 script 1_blank_1a#1::1_blank 139,0,1,{ // -- Duplicates --
sword_1-1.gat,19,251,4 duplicate(1_blank) 1_blank_1b 139,0,1
sword_1-1.gat,17,250,4 duplicate(1_blank) 1_blank_1c 139,1,0
-sword_1-1.gat,17,251,4 duplicate(1_blank) 1_blank_1a 139,1,1
-sword_1-1.gat,18,251,4 duplicate(1_blank) 1_blank_1b 139,1,1
-sword_1-1.gat,17,251,4 duplicate(1_blank) 1_blank_1c 139,1,1
+sword_1-1.gat,17,251,4 duplicate(1_blank) 1_blank_1d 139,1,1
+sword_1-1.gat,18,251,4 duplicate(1_blank) 1_blank_1e 139,1,1
+sword_1-1.gat,17,251,4 duplicate(1_blank) 1_blank_1f 139,1,1
sword_1-1.gat,16,238,4 duplicate(1_blank) 1_blank_2a 139,0,1
sword_1-1.gat,19,238,4 duplicate(1_blank) 1_blank_2b 139,0,1
sword_1-1.gat,17,239,4 duplicate(1_blank) 1_blank_2c 139,0,1
@@ -676,7 +677,7 @@ sword_1-1.gat,26,168,4 duplicate(3_blank) 3_blank_3_d 139,0,2 sword_1-1.gat,36,169,4 duplicate(3_blank) 3_blank_4_a 139,0,0
sword_1-1.gat,37,169,4 duplicate(3_blank) 3_blank_4_b 139,0,0
sword_1-1.gat,37,168,4 duplicate(3_blank) 3_blank_4_c 139,0,0
-sword_1-1.gat,36,168,4 duplicate(3_blank) 3_blank_4_c 139,0,0
+sword_1-1.gat,36,168,4 duplicate(3_blank) 3_blank_4_d 139,0,0
sword_1-1.gat,40,175,4 duplicate(3_blank) 3_blank_5_a 139,0,1
sword_1-1.gat,41,175,4 duplicate(3_blank) 3_blank_5_b 139,0,1
sword_1-1.gat,41,171,4 duplicate(3_blank) 3_blank_6_a 139,1,0
|