-Temporarily disabled consumeitem lines as we don't have it yet

-Renamed a couple of NPC's in dewata.txt as they're name exceeds the 24 character limit
-Moved El Dicastes information NPC out and into re/guides/guides_dicastes.txt, Credits to Euphy

3 files changed, 124 insertions, 91 deletions

diff --git a/npc/re/cities/dewata.txt b/npc/re/cities/dewata.txt
index b528ad250..88b7f6a4e 100644
--- a/npc/re/cities/dewata.txt
+++ b/npc/re/cities/dewata.txt
@@ -456,18 +456,36 @@ dewata,89,191,6	script	Small Shrine#dew1	844,{
 		next;
 		callsub L_Wish;
 		set Zeny, Zeny - .@input;
-		if (.@stat & 1 && .@bonus)
-			consumeitem 12043; //Str_Dish03
-		else if (.@stat & 2 && .@bonus)
-			consumeitem 12058; //Agi_Dish03
-		else if (.@stat & 4 && .@bonus)
-			consumeitem 12063; //Dex_Dish03
-		else if (.@stat & 8 && .@bonus)
-			consumeitem 12053; //Vit_Dish03
-		else if (.@stat & 16 && .@bonus)
-			consumeitem 12048; //Int_Dish03
-		else if (.@stat & 32 && .@bonus)
-			consumeitem 12068; //Luk_Dish03
+		if (.@stat & 1 && .@bonus){
+			sc_start SC_STRFOOD,1200000,3;
+			percentheal 5,0;
+			//consumeitem 12043; //Str_Dish03
+		}
+		else if (.@stat & 2 && .@bonus){
+			sc_start SC_AGIFOOD,1200000,3;
+			percentheal 5,0;
+			//consumeitem 12058; //Agi_Dish03
+		}
+		else if (.@stat & 4 && .@bonus){
+			sc_start SC_DEXFOOD,1200000,3;
+			percentheal 5,0;
+			//consumeitem 12063; //Dex_Dish03
+		}
+		else if (.@stat & 8 && .@bonus){
+			sc_start SC_VITFOOD,1200000,3;
+			percentheal 5,0;
+			//consumeitem 12053; //Vit_Dish03
+		}
+		else if (.@stat & 16 && .@bonus){
+			sc_start SC_INTFOOD,1200000,3;
+			percentheal 5,0;
+			//consumeitem 12048; //Int_Dish03
+		}
+		else if (.@stat & 32 && .@bonus){
+			sc_start SC_LUKFOOD,1200000,3;
+			percentheal 5,0;
+			//consumeitem 12068; //Luk_Dish03
+		}
 		else if (.@stat & 64) {
 			specialeffect2 EF_ANGEL;
 			mes "- A celestial entity gives you a blessing. -";
@@ -603,7 +621,7 @@ OnTouch:
 	close;
 }
 
-dewata,233,263,8	script	Sweet Married Couple#dew1	828,2,3,{
+dewata,233,263,8	script	Sweet Married Couple::smc_dew_01	828,2,3,{
 OnTouch:
 	mes "[Sweet Husband]";
 	mes "You are the most beautiful thing in the world baby~";
@@ -623,7 +641,7 @@ OnTouch:
 	close;
 }
 
-dewata,234,263,8	script	Sweet Married Couple#dew2	727,2,3,{
+dewata,234,263,8	script	Sweet Married Couple::smc_dew_02	727,2,3,{
 OnTouch:
 	mes "[Sweet Wife]";
 	mes "Baby~ You know what flower that is~?";
@@ -822,7 +840,7 @@ OnTouch:
 	close;
 }
 
-dewata,278,281,4	script	Happily Married Grandpa#dew	534,{
+dewata,278,281,4	script	Happily Married Grandpa::hmg_dew_01	534,{
 	mes "[Happily Married Grandpa]";
 	mes "Today, I should ask my lady to";
 	mes "cook me some ^006400fried rice^000000.";
@@ -838,7 +856,7 @@ dewata,278,281,4	script	Happily Married Grandpa#dew	534,{
 	close;
 }
 
