* Move close3 function into Global_Functions.txt

* Added mapflag for some instance

npc/other/Global_Functions.txt

@@ -45,6 +45,7 @@
 //= 2.25 Added "F_CanOpenStorage" and "F_CanChangeJob". [secretdataz]
 //= 2.26 Added "F_getpositionname". [Capuche]
 //= 2.27 Added "F_GetPlatinumSkills". [mazvi]
+//= 2.28 Added "close3". [Capuche]
 //============================================================ 
 
 //////////////////////////////////////////////////////////////////////////////////
@@ -749,3 +750,12 @@ function	script	F_GetPlatinumSkills	{
 	}
 	return;
 }
+
+//////////////////////////////////////////////////////////////////////////////////
+// Shortcut : close button and clear cutin.
+//////////////////////////////////////////////////////////////////////////////////
+function	script	close3	{
+	close2;
+	cutin "",255;
+	end;
+}

npc/re/custom/lasagna/lasagna_npcs.txt

@@ -11,12 +11,6 @@
 //= 1.0 First version. [Capuche]
 //============================================================
 
-function	script	close3	{
-	close2;
-	cutin "",255;
-	end;
-}
-
 lasa_fild01,47,297,0	script	#doint_evt01	HIDDEN_WARP_NPC,1,1,{
 	end;
 OnTouch:

npc/re/mapflag/hidemobhpbar.txt

@@ -32,3 +32,7 @@ gld2_pay	mapflag	hidemobhpbar
 gld2_prt	mapflag	hidemobhpbar
 teg_dun01	mapflag	hidemobhpbar
 teg_dun02	mapflag	hidemobhpbar
+
+// Episode 15 - Phantasmagorica
+verus04	mapflag	hidemobhpbar
+ 

npc/re/mapflag/nobranch.txt

@@ -88,7 +88,6 @@ ecl_in04	mapflag	nobranch
 1@ecl	mapflag	nobranch
 ecl_hub01	mapflag	nobranch
 que_avan01	mapflag	nobranch
-1@xm_d	mapflag	nobranch
 
 // Izlude duplicates ===========
 izlude_a	mapflag	nobranch
@@ -96,15 +95,43 @@ izlude_b	mapflag	nobranch
 izlude_c	mapflag	nobranch
 izlude_d	mapflag	nobranch
 
-// Heroes' Trail Part 1 ========
-1@sara	mapflag	nobranch
+// Heroes' Trail - Part 1 ========
 1@face	mapflag	nobranch
+1@sara	mapflag	nobranch
+dali	mapflag	nobranch
+dali02	mapflag	nobranch
+
+// Heroes' Trail - Part 2 ========
+1@ge_st	mapflag	nobranch
 1@gef	mapflag	nobranch
 1@gef_in	mapflag	nobranch
-1@ge_st	mapflag	nobranch
+1@spa	mapflag	nobranch
+1@tnm1	mapflag	nobranch
+1@tnm2	mapflag	nobranch
+1@tnm3	mapflag	nobranch
+
+// Horror Toy Factory Memorial Dungeon
+1@xm_d	mapflag	nobranch
+
+// Heroes' Trail - Part 3 ========
 1@glast	mapflag	nobranch
-dali	mapflag	nobranch
-dali02	mapflag	nobranch
+1@air1	mapflag	nobranch
+1@air2	mapflag	nobranch
+
+// Decisive Battle - Part 1 ======
+1@dth1	mapflag	nobranch
+1@dth2	mapflag	nobranch
+1@dth3	mapflag	nobranch
+1@rev	mapflag	nobranch
+
+// Decisive Battle - Part 2 ======
+1@eom	mapflag	nobranch
+1@jtb	mapflag	nobranch
+
+// Episode 15 - Phantasmagorica
+1@lab	mapflag	nobranch
+1@uns	mapflag	nobranch
+1@mcd	mapflag	nobranch
 
 // WOE:TE Maps ===================
 te_alde_gld	mapflag	nobranch

npc/re/mapflag/noicewall.txt

@@ -32,13 +32,41 @@
 // Inside Eclage ===========
 1@ecl	mapflag	noicewall
 
