- Updated and adapted El Dicastes NPC from official script. Credits to Muad_Dib!

- Standardized header.

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@17009 54d463be-8e91-2dee-dedb-b68131a5f0ec

db/quest_db.txt

@@ -1557,6 +1557,7 @@
 12213,0,0,0,0,0,0,0,"Carrot Doc."
 12214,0,0,0,0,0,0,0,"Cactus Needle Doc."
 12215,0,0,0,0,0,0,0,"Stone Heart Doc."
+12216,21600,0,0,0,0,0,0,"Pouty Jahbong"
 12217,0,0,0,0,0,0,0,"Request - Traces of wild boar hunt"
 12218,0,0,0,0,0,0,0,"How to make lava elixir"
 12219,0,0,0,0,0,0,0,"How to creat flame elixir"

npc/quests/quests_13_1.txt

@@ -7,7 +7,7 @@
 //===== Compatible With: ===================================== 
 //= rAthena SVN
 //===== Description: ========================================= 
-//= [Aegis Conversion]
+//= [Official Conversion]
 //= Contains Quests:
 //= Onward to the Other World
 //= - Will differ from iRO wiki's version as iRO changed it.

npc/re/cities/dicastes.txt

@@ -1,9 +1,9 @@
 //===== rAthena Script ======================================= 
 //= El Dicastes Town
 //===== By: ================================================== 
-//= Gennosuke Kouga
+//= Gennosuke Kouga, Muad_Dib
 //===== Current Version: ===================================== 
-//= 1.1
+//= 1.2
 //===== Compatible With: ===================================== 
 //= rAthena SVN
 //===== Description: ========================================= 
@@ -11,6 +11,7 @@
 //===== Additional Comments: ================================= 
 //= 1.0 First version.
 //= 1.1 Standardized. [Euphy]
+//= 1.2 Updated to match the official script. [Joseph]
 //============================================================
 
 dicastes01,194,159,5	script	Excited Galten#a	492,{
@@ -22,7 +23,8 @@ dicastes01,194,159,5	script	Excited Galten#a	492,{
 		mes "As long as we have him,";
 		mes "it will only be a matter of time before Sapha";
 		mes "will rule this land.";
-		close; }
+		close; 
+	}
 	mes "▲⒉ⅲ ⌒ ◎○○";
 	mes "△▲● ↑ ↑";
 	mes "※⒉⒊ ⒉";
@@ -31,20 +33,21 @@ dicastes01,194,159,5	script	Excited Galten#a	492,{
 	close;
 }
 
-dicastes01,201,86,4	script	Sentinel#a	492,{
+dicastes01,202,86,3	script	Sentinel#a	492,{
 	mes "[Sentinel]";
 	if (isequipped(2782)) {
 		mes "El Dicastes, the";
 		mes "capital city of Sapha.";
-		mes "The land is pretty rough,";
-		mes "so many outsiders can't get in. Haha...";
+		mes "The land is pretty";
+		mes "rough so many outsiders can't get in. Ha ha";
 		next;
 		mes "[Sentinel]";
 		mes "...";
 		next;
 		mes "[Sentinel]";
 		mes "Hey, you are an outsider!";
-		close; }
+		close; 
+	}
 	mes "◆⒈⒈ ← ◇⌒● ⅲ ⅳ→";
 	mes "▲◇⒉ ⅳ ";
 	mes "□◇⌒ ⒊ ⌒□ⅲ ← →★";
@@ -63,138 +66,156 @@ dicastes01,194,95,5	script	Sentinel#b	450,{
 		mes "I permit your entry.";
 		mes "But if you dare to cause trouble";
 		mes "you won't know what hit you. Beware!";
-		close; }
+		close; 
+	}
 	mes "▲◆↑ ▲ ◇";
 	mes "▲★← ◇ ←ⅳ⒉ △ ⅲ";
 	mes "ⅳ◆▲ ⒊ △←■ □ ▲";
 	close;
 }
 
-dicastes01,252,133,1	script	Training Galten#a	450,{
-	mes "[Training Galten]";
+dicastes01,234,158,0	script	Training Galten#a	450,{
 	if (isequipped(2782)) {
-		mes "I am a Sapha warrior.";
-		mes "I am never lazy with my training.";
-		next;
 		mes "[Training Galten]";
-		mes "Hahaha~";
-		mes "Just joking. I can't fight a guest in our land.";
-		close; }
+		mes "I'll be ready for anything";
+		mes "if I keep up with my training every day.";
+		close;
+	}
 	mes "�簟� 　�簟� ▲";
 	mes "� ▲";
 	next;
-	mes "- I can't understand what he's trying to say. -";
+	mes "Don't know what it means.";
 	close;
 }
 
-dicastes01,272,166,0	script	Training Galten#b	450,{
-	mes "[Training Galten]";
+dicastes01,244,166,0	script	Training Galten#b	450,{
 	if (isequipped(2782)) {
-		mes "You seem to be an experienced adventurer.";
-		mes "I would like to try testing your strength.";
-		next;
 		mes "[Training Galten]";
-		mes "Hahaha~";
-		mes "Just joking. I can't fight a guest to our land.";
-		close; }
+		mes "I wonder if Ahat knows how";
+		mes "hard I am training.";
+		close; 
+	}
 	mes "▲◆↑ ▲";
 	mes "▲◆↑ ▲ ▲◆↑ ▲ ▲◆↑ ▲";
 	next;
-	mes "- I can't understand what he's trying to say. -";
+	mes "Don't know what it means.";
 	close;
 }
 
-dicastes01,244,166,0	script	Training Galten#c	450,{
+dicastes01,272,166,0	script	Training Galten#c	450,{
 	mes "[Training Galten]";
 	if (isequipped(2782)) {
-		mes "I wonder if Ahat knows how";
-		mes "hard I am training.";
-		close; }
+		mes "[Training Galten]";
+		mes "I am a Sapha warrior.";
+		mes "I am never lazy with my training.";
+		close;
+	}
 	mes "▲◆↑ ▲ ▲◆↑ ▲";
 	mes "▲◆↑ ▲";
 	next;
