Merge remote-tracking branch 'upstream/master'

1 files changed, 52 insertions, 33 deletions

diff --git a/npc/re/cities/dicastes.txt b/npc/re/cities/dicastes.txt
index c47671b4b..af8ec7824 100644
--- a/npc/re/cities/dicastes.txt
+++ b/npc/re/cities/dicastes.txt
@@ -3,16 +3,16 @@
 //===== By: ==================================================
 //= Gennosuke Kouga, Muad_Dib
 //===== Current Version: =====================================
-//= 1.2a
-//===== Compatible With: =====================================
-//= Hercules
+//= 1.3
 //===== Description: =========================================
+//= [Official Conversion]
 //= El Dicastes Town Script
 //===== Additional Comments: =================================
 //= 1.0 First version.
 //= 1.1 Standardized. [Euphy]
 //= 1.2 Updated to match the official script. [Joseph]
 //= 1.2a Moved Guide to a separate file. [Euphy]
+//= 1.3 Updated to match official script. [SkittleNugget]
 //============================================================
 
 dicastes01,194,159,5	script	Excited Galten#a	492,{
@@ -76,8 +76,8 @@ dicastes01,194,95,5	script	Sentinel#b	450,{
 }
 
 dicastes01,234,158,0	script	Training Galten#a	450,{
+	mes "[Training Galten]";
 	if (isequipped(2782)) {
-		mes "[Training Galten]";
 		mes "I'll be ready for anything";
 		mes "if I keep up with my training every day.";
 		close;
@@ -90,8 +90,8 @@ dicastes01,234,158,0	script	Training Galten#a	450,{
 }
 
 dicastes01,244,166,0	script	Training Galten#b	450,{
+	mes "[Training Galten]";
 	if (isequipped(2782)) {
-		mes "[Training Galten]";
 		mes "I wonder if Ahat knows how";
 		mes "hard I am training.";
 		close; 
@@ -134,6 +134,20 @@ dicastes01,248,129,0	script	Training Galten#d	450,{
 	close;
 }
 
+/*
+dicastes01,271,152,0	script	Training Galten#e	450,{
+	mes "[Training Galten]";
+	if (isequipped(2782)) {
+		mes "I will get great results";
+		mes "if I do my best, right?";
+		close;
+	}
+	mes "¡ø¢²¡û ¡ô ¢£¢³¡ô";
+	mes "¡ü¡ô";
+	close;
+}
+*/
+
 dic_in01,349,282,4	script	Waiting Galten#in_1	492,{
 	if (isequipped(2782)) {
 		mes "[Waiting Galten]";
@@ -266,8 +280,8 @@ dic_in01,168,116,5	script	Tired Piom#c	491,{
 	mes "[Tired Piom]";
 	if (isequipped(2782)) {
 		mes "If you need any";
-		mes "information, you'd should try your";
-		mes "luck with the Cat Merchant rather than wander around here.";
+		mes "information, you'd have better";
+		mes "luck with the Cat Merchant than wandering around here.";
 		mes "But of course you'll have to pay the price.";
 		close; 
 	}
@@ -299,17 +313,18 @@ dic_in01,149,104,5	script	Tired Piom#b	455,{
 dic_in01,341,113,3	script	Tired Piom#a	491,{
 	mes "[Tired Piom]";
 	if (isequipped(2782)) {
-		mes "Ahat is the one";
-		mes "and only Sapha pride.";
-		mes "We have plenty of Bradium";
-		mes "because of him!";
+		mes "[Tired Piom]";
+		mes "I think I look better in";
+		mes "robes than in leather.";
+		mes "I may have to change to knitting.";
+		mes "But mining does seem to suit me.";
 		next;
-		mes "[Thrilled Piom]";
+		mes "[Tired Piom]";
 		mes "...";
 		next;
-		mes "[Thrilled Piom]";
-		mes "You don't feel his";
-		mes "blessing?";
+		emotion e_swt;
+		mes "[Tired Piom]";
+		mes "I'll be rejected again, right?";
 		close; 
 	}
 	mes "¡÷¡ò¡û ¡ó ¡ó¡Ð¢±";
@@ -320,6 +335,7 @@ dic_in01,341,113,3	script	Tired Piom#a	491,{
 	mes "[Tired Piom]";
 	mes "¡þ";
 	next;
+	emotion e_swt;
 	mes "[Tired Piom]";
 	mes "¡ø¡ú¡ø ¢± ¡ö¡ò";
 	close;
@@ -337,7 +353,7 @@ dic_in01,252,103,3	script	Eating Adventurer#tre	711,{
 	next;
 	mes "[Eating Adventurer]";
 	mes "I really would like a nice hot meal.";
-	mes "I go to this great little restaurant in Geffen often, and I really miss that place now.";
+	mes "I go to this great little restaurant in Geffen often and I really miss that place now.";
 	close;
 }
 
