* Added missing Hair Dressers and Hair Dyer to Lighthalzen.

- Hair Dresser will change hair styles ranging between 20 to 27
- Assistant Beautician changes to a random style and colour between 1-23.
* Updated the Cursed Spirit quest, and added some more town NPCs.
* Added more town NPCs to Splendide and Manuk.

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

3 files changed, 168 insertions, 3 deletions

diff --git a/npc/cities/lighthalzen.txt b/npc/cities/lighthalzen.txt
index df5e6fa2a..2684c8642 100644
--- a/npc/cities/lighthalzen.txt
+++ b/npc/cities/lighthalzen.txt
@@ -3,7 +3,7 @@
 //===== By: ================================================== 
 //=  erKURITA, Au{R}oN (Translated by Alan), $ephiroth
 //===== Current Version: ===================================== 
-//= 2.1
+//= 2.2
 //===== Compatible With: ===================================== 
 //= eAthena SVN
 //===== Description: ========================================= 
@@ -41,6 +41,7 @@
 //= 1.9 Added Cool Corp. Event Staff, who oringialy resided in the DTS_warper script file. [L0ne_W0lf]
 //= 2.0 Added missing Lab Staff#amano08 NPC. (bugreport:4319) [Gepard]
 //= 2.1 Commented out Duplicate NPCs. (bugreport:4555)
+//= 2.2 Added missing NPC found in AEGIS files. [L0ne_W0lf]
 //=============================================================
 
 lighthalzen,198,285,5	script	Jiwon#zen5	862,{
@@ -3159,6 +3160,56 @@ lhz_in02,19,274,2	script	Maintenance Guy#lhz	851,{
 }
 */
 
+lighthalzen,337,296,3	script	Rekenber Employee#li_2	868,{
+	if (hg_tre > 54) {
+		mes "[Rekenber Employee]";
+		mes "Greetings. As part of our";
+		mes "effort to relieve the poor,";
+		mes "Rekenber is providing job";
+		mes "opportunities targeted for";
+		mes "citizens of the slum areas.";
+		next;
+		mes "[Rekenber Employee]";
+		mes "You can choose to work";
+		mes "from home, or undergo a";
+		mes "little bit of training for more";
+		mes "professional positions. This";
+		mes "is a great chance to make a";
+		mes "difference... and some money~";
+		emotion e_no1,"Rekenber Employee#li";
+		close;
+	}
+}
+
+lhz_in01,221,131,7	script	Scientist#li_01	865,{
+	if (isequipped(2241) && isequipped(2243)) {
+		if (hg_tre > 54) {
+			mes "[A Scientist]";
+			mes "What happened? All the machines are ruined and the research report are gone! The history of Regenschirm has been hacked!";
+			close;
+		}
+		else {
+			mes "[Scientist]";
+			mes "It takes so long for";
+			mes "this device to process";
+			mes "all the data and give me";
+			mes "the results. Still, the wait";
+			mes "heightens my anticipation...";
+			close;
+		}
+	}
+	else {
+		mes "[Scientist]";
+		mes "What?! Guards!";
+		mes "Hurry, there's an";
+		mes "intruder right here!";
+		emotion e_gasp,"A Scientist#li_01";
+		close2;
+		warp "lhz_in01",33,224;
+		end;
+	}
+}
+
 // Lighthalzen Mushroom.
 // Don't really understand why it's there, but it's funny regardless.
 lhz_in01,157,54,0,0	monster	Red Mushroom	1085,1,120000,100000,0
diff --git a/npc/cities/manuk.txt b/npc/cities/manuk.txt
index a3ea0d1fe..4528bf6af 100644
--- a/npc/cities/manuk.txt
+++ b/npc/cities/manuk.txt
@@ -3,7 +3,7 @@
 //===== By: ================================================== 
 //= L0ne_W0lf
 //===== Current Version: ===================================== 
-//= 1.1
+//= 1.2
 //===== Compatible With: ===================================== 
 //= eAthena SVN
 //===== Description: ========================================= 
@@ -12,6 +12,7 @@
 //===== Additional Comments: ================================= 
 //= 1.0 First Version.
 //= 1.1 Added more town NPCs
+//= 1.2 Added more town NPCs
 //============================================================
 
 // cat_enhance