-	mes "- I can't understand what he's trying to say. -";
+	mes "Don't know what it means.";
 	close;
 }
 
-dicastes01,234,158,0	script	Training Galten#d	450,{
+dicastes01,248,129,0	script	Training Galten#d	450,{
 	mes "[Training Galten]";
 	if (isequipped(2782)) {
-		mes "I'll be ready for anything.";
-		mes "If I keep up with my training every day.";
-		close; }
+		mes "[Training Galten]";
+		mes "I heard this isn't training";
+		mes "equipment but a massager";
+		mes "for trainees like me.";
+		close; 
+	}
 	mes "▲◆↑ ▲ ▲◆↑";
 	mes "▲◆↑ ▲� �簟� ▲";
 	next;
-	mes "- I can't understand what he's trying to say. -";
+	mes "Don't know what it means.";
 	close;
 }
 
 dic_in01,349,282,4	script	Waiting Galten#in_1	492,{
-	mes "[Waiting Galten]";
 	if (isequipped(2782)) {
+		mes "[Waiting Galten]";
 		mes "Here is the Battle Station.";
-		mes "We are all tensed up and ready for action.";
-		close;	 }
+		mes "We are all tensed up to be ready for action.";
+		close;	 
+	}
+	mes "[⒉⌒← ※ ⌒]";
 	mes "●□↑ ⅲ ◇";
-	mes "ⅳ◇□ ⅲ ⅲ◎◆ ■ →ⅳ→ ⅳ ◎■□ ⅳ";
+	mes "ⅳ◇□ ⅲ ⅲ◎◆ ■ →ⅳ→ ⅳ ◎■□ ⅳ ";
 	close;
 }
 
 dic_in01,370,261,1	script	Waiting Galten#in_2	492,{
-	mes "[Waiting Galten]";
 	if (isequipped(2782)) {
+		mes "[Waiting Galten]";
 		mes "Boring.";
-		close; }
+		close; 
+	}
+	mes "[⒉⌒← ※ ⌒]";
 	mes "※ⅳ⒈";
 	close;
 }
 
 dic_in01,381,261,1	script	Waiting Galten#in_3	492,{
-	mes "[Waiting Galten]";
 	if (isequipped(2782)) {
+		mes "[Waiting Galten]";
 		mes "Zzzzz...";
-		close; }
+		close; 
+	}
+	mes "[⒉⌒← ※ ⌒]";
 	mes "→◆";
 	close;
 }
 
 dic_in01,370,282,4	script	Waiting Galten#in_4	492,{
-	mes "[Waiting Galten]";
 	if (isequipped(2782)) {
+		mes "[Waiting Galten]";
 		mes "El Dicastes is the most peaceful place in this world as long as I am here.";
-		close; }
+		close; 
+	}
+	mes "[⒉⌒← ※ ⌒]";
 	mes "★★⒊ 〓 ■⒊ⅲ ⒈ ⒊←□ ▲ 〓★★ ▲ ←";
 	close;
 }
 
 dic_in01,354,219,4	script	Resting Galten#in_5	492,{
-	mes "[Resting Galten]";
 	if (isequipped(2782)) {
+		mes "[Resting Galten]";
 		mes "Resting is always so sweet.";
-		close; }
+		close; 
+	}
+	mes "[□▲◎ ↑ ⅳ]";
 	mes "★□※ ■ ◎○⒉ ⒊ ■";
 	close;
 }
 
 dic_in01,365,197,1	script	Resting Galten#in_6	492,{
-	mes "[Resting Galten]";
 	if (isequipped(2782)) {
+		mes "[Resting Galten]";
 		mes "Galten can also rest while standing up like this.";
 		next;
 		mes "[Resting Galten]";
 		mes "You say I don't look like I'm resting? But I'm already used to this.";
-		close; }
+		close; 
+	}
+	mes "[□▲◎ ↑ ⅳ]";
 	mes "◆★ⅳ ■ ※○● ↑ ◇←←";
 	mes "★ⅲ◇ ※ ⒊◆○ ⅲ ⌒←◆ ◆ ⌒→※ ◆ ◇";
 	close;
 }
 
+dic_in01,87,102,5	script	Resting Piom#01	454,{
+	end;
+}
+
 dic_in01,29,119,4	script	Resting Piom#04	489,{
-	mes "[Resting Piom]";
 	if (isequipped(2782)) {
+		mes "[Resting Piom]";
 		mes "Why is it so noisy when I'm trying to get rest?";
-		close; }
+		close; 
+	}
+	mes "[ⅲ※◎ ⅳ ※]";
 	mes "↑⒉○ ⌒ ◎▲⒉ ◆ ⒉□";
 	close;
 }
@@ -205,33 +226,38 @@ dic_in01,91,113,5	script	Suspicious Piom#a	489,{
 		mes "Have you heard of the";
 		mes "rumor about Ahat?";
 		next;
-		if(select("Nope!:You first.")==2) {
+		if(select("Nope!:You first.") == 1) {
 			mes "[Suspicious Piom]";
 			mes "Never mind.";
-			close; }
+			close; 
+		}
 		mes "[Suspicious Piom]";
 		mes "Oh, you do seem to know?";
 		mes "I need to collect information.";
 		mes "You first.";
 		mes "You heard of the rumor, right?";
 		next;
-		if(select("Something is fishy?:If you're not going to spill it, me neither!")==2) {
+		if(select("Something is fishy?:If you're not going to spill it, me neither!") == 1) {
 			mes "[Suspicious Piom]";
 			mes "I'm only a very curious";
 			mes "ordinary Piom.";
-			close; }
+			close; 
+		}
 		mes "[Suspicious Piom]";
 		mes "I am not going to say anything, either!";
-		close; }
+		close; 
+	}
 	mes "◇⒊◇ ◇ ◇〓■";
 	mes "□ ⒊⒉△ ◇◇";
 	next;
