From e07326b0aa71a74cacd425e30745bb01a60b153f Mon Sep 17 00:00:00 2001
From: Playtester <Playtester@54d463be-8e91-2dee-dedb-b68131a5f0ec>
Date: Fri, 16 Jun 2006 10:02:18 +0000
Subject: * 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
---
 npc/jobs/novice/novice.txt | 27 ++++++++++++++-------------
 1 file changed, 14 insertions(+), 13 deletions(-)

(limited to 'npc/jobs/novice')

diff --git a/npc/jobs/novice/novice.txt b/npc/jobs/novice/novice.txt
index e0d710a2a..8c06d6a47 100644
--- a/npc/jobs/novice/novice.txt
+++ b/npc/jobs/novice/novice.txt
@@ -3,7 +3,7 @@
 //===== By: ================================================== 
 //= Dr.Evil & MasterOfMuppets
 //===== Current Version: ===================================== 
-//= 1.1b 
+//= 1.2
 //===== Compatible With: ===================================== 
 //= eAthena SVN 3422+(Requires jA Script System)
 //===== Description: ========================================= 
@@ -13,6 +13,7 @@
 //= 1.0 Added the New Novice Training Grounds, a big thanks [MasterOfMuppets]
 //=	to Dr.Evil who did 90% of the work =)
 //= 1.0b Temp measure to stop exploits. [Vicious]
+//= 1.2 Removed Duplicates [Silent]
 //============================================================ 
 
 //====================================================================
@@ -207,14 +208,14 @@ L_Fail:
 	end;
 }
 
-new_1-1.gat,144,116,2	script	Guard	105,{
+new_1-1.gat,144,116,2	script	Guard#01	105,{
 	mes "[Training Grounds Guard]";
 	mes "Welcome to the Training Grounds.";
 	mes "You are now in the outer court yard. Please go inside the castle to begin your training.";
 	close;
 }
 
-new_1-1.gat,144,107,2	script	Guard	105,{
+new_1-1.gat,144,107,2	script	Guard#02	105,{
 	mes "[Training Grounds Guard]";
 	switch ( rand(2) ) {
 	case 0:	mes "Come in!";
@@ -2417,7 +2418,7 @@ function	script	training_personnel3	{
 	return;
 }
 
-new_1-3.gat,95,30,4	script	Training Center Employee	84,{
+new_1-3.gat,95,30,4	script	Training Center Employee#01	84,{
 	callfunc "training_personnel";
 	switch( select("I don't want a challenge~","I wanna fight tough monsters!","Cancel.") ) {
 	case 1:	callfunc "training_personnel2"; break;
@@ -2425,7 +2426,7 @@ new_1-3.gat,95,30,4	script	Training Center Employee	84,{
 	case 3:	callfunc "training_personnel0";
 	}
 }
-new_2-3.gat,95,30,4	script	Training Center Employee	84,{
+new_2-3.gat,95,30,4	script	Training Center Employee#02	84,{
 	callfunc "training_personnel";
 	switch( select("I don't want a challenge~","I wanna fight tough monsters!","Cancel.") ) {
 	case 1:	callfunc "training_personnel1"; break;
@@ -2433,7 +2434,7 @@ new_2-3.gat,95,30,4	script	Training Center Employee	84,{
 	case 3:	callfunc "training_personnel0";
 	}
 }
-new_3-3.gat,95,30,4	script	Training Center Employee	84,{
+new_3-3.gat,95,30,4	script	Training Center Employee#03	84,{
 	callfunc "training_personnel";
 	switch( select("I don't want a challenge~","I wanna fight tough monsters!","Cancel.") ) {
 	case 1:	callfunc "training_personnel1"; break;
@@ -2441,7 +2442,7 @@ new_3-3.gat,95,30,4	script	Training Center Employee	84,{
 	case 3:	callfunc "training_personnel0";
 	}
 }
-new_4-3.gat,95,30,4	script	Training Center Employee	84,{
+new_4-3.gat,95,30,4	script	Training Center Employee#04	84,{
 	callfunc "training_personnel";
 	switch( select("I don't want a challenge~","I wanna fight tough monsters!","Cancel.") ) {
 	case 1:	callfunc "training_personnel1"; break;
@@ -2449,7 +2450,7 @@ new_4-3.gat,95,30,4	script	Training Center Employee	84,{
 	case 3:	callfunc "training_personnel0";
 	}
 }
-new_5-3.gat,95,30,4	script	Training Center Employee	84,{
+new_5-3.gat,95,30,4	script	Training Center Employee#05	84,{
 	callfunc "training_personnel";
 	switch( select("I don't want a challenge~","I wanna fight tough monsters!","Cancel.") ) {
 	case 1:	callfunc "training_personnel1"; break;
@@ -2475,11 +2476,11 @@ L2:		mes "[Keyman]";
 		mes "So you want to stay here longer? Continue training, and train hard!";
 		close;
 }
-new_1-3.gat,96,174,4	duplicate(supervision)	Petugas Pemeriksa	85
-new_2-3.gat,96,174,4	duplicate(supervision)	Petugas Pemeriksa	85
-new_3-3.gat,96,174,4	duplicate(supervision)	Petugas Pemeriksa	85
-new_4-3.gat,96,174,4	duplicate(supervision)	Petugas Pemeriksa	85
-new_5-3.gat,96,174,4	duplicate(supervision)	Petugas Pemeriksa	85
+new_1-3.gat,96,174,4	duplicate(supervision)	Petugas Pemeriksa#01	85
+new_2-3.gat,96,174,4	duplicate(supervision)	Petugas Pemeriksa#02	85
+new_3-3.gat,96,174,4	duplicate(supervision)	Petugas Pemeriksa#03	85
+new_4-3.gat,96,174,4	duplicate(supervision)	Petugas Pemeriksa#04	85
+new_5-3.gat,96,174,4	duplicate(supervision)	Petugas Pemeriksa#05	85
 
 //Novice Instructor
 new_1-4.gat,91,22,4	script	Novice Instructor	57,{
-- 
cgit v1.2.3-70-g09d2