@@ -368,7 +384,8 @@ dic_in01,372,116,3	script	Thrilled Piom#a	490,{
 		mes "[Thrilled Piom]";
 		mes "You don't feel his";
 		mes "blessing?";
-		close; }
+		close;
+	}
 	mes "¡ò¡õ¢³ ¡õ ¡ô";
 	mes "¢£¡ó¡ø ¢² ¡ô¡÷";
 	mes "¡ò¡ô¢³ ¡ù ¢±¡ó¢± ¡õ";
@@ -444,7 +461,7 @@ dic_in01,42,250,5	script	Guide#diel_1	489,{
 	close;
 }
 
-dic_in01,335,34,0	script	Talkative Piom#a	490,{
+dic_in01,335,34,5	script	Talkative Piom#a	490,{
 	mes "[Talkative Piom]";
 	if (isequipped(2782)) {	
 		mes "At my factory";
@@ -480,7 +497,7 @@ dicastes01,282,210,4	script	Free Knit#a	453,{
 	mes "[Free Knit]";
 	if (isequipped(2782)) {
 		mes "As long as we have a steady";
-		mes "supply of Bradium,";
+		mes "supply of Bradium";
 		mes "Saphas can live forever.";
 		mes "Our childhood lasts 10 years,";
 		mes "which is short.";
@@ -494,7 +511,7 @@ dicastes01,282,210,4	script	Free Knit#a	453,{
 	close;
 }
 
-dicastes01,246,210,4	script	Free Venknick#a	449,{
+dicastes01,246,210,3	script	Free Venknick#a	449,{
 	mes "[Free Venknick]";
 	if (isequipped(2782)) {
 		mes "At least we have plenty of Bradium.";
@@ -539,14 +556,12 @@ dicastes01,235,245,4	script	Excited Piom#a	490,{
 	close;
 }
 
-dicastes01,284,262,4	script	Favorable Knit#a	453,{
+dicastes01,284,262,3	script	Favorable Knit#a	453,{
 	mes "[Favorable Knit]";
 	if (isequipped(2782)) {
-		mes "Unlike the Laphine, we Saphas";
+		mes "Unlike the Raphine, we Saphas";
 		mes "are a very close community.";
 		mes "We start by living together in common facilities after we are born.";
-		next;
-		mes "[Favorable Knit]";
 		mes "That is why all Saphas are like family.";
 		mes "We never have any quarrels between classes.";
 		close; 
@@ -560,8 +575,8 @@ dicastes01,284,262,4	script	Favorable Knit#a	453,{
 }
 
 dicastes01,164,180,4	script	Limpy Piom#a	489,{
+	mes "[Limpy Piom]";
 	if (isequipped(2782)) {
-		mes "[Limpy Piom]";
 		mes "They say there is a";
 		mes "war going on with the Splendide in Manuk.";
 		mes "I hope everything goes well.";
@@ -591,8 +606,8 @@ dicastes01,191,202,4	script	Complaining Galten#fihs	450,{
 		next;
 		if(select("No:Yes") == 1) {
 			mes "[Complaining Galten]";
-			mes "You don't know about the legend behind the statue?";
-			mes "Then I don't know what to talk about it with you.";
+			mes "Then you don't know about the legend behind the statue?";
+			mes "Then, I don't know what to talk about with you.";
 			close; 
 		}
 		emotion e_gg,0,"Crazy Venknick#fihsing1";
@@ -643,21 +658,25 @@ dicastes01,202,197,4	script	Crazy Venknick#fihsing1	449,{
 		mes "Thanks.";
 		emotion e_gg,0,"Complaining Galten#fihs";
 		next;
-		select("What is the sad legend?");
+		mes "["+strcharinfo(0)+"]";
+		mes "What is the sad legend?";
+		next;
 		emotion e_dots;
-		select("I asked what the sad legend is about!");
+		mes "["+strcharinfo(0)+"]";
+		mes "I asked what the sad legend is about!";
 		next;
 		mes "[Crazy Venknick]";
 		mes "I don't believe in legends.";
 		next;
 		emotion e_dots,1;
-		select("Was I tricked?");
-		sc_start SC_Blind,20000,0;
+		mes "["+strcharinfo(0)+"]";
+		mes "Was I tricked?";
+		sc_start SC_BLIND,20000,0;
 		next;
 		mes "You feel outraged at being tricked.";
 		close; 
 	}
-	mes "[???¨²?¨´ ¡é3 ]";
+	mes "[¡ö¡ú¡ù ¢³ ]";
 	mes "¢²¡û¡ó ¡ó ¡ù¢¤¡ø";
 	mes "¢¤¡ð¢² ¢± ¡ñ¡ö¢² ¡ø ¡ï¡ö¡ü";
 	next;
@@ -693,4 +712,4 @@ dic_in01,98,96,3	script	Lost Galten#a	492,{
 	mes "¡ü¡ø¡ñ ¢£ ";
 	mes "¡ö¡ï¢² ¡û ¡ö¡ó";
 	close;
-}
+}
\ No newline at end of file