-	if(select("Can't tell what it means:Is it a curse??")==2) {
+	if(select("Can't tell what it means:Is it a curse??") == 2) {
 		mes "[Suspicious Piom]";
-		mes "◇ ◇ ◇〓■.";
-		close; }
+		mes "Too bad.";
+		close; 
+	}
 	mes "[Suspicious Piom]";
-	mes "Go human!";
+	mes "Be on your";
+	mes "way, shoo";
 	close;
 }
 
@@ -242,7 +268,8 @@ dic_in01,168,116,5	script	Tired Piom#c	491,{
 		mes "information, you'd should try your";
 		mes "luck with the Cat Merchant rather than wander around here.";
 		mes "But of course you'll have to pay the price.";
-		close; }
+		close; 
+	}
 	mes "〓□○ ⒊ ⒊〓";
 	mes "〓▲○ ■ ●→○ ◎";
 	mes "★●→ ◆ ■■◎ ← ◇ⅳ▲ ▲ ⒉ ▲";
@@ -258,7 +285,8 @@ dic_in01,149,104,5	script	Tired Piom#b	455,{
 		mes "I think the effects are weaker than before,";
 		mes "or is it just me?";
 		emotion e_what;
-		close; }
+		close; 
+	}
 	mes "○⌒→ ▲ ⒉";
 	mes "■□◇ ⅳ ◎◎⒊ ◆ ◆◇●";
 	mes "ⅲ●〓 ↑ ⒉←◇ ◎ ○〓";
@@ -270,18 +298,19 @@ 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 "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.";
+		mes "Ahat is the one";
+		mes "and only Sapha pride.";
+		mes "We have plenty of Bradium";
+		mes "because of him!";
 		next;
-		mes "[Tired Piom]";
+		mes "[Thrilled Piom]";
 		mes "...";
 		next;
-		emotion e_swt;
-		mes "[Tired Piom]";
-		mes "I'll be rejected again, right?";
-		close; }
+		mes "[Thrilled Piom]";
+		mes "You don't feel his";
+		mes "blessing?";
+		close; 
+	}
 	mes "△◎← ◇ ◇⌒⒈";
 	mes "◇□※ 〓 ◎⒈● □ ⅲ";
 	mes "↑○ⅳ ※ ◎◆□ ◎ ●";
@@ -290,7 +319,6 @@ dic_in01,341,113,3	script	Tired Piom#a	491,{
 	mes "[Tired Piom]";
 	mes "〓";
 	next;
-	emotion e_swt;
 	mes "[Tired Piom]";
 	mes "▲→▲ ⒈ ■◎";
 	close;
@@ -301,10 +329,7 @@ dic_in01,252,103,3	script	Eating Adventurer#tre	711,{
 	mes "Hey, do you have any emergency rations on you from Midgard?";
 	next;
 	mes "[Eating Adventurer]";
-	mes "I came all the way here with a hungry stomach because";
-	mes "I heard there was a Midgard pub, but";
-	mes "I've never tasted this food";
-	mes "anywhere in Midgard.";
+	mes "I came all the way here with a hungry stomach because I heard there was a Midgard pub but I've never tasted this food anywhere in Midgard.";
 	next;
 	mes "[Eating Adventurer]";
 	mes "No, I'm sure nobody in Midgard would want to try this.";
@@ -316,11 +341,13 @@ dic_in01,252,103,3	script	Eating Adventurer#tre	711,{
 }
 
 dic_in01,32,54,5	script	Venknick#el_01	449,{
-	mes "[Venknick]";
 	if (isequipped(2782)) {
-		mes "Oh, I feel so refreshed.";
+		mes "[Venknick]";
+		mes "Oh feels so refreshed.";
 		mes "The refined Bradium was the best ever. Do you want to try some?";
-		close; }
+		close; 
+	}
+	mes "[◇◎○]";
 	mes "※◇ⅳ ⒈ ⅲ";
 	mes "□〓★ ⅲ △△ⅳ → ◇●■ ⒉ 〓⒉ⅳ ⒉ ⅲ?";
 	close;
@@ -361,7 +388,8 @@ dic_in01,360,125,5	script	Serious Venknicka	449,{
 		mes "A sudden increase in Bradium production.";
 		mes "Why?";
 		mes "I will have to get more factory lines running.";
-		close; }
+		close; 
+	}
 	mes "←□● ⒉ ⒉ⅳ⌒ ⒉ ↑●□";
 	mes "〓◇■ ⒉";
 	mes "■△← → △⌒⒊ ⒊";
@@ -369,9 +397,9 @@ dic_in01,360,125,5	script	Serious Venknicka	449,{
 }
 
 dic_in01,42,250,5	script	Guide#diel_1	489,{
