Merge branch 'master' of https://github.com/HerculesWS/Hercules

2 files changed, 76 insertions, 9 deletions

diff --git a/npc/re/warps/fields/bif_fild.txt b/npc/re/warps/fields/bif_fild.txt
index 3a32c3e75..ec9de1cf9 100644
--- a/npc/re/warps/fields/bif_fild.txt
+++ b/npc/re/warps/fields/bif_fild.txt
@@ -1,20 +1,44 @@
-//===== Hercules Script ======================================
+//===== rAthena Script =======================================
 //= Bifrost Field Warp Script
 //===== By: ==================================================
 //= Chilly
 //===== Current Version: =====================================
-//= 1.0
+//= 1.2
+//===== Compatible With: =====================================
+//= rAthena SVN
 //===== Description: =========================================
 //= Warp Points for Bifrost Field
 //===== Additional Comments: =================================
 //= 1.0 First Version.
+//= 1.1 Added official warp scripts. [Euphy]
+//= 1.2 Updated to match the official script. [Euphy]
 //============================================================
 
 splendide,275,390,0	warp	bifrost_field0001	1,1,bif_fild01,316,50
-bif_fild01,318,48,0	warp	bifrost_field0002	1,1,splendide,275,387
-bif_fild02,285,333,0	warp	bifrost_field0003	1,1,mora,179,74
-mora,182,74,0	warp	bifrost_field0004	1,1,bif_fild02,285,330
-bif_fild02,95,310,0	warp	bifrost_field0005	1,1,mora,22,157
-mora,20,159,0	warp	bifrost_field0006	1,1,bif_fild02,98,309
-bif_fild02,174,162,0	warp	bifrost_field0007	1,1,mora,58,27
-mora,56,25,0	warp	bifrost_field0008	1,1,bif_fild02,177,162
+bif_fild01,318,48,0	warp	bifrost_field0002	1,1,splendide,271,382
+mora,182,74,0	warp	bifrost_field0003	1,1,bif_fild02,286,327
+mora,20,159,0	warp	bifrost_field0004	1,1,bif_fild02,99,308
+mora,56,25,0	warp	bifrost_field0005	1,1,bif_fild02,176,162
+
+-	script	bifrost_field0000	-1,{
+	mes "At the end of the small path through the bright flower garden";
+	mes "is an entrance to something that looks like a small hill.";
+	next;
+	if(select("Knock-knock:Is this a wormhole?") == 1) {
+		mes "When you knock on the door-like thing just for fun,";
+		mes "the door clicks open and you feel some mysterious force pulling you inside.";
+		close2;
+		switch(atoi(charat(strnpcinfo(2),9))) {
+			case 1: warp "mora",179,74; end;
+			case 2: warp "mora",22,157; end;
+			case 3: warp "mora",58,27; end;
+		}
+	}
+	close;
+OnTouch:
+	specialeffect EF_LEVEL99_4;
+	end;
+}
+bif_fild02,285,332,0	duplicate(bifrost_field0000)	Small Hole#ep14_mora1	844
+bif_fild02,95,310,0	duplicate(bifrost_field0000)	Small Hole#ep14_mora2	844
+bif_fild02,174,162,0	duplicate(bifrost_field0000)	Small Hole#ep14_mora3	844
diff --git a/npc/re/warps/guildcastles.txt b/npc/re/warps/guildcastles.txt
new file mode 100644
index 000000000..d8eab7cea
--- /dev/null
+++ b/npc/re/warps/guildcastles.txt
@@ -0,0 +1,43 @@
+//===== rAthena Script =======================================
+//= Guild Castles Warp Script
+//===== By: ==================================================
+//= Euphy
+//===== Current Version: =====================================
+//= 1.0
+//===== Compatible With: =====================================
+//= rAthena SVN
+//===== Description: =========================================
+//= Warp Points for Renewal Guild Castles
+//===== Additional Comments: =================================
+//= 1.0 First version. [Euphy]
+//============================================================
+
+// Hall of Abyss
+//============================================================
+gld2_prt,10,22,0	warp	dun2prt_to_gld	1,1,prt_gld,252,247
+gld2_prt,14,252,0	warp	dun2prt_to_gld#2	1,1,prt_gld,63,66
+gld2_prt,266,236,0	warp	dun2prt_to_gld#3	1,1,prt_gld,252,247
+gld2_prt,226,21,0	warp	dun2prt_to_gld#4	1,1,prt_gld,63,66
+gld2_prt,103,11,0	warp	dun2prt_to_gld#5	1,1,prt_gld,252,247
+gld_dun03_2,238,274,0	warp	gdun03a_prtg#abyss	1,1,prt_gld,252,247
+gld_dun03_2,42,30,0	warp	gdun03b_prtg#abyss	1,1,prt_gld,63,66
+gld2_pay,33,105,0	warp	dun2pay_to_gld	1,1,pay_gld,53,141
+gld2_pay,119,21,0	warp	dun2pay_to_gld#2	1,1,pay_gld,53,141
+gld2_pay,205,105,0	warp	dun2pay_to_gld#3	1,1,pay_gld,53,141
+gld2_pay,175,215,0	warp	dun2pay_to_gld#4	1,1,pay_gld,53,141
+gld2_pay,61,215,0	warp	dun2pay_to_gld#5	1,1,pay_gld,53,141
+gld_dun01_2,119,14,0	warp	gdun01_payg#abyss	1,1,pay_gld,53,141
+gld2_gef,28,205,0	warp	dun2gef_to_gld	1,1,gef_fild13,42,331
+gld2_gef,221,145,0	warp	dun2gef_to_gld#2	1,1,gef_fild13,373,62
+gld2_gef,175,198,0	warp	dun2gef_to_gld#3	1,1,gef_fild13,42,331
+gld2_gef,25,68,0	warp	dun2gef_to_gld#4	1,1,gef_fild13,373,62
+gld2_gef,111,35,0	warp	dun2gef_to_gld#5	1,1,gef_fild13,42,331
+gld_dun04_2,37,230,0	warp	gdun04_g13a#abyss	1,1,gef_fild13,42,331
+gld_dun04_2,110,20,0	warp	gdun04_g13b#abyss	1,1,gef_fild13,373,62
+gld2_ald,172,46,0	warp	dun2gef_to_gld#6	1,1,alde_gld,242,121
+gld2_ald,77,58,0	warp	dun2gef_to_gld#7	1,1,alde_gld,229,185
+gld2_ald,46,122,0	warp	dun2gef_to_gld#8	1,1,alde_gld,242,121
+gld2_ald,104,250,0	warp	dun2gef_to_gld#9	1,1,alde_gld,229,185
+gld2_ald,247,156,0	warp	dun2gef_to_gld#10	1,1,alde_gld,242,121
+gld_dun02_2,20,160,0	warp	gdun02a_aldega#abyss	1,1,alde_gld,229,185
+gld_dun02_2,180,112,0	warp	gdun02b_aldegb#abyss	1,1,alde_gld,242,121