@@ -490,3 +491,79 @@ manuk,253,173,3	script	Manuk Benknee#tre5	449,{
 		close;
 	}
 }
+
+// ep12_2_dailybs
+manuk,251,180,5	script	Young Villager#ep13bs	454,{
+	if (isequipped(2782) == 1) {
+		mes "[Young Villager]";
+		mes "It's past the time of our date, why isn't she here yet!!?";
+		close;
+	}
+	else {
+		mes "[Asd]";
+		mes "Ywo di pi butfs oui Afbsu ";
+		close;
+	}
+}
+
+man_in01,360,137,5	script	Mechanic#ep13bs	454,{
+	if (isequipped(2782) == 1) {
+		mes "[Mechanic]";
+		mes "Alien races are not allowed to enter.";
+		mes "It's very dangerous here, please don't come any closer.";
+		close;
+	}
+	else {
+		mes "[Asoui]";
+		mes "Fs iua sdjosow ww ";
+		mes "Adds wwpq iusnd ";
+		close;
+	}
+}
+
+man_in01,68,187,0	script	Worker#ep13bs1	454,{
+	if (isequipped(2782) == 1) {
+		mes "[Worker]";
+		mes "Hmm, it smells delicious.";
+		mes "It should be time to turn it around now.";
+		next;
+		mes "[Worker]";
+		mes "Hardrock Mammoth steak should be eaten slightly raw!";
+		close;
+	}
+	else {
+		mes "[Tee]";
+		mes "As woue dpi sha we";
+		mes "Two psie bu le";
+		next;
+		mes "[Tee]";
+		mes "Tr sdou powee wwee ";
+		close;
+	}
+}
+
+man_in01,74,181,3	script	Worker#ep13bs2	454,{
+	if (isequipped(2782) == 1) {
+		mes "[Worker]";
+		mes "Chef Cook, how many plates should I put down?";
+		close;
+	}
+	else {
+		mes "[Tee]";
+		mes "We pishd bugs ouwwe iro ";
+		close;
+	}
+}
+
+man_in01,227,280,5	script	Scientist#ep13bs	449,{
+	if (isequipped(2782) == 1) {
+		mes "[Scientist]";
+		mes "Is there only one way we can survive..?";
+		close;
+	}
+	else {
+		mes "[Apti]";
+		mes "Dso piey pioit ioep ";
+		close;
+	}
+}
diff --git a/npc/cities/splendide.txt b/npc/cities/splendide.txt
index 8ce51d053..58921e71e 100644
--- a/npc/cities/splendide.txt
+++ b/npc/cities/splendide.txt
@@ -3,7 +3,7 @@
 //===== By: ================================================== 
 //= L0ne_W0lf
 //===== Current Version: ===================================== 
-//= 1.1
+//= 1.2
 //===== Compatible With: ===================================== 
 //= eAthena SVN
 //===== Description: ========================================= 
@@ -12,6 +12,7 @@
 //===== Additional Comments: ================================= 
 //= 1.0 First Version.
 //= 1.1 Added more town NPCs
+//= 1.2 Added more town NPCs
 //============================================================
 
 // cat_enhance
@@ -792,3 +793,39 @@ spl_in01,122,311,1	script	Laphine Soldier#ep13_2	447,{
 	}
 }
 
+// ep33_2_dailybs
+splendide,121,259,3	script	Fairy#ep13bs1	436,{
+	if (isequipped(2782) == 1) {
+		mes "[Fairy]";
+		mes "Have you ever gone to the East side?";
+		mes "Theres lots of ice~";
+		mes "How cold...";
+		close;
+	}
+	else {
+		mes "[nes]";
+		mes "VaFuloDor An ";
+		mes "WosNuffremu Ha TurAshTi";
+		mes "VilTiRini O ";
+		close;
+	}
+}
+
+splendide,163,264,3	script	Fairy#ep13bs2	438,{
+	if (isequipped(2782) == 1) {
+		mes "[Fairy]";
+		mes "What are you looking at!";
+		next;
+		mes "[Fairy]";
+		mes "Oh me! You know beauty when you see it don't you~?!";
+		close;
+	}
+	else {
+		mes "[nes]";
+		mes "UorVeLars No Ador";
+		next;
+		mes "[nes]";
+		mes "SeGothShar An AshDur";
+		close;
+	}
+}