-	if (ep13_3_invite == 5) {
-		mes "[Guide]";
-		if (isequipped(2782)) {
+	if (isequipped(2782)) {
+		if (ep13_3_invite > 5) {		
+			mes "[Guide]";
 			mes "I'm Dior, your kind guide for El Dicastes.";
 			mes "How can I help you?";
 			next;
@@ -388,42 +416,44 @@ dic_in01,42,250,5	script	Guide#diel_1	489,{
 			next;
 			mes "[Guide]";
 			mes "Oh, you didn't ask?";
-			mes "But since I'm Dior, the kind guide...";
-			close; }
-		mes "□ⅲ◇ ⌒ □●◎ ⅳ ▲▲ⅲ ⒈ ⒉⒊△ ⒈";
-		mes "■◎○ ◇ ◆◆?";
-		next;
-		mes "[Guide]";
-		mes "⌒※◇ ※ ↑⒉⌒ ⒈ △■〓";
-		mes "●〓⒉ ▲ ◇★★ ※ ○●⌒ ※ ⒊◎〓 ※ ▲○□ □ ⅳ";
-		next;
-		mes "[Guide]";
-		mes "←※◆ ▲ ○〓△ ⒊ 〓※● → ↑ⅳ◎ → ◆ⅲ";
-		mes "△◎ⅳ ▲ ←⒊";
-		next;
-		mes "[Guide]";
-		mes "◆○● ⅳ ◇△⒊ 〓 ◇□△ ■ ◇ ■";
-		next;
-		mes "[Guide]";
-		mes "◎◆▲ △ □▲○ ◇ ⅳ⌒◆ ▲ ●●● ▲ →■▲ ↑";
-		mes "★⒊○ ⅳ ○■ⅲ ⒈ ◆▲";
-		close; }
-	mes "- The guide looks at you with an alert expression. -";
+			mes "But since I'm Dior, the kind guide. He he.";
+			close; 
+		}
+		mes "- The guide looks at you with an alert expression. -";
+		close;
+	}
+	mes "[⒊●]";
+	mes "□ⅲ◇ ⌒ □●◎ ⅳ ▲▲ⅲ ⒈ ⒉⒊△ ⒈";
+	mes "■◎○ ◇ ◆◆?";
+	next;
+	mes "[⒊●]";
+	mes "⌒※◇ ※ ↑⒉⌒ ⒈ △■〓";
+	mes "●〓⒉ ▲ ◇★★ ※ ○●⌒ ※ ⒊◎〓 ※ ▲○□ □ ⅳ";
+	next;
+	mes "[⒊●]";
+	mes "←※◆ ▲ ○〓△ ⒊ 〓※● → ↑ⅳ◎ → ◆ⅲ";
+	mes "△◎ⅳ ▲ ←⒊";
+	next;
+	mes "[⒊●]";
+	mes "◆○● ⅳ ◇△⒊ 〓 ◇□△ ■ ◇ ■";
+	next;
+	mes "[⒊●]";
+	mes "◎◆▲ △ □▲○ ◇ ⅳ⌒◆ ▲ ●●● ▲ →■▲ ↑";
+	mes "★⒊○ ⅳ ○■ⅲ ⒈ ◆▲";
 	close;
 }
 
-dic_in01,326,37,0	script	Talkative Piom#a	454,{
+dic_in01,335,34,0	script	Talkative Piom#a	490,{
 	mes "[Talkative Piom]";
 	if (isequipped(2782)) {	
 		mes "At my factory";
 		mes "we not only refine Bradium,";
 		mes "but we also produce various";
 		mes "tools for daily use.";
-		next;
-		mes "[Talkative Piom]";
 		mes "We manufacture war supplies";
-		mes "here, too.";
-		close; }
+		mes "here too.";
+		close; 
+	}
 	mes "↑※⒈ ⒊";
 	mes "△▲★ 〓 ◇◇";
 	mes "●□◎ ◇ △↑※ ■";
@@ -433,12 +463,13 @@ dic_in01,326,37,0	script	Talkative Piom#a	454,{
 	close;
 }
 
-dic_in01,351,35,7	script	Manuk Piom#a	454,{
+dic_in01,387,30,1	script	Manuk Piom#a	454,{
 	mes "[Manuk Piom]";
 	if (isequipped(2782)) {
 		mes "You! We met in Manuk, didn't we?";
 		mes "I've come to pick up the weapon I ordered.";
-		close; }
+		close; 
+	}
 	mes "↑◇〓 ◇ ★○ⅳ ↑ ○⒈";
 	mes "※◆★ → ●※⒊ ◇ ◎■◇ ◆◆";
 	close;
@@ -452,7 +483,8 @@ dicastes01,282,210,4	script	Free Knit#a	453,{
 		mes "Saphas can live forever.";
 		mes "Our childhood lasts 10 years,";
 		mes "which is short.";
-		close; }
+		close; 
+	}
 	mes "●〓○ ◇ ↑◎■ △";
 	mes "⒊○★ ⅲ ※◆◎ ◆ ◇〓● ⒉ ●←ⅲ ⒉";
 	mes "◆◇○ 〓 ⅲ○ⅳ □ ←⒊↑";
@@ -475,7 +507,8 @@ dicastes01,246,210,4	script	Free Venknick#a	449,{
 		mes "[Free Venknick]";
 		mes "The thing rolling around is a gem,";
 		mes "but why are you interested in it?";
-		close; }
+		close; 
+	}
 	mes "◆★ⅲ ⅳ △□⒈ ↑ ●□";
 	mes "↑⒊";
 	mes "■※ⅳ ⒉ ※◇◆";
@@ -491,13 +524,14 @@ dicastes01,246,210,4	script	Free Venknick#a	449,{
 }
 
 dicastes01,235,245,4	script	Excited Piom#a	490,{
-	mes "[Excited Piom]";
 	if (isequipped(2782)) {
 		mes "[Excited Piom]";
 		mes "Have you seen Ahat?";
 		emotion e_ho;
 		mes "His popularity here in El Discastes is phenomenal!";
-		close; }
+		close; 
+	}
+	mes "[Excited Piom]";
 	mes "→〓◇ ⒊ ↑⒉● ⒈";
 	emotion e_ho;
 	mes "⒊◇● □ ○◆〓 △ →◎□ ▲ ⒉ ▲";
@@ -514,7 +548,8 @@ dicastes01,284,262,4	script	Favorable Knit#a	453,{
 		mes "[Favorable Knit]";
 		mes "That is why all Saphas are like family.";
 		mes "We never have any quarrels between classes.";
-		close; }
+		close; 
+	}
 	mes "◆⒈◇ □ →△⌒ □";
 	mes "↑★⌒ □ ◆◇↑ ◇ ⒊";
 	mes "●◆↑ 〓 ⅳ●ⅳ ◆ ←★※";
@@ -524,16 +559,16 @@ 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 war";
-		mes "going on with the Laphine.";
+		mes "They say there is a";
+		mes "war going on with the Splendide in Manuk.";
 		mes "I hope everything goes well.";
 		mes "I hope it doesn't come all";
