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

1 files changed, 84 insertions, 97 deletions

diff --git a/npc/cities/lighthalzen.txt b/npc/cities/lighthalzen.txt
index e64d84403..42bee3529 100644
--- a/npc/cities/lighthalzen.txt
+++ b/npc/cities/lighthalzen.txt
@@ -3,7 +3,7 @@
 //===== By: ================================================== 

 //=  erKURITA

 //===== Current Version: ===================================== 

-//= 1.0

+//= 1.0a

 //===== Compatible With: ===================================== 

 //= eAthena 1.0

 //===== Description: ========================================= 

@@ -19,6 +19,7 @@
 //= 0.8 Removed Duplicates [Silent]

 //= 0.9 Removed Duplicates [Toms]

 //= 1.0 Added a missing feature to the donation NPC [MasterOfMuppets]

+//= 1.0a added constants to emotions, minor optimization [Lupus]

 //=============================================================

 

 lighthalzen.gat,198,285,5	script	Jiwon	862,{

@@ -40,7 +41,6 @@ lighthalzen.gat,198,285,5	script	Jiwon	862,{
 }

 

 

-

 lighthalzen.gat,220,244,3	script	Samnang	863,{

 

 	mes "[Samnang]";

@@ -590,8 +590,8 @@ lighthalzen.gat,182,102,3	script	Lucius	866,{
 	next;

 	menu "Sure.",s_Sure,"No, thanks.",-;

 

-s_Cancel:

 	mes "[Lucius]";

+s_Cancel:

 	mes "I understand. Still,";

 	mes "keep in mind that when";

 	mes "you give from your heart,";

@@ -609,12 +609,25 @@ s_Sure:
 	mes "to cancel, please enter '0'.";

 	next;

 	input @zenydonate;

-		if(@zenydonate > 30000)goto s_Much;

-		if(!@zenydonate)goto s_Cancel;

-		if(Zeny < @zenydonate)goto s_NEnoughZ;

-		set Zeny,Zeny - @zenydonate;

-		set $donatedzeny,$donatedzeny + @zenydonate;

 	mes "[Lucius]";

+	if(!@zenydonate)goto s_Cancel;

+	if(@zenydonate > 30000){

+		mes "I'm sorry but you can't";

+		mes "donate more than 30,000";

+		mes "zeny. Please choose another";

+		mes "number.";

+		close;

+	}

+	if(Zeny < @zenydonate){

+		mes "I'm sorry but you do";

+		mes "not have as much zeny";

+		mes "as you wish to donate.";

+		mes "Please come back when you";

+		mes "do!";

+		close;

+	}

+	set Zeny,Zeny - @zenydonate;

+	set $donatedzeny,$donatedzeny + @zenydonate;

 	mes "Thank you so much";

 	mes "for your " + @zenydonate + " zeny donation.";

 	mes "I promise that your money";

@@ -627,39 +640,21 @@ s_Sure:
 	mes "donations. I'm glad to see";

 	mes "that there are still kinda and";

 	mes "generous people in the world.";

-	if($donatedzeny > 259999)

-	{

-	next;

-	mes "[Lucius]";

-	mes "This should be enough";

-	mes "to send to the Poor Relief";

-	mes "Organization. Please accpet";

-	mes "this small gift as a token of";

-	mes "my gratitude, adventurer. Bless";

-	mes "you, youngster and take care.";

-	getitem 603,1;

-	getitem 12016,1;

-	set $donatedzeny,0;

+	if($donatedzeny > 259999){

+		next;

+		mes "[Lucius]";

+		mes "This should be enough";

+		mes "to send to the Poor Relief";

+		mes "Organization. Please accpet";

+		mes "this small gift as a token of";

+		mes "my gratitude, adventurer. Bless";

+		mes "you, youngster and take care.";

+		getitem 603,1;

+		getitem 12016,1;

+		set $donatedzeny,0;

 	}

 	close;

 

-s_Much:

-	mes "[Lucius]";

-	mes "I'm sorry but you can't";

-	mes "donate more than 30,000";

-	mes "zeny. Please choose another";

-	mes "number.";

-	close;

-

-s_NEnoughZ:

-	mes "[Lucius]";

-	mes "I'm sorry but you do";

-	mes "not have as much zeny";

-	mes "as you wish to donate.";

-	mes "Please come back when you";

-	mes "do!";

-	close;

-

 }

 

 lighthalzen.gat,147,105,3	script	Laqumet	869,{

@@ -1019,7 +1014,7 @@ lighthalzen.gat,296,239,3	script	Berru	706,{
 	mes "[Berru]";

 	mes "Daddy...! Waaaaah~!";

 	mes "I wanna see my daddy!";

-	emotion 28;

+	emotion e_sob;

 	next;

 	mes "[Pilia]";

 	mes "Berru, I don't";

@@ -1033,7 +1028,7 @@ lighthalzen.gat,296,239,3	script	Berru	706,{
 	mes "home! He said he'll";

 	mes "bring us candy tonight!";

 	mes "You go sleep first, Pilia!";

-	emotion 7;

+	emotion e_ag;

 	next;

 	mes "[Pilia]";

 	mes "*Sigh...*";

@@ -1054,18 +1049,22 @@ lighthalzen.gat,312,234,2	script	Beggar	777,{
 	mes "Would you give me";

 	mes "some money?";

 	next;

-	menu "Give him some money.",L_give,"Ignore him.",-;

-	mes "[" + strcharinfo(0) + "]";

-	mes "...";

-	mes "......";

-	close;

-

-L_give:

-	if(Zeny < 50)goto L_zeny;

+	if(select("Give him some money.:Ignore him.")==2){

+		mes "[" + strcharinfo(0) + "]";

+		mes "...";

+		mes "......";

+		close;

+	}

+	if(Zeny < 50){

+		mes "[Beggar]";

+		mes "You don't seem to have";

+		mes "enough zeny.";

+		close;

+	}

+	set Zeny,Zeny-50;

 	mes "[" + strcharinfo(0) + "]";

 	mes "Here you go,";

 	mes "take this.";

-	set Zeny,Zeny-50;

 	next;

 	mes "[Beggar]";

 	mes "Thank you so much.";

@@ -1074,7 +1073,7 @@ L_give:
 	mes "a story with you and impart";

 	mes "some of the wisdom I've";

 	mes "learned over the years.";

-	emotion 15;

+	emotion e_thx;

 	next;

 	mes "[Beggar]";

 	mes "Anger. People deal with";

@@ -1134,12 +1133,6 @@ L_give:
 	mes "to take in, I know.";

 	close;

 

-L_zeny:

-	mes "[Beggar]";

-	mes "You don't seem to have";

-	mes "enough zeny.";

-	close;

-

 }

 

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

@@ -1158,7 +1151,7 @@ lighthalzen.gat,311,194,3	script	Reuben	870,{
 	mes "Did you just hear";

 	mes "me talk to myself?";

 	mes "Crud! Don't be so nosy!";

-	emotion 6;

+	emotion e_an;

 	close;

 }

 

@@ -1260,7 +1253,7 @@ lighthalzen.gat,337,296,3	script	Employee	867,{
 	mes "professional positions. This";

 	mes "is a great chance to make a";

 	mes "difference... and some money~";

-	emotion 21;

+	emotion e_no1;

 	close;

 }

 

@@ -1372,7 +1365,7 @@ lhz_in01.gat,125,40,2	script	Dowbow Ryuei#Dowbow_Ryuei	843,{
 	mes "outlook on life. If you don't";

 	mes "mind, I'd like to shake";

 	mes "your hand, adventurer.";

-	emotion 21;

+	emotion e_no1;

 	close;

 

 L_reality:

@@ -2003,8 +1996,16 @@ s_Staff:
 

 lhz_in01.gat,19,129,0	script	LhzHiddenTrg1::LhzTrig	-1,1,1{

 OnTouch:

-	if(isequipped(2241) && isequipped(2243)) goto s_Staff;

 	mes "[Rekenber Guard]";

+	if(isequipped(2241) && isequipped(2243)){

+		mes "Keep your eyes open.";

+		mes "I've heard rumors that some";

+		mes "adventurers from Rune-Midgard";

+		mes "are trying to sneak into here!";

+		mes "I know the security here is";

+		mes "pretty much failsafe, but...";

+		close;

+	}

 	mes "This area is restricted";

 	mes "to the public! Who are you";

 	mes "and how did you get in here?!";

@@ -2013,16 +2014,6 @@ OnTouch:
 	warp "lhz_in01.gat",34,224;

 	end;

 

-s_Staff:

-	mes "[Rekenber Guard]";

-	mes "Keep your eyes open.";

-	mes "I've heard rumors that some";

-	mes "adventurers from Rune-Midgard";

-	mes "are trying to sneak into here!";

-	mes "I know the security here is";

-	mes "pretty much failsafe, but...";

-	close;

-

 }

 

 lhz_in01.gat,23,137,0	duplicate(LhzTrig)	LhzHiddenTrg2	-1,1,1

@@ -2031,8 +2022,30 @@ lhz_in01.gat,24,131,2	duplicate(LhzTrig)	Rekenber Guard#02	867
 

 lhz_in01.gat,25,141,4	script	Regenschirm Guard	868,{

 

-	if(isequipped(2241) && isequipped(2243)) goto s_Staff;

 	mes "[Regenschirm Guard]";

+	if(isequipped(2241) && isequipped(2243)){

+		mes "Do you wish to";

+		mes "go underground?";

+		next;

+		if(select("Yes:No")==1){

+			if(isequipped(2657)){

+				warp "lhz_dun01.gat",150,288;

+				end;

+			}

+			mes "[Regenschirm Guard]";

+			mes "I'm sorry but I can't let";

+			mes "staff without proper autorization";

+			mes "pass. Only staff members with";

+			mes "Laboratory Passports are allowed";

+			mes "to enter the underground.";

+			close;

+

+		}

+		mes "[Regenschirm Guard]";

+		mes "Thank you and";

+		mes "have a nice day.";

+		close;

+	}

 	mes "This area is restricted";

 	mes "to the public! Who are you";

 	mes "and how did you get in here?!";

@@ -2041,30 +2054,4 @@ lhz_in01.gat,25,141,4	script	Regenschirm Guard	868,{
 	warp "lhz_in01.gat",34,224;

 	end;

 

-s_Staff:

-	mes "[Regenschirm Guard]";

-	mes "Do you wish to";

-	mes "go underground?";

-	next;

-	menu "Yes",s_Yes,"No",-;

-

-	mes "[Regenschirm Guard]";

-	mes "Thank you and";

-	mes "have a nice day.";

-	close;

-

-s_Yes:

-	if(isequipped(2657)) goto s_Auth;

-	mes "[Regenschirm Guard]";

-	mes "I'm sorry but I can't let";

-	mes "staff without proper autorization";

-	mes "pass. Only staff members with";

-	mes "Laboratory Passports are allowed";

-	mes "to enter the underground.";

-	close;

-

-s_Auth:

-	warp "lhz_dun01.gat",150,288;

-	end;

-

 }