Merge pull request #1 from Earisu/master

updating, with earisu's

8 files changed, 121 insertions, 74 deletions

diff --git a/npc/re/warps/cities/brasilis.txt b/npc/re/warps/cities/brasilis.txt
index 131b4d1ca..e5e8a5386 100644
--- a/npc/re/warps/cities/brasilis.txt
+++ b/npc/re/warps/cities/brasilis.txt
@@ -1,11 +1,9 @@
-//===== rAthena Script =======================================
+//===== Hercules Script ======================================
 //= Brasilis Town Warps Script
 //===== By: ==================================================
 //= L0ne_W0lf
 //===== Current Version: =====================================
 //= 1.2
-//===== Compatible With: =====================================
-//= Any Athena Version; RO Episode 13.1+
 //===== Description: =========================================
 //= [Aegis Conversion]
 //= Warp Points for Brasilis
diff --git a/npc/re/warps/cities/dewata.txt b/npc/re/warps/cities/dewata.txt
index d5c0b7f93..9ca29688c 100644
--- a/npc/re/warps/cities/dewata.txt
+++ b/npc/re/warps/cities/dewata.txt
@@ -3,7 +3,7 @@
 //===== By: ==================================================
 //= Chilly
 //===== Current Version: =====================================
-//= 1.1
+//= 1.2
 //===== Compatible With: =====================================
 //= rAthena SVN
 //===== Description: =========================================
@@ -11,11 +11,12 @@
 //===== Additional Comments: =================================
 //= 1.0 First version
 //= 1.1 Disabled warps that clash with quest warps. [Euphy]
+//= 1.2 Updated to match official scripts. [Lemongrass]
 //============================================================
 
-dewata,44,252,0	warp	dewata0001	1,1,dew_fild01,372,212
-dew_fild01,375,212,0	warp	dewata0002	1,1,dewata,47,252
-//dew_fild01,57,273,0	warp	dewata0003	1,1,dew_in01,16,34
-//dew_in01,16,31,0	warp	dewata0004	1,1,dew_fild01,60,273
+dewata,44,252,0	warp	dewata0001	1,1,dew_fild01,373,212
+dew_fild01,375,212,0	warp	dewata0002	1,1,dewata,46,251
+//dew_fild01,57,273,0	warp	dewata0003	1,1,dew_in01,15,33
+//dew_in01,16,31,0	warp	dewata0004	1,1,dew_fild01,59,273
 dew_fild01,48,65,0	warp	dewata0005	1,1,dew_dun02,302,30
-dew_dun02,305,30,0	warp	dewata0006	1,1,dew_fild01,51,65
+dew_dun02,305,30,0	warp	dewata0006	1,1,dew_fild01,50,65
diff --git a/npc/re/warps/cities/izlude.txt b/npc/re/warps/cities/izlude.txt
index 149e61531..4be33317e 100644
--- a/npc/re/warps/cities/izlude.txt
+++ b/npc/re/warps/cities/izlude.txt
@@ -1,33 +1,41 @@
-//===== rAthena Script =======================================
+//===== Hercules Script ======================================
 //= Izlude Warp Script
 //===== By: ==================================================
 //= Athena (1.0), Nana (1.1)
 //===== Current Version: =====================================
-//= 1.4
+//= 1.7
 //===== Compatible With: =====================================
-//= Any Athena Version
+//= Any Athena & Hercules Version
 //===== Description: =========================================
 //= Warp Points for Izlude
 //===== Additional Comments: =================================
 //= 1.3 Added warps to Izlude Airship [Justin84]
 //= 1.4 Minor correction on airport warps
 //= 1.5 Updated to match the new Izlude Map. [Masao]
+//= 1.6 Added new warps [Streusel]
+//= 1.7 Removed indoor warps [Streusel]
 //============================================================
 
 //= Izlude City ==============================================
 izlude,109,182,0	warp	iz01	3,3,izlude_in,65,87