-// Horror Toy Factory
+// Heroes' Trail - Part 1 ========
+1@face	mapflag	noicewall
+1@sara	mapflag	noicewall
+
+// Heroes' Trail - Part 2 ========
+1@ge_st	mapflag	noicewall
+1@gef	mapflag	noicewall
+1@gef_in	mapflag	noicewall
+1@spa	mapflag	noicewall
+1@tnm1	mapflag	noicewall
+1@tnm2	mapflag	noicewall
+1@tnm3	mapflag	noicewall
+
+// Horror Toy Factory Memorial Dungeon
 1@xm_d	mapflag	noicewall
 
-// Heroes' Trail Part 1 =======
-1@sara	mapflag	noicewall
-1@face	mapflag	noicewall
+// Heroes' Trail - Part 3 ========
 1@glast	mapflag	noicewall
+1@air1	mapflag	noicewall
+1@air2	mapflag	noicewall
+
+// Decisive Battle - Part 1 ======
+1@dth1	mapflag	noicewall
+1@dth2	mapflag	noicewall
+1@dth3	mapflag	noicewall
+1@rev	mapflag	noicewall
+
+// Decisive Battle - Part 2 ======
+1@eom	mapflag	noicewall
+1@jtb	mapflag	noicewall
+
+// Episode 15 - Phantasmagorica
+1@lab	mapflag	noicewall
+1@uns	mapflag	noicewall
+1@mcd	mapflag	noicewall
 
 // WOE:TE Maps ===================
 te_prtcas01	mapflag	noicewall

npc/re/mapflag/nopvp.txt

@@ -28,12 +28,42 @@
 1@def01	mapflag	pvp	off
 1@def02	mapflag	pvp	off
 1@def03	mapflag	pvp	off
-1@gef	mapflag	pvp	off
+
+// Heroes' Trail - Part 1 ========
 1@face	mapflag	pvp	off
 1@sara	mapflag	pvp	off
+
+// Heroes' Trail - Part 2 ========
+1@ge_st	mapflag	pvp	off
+1@gef	mapflag	pvp	off
 1@gef_in	mapflag	pvp	off
+1@spa	mapflag	pvp	off
+1@tnm1	mapflag	pvp	off
+1@tnm2	mapflag	pvp	off
+1@tnm3	mapflag	pvp	off
+
+// Horror Toy Factory Memorial Dungeon
 1@xm_d	mapflag	pvp	off
+
+// Heroes' Trail - Part 3 ========
 1@glast	mapflag	pvp	off
+1@air1	mapflag	pvp	off
+1@air2	mapflag	pvp	off
+
+// Decisive Battle - Part 1 ======
+1@dth1	mapflag	pvp	off
+1@dth2	mapflag	pvp	off
+1@dth3	mapflag	pvp	off
+1@rev	mapflag	pvp	off
+
+// Decisive Battle - Part 2 ======
+1@eom	mapflag	pvp	off
+1@jtb	mapflag	pvp	off
+
+// Episode 15 - Phantasmagorica
+1@lab	mapflag	pvp	off
+1@uns	mapflag	pvp	off
+1@mcd	mapflag	pvp	off
 
 // Cities ========================
 moc_para01	mapflag	pvp	off

npc/re/mapflag/nosave.txt

@@ -92,9 +92,6 @@ ma_zif09	mapflag	nosave	SavePoint
 que_avan01	mapflag	nosave	SavePoint
 1@ecl	mapflag	nosave	SavePoint
 
-// Horror Toy Factory
-1@xm_d	mapflag	nosave	SavePoint
-
 // Glast Heim Memorial Dungeon ====
 1@gl_k	mapflag	nosave	SavePoint
 2@gl_k	mapflag	nosave	SavePoint
@@ -104,10 +101,39 @@ que_avan01	mapflag	nosave	SavePoint
 1@def02	mapflag	nosave	SavePoint
 1@def03	mapflag	nosave	SavePoint
 
-// Heroes' Trails - Part 1 ========
-1@gef	mapflag	nosave	SavePoint
+// Heroes' Trail - Part 1 ========
 1@face	mapflag	nosave	SavePoint
 1@sara	mapflag	nosave	SavePoint
+
+// Heroes' Trail - Part 2 ========
+1@ge_st	mapflag	nosave	SavePoint
+1@gef	mapflag	nosave	SavePoint
 1@gef_in	mapflag	nosave	SavePoint