-dewata,280,277,4	script	Happily Married Grandma#dew	535,{
+dewata,280,277,4	script	Happily Married Grandma::hmg_dew_02	535,{
 	mes "[Happily Married Grandma]";
 	mes "In my younger days,";
 	mes "there were many gentleman callers";
@@ -929,7 +947,7 @@ dewata,181,88,6	script	Young Man#dew-2	536,{
 	mes "really beautiful?";
 	mes "The children always play";
 	mes "at this beach. It really";
-	mes "reminds me of my youth."
+	mes "reminds me of my youth.";
 	next;
 	mes "[Young Man]";
 	mes "At the evening, you can see";
@@ -1086,7 +1104,7 @@ dewata,127,248,6	script	Wishing Kid#dew	539,{
 	close;
 }
 
-dew_fild01,101,259,6	script	Jaty Tribe Gatekeeper#dew	541,{
+dew_fild01,101,259,6	script	Jaty Tribe Gatekeeper::jtg_dew	541,{
 	mes "[Jaty Tribe Gatekeeper]";
 	mes "Welcome to ^FF0000Jaty^000000 town.";
 	mes "Our tribe reveres strength and bravery.";
diff --git a/npc/re/cities/dicastes.txt b/npc/re/cities/dicastes.txt
index 425fbb510..f755a797e 100644
--- a/npc/re/cities/dicastes.txt
+++ b/npc/re/cities/dicastes.txt
@@ -618,79 +618,6 @@ dicastes01,191,202,4	script	Complaining Galten#fihs	450,{
 	close;
 }
 
