updated some lighthalzen bank / jail / auction npc

git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@8930 54d463be-8e91-2dee-dedb-b68131a5f0ec

6 files changed, 213 insertions, 117 deletions

diff --git a/npc/Changelog.txt b/npc/Changelog.txt
index 0bf99fad8..e623d082e 100644
--- a/npc/Changelog.txt
+++ b/npc/Changelog.txt
@@ -29,6 +29,9 @@ Playtester
 

 Date		Added

 ======

+10/04

+	* Updated missing dialogues/NPC to Lighthalzen Bank, Prison,Auction area [Lupus]

+		thanks to Au{R}oN

 10/03

 	* Fixed Assassin Job Quest: Timer bug / NPC bypass exploit [Lupus]

 10/01

diff --git a/npc/merchants/shuriken_maker.txt b/npc/merchants/shuriken_maker.txt
index c697b00cb..d78305948 100644
--- a/npc/merchants/shuriken_maker.txt
+++ b/npc/merchants/shuriken_maker.txt
@@ -3,7 +3,7 @@
 //===== By: ==================================================
 //= Au{R}oN
 //===== Current Version: =====================================
-//= 1.2b
+//= 1.2c
 //===== Compatible With: =====================================
 //= eAthena 1.0+
 //===== Description: =========================================