-		mes "the way to the capital.";
+		mes "the way to the capital city here.";
 		emotion e_dots;
-		close; }
+		close; 
+	}
 	mes "⒉◆〓 ※ □⌒";
 	mes "⒊◆← → ▲";
 	mes "⒊〓ⅳ ◇ □△⌒";
@@ -544,8 +579,8 @@ dicastes01,164,180,4	script	Limpy Piom#a	489,{
 }
 
 dicastes01,191,202,4	script	Complaining Galten#fihs	450,{
-	mes "[Complaining Galten]";
 	if (isequipped(2782)) {
+		mes "[Complaining Galten]";
 		mes "That crazy Vanknick always";
 		mes "talks about the legend of that statue.";
 		next;
@@ -553,116 +588,128 @@ dicastes01,191,202,4	script	Complaining Galten#fihs	450,{
 		mes "Have you ever talked";
 		mes "to him?";
 		next;
-		if(select("No:Yes")==1) {
+		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.";
-			close; }
+			close; 
+		}
+		emotion e_gg,0,"Crazy Venknick#fihsing1";
 		mes "[Complaining Galten]";
 		mes "You also fell for that crazy man.";
 		next;
-		select("Yes");
+		mes "[" + strcharinfo(0) + "]";
+		mes "Yes";
 		emotion e_sob,1;
 		next;
 		mes "[Complaining Galten]";
 		mes "Just forget about it quickly for your own good.";
-		close; }
+		close;
+	}
+	mes "[□ⅲ■ → ]";
 	mes "□◎← ◎ ⅲ←△ △ ";
 	mes "←※← △ ↑〓← ⒊ ◇";
 	next;
-	mes "[Complaining Galten]";
+	mes "[□ⅲ■ → ]";
 	mes "○⒈↑ ← □△ⅳ";
 	mes "ⅳ〓▲ ⒉ △";
 	next;
-	mes "- I can't understand what he's trying to say. -";
+	mes "Don't know what it means.";
 	close;
 }
 
-dicastes01,181,198,5	script	Traveler Ichack#info	481,{
+dicastes01,181,191,5	script	Traveler Ichack#info	481,2,2,{
 	mes "[Traveler Ichack]";
-	mes "Oh! You are a stranger!";
-	mes "I'm Traveler Ichack, the first person to arrive in El Dicastes.";
+	mes "Oh!! You are a stranger!";
+	mes "I'm Ichack the first adventurer that arrived here in El Dicastes!";
 	next;
 	mes "[Traveler Ichack]";
-	mes "I saw someone insist that he was the first one here but I'm telling you the truth. It was me! It's true!";
+	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 "I'm here to guide new visitors from Rune Midgard.";
-	mes "Do you want to know more about some places here?";
+	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:Residence:Training Room:Factory:Pub:Cat Guild")) {
+	switch (select("Dicastes Diel:Residential Area:Training Room:Factory:Pub:Cat Hand Caravan")) {
 		case 1:
 			mes "[Traveler Ichack]";
-			mes "Ah~ what a beautiful building.";
-			mes "I heard that they treat very important things.";
+			mes "Ah~ That's a beautiful building.";
+			mes "It's said they discuss important things...";
 			next;
 			mes "[Traveler Ichack]";
-			mes "If you don't register in Diel, you will be in trouble so you should stop by there.";
-			mes "Head north and you'll get there.";
-			close2;
-			viewpoint 1,198,351,1,0x00FF00;
-			end;
+			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 Safa tribe is really strange. How can they can sleep in there?";
+			mes "The Sapha tribe is so weird. How can they sleep in there?";
 			next;
 			mes "[Traveler Ichack]";
-			mes "Can't you understand?";
-			mes "Just see for yourself and it will be better!";
+			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 residence is separated into two places. The lower class and the upper class.";
-			mes "The lower class is south and the upper class is up north.";
-			close2;
-			viewpoint 1,280,283,2,0x00FF00;
-			viewpoint 1,136,106,3,0x3355FF;
-			end;
+			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 "It is too dangerous here so we need a security system.";
-			mes "Did you go to the training room? I don't think they ever sleep there.";
-			close2;
-			viewpoint 1,255,172,4,0xFBBBB9;
-			end;
+			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 "The factory is the most important place here for the Safa livelihood.";
-			mes "You can see the Bradium that the Safa make there.";
-			close2;
-			viewpoint 1,97,256,5,0x3355FF;
-			end;
+			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 "Actually, I arrived as the first adventurer but the owner of pub says he's the first.";
-			mes "The pub of Bumen Florine is located underground of the lower residence.";
-			close2;
-			viewpoint 1,136,106,6,0xE77471;
-			end;
+			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 don't seem to have a good relationship with the Safa either.";
-			mes "But due to shops they can't do that. Poor cats. They shiver from the cold out there.";
-			// -- NPC Traveler Ichack#info (1) shown minimap indicator at location 199, 39 with the color [R:153, G:51, B:255, A:255]
-			close2;
-			viewpoint 1,199,39,7,0x800080;
-			end;
+			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,{
-	mes "[Crazy Venknick]";
 	if (isequipped(2782)) {
-		mes "For only 5000 Zeny";
-		mes "I can tell you the sad legend behind that statue.";
+		mes "[Crazy Venknick]";
+		mes "At only 5000 Zeny";
+		mes "I will tell you the sad legend behind that statue.";
 		next;
-		if(select("Give 5000 Zeny.:Don't give 5000 Zeny.")==2) {
+		if(select("Give 5000 Zeny.:Don't give 5000 Zeny.") == 2) {
 			mes "[Crazy Venknick]";
 			mes "Don't come back with regrets.";
-			close; }
+			close; 
+		}
 		if (Zeny < 5000) {
 			mes "[Crazy Venknick]";
-			mes "Don't come back here if you don't have Zeny.";
-			close; }
+			mes "I have";
+			mes "no legend to share with";
+			mes "the poor.";
+			close;
+			close; 
+		}
 		set Zeny, Zeny-5000;
 		mes "[Crazy Venknick]";
 		mes "Thanks.";
@@ -677,14 +724,45 @@ dicastes01,202,197,4	script	Crazy Venknick#fihsing1	449,{
 		next;
 		emotion e_dots,1;
 		select("Was I tricked?");
+		sc_start SC_Blind,20000,0;
 		next;
-		sc_start SC_Blind,10000,0;
-		mes ""+strcharinfo(0)+"?";
-		mes "You feel outraged at being tricked...";
-		close; }
+		mes "You feel outraged at being tricked.";
+		close; 
+	}
+	mes "[???ú?ù ￠3 ]";
 	mes "⒉←◇ ◇ ※ⅳ▲";
 	mes "ⅳ○⒉ ⒈ ●■⒉ ▲ ★■↑";
 	next;