-izlude,162,125,0	warp	iz02	2,2,izlude_in,116,49
 izlude,216,162,0	warp	iz03	3,2,izlude_in,151,127
 izlude,21,98,0	warp	iz001	3,3,prt_fild08,367,212
 izlude,52,172,0	warp	iz04	2,2,izlude_in,74,161
+izlude,130,257,0	warp	iz09#1	2,2,iz_ac01,99,29
+izlude,125,257,0	warp	iz09#2	2,2,iz_ac01,99,29
+izlude,213,161,0	warp	iz10	2,2,arena_room,100,30
+arena_room,99,24,0	warp	iz_arena	2,2,izlude,209,161
 izlude_in,108,169,0	warp	iz05	2,3,izlude_in,84,169
-izlude_in,116,46,0	warp	iz02-1	3,2,izlude,157,125
 izlude_in,148,127,0	warp	iz03-1	2,5,izlude,207,162
-izlude_in,171,97,0	warp	iz06	3,2,izlude_in,172,119
-izlude_in,172,116,0	warp	iz06-1	3,2,izlude_in,172,94
-izlude_in,172,139,0	warp	iz07	3,2,izlude_in,172,161
-izlude_in,172,158,0	warp	iz07-1	3,2,izlude_in,172,136
+
 izlude_in,43,169,0	warp	w219	2,3,izlude_in,64,169
 izlude_in,65,84,0	warp	iz01-1	5,2,izlude,113,178
 izlude_in,74,158,0	warp	iz04-1	3,2,izlude,52,166
 izlude_in,87,169,0	warp	iz05-1	2,3,izlude_in,111,169
+
+//Izlude Academy
+iz_ac01,100,24,0	warp	iz_ac01	2,2,izlude,127,253
+iz_ac01,122,25,0	warp	iz_ac02	2,2,iz_ac02,104,27
+iz_ac01,78,25,0	warp	iz_ac03	2,2,iz_ac02,104,27
+iz_ac02,113,27,0	warp	iz_ac04	2,2,iz_ac01,122,28
+iz_ac02,94,27,0	warp	iz_ac05	2,2,iz_ac01,78,28
\ No newline at end of file
diff --git a/npc/re/warps/cities/malangdo.txt b/npc/re/warps/cities/malangdo.txt
index 11810196b..f2bf50572 100644
--- a/npc/re/warps/cities/malangdo.txt
+++ b/npc/re/warps/cities/malangdo.txt
@@ -1,63 +1,64 @@
-//===== rAthena Script =======================================
+//===== Hercules Script =======================================
 //= Malangdo Island Warp Script
 //===== By: ==================================================
 //= Chilly
 //===== Current Version: =====================================
-//= 1.0
+//= 1.1
 //===== Compatible With: =====================================
-//= rAthena SVN
+//= Hercules
 //===== Description: =========================================
 //= Warp Points for Malangdo Island
 //===== Additional Comments: =================================
 //= 1.0 First version
+//= 1.1 Updated warps. [Euphy]
 //============================================================
 
 // Town Warps
-malangdo,240,150,0	warp	malangdo0001	1,1,mal_in01,12,16
-mal_in01,9,16,0	warp	malangdo0002	1,1,malangdo,237,150
-mal_in01,20,15,0	warp	malangdo0003	1,1,mal_in01,67,9
-mal_in01,67,12,0	warp	malangdo0004	1,1,mal_in01,20,12
-malangdo,112,168,0	warp	malangdo0005	1,1,mal_in01,18,164
-mal_in01,18,161,0	warp	malangdo0006	1,1,malangdo,114,166
-mal_in01,18,173,0	warp	malangdo0007	1,1,mal_in01,72,174
-mal_in01,75,174,0	warp	malangdo0008	1,1,mal_in01,18,170
+malangdo,240,150,0	warp	malangdo0001	1,1,mal_in01,11,17
+mal_in01,9,16,0	warp	malangdo0002	1,1,malangdo,238,149
+mal_in01,20,15,0	warp	malangdo0003	1,1,mal_in01,65,11
+mal_in01,67,12,0	warp	malangdo0004	1,1,mal_in01,20,13
+malangdo,112,167,0	warp	malangdo0005	1,1,mal_in01,17,163
+mal_in01,18,161,0	warp	malangdo0006	1,1,malangdo,115,166
+mal_in01,18,173,0	warp	malangdo0007	1,1,mal_in01,72,173
+mal_in01,75,174,0	warp	malangdo0008	1,1,mal_in01,18,171
 mal_in01,73,170,0	warp	malangdo0009	1,1,mal_in01,124,172
 mal_in01,124,175,0	warp	malangdo0010	1,1,mal_in01,70,170
