11 files changed, 24 insertions, 40 deletions
diff --git a/npc/warps/fields/amatsu_fild.txt b/npc/warps/fields/amatsu_fild.txt
index 93c5eccf2..d9f0f5bd3 100644
--- a/npc/warps/fields/amatsu_fild.txt
+++ b/npc/warps/fields/amatsu_fild.txt
@@ -5,7 +5,7 @@
 //===== Current Version: =====================================
 //= 1.1
 //===== Description: =========================================
-//= [Aegis COnversion]
+//= [Official Conversion]
 //= Warp Points for Amatsu Field
 //===== Additional Comments: =================================
 //= 1.1 Rescripted to Aegis 10.3 standards. [L0ne_W0lf]
diff --git a/npc/warps/fields/ein_fild.txt b/npc/warps/fields/ein_fild.txt
index c83a13b1e..f6a25c4a1 100644
--- a/npc/warps/fields/ein_fild.txt
+++ b/npc/warps/fields/ein_fild.txt
@@ -1,11 +1,9 @@
-//===== rAthena Script =======================================
+//===== Hercules Script ======================================
 //= Einbroch Field Warp Script
 //===== By: ==================================================
 //= Sara-chan (1.0), SSUNNY@YOUNG(1.2)
 //===== Current Version: =====================================
 //= 1.2
-//===== Compatible With: =====================================
-//= Any Athena Version; RO Episode 8+
 //===== Description: =========================================
 //= Warp Points for Lighthalzen Field
 //===== Additional Comments: =================================
diff --git a/npc/warps/fields/gefenia.txt b/npc/warps/fields/gefenia.txt
index 832bdea74..ce89232e7 100644
--- a/npc/warps/fields/gefenia.txt
+++ b/npc/warps/fields/gefenia.txt
@@ -1,4 +1,4 @@
-//===== rAthena Script =======================================
+//===== Hercules Script ======================================
 //= Gefenia Warp Script
 //===== By: ==================================================
 //= Muad Dib (1.0)
@@ -6,8 +6,6 @@
 //= Nana (1.2)
 //===== Current Version: =====================================
 //= 1.3
-//===== Compatible With: =====================================
-//= Any Athena Version; RO Episode 6+
 //===== Description: =========================================
 //= Warp Points for Gefenia
 //===== Additional Comments: =================================
diff --git a/npc/warps/fields/glastheim.txt b/npc/warps/fields/glastheim.txt
index e5d2d359b..b40cac0b5 100644
--- a/npc/warps/fields/glastheim.txt
+++ b/npc/warps/fields/glastheim.txt
@@ -1,17 +1,16 @@
-//===== rAthena Script =======================================
+//===== Hercules Script ======================================
 //= Glastheim Warp Script
 //===== By: ==================================================
 //= Athena (1.0)
 //===== Current Version: =====================================
-//= 1.4
-//===== Compatible With: =====================================
-//= Any Athena Version; RO Episode 2.x
+//= 1.5
 //===== Description: =========================================
 //= Warp Points for Glastheim
 //===== Additional Comments: =================================
 //= Split off npc_warp.txt, 1.1 added gl18-2 [Lupus]
 //= optimized random warp [Lupus] fixed looped warps
 //= 1.4 Corrected NPC names to fall within proper restrictions. [L0ne_W0lf]
+//= 1.5 Fixed random warp coordinates. [Euphy]
 //============================================================
 
 //Glastheim
@@ -52,10 +51,13 @@ gl_knt02,10,138,0	warp	gl14-1	1,1,gl_knt01,7,148
 gl_knt02,157,292,0	warp	gl16-1	1,1,gl_knt01,150,286
 gl_knt02,289,138,0	warp	gl17-1	1,1,gl_knt01,292,144
 gl_prison,149,183,0	warp	gl18-1	1,1,gl_prison1,150,14