-	mes "- I can't understand what he's trying to say. -";
+	mes "Don't know what it means.";
+	close;
+}
+
+dic_in01,98,110,5	script	Worried Piom#a	489,{
+	if (isequipped(2782)) {
+		mes "[Worried Piom]";
+		mes "I haven't seen my friends for the last few hours.";
+		mes "It's about time for them to have";
+		mes "their Bradium. Hmm..";
+		close;
+	}
+	mes "[Worried Piom]";
+	mes "←⒈△ ⒉ ★〓◎ ↑ ★←⒉";
+	mes "★△ⅳ ⌒ ★★⌒ ⅳ ⅲ";
+	mes "△〓○ ◇ ●";
 	close;
 }
+
+dic_in01,98,96,3	script	Lost Galten#a	492,{
+	if (isequipped(2782)) {
+		mes "[Lost Galten]";
+		mes "I've been living as a Piom for too long";
+		mes "now it's like a bad habit.";
+		mes "and I find myself here all the time.";
+		close;
+	}
+	mes "[Lost Galten]";
+	mes "◇◆★ ← ⒊→";
+	mes "↑▲● ⅲ ";
+	mes "■★⒉ ← ■◇";
+	close;
+}

npc/re/merchants/shops.txt

@@ -3,13 +3,14 @@
 //===== By: ================================================== 
 //= rAthena Dev Team
 //===== Current Version: ===================================== 
-//= 1.0
+//= 1.1
 //===== Compatible With: ===================================== 
 //= rAthena SVN
 //===== Description: ========================================= 
 //= Renewal-specific town shop NPCs.
 //===== Additional Comments: ================================= 
 //= 1.0 Moved some merchants to a separate renewal file. [Kenpachi]
+//= 1.1 Added Dicastes merchants. [Joseph]
 //============================================================ 
 
 //=======================================================
@@ -48,3 +49,9 @@ s_atelier,17,110,1	shop	Part-Timer#sc_prt	67,6123:-1,6120:-1
 //=======================================================
 ra_in01,257,266,4	shop	Black Marketeer#ra	49,2139:-1,2800:-1,2801:-1,2802:-1,2803:-1,2804:-1,2805:-1,2806:-1,2807:-1,18000:-1,18001:-1,18002:-1,18003:-1,18004:-1,12392:-1,12393:-1,12394:-1,6145:-1,6146:-1,6147:-1,6186:-1,2808:-1
 s_atelier,137,60,3	shop	Part-Timer#sc_ra	70,6123:-1,6120:-1
+
+//=======================================================
+// Dicastes
+//=======================================================
+dic_in01,238,107,5	shop	Peddler#dic	900,601:-1,602:-1,611:-1,610:-1
+dicastes01,207,200,6	shop	Points Merchant#dic	66,6360:-1,6361:-1,6362:-1,6363:-1

npc/re/warps/cities/dicastes.txt

@@ -1,9 +1,9 @@
 //===== rAthena Script =======================================
 //= El Dicastes Warp Script
 //===== By: ==================================================
-//= Chilly
+//= Chilly, Muad_Dib
 //===== Current Version: =====================================
-//= 1.2
+//= 1.3
 //===== Compatible With: =====================================
 //= rAthena SVN
 //===== Description: =========================================
@@ -12,181 +12,63 @@
 //= 1.0 First Version.
 //= 1.1 Added Elevators.
 //= 1.2 Removed a warp. [Joseph] 
+//= 1.3 Updated to match official script. [Joseph]
 //============================================================
 
 // Town Warps
-dicastes01,283,285,0	warp	eldicastes0001	1,1,dic_in01,45,31
-dic_in01,45,28,0	warp	eldicastes0002	1,1,dicastes01,281,283
-dicastes01,163,297,0	warp	eldicastes0003	1,1,dic_in01,372,102
-dic_in01,372,99,0	warp	eldicastes0004	1,1,dicastes01,163,294
-dicastes01,94,259,0	warp	eldicastes0005	1,1,dic_in01,390,52
-dic_in01,390,55,0	warp	eldicastes0006	1,1,dicastes01,96,257
-dicastes01,136,103,0	warp	eldicastes0007	1,1,dic_in01,26,99
-dic_in01,26,96,0	warp	eldicastes0008	1,1,dicastes01,136,106
-dicastes01,255,175,0	warp	eldicastes0009	1,1,dic_in01,345,271
-dic_in01,342,271,0	warp	eldicastes0010	1,1,dicastes01,255,172
-dicastes01,198,353,0	warp	eldicastes0011	1,1,dicastes02,120,81
-dicastes02,120,77,0	warp	eldicastes0012	1,1,dicastes01,198,349
-dicastes02,120,237,0	warp	eldicastes0013	1,1,dic_in01,45,247
-dic_in01,45,244,0	warp	eldicastes0014	1,1,dicastes02,120,234
-dic_in01,242,180,0	warp	eldicastes0015	1,1,dic_in01,138,223
-dic_in01,300,248,0	warp	eldicastes0016	1,1,dic_in01,262,191
+dicastes01,283,285,0	warp	eldicastes0001	1,1,dic_in01,45,30
+dic_in01,45,28,0	warp	eldicastes0002	1,1,dicastes01,281,284
+dicastes01,163,297,0	warp	eldicastes0003	1,1,dic_in01,371,101
+dic_in01,372,99,0	warp	eldicastes0004	1,1,dicastes01,163,295
+dicastes01,94,259,0	warp	eldicastes0005	1,1,dic_in01,390,53
+dic_in01,390,55,0	warp	eldicastes0006	1,1,dicastes01,95,257
+dicastes01,136,103,0	warp	eldicastes0007	1,1,dic_in01,26,98
+dic_in01,26,96,0	warp	eldicastes0008	1,1,dicastes01,137,106
+dicastes01,255,175,0	warp	eldicastes0009	1,1,dic_in01,344,272
+dic_in01,342,271,0	warp	eldicastes0010	1,1,dicastes01,255,173
+dicastes01,198,353,0	warp	eldicastes0011	1,1,dicastes02,120,80
+dicastes02,120,77,0	warp	eldicastes0012	1,1,dicastes01,197,351
+dicastes02,120,237,0	warp	eldicastes0013	1,1,dic_in01,45,246
+dic_in01,45,244,0	warp	eldicastes0014	1,1,dicastes02,119,235
+dic_in01,299,248,0	warp	eldicastes0015	1,1,dic_in01,262,191
 