-malangdo,113,151,0	warp	malangdo0011	1,1,mal_in01,27,119
-mal_in01,30,119,0	warp	malangdo0012	1,1,malangdo,116,151
-mal_in01,20,119,0	warp	malangdo0013	1,1,mal_in01,67,115
-mal_in01,67,118,0	warp	malangdo0014	1,1,mal_in01,20,116
-malangdo,119,137,0	warp	malangdo0015	1,1,mal_in01,35,217
-mal_in01,38,217,0	warp	malangdo0016	1,1,malangdo,122,137
-mal_in01,11,218,0	warp	malangdo0017	1,1,mal_in01,75,219
-mal_in01,75,222,0	warp	malangdo0018	1,1,mal_in01,11,221
+malangdo,113,151,0	warp	malangdo0011	1,1,mal_in01,28,118
+mal_in01,30,119,0	warp	malangdo0012	1,1,malangdo,115,150
+mal_in01,20,119,0	warp	malangdo0013	1,1,mal_in01,65,117
+mal_in01,67,118,0	warp	malangdo0014	1,1,mal_in01,20,117
+malangdo,119,137,0	warp	malangdo0015	1,1,mal_in01,36,216
+mal_in01,38,217,0	warp	malangdo0016	1,1,malangdo,121,138
+mal_in01,11,218,0	warp	malangdo0017	1,1,mal_in01,75,220
+mal_in01,75,222,0	warp	malangdo0018	1,1,mal_in01,12,221
 mal_in01,79,219,0	warp	malangdo0019	1,1,mal_in01,140,216
-mal_in01,140,213,0	warp	malangdo0020	1,1,mal_in01,79,216
-malangdo,135,109,0	warp	malangdo0021	1,1,mal_in01,18,75
-mal_in01,18,78,0	warp	malangdo0022	1,1,malangdo,135,112
-mal_in01,18,67,0	warp	malangdo0023	1,1,mal_in01,67,63
-mal_in01,67,66,0	warp	malangdo0024	1,1,mal_in01,21,67
-malangdo,135,276,0	warp	malangdo0025	1,1,mal_in01,163,16
-mal_in01,163,13,0	warp	malangdo0026	1,1,malangdo,135,273
+mal_in01,140,213,0	warp	malangdo0020	1,1,mal_in01,80,216
+malangdo,135,109,0	warp	malangdo0021	1,1,mal_in01,19,76
+mal_in01,18,78,0	warp	malangdo0022	1,1,malangdo,135,111
+mal_in01,18,67,0	warp	malangdo0023	1,1,mal_in01,65,65
+mal_in01,67,66,0	warp	malangdo0024	1,1,mal_in01,20,67
+malangdo,135,276,0	warp	malangdo0025	1,1,mal_in01,164,15
+mal_in01,163,13,0	warp	malangdo0026	1,1,malangdo,135,274
 malangdo,73,239,0	warp	malangdo0027	1,1,mal_dun01,33,230
-mal_dun01,30,230,0	warp	malangdo0028	1,1,malangdo,75,237
+mal_dun01,30,230,0	warp	malangdo0028	1,1,malangdo,75,236
 
 // Ship Warps
-malangdo,162,163,0	warp	malangdo_ship0001	1,1,mal_in02,57,61
-mal_in02,60,61,0	warp	malangdo_ship0002	1,1,malangdo,164,161
+malangdo,162,163,0	warp	malangdo_ship0001	1,1,mal_in02,58,61
+mal_in02,60,61,0	warp	malangdo_ship0002	1,1,malangdo,164,163
 mal_in02,51,60,0	warp	malangdo_ship0003	1,1,mal_in02,31,60