-gl_prison,10,70,4	script	gl18-2	45,1,1,{
-if(rand(2)==1) goto w2;
-	warp "gl_cas01",236,192; end;
-w2: warp "gl_cas01",164,191; end;
+gl_prison,11,70,0	script	gl18-2	45,1,1,{
+	switch(rand(4)) {
+		case 0: warp "gl_cas01",163,193; end;
+		case 1: warp "gl_cas01",238,192; end;
+		case 2: warp "gl_cas01",144,314; end;
+		case 3: warp "gl_cas01",367,301; end;
+	}
 }
 gl_prison1,150,10,0	warp	gl18	1,1,gl_prison,149,178
 gl_prison1,62,187,0	warp	gl10	1,1,gl_sew01,258,255
diff --git a/npc/warps/fields/jawaii.txt b/npc/warps/fields/jawaii.txt
index 024f97c1f..d1945ffad 100644
--- a/npc/warps/fields/jawaii.txt
+++ b/npc/warps/fields/jawaii.txt
@@ -1,4 +1,4 @@
-//===== rAthena Script =======================================
+//===== Hercules Script ======================================
 //= Jawaii Warp Script
 //===== By: ==================================================
 //= Muad Dib (1.0)
@@ -6,8 +6,6 @@
 //= MasterOfMuppets (1.2)
 //===== Current Version: =====================================
 //= 1.2b
-//===== Compatible With: =====================================
-//= Any Athena Version; RO Episode 6+
 //===== Description: =========================================
 //= Warp Points for Jawaii
 //===== Additional Comments: =================================
diff --git a/npc/warps/fields/lhalzen_fild.txt b/npc/warps/fields/lhalzen_fild.txt
index 10a5b5d7e..85f06cb87 100644
--- a/npc/warps/fields/lhalzen_fild.txt
+++ b/npc/warps/fields/lhalzen_fild.txt
@@ -1,11 +1,9 @@
-//===== rAthena Script =======================================
+//===== Hercules Script ======================================
 //= Lighthalzen Field Warp Script
 //===== By: ==================================================
 //= Sara-chan (1.0)
 //===== Current Version: =====================================
 //= 1.2
-//===== Compatible With: =====================================
-//= Any Athena Version; RO Episode 8+
 //===== Description: =========================================
 //= Warp Points for Lighthalzen Field
 //===== Additional Comments: =================================
diff --git a/npc/warps/fields/lutie_fild.txt b/npc/warps/fields/lutie_fild.txt
index 8e944bd81..3fd47b22d 100644
--- a/npc/warps/fields/lutie_fild.txt
+++ b/npc/warps/fields/lutie_fild.txt
@@ -1,13 +1,11 @@
-//===== rAthena Script =======================================
+//===== Hercules Script ======================================
 //= Lutie Field Warp Script
 //===== By: ==================================================
 //= Nana (1.0)
 //===== Current Version: =====================================
 //= 1.1
-//===== Compatible With: =====================================
-//= Any Athena Version; RO Episode 2+
 //===== Description: =========================================
-//= [Aegis Conversion]
+//= [Official Conversion]
 //= Warp Points for Lutie Field
 //===== Additional Comments: =================================
 //= 1.2 Rescripted to Aegis 10.3 standards. [L0ne_W0lf]
diff --git a/npc/warps/fields/man_fild.txt b/npc/warps/fields/man_fild.txt
index 55e799a69..3e355700b 100644
--- a/npc/warps/fields/man_fild.txt
+++ b/npc/warps/fields/man_fild.txt
@@ -1,13 +1,11 @@
-//===== rAthena Script =======================================
+//===== Hercules Script ======================================
 //= Manuk Field Warp Script
 //===== By: ==================================================
 //= L0ne_W0lf
 //===== Current Version: =====================================
 //= 1.1
-//===== Compatible With: =====================================
-//= Any Athena Version
 //===== Description: =========================================
-//= [Aegis Conversion]
+//= [Official Conversion]
 //= Warp Points for Manuk Field
 //===== Additional Comments: =================================
 //= 1.0 First Version.
diff --git a/npc/warps/fields/mtmjolnir.txt b/npc/warps/fields/mtmjolnir.txt
index 1c49ddc96..efd0bbf57 100644
--- a/npc/warps/fields/mtmjolnir.txt
+++ b/npc/warps/fields/mtmjolnir.txt
@@ -1,11 +1,9 @@
-//===== rAthena Script =======================================
+//===== Hercules Script ======================================
 //= Mt. Mjolnir Warp Script
 //===== By: ==================================================
 //= Nana (1.0)
 //===== Current Version: =====================================
 //= 1.2a
-//===== Compatible With: =====================================
-//= Any Athena Version
 //===== Description: =========================================
 //= Warp Points for Mt. Mjolnir
 //===== Additional Comments: =================================
diff --git a/npc/warps/fields/spl_fild.txt b/npc/warps/fields/spl_fild.txt
index 1860636ff..024f76bde 100644
--- a/npc/warps/fields/spl_fild.txt
+++ b/npc/warps/fields/spl_fild.txt
@@ -1,13 +1,11 @@
-//===== rAthena Script =======================================
+//===== Hercules Script ======================================
 //= Splendid Field Warp Script
 //===== By: ==================================================
 //= L0ne_W0lf
 //===== Current Version: =====================================
 //= 1.2
-//===== Compatible With: =====================================
-//= Any Athena Version
 //===== Description: =========================================
-//= [Aegis Conversion]
+//= [Official Conversion]
 //= Warp Points for Splendide
 //===== Additional Comments: =================================
 //= 1.0 First Version.
diff --git a/npc/warps/fields/umbala_fild.txt b/npc/warps/fields/umbala_fild.txt
index 1282257e4..0ed3dc47c 100644
--- a/npc/warps/fields/umbala_fild.txt
+++ b/npc/warps/fields/umbala_fild.txt
@@ -1,13 +1,11 @@
-//===== rAthena Script =======================================
+//===== Hercules Script ======================================
 //= Umbala Field Warp Script
 //===== By: ==================================================
 //= Nana (1.0)
 //===== Current Version: =====================================
 //= 1.1
-//===== Compatible With: =====================================
-//= Any Athena Version; RO Episode 6+
 //===== Description: =========================================
-//= [Aegis Conversion]
+//= [Official Conversion]
 //= Warp Points for Umbala Field
 //===== Additional Comments: =================================
 //= 1.1 Rescripted to Aegis 10.3 Standards. [L0ne_W0lf]