-// Elevators
-dic_in01,46,288,4	script	Elevator#01	111,{
-	switch(select("Headquarters","Document Vault","General Command Room","Top Secret")) {
-	case 1:
-		warp "dic_in01",46,286;
-		end;
-	case 2:
-		warp "dic_in01",36,212;
-		end;
-	case 3:
-		warp "dic_in01",122,282;
-		end;
-	case 4:
-		warp "dic_in01",122,201;
-		end;
-	}
+dic_in01,242,182,0	script	eldicastes0016	844,{
+	if (isequipped(2782)) select("Administrative Office");
+	else select("△→○");
+	warp "dic_in01",138,221;
+	end;
 }
 
-dic_in01,36,214,4	script	Elevator#02	111,{
-	switch(select("Headquarters","Document Vault","General Command Room","Top Secret")) {
-	case 1:
-		warp "dic_in01",46,286;
-		end;
-	case 2:
-		warp "dic_in01",36,212;
-		end;
-	case 3:
-		warp "dic_in01",122,282;
-		end;
-	case 4:
-		warp "dic_in01",122,201;
-		end;
-	}
-}
-
-dic_in01,122,284,4	script	Elevator#03	111,{
-	switch(select("Headquarters","Document Vault","General Command Room","Top Secret")) {
-	case 1:
-		warp "dic_in01",46,286;
-		end;
-	case 2:
-		warp "dic_in01",36,212;
-		end;
-	case 3:
-		warp "dic_in01",122,282;
-		end;
-	case 4:
-		warp "dic_in01",122,201;
-		end;
-	}
-}
-
-dic_in01,123,205,4	script	Elevator#04	111,{
-	switch(select("Headquarters","Document Vault","General Command Room","Top Secret")) {
-	case 1:
-		warp "dic_in01",46,286;
-		end;
-	case 2:
-		warp "dic_in01",36,212;
-		end;
-	case 3:
-		warp "dic_in01",122,282;
-		end;
-	case 4:
-		warp "dic_in01",122,202;
-		end;
-	}
-}
-
-dic_in01,44,116,4	script	Elevator#05	111,{
-	switch(select("1st Floor Residence","2nd Floor Residence","3rd Floor Residence","The Pub")) {
-	case 1:
-		warp "dic_in01",42,116;
-		end;
-	case 2:
-		warp "dic_in01",110,108;
-		end;
-	case 3:
-		warp "dic_in01",178,108;
-		end;
-	case 4:
-		warp "dic_in01",260,116;
-		end;
-	}
-}
-
-dic_in01,112,108,4	script	Elevator#06	111,{
-	switch(select("1st Floor Residence","2nd Floor Residence","3rd Floor Residence","The Pub")) {
-	case 1:
-		warp "dic_in01",42,116;
-		end;
-	case 2:
-		warp "dic_in01",110,108;
-		end;
-	case 3:
-		warp "dic_in01",178,108;
-		end;
-	case 4:
-		warp "dic_in01",260,116;
-		end;
-	}
-}
-
-dic_in01,180,108,4	script	Elevator#07	111,{
-	switch(select("1st Floor Residence","2nd Floor Residence","3rd Floor Residence","The Pub")) {
-	case 1:
-		warp "dic_in01",42,116;
-		end;
-	case 2:
-		warp "dic_in01",110,108;
-		end;
-	case 3:
-		warp "dic_in01",178,108;
-		end;
-	case 4:
-		warp "dic_in01",260,116;
-		end;
-	}
-}
-
-dic_in01,262,116,4	script	Elevator#08	111,{
-	switch(select("1st Floor Residence","2nd Floor Residence","3rd Floor Residence","The Pub")) {
-	case 1:
-		warp "dic_in01",42,116;
-		end;
-	case 2:
-		warp "dic_in01",110,108;
-		end;
-	case 3:
-		warp "dic_in01",178,108;
-		end;
-	case 4:
-		warp "dic_in01",260,116;
-		end;
+// Elevators
+-	script	Elevator#main	-1,{
+	set .@n, atoi(strnpcinfo(2));
+	set .@eq, (isequipped(2782))?1:0;
+	if (.@n <= 4) {
+		set .@m$, (.@eq)?"Civil Services:Archive Room:Situation Room:Administrative Office":"⒊○⌒:●●◎:▲▲○:△→○";
+		setarray .@xy, 45,286,36,212,122,282,121,201;
 	}
-}
-
-dic_in01,388,272,4	script	Elevator#09	111,{
-	switch(select("Battle Room","Residence Area")) {
-	case 1:
-		warp "dic_in01",386,272;
-		end;
-	case 2:
-		warp "dic_in01",386,208;
-		end;
+	else if (.@n <= 11) {
+		set .@m$, (.@eq)?"Residential Zone 1:Residential Zone 2:Residential Zone 3:Pub Burman Flone":"◆□● 〓 :⒊↑⌒ → :★⒊ⅳ ⒉ :⒈⌒●";
+		setarray .@xy, 42,115,110,108,178,108,260,115;
 	}
-}
-
-dic_in01,388,208,4	script	Elevator#10	111,{
-	switch(select("Battle Room","Residence Area")) {
-	case 1:
-		warp "dic_in01",386,272;
-		end;
-	case 2:
-		warp "dic_in01",386,208;
-		end;
+	else if (.@n <= 13) {
+		set .@m$, (.@eq)?"Battle Station:Galten Quarters":"▲◆★ ◎ :↑△◇ △ ";
+		setarray .@xy, 385,272,385,208;
 	}
+	set .@m, select(.@m$) - 1;
+	warp "dic_in01",.@xy[.@m*2],.@xy[.@m*2+1];
+	end;
 }