-mal_in02,34,60,0	warp	malangdo_ship0004	1,1,mal_in02,54,60
-mal_in02,63,53,0	warp	malangdo_ship0005	1,1,mal_in02,63,32
-mal_in02,63,35,0	warp	malangdo_ship0006	1,1,mal_in02,63,56
-mal_in02,63,66,0	warp	malangdo_ship0007	1,1,mal_in02,64,90
-mal_in02,64,87,0	warp	malangdo_ship0008	1,1,mal_in02,63,63
-mal_in02,101,53,0	warp	malangdo_ship0009	1,1,mal_in02,101,32
-mal_in02,101,35,0	warp	malangdo_ship0010	1,1,mal_in02,101,56
-mal_in02,101,66,0	warp	malangdo_ship0011	1,1,mal_in02,102,90
-mal_in02,102,87,0	warp	malangdo_ship0012	1,1,mal_in02,101,63
-mal_in02,137,53,0	warp	malangdo_ship0013	1,1,mal_in02,139,32
-mal_in02,139,35,0	warp	malangdo_ship0014	1,1,mal_in02,137,56
-mal_in02,137,66,0	warp	malangdo_ship0015	1,1,mal_in02,140,90
-mal_in02,140,87,0	warp	malangdo_ship0016	1,1,mal_in02,137,63
+mal_in02,34,60,0	warp	malangdo_ship0004	1,1,mal_in02,53,59
+mal_in02,63,53,0	warp	malangdo_ship0005	1,1,mal_in02,63,33
+mal_in02,63,35,0	warp	malangdo_ship0006	1,1,mal_in02,64,55
+mal_in02,63,66,0	warp	malangdo_ship0007	1,1,mal_in02,63,89
+mal_in02,64,87,0	warp	malangdo_ship0008	1,1,mal_in02,63,64
+mal_in02,101,53,0	warp	malangdo_ship0009	1,1,mal_in02,101,33
+mal_in02,101,35,0	warp	malangdo_ship0010	1,1,mal_in02,102,55
+mal_in02,101,66,0	warp	malangdo_ship0011	1,1,mal_in02,101,89
+mal_in02,102,87,0	warp	malangdo_ship0012	1,1,mal_in02,101,64
+mal_in02,137,53,0	warp	malangdo_ship0013	1,1,mal_in02,139,33
+mal_in02,139,35,0	warp	malangdo_ship0014	1,1,mal_in02,138,55
+mal_in02,137,66,0	warp	malangdo_ship0015	1,1,mal_in02,139,89
+mal_in02,140,87,0	warp	malangdo_ship0016	1,1,mal_in02,137,64
 mal_in02,142,60,0	warp	malangdo_ship0017	1,1,mal_in02,162,61
-mal_in02,159,61,0	warp	malangdo_ship0018	1,1,mal_in02,139,60
+mal_in02,159,61,0	warp	malangdo_ship0018	1,1,mal_in02,140,59
diff --git a/npc/re/warps/dungeons/bra_dun.txt b/npc/re/warps/dungeons/bra_dun.txt
index a151ed645..de7d1d94f 100644
--- a/npc/re/warps/dungeons/bra_dun.txt
+++ b/npc/re/warps/dungeons/bra_dun.txt
@@ -1,11 +1,9 @@
-//===== rAthena Script =======================================
+//===== Hercules Script ======================================
 //= Brasilis Dungeon Warp
 //===== By: ==================================================
 //= L0ne_W0lf
 //===== Current Version: =====================================
 //= 1.0
-//===== Compatible With: =====================================
-//= Any Athena Version
 //===== Description: =========================================
 //= [Aegis Conversion]
 //= Brasilis Dungeon warp script
