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

- Standardized header.

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

3 files changed, 68 insertions, 184 deletions

diff --git a/npc/re/warps/cities/dicastes.txt b/npc/re/warps/cities/dicastes.txt
index 2f1950a9c..4c767df67 100644
--- a/npc/re/warps/cities/dicastes.txt
+++ b/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
\ No newline at end of file
diff --git a/npc/re/warps/dungeons/dic_dun.txt b/npc/re/warps/dungeons/dic_dun.txt
index 63d5e8f0b..2af6d4445 100644
--- a/npc/re/warps/dungeons/dic_dun.txt
+++ b/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
diff --git a/npc/re/warps/fields/dic_fild.txt b/npc/re/warps/fields/dic_fild.txt
index 10c9a5635..d49b5f5c7 100644
--- a/npc/re/warps/fields/dic_fild.txt
+++ b/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