+dic_in01,46,288,0	duplicate(Elevator#main)	Elevator#1	844
+dic_in01,122,284,0	duplicate(Elevator#main)	Elevator#2	844
+dic_in01,121,203,0	duplicate(Elevator#main)	Elevator#3	844
+dic_in01,35,214,0	duplicate(Elevator#main)	Elevator#4	844
+dic_in01,44,116,0	duplicate(Elevator#main)	Elevator#5	844
+dic_in01,112,108,0	duplicate(Elevator#main)	Elevator#6	844
+dic_in01,180,108,0	duplicate(Elevator#main)	Elevator#7	844
+dic_in01,261,115,0	duplicate(Elevator#main)	Elevator#8	844
+dic_in01,57,48,0	duplicate(Elevator#main)	Elevator#9	844
+dic_in01,137,46,0	duplicate(Elevator#main)	Elevator#10	844
+dic_in01,222,46,0	duplicate(Elevator#main)	Elevator#11	844
+dic_in01,388,272,0	duplicate(Elevator#main)	Elevator#12	844
+dic_in01,389,208,0	duplicate(Elevator#main)	Elevator#13	844

npc/re/warps/dungeons/dic_dun.txt

@@ -1,24 +1,25 @@
 //===== rAthena Script =======================================
 //= Scaraba Hole Warp Script
 //===== By: ==================================================
-//= Chilly
+//= Chilly, Muad_Dib
 //===== Current Version: =====================================
-//= 1.0
+//= 1.1
 //===== Compatible With: =====================================
 //= rAthena SVN
 //===== Description: =========================================
 //= Warp Points for Scaraba Hole
 //===== Additional Comments: =================================
 //= 1.0 First Version.
+//= 1.1 Updated to match official script. [Joseph]
 //============================================================
 
-dic_dun01,88,212,0	warp	scarabahole0001	1,1,dic_dun01,168,228
-dic_dun01,164,228,0	warp	scarabahole0002	1,1,dic_dun01,84,212
+dic_dun01,87,212,0	warp	scarabahole0001	1,1,dic_dun01,169,227
+dic_dun01,165,227,0	warp	scarabahole0002	1,1,dic_dun01,83,212
 dic_dun01,371,228,0	warp	scarabahole0003	1,1,dic_dun01,32,156
 dic_dun01,28,156,0	warp	scarabahole0004	1,1,dic_dun01,367,228
 dic_dun01,371,172,0	warp	scarabahole0005	1,1,dic_dun01,32,100
 dic_dun01,28,100,0	warp	scarabahole0006	1,1,dic_dun01,367,172
-dic_dun02,102,148,0	warp	scarabahole0007	1,1,dic_dun01,290,103
-dic_dun01,370,100,0	warp	scarabahole0008	1,1,dic_dun01,33,44
-dic_dun01,29,44,0	warp	scarabahole0009	1,1,dic_dun01,366,100
-dic_dun03,102,148,0	warp	scarabahole0010	1,1,dic_dun01,290,103
+dic_dun02,102,148,0	warp	scarabahole0007	1,1,dic_dun01,290,99
+dic_dun01,371,100,0	warp	scarabahole0008	1,1,dic_dun01,33,43
+dic_dun01,29,43,0	warp	scarabahole0009	1,1,dic_dun01,367,100
+dic_dun03,101,148,0	warp	scarabahole0010	1,1,dic_dun01,286,102

npc/re/warps/fields/dic_fild.txt

@@ -1,19 +1,20 @@
 //===== rAthena Script =======================================
 //= El Dicastes Field Warp Script
 //===== By: ==================================================
-//= Chilly
+//= Chilly, Muad_Dib
 //===== Current Version: =====================================
-//= 1.0
+//= 1.1
 //===== Compatible With: =====================================
 //= rAthena SVN
 //===== Description: =========================================
 //= Warp Points for El Dicastes Field
 //===== Additional Comments: =================================
 //= 1.0 First Version.
+//= 1.1 Updated to match the official script. [Joseph]
 //============================================================
 
 dic_dun01,371,44,0	warp	dic_field0001	1,1,dic_fild01,28,79
-dic_fild01,24,79,0	warp	dic_field0002	1,1,dic_dun01,367,44
-dic_fild01,69,23,0	warp	dic_field0003	1,1,dic_fild02,71,371
-dic_fild02,71,375,0	warp	dic_field0004	1,1,dic_fild01,69,27
-dicastes01,199,34,0	warp	dic_field0005	1,1,dic_fild01,150,277
+dic_fild01,24,79,0	warp	dic_field0002	1,1,dic_dun01,366,45
+dic_fild01,69,23,0	warp	dic_field0003	1,1,dic_fild02,70,373
+dic_fild02,71,375,0	warp	dic_field0004	1,1,dic_fild01,69,25
+dicastes01,199,34,0	warp	dic_field0005	1,1,dic_fild01,149,279