@@ -21,7 +21,7 @@ que_ng.gat,22,62,3	script	Taitsu	709,{
 
 	mes "[Taitsu]";
 	if(Class!=Job_Ninja){
-		mes "Sorry, buy I can use my ability only for Ninja Class.";
+		mes "Sorry, but I can use my ability only for Ninja Class.";
 		close;
 	}
 	mes "Hello";
diff --git a/npc/other/lighthalzen_auction.txt b/npc/other/lighthalzen_auction.txt
new file mode 100644
index 000000000..464a67f54
--- /dev/null
+++ b/npc/other/lighthalzen_auction.txt
@@ -0,0 +1,59 @@
+//===== eAthena Script =======================================
+//= Auction NPC
+//===== By: ==================================================
+//= Au{R}o
+//===== Current Version: =====================================
+//= 1.01
+//===== Compatible With: =====================================
+//= eAthena 1.0+
+//===== Description: =========================================
+//= Auction System
+//===== Additional Comments: =================================
+//= Converted from Aegis
+//= 1.0 Add NPC dialogue (FACING PROBABLY INCORRECT) [Au{R}oN]
+//============================================================
+
+//=======================WARPER===============================
+lighthalzen.gat,205,169,4	script	Auction Guide	833,{
+
+	mes "[Auction Guide]";
+	mes "Trying to go to the acution";
+	next;
+	menu "Yes.",WA_yes,"No.",WA_no;
+WA_yes:
+	mes "[Auction Guide]";
+	mes "Have a good trip~";
+	close2;
+	warp "auction_02.gat",43,24;
+	end;
+
+WA_no:
+	mes "[Auction Guide]";
+	MES "Come visit next time.";
+	close;
+}
+
+//=======================AUCTION NPC==========================
+auction_02.gat,31,46,9	script	Auction Supervisor::as1	874,{
+
+	mes "[Auctioner]";
+	mes "Welcome.";
+	mes "Is there an item that you're";
+	mes "looking for...?";
+	next;
+	menu "Yes.",AU_yes,"No.",AU_no;
+AU_yes;
+	//NEED TO ADD THE COMMAND FOR OPEN AUCTION WINDOW!!
+	mes "Sorry, but at the moment the auction system is in development";//CUSTOM MSG!!
+	close;
+
+AU_no;
+	mes "[Auctioner]";
+	mes "Okay then..";
+	close;
+}
+auction_02.gat,43,65,2	duplicate(as1)	Auction Supervisor::as1	874
+auction_02.gat,56,46,2	duplicate(as1)	Auction Supervisor::as2	874
+
+//=======================WARP=================================
+auction_02.gat,43,17,0	warp	auc_light01	1,1,lighthalzen.gat,209,169
\ No newline at end of file
diff --git a/npc/other/lighthalzen_bank.txt b/npc/other/lighthalzen_bank.txt
index 3408e019e..ede343b06 100644
--- a/npc/other/lighthalzen_bank.txt
+++ b/npc/other/lighthalzen_bank.txt
@@ -1,9 +1,9 @@
 //===== eAthena Script ========================================
 //= Lighthalzen Bank Area
 //===== By: ==================================================
-//= Au{R}oN
+//= Au{R}oN (Translate by Alan)
 //===== Current Version: =====================================
-//= 1.0
+//= 1.1
 //===== Compatible With: =====================================
 //= eAthena 1.0+
 //===== Description: =========================================
@@ -11,73 +11,73 @@
 //===== Additional Comments: =================================
 //= Converted from Aegis
 //= 1.0 Add all Bank NPC (TEMPORARY NAME and FACING PROBABLY INCORRECT) [Au{R}oN]
+//= 1.1 Add correct name, and change some dialogue. [Au{R}oN]
 //============================================================
 
-lhz_in02.gat,34,41,7	script	Young Man#gli1	849,{
+lhz_in02.gat,34,41,7	script	Arthur	849,{
 
-	mes "[Young Man]";
-	mes "Ugh, while the chair are";
-	mes "too hard, I still like how nice and cool it is in the bank!";
+	mes "[Arthur]";
+	mes "The chairs here are";
+	mes "so not ergonomic. And";
+	mes "they're uncomfortable too!";
+	mes "But it's sooo cool inside this";
+	mes "bank and I just wanted to get";
+	mes "get away from all this heat...";
 	close;
 }
 
-lhz_in02.gat,28,39,3	script	Young Girl#gli1	703,{
+lhz_in02.gat,28,39,3	script	Helen	703,{
 
-	mes "[Young Girl]";
-	mes "I should work here in";
-	mes "in the Bank after I've grown up... Don't you think this";
-	mes "Job is great? Tee hee hee...";
+	mes "[Helen]";
+	mes "You know, maybe when";
+	mes "I grow up, i'll be a bank";
+	mes "clerk. That sounds liek a";
+	mes "really nice jobm, don't you";
+	mes "think? It's laid back and posh...";
 	close;
 }
 
-lhz_in02.gat,31,34,3	script	Grandpa#gli1	847,{
+lhz_in02.gat,31,34,3	script	Tadem	847,{
 
-	mes "[Grandpa]";
-	mes "The build looks very clean,";
-	mes "it's just so nice to look at";
-	mes "it... Maybe i should make";
-	mes "my house look like this.";
+	mes "[Tadem]";
+	mes "I do so enjoy the";
+	mes "architectural structure";
+	mes "of this bank. It's quite";
+	mes "artistic with both classical";
+	mes "and modern elements. Would";
+	mes "you not agree? Fascinating";
 	close;
 }
 
-lhz_in02.gat,31,33,3	script	Grandma#gli2	863,{
+lhz_in02.gat,31,33,3	script	Gracie	863,{
 
-	mes "[Grandma]";
-	mes "It's so comfortable with";
-	mes "the nice scent here...";
-	mes "Isn't this place great?";
-	mes "Only if this is my home...";
+	mes "[Gracie]";
+	mes "Oh, it's so comfortable";
+	mes "in there~Though, why are";
+	mes "we inside the bank when";
+	mes "the bank services aren't even";
+	mes "working? Yes, we're standing,";
+	mes "but we're doing it in comfort";
+	next;
+	mes "[Gracie]";
+	mes "In fact, it's so";
+	mes "comfortable here,";
+	mes "I think I'll refuse to leave.";
+	mes "Though, I'm willing to change";
+	mes "my mind if you can find a place";
+	mes "that's even more comfortable.";
 	close;
 }
 
-lhz_in02.gat,34,22,8	script	Bank Employee::alone	755,{
+lhz_in02.gat,34,22,8	script	Bank Clerk::1_st	755,{
 
-	mes "[Bank Employee]";
-	mes "This Bank is built to";
-	mes "provide a service to the";
-	mes "our service are currently";
-	mes "terminated, we will provide";
-	mes "great services to satisfy";
-	mes "our guests once the system";
-	mes "is recovered.";
-	mes "We apologize for the";
-	mes "inconvenience.";
+	mes "[Bank Clerk]";
+	mes "Due to some critical system";
+	mes "errors, all f the bank services";
+	mes "have been temporarily stopped.";
+	mes "We apologize for any inconvenience.";
+	mes "and appreciate your understanding.";
 	close;
 }
-
-lhz_in02.gat,21,25,9	script	Bank Employee::clone1	86,{
-
-	mes "[Bank Employee]";
-	mes "Currently this Bank has";
-	mes "temporarily terminated";
-	mes "all services due to";
-	mes "internal problems.";
-	mes "We will fix the problems";
-	mes "as soon as possibile and";
-	mes "be in services again.";
-	mes "We apologize for the";
-	mes "inconvenience.";
-	close;
-}
-
-lhz_in02.gat,21,38,9	duplicate(clone1)	Bank Employee::clone2	86
\ No newline at end of file
+lhz_in02.gat,21,25,9	duplicate(1_st)	Bank Clerk::2_nd	86
+lhz_in02.gat,21,38,9	duplicate(1_st)	Bank Clerk::3_th	86
\ No newline at end of file
diff --git a/npc/other/lighthalzen_prison.txt b/npc/other/lighthalzen_prison.txt
index c2ba2831d..b7a57e619 100644
--- a/npc/other/lighthalzen_prison.txt
+++ b/npc/other/lighthalzen_prison.txt
@@ -1,7 +1,7 @@
 //===== eAthena Script ========================================
 //= Lightalzen Prison Area
 //===== By: ==================================================
-//= Au{R}oN
+//= Au{R}oN (Translate by Alan)
 //===== Current Version: =====================================
 //= 1.0
 //===== Compatible With: =====================================
@@ -11,108 +11,141 @@
 //===== Additional Comments: =================================
 //= Converted from Aegis
 //= 1.0 Add all Prison NPC (FACING PROBABLY INCORRECT) [Au{R}oN]
+//= 1.1 Add correct names and fix some dialogues. [Au{R}oN]
 //============================================================
 
-lhz_in02.gat,145,179,7	script	Drunky Guy::d1	849,{
+lhz_in02.gat,145,179,7	script	Togii::d1	849,{
 
-	mes "[Drunky Guy]";
-	mes "Ahh, ahh...";
-	mes "I'm drunking again... *hiccup*";
-	mes "Heheheheeheh.....";
-	mes "Wine from Morroc is";
-	mes "always the best.";
+	mes "[Togii]";
+	mes "Ooo yeah";
+	mes "Goeas down smooth.";
+	mes "Morroc whiskey's the best!";
+	mes "*Hiccup*Whoam, this stuff";
+	mes "really works fast! Heh heh~";
 	close;
 }
 
-lhz_in02.gat,157,198,8	script	Cool Man	85,{
+lhz_in02.gat,157,198,8	script	Healthy Looking Guy	85,{
 
-	mes "[Strong Guy]";
-	mes "Kekekeke!!!";
-	mes "What did you do~";
-	mes "Stole Materials?";
-	mes "I'm innocent!!!";
+	mes "[Healthy Looking Guy]";
+	mes "Grrrrr! Leave me alone!";
+	mes "How many times do I have";
+	mes "to keep telling you? I've never";
+	mes "hoarded item upgrade materials!";
+	mes "I swear that i'm innocent!";
 	close;
 }
 
-lhz_in02.gat,155,201,7	script	Drunky Guy::d2	870,{
+lhz_in02.gat,155,201,7	script	Hinkley::d2	870,{
 
-	mes "[Drunky Guy]";
-	mes "........";
-	mes ".....*hiccup*";
-	mes "........Eheheheeheh...";
-	mes "*hiccup hiccup.";
+	mes "[Hinkley]";
+	mes "Meh heh heh...";
+	mes "*Hiccup* Believe";
+	mes "it or notsh, I'm...";
+	mes "walkin on a...Air....";
+	mes "Nevah thought I could";
+	mes "b-be sho freee-eeee-eee~";
 	next;
-	mes "== Totally Drunk... ==";
-	mes "== Can't talk to him at all... ==";
+	mes "[Hinkley]";
+	mes "This guy";
+	mes "Is completely";
+	mes "hammered out";
+	mes "of his mind!";
 	close;
 }
 
-lhz_in02.gat,153,206,6	script	Drunk Guy::d3	853,{
+lhz_in02.gat,153,206,6	script	Milette::d3	853,{
 
-	mes "[Drunk Guy]";
-	mes "I'm innocent~!!!!!!";
-	mes "*cough cough cough cough*";
-	mes "*cough cough cough cough*";
-	mes "Huh... Huh... Huh...";
-	mes "I'M INNOCENT!!!!!";
-	mes "*hiccup hiccup*";
+	mes "[Milette]";
+	mes "Let me go!";
+	mes "Let me GO!!!";
+	mes "LET ME GO!!!";
+	mes "I didn't do nuthin'";
+	mes "wrong! I'm innocent!";
+	mes "*Hic-Hic-Hiccup...*";
 	next;
-	mes "[Drunk Guy]";
-	mes "I'm just drunk and";
-	mes "sang a song, how is";
-	mes "this a crime!? And so";
-	mes "what if i just want to";
-	mes "make some noise!?";
-	mes "*cough cough cough cough*";
-	mes "*hiccup hiccup*";
+	mes "[Milette]";
+	mes "What's wrong with";
+	mes "drinking and singing";
+	mes "in the street, huh?";
+	mes "Is it a crime to have";
+	mes " a beautiful tenor vice?!";
+	mes "Get me outta this joint!";
 	close;
 }
 
-lhz_in02.gat,147,222,4	script	Police::police1	85,{
+lhz_in02.gat,147,222,4	script	Officer Guo::off_guo	85,{
 
-	mes "[Police]";
-	mes "Tell me! Tell me already!";
-	mes "Why can't you just tell";
-	mes "the truth! Tell me!";
+	mes "[Officer Guo]";
+	mes "Tell me...!";
+	mes "TELL ME...!!";
+	mes "Admit you did it!!!";
 	next;
 	mes "[Suspect]";
-	mes "Augh, seriously!";
-	mes "It wasn't me!!!";
+	mes "Damn it!";
+	mes "I keep telling";
+	mes "you I'm not a guilty!";
 	next;
-	mes "[Police]";
-	mes "...*sigh*";
+	mes "[Officer Guo]";
+	mes "*Sigh...*";
 	next;
 	mes "[Suspect]";
-	mes "Stop wasting your time...";
-	mes "Just let me go.";
+	mes "You are wasting your";
+	mes "time. Just let me go.";
 	next;
-	mes "[Police]";
-	mes "...How's... your mother?";
+	mes "[Officer Guo]";
+	mes "So...";
+	mes "How's your mother?";
 	next;
 	mes "[Suspect]";
-	mes "My mother!? She's fine!";
+	mes "That's none of";
+	mes "your business!";
+	mes "She's fine, i guess.";
 	next;
-	mes "[Police]";
-	mes "When was the last time";
-	mes "you met your mother?";
+	mes "[Officer Guo]";
+	mes "When was the last";
+	mes "time you've seen her?";
 	next;
 	mes "[Suspect]";
-	mes "This dosen't concern you!";
+	mes "I just told you,";
+	mes "that's none of";
+	mes "your business....!";
 	next;
-	mes "[Police]";
-	mes "But your mother... She";
-	mes "still worries about you";
+	mes "[Officer Guo]";
+	mes "You know, mothers";
+	mes "throughout the animal";
+	mes "kingdom instinctively";
+	mes "care for their young.";
+	mes "Humans are no exception.";
+	mes "Yours must be worreid to death";
 	next;
 	mes "[Suspect]";
 	mes "...";
+	mes "Man...";
+	mes "You're starting";
+	mes "to weird me out.";
 	next;
-	mes "[Police]";
-	mes "Well... Want to have some";
-	mes "stir-fried Poring?";
+	mes "[Officer Guo]";
+	mes "Funny yhing about humans,";
+	mes "though. It seems to be their";
+	mes "nature to lie, even when they";
+	mes "know they'll be caught. But";
+	mes "like all animals, they";
+	mes "instinctively fear pain...";
 	next;
 	mes "[Suspect]";
-	mes "Forget it!";
+	mes "N-no,no...";
+	mes "You gotta be...";
+	mes "You're bluffing.";
+	mes "Right?";
+	next;
+	mes "[Officer Guo]";
+	mes "NO.";
+	mes "You're bluffing.";
+	mes "Tell me...";
+	mes "TELL ME...!!!";
+	mes "Admit you did it!!";
 	close;
 }
 
-lhz_in02.gat,142,221,9	duplicate(police1)	Suspect::plice2	870
\ No newline at end of file
+lhz_in02.gat,142,221,8	duplicate(off_guo)	Suspect::susp_guo	870
\ No newline at end of file
diff --git a/npc/scripts_athena.conf b/npc/scripts_athena.conf
index 779a79b86..f4302afc2 100644
--- a/npc/scripts_athena.conf
+++ b/npc/scripts_athena.conf
@@ -180,4 +180,5 @@ npc: npc/other/dts_warper.txt
 npc: npc/other/comodo_gambling.txt

 npc: npc/other/lighthalzen_bank.txt

 npc: npc/other/lighthalzen_prison.txt

+npc: npc/other/lighthalzen_auction.txt

 // --------------------------------------------------------------