-dicastes01,181,191,5	script	Traveler Ichack#info	481,2,2,{
-	mes "[Traveler Ichack]";
-	mes "Oh!! You are a stranger!";
-	mes "I'm Ichack the first adventurer that arrived here in El Dicastes!";
-	next;
-	mes "[Traveler Ichack]";
-	mes "There was someone in the expedition team claiming that he was the first, but it WAS me. That's right.";
-	next;
-	mes "[Traveler Ichack]";
-	mes "That's why I will provide a service to guide adventurers from Rune-Midgard.";
-	mes "What would you like to know?";
-	next;
-	switch (select("Dicastes Diel:Residential Area:Training Room:Factory:Pub:Cat Hand Caravan")) {
-		case 1:
-			mes "[Traveler Ichack]";
-			mes "Ah~ That's a beautiful building.";
-			mes "It's said they discuss important things...";
-			next;
-			mes "[Traveler Ichack]";
-			mes "Please make sure you signed in at the dior, otherwise you'll get in trouble.";
-			mes "Go directly north from here and you can't miss it.";
-			viewpoint 351,198,1,1,0x00FF00;
-			close;
-		case 2:
-			mes "[Traveler Ichack]";
-			mes "The Sapha tribe is so weird. How can they sleep in there?";
-			next;
-			mes "[Traveler Ichack]";
-			mes "You don't understand?";
-			mes "You won't believe me until you see it! Go see it for yourself!";
-			next;
-			mes "[Traveler Ichack]";
-			mes "The residential area is divided into 2 area's.";
-			mes "The lower residential area is around 7 o'clock and, the upper area is around 1 o'clock.";
-			viewpoint 283,280,2,1,0x01FF01;
-			viewpoint 106,136,3,1,0x0066FF;
-			close;
-		case 3:
-			mes "[Traveler Ichack]";
-			mes "Because of the dangers here, we need better security..";
-			mes "Have you ever been to the training room? The training guards seem to never sleep!";
-			viewpoint 172,255,4,1,0xFFCCCC;
-			close;
-		case 4:
-			mes "[Traveler Ichack]";
-			mes "This is one of the most important reasons why they live here.";
-			mes "If you go to factory, you can see the recently refined Bradium.";
-			viewpoint 256,97,5,1,0x0066FF;
-			close;
-		case 5:
-			mes "[Traveler Ichack]";
-			mes "Although I arrived here as the first adventurer, the owner of the pub was the first person here.";
-			mes "Bumen Florine's pub is located underground in the lower residential area.";
-			mes "He might have some valuable information for you.";
-			viewpoint 106,136,6,1,0xFF3300;
-			close;
-		case 6:
-			mes "[Traveler Ichack]";
-			mes "The cats seems that don't have good relationship with sapha same as us.";
-			mes "Perhaps it's because trading is involved.";
-			mes "Poor cats. They must be shivering from the cold out there.";
-			next;
-			mes "[Traveler Ichack]";
-			mes "You can find their caravan just outside the gates.";
-			viewpoint 39,199,7,1,0x9933FF;
-			close;
-	}
-OnTouch:
-	if (ep13_3_invite == 6) 
-		emotion e_gasp,0;
-	end;
-}
-
 dicastes01,202,197,4	script	Crazy Venknick#fihsing1	449,{
 	if (isequipped(2782)) {
 		mes "[Crazy Venknick]";
diff --git a/npc/re/guides/guides_dicastes.txt b/npc/re/guides/guides_dicastes.txt
new file mode 100644
index 000000000..99beb318d
--- /dev/null
+++ b/npc/re/guides/guides_dicastes.txt
@@ -0,0 +1,88 @@
+//===== rAthena Script ======================================= 
+//= El Dicastes Guide
+//===== By: ================================================== 
+//= Muad_Dib
+//===== Current Version: ===================================== 
+//= 1.1
+//===== Compatible With: ===================================== 
+//= rAthena SVN
+//===== Description: ========================================= 
+//= [Official Conversion]
+//= Guide for the city of El Dicastes.
+//===== Additional Comments: ================================= 
+//= 1.0 First version. [Joseph]
+//= 1.1 Fixed viewpoint syntax. [Euphy]
+//============================================================ 
+
+dicastes01,181,191,5	script	Traveler Ichack#info	481,2,2,{
+	mes "[Traveler Ichack]";
+	mes "Oh!! You are a stranger!";
+	mes "I'm Ichack, the first adventurer that arrived here in El Dicastes!";
+	next;
+	mes "[Traveler Ichack]";
+	mes "There was someone in the expedition team claiming that he was the first, but it WAS me. That's right.";
+	next;
+	mes "[Traveler Ichack]";
+	mes "That's why I will provide a service to guide adventurers from Rune-Midgard.";
+	mes "What would you like to know?";
+	next;
+	switch(select("Dicastes Diel:Residential Area:Training Room:Factory:Pub:Cat Hand Caravan")) {
+	case 1:
+		mes "[Traveler Ichack]";
+		mes "Ah~ That's a beautiful building.";
+		mes "It's said they discuss important things...";
+		next;
+		mes "[Traveler Ichack]";
+		mes "Please make sure you signed in at the dior, otherwise you'll get in trouble.";
+		mes "Go directly north from here and you can't miss it.";
+		viewpoint 1,351,198,0,0x00FF00;
+		close;
+	case 2:
+		mes "[Traveler Ichack]";
+		mes "The Sapha tribe is so weird. How can they sleep in there?";
+		next;
+		mes "[Traveler Ichack]";
+		mes "You don't understand?";
+		mes "You won't believe me until you see it! Go see it for yourself!";
+		next;
+		mes "[Traveler Ichack]";
+		mes "The residential area is divided into 2 area's.";
+		mes "The lower residential area is around 7 o'clock and, the upper area is around 1 o'clock.";
+		viewpoint 1,283,280,1,0x01FF01;
+		viewpoint 1,106,136,2,0x0066FF;
+		close;
+	case 3:
+		mes "[Traveler Ichack]";
+		mes "Because of the dangers here, we need better security..";
+		mes "Have you ever been to the training room? The training guards seem to never sleep!";
+		viewpoint 1,172,255,3,0xFFCCCC;
+		close;
+	case 4:
+		mes "[Traveler Ichack]";
+		mes "This is one of the most important reasons why they live here.";
+		mes "If you go to factory, you can see the recently refined Bradium.";
+		viewpoint 1,256,97,4,0x0066FF;
+		close;
+	case 5:
+		mes "[Traveler Ichack]";
+		mes "Although I arrived here as the first adventurer, the owner of the pub was the first person here.";
+		mes "Bumen Florine's pub is located underground in the lower residential area.";
+		mes "He might have some valuable information for you.";
+		viewpoint 1,106,136,5,0xFF3300;
+		close;
+	case 6:
+		mes "[Traveler Ichack]";
+		mes "The cats seems that don't have good relationship with sapha same as us.";
+		mes "Perhaps it's because trading is involved.";
+		mes "Poor cats. They must be shivering from the cold out there.";
+		next;
+		mes "[Traveler Ichack]";
+		mes "You can find their caravan just outside the gates.";
+		viewpoint 1,39,199,6,0x9933FF;
+		close;
+	}
+OnTouch:
+	if (ep13_3_invite == 6) 
+		emotion e_gasp,0;
+	end;
+}