+1@spa	mapflag	nosave	SavePoint
+1@tnm1	mapflag	nosave	SavePoint
+1@tnm2	mapflag	nosave	SavePoint
+1@tnm3	mapflag	nosave	SavePoint
+
+// Horror Toy Factory Memorial Dungeon
+1@xm_d	mapflag	nosave	SavePoint
+
+// Heroes' Trail - Part 3 ========
 1@glast	mapflag	nosave	SavePoint
-dali	mapflag	nosave	SavePoint
+1@air1	mapflag	nosave	SavePoint
+1@air2	mapflag	nosave	SavePoint
+
+// Decisive Battle - Part 1 ======
+1@dth1	mapflag	nosave	SavePoint
+1@dth2	mapflag	nosave	SavePoint
+1@dth3	mapflag	nosave	SavePoint
+1@rev	mapflag	nosave	SavePoint
+
+// Decisive Battle - Part 2 ======
+1@eom	mapflag	nosave	SavePoint
+1@jtb	mapflag	nosave	SavePoint
+
+// Episode 15 - Phantasmagorica
+1@lab	mapflag	nosave	SavePoint
+1@uns	mapflag	nosave	SavePoint
+un_myst	mapflag	nosave	SavePoint
+1@mcd	mapflag	nosave	SavePoint

npc/re/mapflag/noteleport.txt

@@ -66,8 +66,6 @@ ecl_in04	mapflag	noteleport
 1@ecl	mapflag	noteleport
 1@ecl	mapflag	monster_noteleport
 ecl_hub01	mapflag	noteleport
-1@xm_d	mapflag	monster_noteleport
-1@xm_d	mapflag	noteleport
 
 // Glast Heim Memorial Dungeon ===
 1@gl_k	mapflag	noteleport
@@ -99,6 +97,71 @@ gl_cas02_	mapflag	noteleport
 dali	mapflag	noteleport
 dali02	mapflag	noteleport
 
+// Heroes' Trail - Part 1 ========
+1@face	mapflag	noteleport
+1@face	mapflag	monster_noteleport
+1@sara	mapflag	noteleport
+1@sara	mapflag	monster_noteleport
+dali	mapflag	noteleport
+dali02	mapflag	noteleport
+
+// Heroes' Trail - Part 2 ========
+1@ge_st	mapflag	noteleport
+1@ge_st	mapflag	monster_noteleport
+1@gef	mapflag	noteleport
+1@gef	mapflag	monster_noteleport
+1@gef_in	mapflag	noteleport
+1@gef_in	mapflag	monster_noteleport
+1@spa	mapflag	noteleport
+1@spa	mapflag	monster_noteleport
+1@tnm1	mapflag	noteleport
+1@tnm1	mapflag	monster_noteleport
+1@tnm2	mapflag	noteleport
+1@tnm2	mapflag	monster_noteleport
+1@tnm3	mapflag	noteleport
+1@tnm3	mapflag	monster_noteleport
+
+// Horror Toy Factory Memorial Dungeon
+1@xm_d	mapflag	monster_noteleport
+1@xm_d	mapflag	noteleport
+
+// Heroes' Trail - Part 3 ========
+1@glast	mapflag	noteleport
+1@air1	mapflag	noteleport
+1@air2	mapflag	noteleport
+1@glast	mapflag	monster_noteleport
+1@air1	mapflag	monster_noteleport
+1@air2	mapflag	monster_noteleport
+
+// Decisive Battle - Part 1 ======
+1@dth1	mapflag	noteleport
+1@dth2	mapflag	noteleport
+1@dth3	mapflag	noteleport
+1@rev	mapflag	noteleport
+1@dth1	mapflag	monster_noteleport
+1@dth2	mapflag	monster_noteleport
+1@dth3	mapflag	monster_noteleport
+1@rev	mapflag	monster_noteleport
+
+// Decisive Battle - Part 2 ======
+1@eom	mapflag	noteleport
+1@jtb	mapflag	noteleport
+1@eom	mapflag	monster_noteleport
+1@jtb	mapflag	monster_noteleport
+
+// Episode 15 - Phantasmagorica
+1@lab	mapflag	noteleport
+1@uns	mapflag	noteleport
+un_bk_q	mapflag	noteleport
+un_myst	mapflag	noteleport
+verus04	mapflag	noteleport
+1@mcd	mapflag	noteleport
+1@lab	mapflag	monster_noteleport
+1@uns	mapflag	monster_noteleport
+un_bk_q	mapflag	monster_noteleport
+verus04	mapflag	monster_noteleport
+1@mcd	mapflag	monster_noteleport
+
 // WOE:TE Maps ===================
 te_prtcas01	mapflag	noteleport
 te_prtcas02	mapflag	noteleport