diff --git a/npc/re/warps/dungeons/iz_dun.txt b/npc/re/warps/dungeons/iz_dun.txt
index b912f62e1..3ef9ab86e 100644
--- a/npc/re/warps/dungeons/iz_dun.txt
+++ b/npc/re/warps/dungeons/iz_dun.txt
@@ -4,15 +4,60 @@
 //= Athena (1.0)
 //= Nana (1.1)
 //===== Current Version: =====================================
-//= 1.2
+//= 1.3
 //===== Compatible With: =====================================
 //= Any Athena Version
 //===== Description: =========================================
 //= Warp Points for Bibilyn Island & Undersea Cave
 //===== Additional Comments: =================================
 //= 1.2 Moved common warps to base path. [Euphy]
+//= 1.3 Added Undersea Tunnel 6th floor warper. [L0ne_W0lf]
 //============================================================
 
-//= Undersea Cave ============================================
-iz_dun04,129,233,0	warp	izd07	2,2,iz_dun05,141,187
-iz_dun05,141,190,0	warp	izd07-1	2,2,iz_dun04,129,230
+// Undersea Tunnel Warper
+//============================================================
+iz_dun04,130,234,5	script	Gatekeeper#iz_dun	413,{
+	mes "[Gatekeeper]";
+	mes "Halt!";
+	mes "What brings you here, Adventurer?";
+	mes "We've discovered a new floor of this underwater city.";
+	next;
+	mes "[Gatekeeper]";
+	mes "Do you think you're up to the challenge?";
+	mes "The monsters here are between levels 110 and 124.";
+	mes "And you must beware of the Kraken!";
+	next;
+	switch(select("Release the Kraken!:I'll stay here.")) {
+	case 1:
+		mes "[Gatekeeper]";
+		mes "Be cautious and good luck.";
+		mes "If you see the Kraken be sure you have your friends to help or do what we do and run.";
+		close2;
+		warp "iz_dun05",141,187;
+		end;
+	case 2:
+		mes "[Gatekeeper]";
+		mes "It's always best to be prepared before exploring a new area.";
+		mes "Come back when you're ready to go.";
+		close;
+	}
+}
+
+iz_dun05,142,190,5	script	Guard#iz_dun	413,{
+	mes "[Gatekeeper]";
+	mes "So I guess you want to go back to the fifth floor?";
+	next;
+	switch(select("Yes!:No, I'll stay.")) {
+	case 1:
+		mes "[Gatekeeper]";
+		mes "Be safe, adventurer.";
+		close2;
+		warp "iz_dun04",129,232;
+		end;
+	case 2:
+		mes "[Gatekeeper]";
+		mes "You're not going?";
+		mes "You're braver than I thought.";
+		close;
+	}
+}
\ No newline at end of file
diff --git a/npc/re/warps/fields/bif_fild.txt b/npc/re/warps/fields/bif_fild.txt
index d6f6505e4..3a32c3e75 100644
--- a/npc/re/warps/fields/bif_fild.txt
+++ b/npc/re/warps/fields/bif_fild.txt
@@ -1,11 +1,9 @@
-//===== rAthena Script =======================================
+//===== Hercules Script ======================================
 //= Bifrost Field Warp Script
 //===== By: ==================================================
 //= Chilly
 //===== Current Version: =====================================
 //= 1.0
-//===== Compatible With: =====================================
-//= rAthena SVN
 //===== Description: =========================================
 //= Warp Points for Bifrost Field
 //===== Additional Comments: =================================
diff --git a/npc/re/warps/fields/bra_fild.txt b/npc/re/warps/fields/bra_fild.txt
index 1f0fe24ba..c2078cdd2 100644
--- a/npc/re/warps/fields/bra_fild.txt
+++ b/npc/re/warps/fields/bra_fild.txt
@@ -1,11 +1,9 @@
-//===== rAthena Script =======================================
+//===== Hercules Script ======================================
 //= Brasilis Fild Warps Script
 //===== By: ==================================================
 //= Protimus
 //===== Current Version: =====================================
 //= 1.0
-//===== Compatible With: =====================================
-//= Any Athena Version
 //===== Description: =========================================
 //= [Aegis Conversion]
 //= Warp Points for Brasilis