added Thanks to Au{R}oN + some lighthalzen NPC

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

5 files changed, 364 insertions, 0 deletions

diff --git a/npc/Changelog.txt b/npc/Changelog.txt
index 8166ba32b..ddc7ab86e 100644
--- a/npc/Changelog.txt
+++ b/npc/Changelog.txt
@@ -29,6 +29,9 @@ Playtester
 

 Date		Added

 ======

+09/25

+	* Thanks to Au{R}oN, added prison and bank Lighthalzen NPC [Lupus]

+	- Thanks to Au{R}oN, added Shuriken Blacksmith. Fixed bugs.

 09/22

 	* Fixed missing npc interaction at Einb Pollution Quest [Lupus]

 09/21

diff --git a/npc/merchants/shuriken_maker.txt b/npc/merchants/shuriken_maker.txt
new file mode 100644
index 000000000..09882cfb3
--- /dev/null
+++ b/npc/merchants/shuriken_maker.txt
@@ -0,0 +1,157 @@
+//===== eAthena Script ========================================
+//= Shuriken Blacksmith
+//===== By: ==================================================
+//= Au{R}oN
+//===== Current Version: =====================================
+//= 1.2
+//===== Compatible With: =====================================
+//= eAthena 1.0+
+//===== Description: =========================================
+//= Shuriken Weapon Maker.
+//===== Additional Comments: =================================
+//= Converted from Aegis
+//= 1.0 Added the 4 Shuriken. [Au{R}oN]
+//= 1.1 Fix getitem bugs and add if ninja job check. [Au{R}oN]
+//= 1.2 more bugs fixed,wrong labels, missing stuf, etc[Lupus]
+//============================================================
+
+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.";
+		close;
+	}
+	mes "Hello";
+	mes "I'm Taitsu, the Blacksmith of Fuuma Ninja.";
+	next;
+	mes "[Taitsu]";
+	mes "Due to a burst of interest, my life became very miserable.";
+	mes "So, I'm taking everything from the beginning, but haven't made weapon in a long time...";
+	next;
+	mes "[Taitsu]";
+	mes "However, in terms of making Fuuma weapons, no one can make them any better then mine.";
+	mes "Here, take a look.";
+	next;
+	menu "Fuuma Shuriken Beneki",M_BENEKI,"Fuuma Shuriken Daisharin",M_DAIS,
+		"Fuuma Shuriken Daisharin [4]",M_DAIS4,"Fuuma Shuriken Rekka",M_REKKA;
+
+//=====================BENEKI========================
+M_BENEKI:
+	mes "[Taitsu]";
+	mes "You want make ^FF0000Fuuma Shuriken Beneki^000000";
+	mes "Fuuma Shuriken Beneki needs:";
+	mes "50 Steel, 20 Harpy's Feathers, 5 Oridecon, and 90.000z.";
+	mes "Do you want me to make it?";
+	next;
+	menu "Yes",-,"No Thanks",M_NOPE;
+
+	mes "[Taitsu]";
+	mes "So let me check for your items...";
+	set @z,90000;
+	if(Zeny < @z) goto L_NOZENY;
+	if(countitem(999)<50 || countitem(7115)<20 || countitem(984)<5) goto L_NOITEMS;
+	set Zeny,Zeny-@z;
+	delitem 999,50;
+	delitem 7115,20;
+	delitem 984,5;
+	next;
+	getitem 13300,1;
+	mes "[Taitsu]";
+	mes "Ok, enjoy with your new weapon.";
+	close;
+
+//=====================DAISHARIN========================
+M_DAIS:
+	mes "[Taitsu]";
+	mes "You want make ^FF0000Fuuma Shuriken Daisharin^000000";
+	mes "Fuuma Shuriken Daisharin needs:";
+	mes "30 Steel, 100 Tassels, 2 Oridecon, and 40.000z.";
+	mes "Do you want me to make it?";
+	next;
+	menu "Yes",-,"No Thanks",M_NOPE;
+
+	mes "[Taitsu]";
+	mes "So let me check for your items...";
+	set @z,40000;
+	if(Zeny < @z) goto L_NOZENY;
+	if(countitem(999)<30 || countitem(7301)<100 || countitem(984)<2) goto L_NOITEMS;
+	set Zeny,Zeny-@z;
+	delitem 999,30;
+	delitem 7301,100;
+	delitem 984,2;
+	next;
+	getitem 13301,1;
+	mes "[Taitsu]";
+	mes "Ok, enjoy with your new weapon.";
+	close;
+
+//=====================DAISHARIN4========================
+M_DAIS:
+	mes "[Taitsu]";
+	mes "You want make ^FF0000Fuuma Shuriken Daisharin[4]^000000";
+	mes "Fuuma Shuriken Daisharin[4] needs:";
+	mes "20 Cracked Diamonds, 1 Fuuma Shuriken Daisharin, 2 Oridecon, and 40.000z.";
+	mes "Do you want me to make it?";
+	next;
+	menu "Yes",-,"No Thanks",M_NOPE;
+
+	mes "[Taitsu]";
+	mes "So let me check for your items...";
+	set @z,40000;
+	if(Zeny < @z) goto L_NOZENY;
+	if(countitem(733)<20 || countitem(13301)<1 || countitem(984)<3) goto L_NOITEMS;
+	set Zeny,Zeny-@z;
+	delitem 733,20;
+	delitem 13301,1;
+	delitem 984,3;
+	next;
+	getitem 13302,1;
+	mes "[Taitsu]";
+	mes "Ok, enjoy with your new weapon.";
+	close;
+
+//=====================REKKA========================
+M_REKKA:
+	mes "[Taitsu]";
+	mes "You want make ^FF0000Fuuma Shuriken Rekka^000000";
+	mes "Fuuma Shuriken Rekka needs:";
+	mes "50 Steel, 100 Live Coal, 2 Oridecon, 50 Burning Stone and 78.000z.";
+	mes "Do you want me to make it?";
+	next;
+	menu "Yes",-,"No Thanks",M_NOPE;
+
+	mes "[Taitsu]";
+	mes "So let me check for your items...";
+	set @z,78000;
+	if(Zeny < @z) goto L_NOZENY;
+	if(countitem(733)<50 || countitem(7098)<100 || countitem(7097)<100 || countitem(7521)<50)) goto L_NOITEMS;
+	set Zeny,Zeny-@z;
+	delitem 733,50;
+	delitem 7098,100;
+	delitem 7097,100;
+	delitem 7521,50;
+	next;
+	getitem 13303,1;
+	mes "[Taitsu]";
+	mes "Ok, enjoy with your new weapon.";
+	close;
+
+//=====================I'M SORRY========================
+L_NOITEMS:
+	mes "[Taitsu]";
+	mes "Sorry, but you not have all required items.";
+	emotion e_sry;
+	close;
+
+L_NOZENY:
+	mes "[Taitsu]";
+	mes "I'm sorry, but you need "+@z+"z";
+	emotion e_cash;
+	close;
+
+M_NOPE:
+	mes "[Taitsu]";
+	mes "Ok came back when you want.";
+	close;
+}
diff --git a/npc/other/lighthalzen_bank.txt b/npc/other/lighthalzen_bank.txt
new file mode 100644
index 000000000..3408e019e
--- /dev/null
+++ b/npc/other/lighthalzen_bank.txt
@@ -0,0 +1,83 @@
+//===== eAthena Script ========================================
+//= Lighthalzen Bank Area
+//===== By: ==================================================
+//= Au{R}oN
+//===== Current Version: =====================================
+//= 1.0
+//===== Compatible With: =====================================
+//= eAthena 1.0+
+//===== Description: =========================================
+//= Lighthalzen Bank
+//===== Additional Comments: =================================
+//= Converted from Aegis
+//= 1.0 Add all Bank NPC (TEMPORARY NAME and FACING PROBABLY INCORRECT) [Au{R}oN]
+//============================================================
+
+lhz_in02.gat,34,41,7	script	Young Man#gli1	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!";
+	close;
+}
+
+lhz_in02.gat,28,39,3	script	Young Girl#gli1	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...";
+	close;
+}
+
+lhz_in02.gat,31,34,3	script	Grandpa#gli1	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.";
+	close;
+}
+
+lhz_in02.gat,31,33,3	script	Grandma#gli2	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...";
+	close;
+}
+
+lhz_in02.gat,34,22,8	script	Bank Employee::alone	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.";
+	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
diff --git a/npc/other/lighthalzen_prison.txt b/npc/other/lighthalzen_prison.txt
new file mode 100644
index 000000000..c2ba2831d
--- /dev/null
+++ b/npc/other/lighthalzen_prison.txt
@@ -0,0 +1,118 @@
+//===== eAthena Script ========================================
+//= Lightalzen Prison Area
+//===== By: ==================================================
+//= Au{R}oN
+//===== Current Version: =====================================
+//= 1.0
+//===== Compatible With: =====================================
+//= eAthena 1.0+
+//===== Description: =========================================
+//= Lighthalzen Prison Area
+//===== Additional Comments: =================================
+//= Converted from Aegis
+//= 1.0 Add all Prison NPC (FACING PROBABLY INCORRECT) [Au{R}oN]
+//============================================================
+
+lhz_in02.gat,145,179,7	script	Drunky Guy::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.";
+	close;
+}
+
+lhz_in02.gat,157,198,8	script	Cool Man	85,{
+
+	mes "[Strong Guy]";
+	mes "Kekekeke!!!";
+	mes "What did you do~";
+	mes "Stole Materials?";
+	mes "I'm innocent!!!";
+	close;
+}
+
+lhz_in02.gat,155,201,7	script	Drunky Guy::d2	870,{
+
+	mes "[Drunky Guy]";
+	mes "........";
+	mes ".....*hiccup*";
+	mes "........Eheheheeheh...";
+	mes "*hiccup hiccup.";
+	next;
+	mes "== Totally Drunk... ==";
+	mes "== Can't talk to him at all... ==";
+	close;
+}
+
+lhz_in02.gat,153,206,6	script	Drunk Guy::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*";
+	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*";
+	close;
+}
+
+lhz_in02.gat,147,222,4	script	Police::police1	85,{
+
+	mes "[Police]";
+	mes "Tell me! Tell me already!";
+	mes "Why can't you just tell";
+	mes "the truth! Tell me!";
+	next;
+	mes "[Suspect]";
+	mes "Augh, seriously!";
+	mes "It wasn't me!!!";
+	next;
+	mes "[Police]";
+	mes "...*sigh*";
+	next;
+	mes "[Suspect]";
+	mes "Stop wasting your time...";
+	mes "Just let me go.";
+	next;
+	mes "[Police]";
+	mes "...How's... your mother?";
+	next;
+	mes "[Suspect]";
+	mes "My mother!? She's fine!";
+	next;
+	mes "[Police]";
+	mes "When was the last time";
+	mes "you met your mother?";
+	next;
+	mes "[Suspect]";
+	mes "This dosen't concern you!";
+	next;
+	mes "[Police]";
+	mes "But your mother... She";
+	mes "still worries about you";
+	next;
+	mes "[Suspect]";
+	mes "...";
+	next;
+	mes "[Police]";
+	mes "Well... Want to have some";
+	mes "stir-fried Poring?";
+	next;
+	mes "[Suspect]";
+	mes "Forget it!";
+	close;
+}
+
+lhz_in02.gat,142,221,9	duplicate(police1)	Suspect::plice2	870
\ No newline at end of file
diff --git a/npc/scripts_athena.conf b/npc/scripts_athena.conf
index 102151e14..779a79b86 100644
--- a/npc/scripts_athena.conf
+++ b/npc/scripts_athena.conf
@@ -52,6 +52,7 @@ npc: npc/merchants/alchemist.txt
 npc: npc/merchants/icecream.txt

 npc: npc/merchants/quivers.txt

 npc: npc/merchants/kunai_maker.txt

+npc: npc/merchants/shuriken_maker.txt

 npc: npc/merchants/socket_enchant.txt

 npc: npc/merchants/ammo_boxes.txt

 npc: npc/merchants/ammo_dealer.txt

@@ -177,4 +178,6 @@ npc: npc/other/marriage.txt
 //npc: npc/other/divorce.txt

 npc: npc/other/dts_warper.txt

 npc: npc/other/comodo_gambling.txt

+npc: npc/other/lighthalzen_bank.txt

+npc: npc/other/lighthalzen_prison.txt

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