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

1 files changed, 33 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