npc/re/mapflag/nowarpto.txt

@@ -44,7 +44,6 @@ que_lhz	mapflag	nowarpto
 
 // 14.2 Eclage ===================
 1@ecl	mapflag	nowarpto
-1@xm_d	mapflag	nowarpto
 
 // Pyramids Basement Nightmare Mode
 moc_prydn1	mapflag	nowarpto
@@ -61,12 +60,44 @@ gl_cas02_	mapflag	nowarpto
 1@def02	mapflag	nowarpto
 1@def03	mapflag	nowarpto
 
-// Heroes' Trails - Part 1 =======
-1@gef	mapflag	nowarpto
+// Heroes' Trail - Part 1 ========
 1@face	mapflag	nowarpto
 1@sara	mapflag	nowarpto
+
+// Heroes' Trail - Part 2 ========
+1@ge_st	mapflag	nowarpto
+1@gef	mapflag	nowarpto
 1@gef_in	mapflag	nowarpto
+1@spa	mapflag	nowarpto
+1@tnm1	mapflag	nowarpto
+1@tnm2	mapflag	nowarpto
+1@tnm3	mapflag	nowarpto
+
+// Horror Toy Factory Memorial Dungeon
+1@xm_d	mapflag	nowarpto
+
+// Heroes' Trail - Part 3 ========
 1@glast	mapflag	nowarpto
+1@air1	mapflag	nowarpto
+1@air2	mapflag	nowarpto
+
+// Decisive Battle - Part 1 ======
+1@dth1	mapflag	nowarpto
+1@dth2	mapflag	nowarpto
+1@dth3	mapflag	nowarpto
+1@rev	mapflag	nowarpto
+moro_cav	mapflag	nowarpto
+
+// Decisive Battle - Part 2 ======
+1@eom	mapflag	nowarpto
+1@jtb	mapflag	nowarpto
+
+// Episode 15 - Phantasmagorica
+1@lab	mapflag	nowarpto
+1@uns	mapflag	nowarpto
+un_bk_q	mapflag	nowarpto
+un_myst	mapflag	nowarpto
+1@mcd	mapflag	nowarpto
 
 // WOE:TE Maps ===================
 te_prtcas01	mapflag	nowarpto

npc/re/mapflag/restricted.txt

@@ -19,9 +19,42 @@
 1@ma_c	mapflag	restricted	6
 1@ma_b	mapflag	restricted	6
 1@ecl	mapflag	restricted	6
-1@xm_d	mapflag	restricted	6
+
+// Heroes' Trail - Part 1 ========
 1@face	mapflag	restricted	6
+1@sara	mapflag	restricted	6
+
+// Heroes' Trail - Part 2 ========
+1@ge_st	mapflag	restricted	6
+1@gef	mapflag	restricted	6
+1@gef_in	mapflag	restricted	6
+1@spa	mapflag	restricted	6
+1@tnm1	mapflag	restricted	6
+1@tnm2	mapflag	restricted	6
+1@tnm3	mapflag	restricted	6
+
+// Horror Toy Factory Memorial Dungeon
+1@xm_d	mapflag	restricted	6
+
+// Heroes' Trail - Part 3 ========
 1@glast	mapflag	restricted	6
+1@air1	mapflag	restricted	6
+1@air2	mapflag	restricted	6
+
+// Decisive Battle - Part 1 ======
+1@dth1	mapflag	restricted	6
+1@dth2	mapflag	restricted	6
+1@dth3	mapflag	restricted	6
+1@rev	mapflag	restricted	6
+
+// Decisive Battle - Part 2 ======
+1@eom	mapflag	restricted	6
+1@jtb	mapflag	restricted	6
+
+// Episode 15 - Phantasmagorica
+1@lab	mapflag	restricted	6
+1@uns	mapflag	restricted	6
+1@mcd	mapflag	restricted	6
 
 // Towns =========================
 brasilis	mapflag	restricted	7