Introducing Hercules' Map Zone Database

Click the link for full info~!
http://hercules.ws/board/topic/302-introducing-hercules-map-zone-database/

Signed-off-by: shennetsind <ind@henn.et>

7 files changed, 479 insertions, 429 deletions

diff --git a/db/const.txt b/db/const.txt
index b4fa39366..d3d5991ab 100644
--- a/db/const.txt
+++ b/db/const.txt
@@ -348,7 +348,7 @@ mf_nomvploot	32
 mf_noreturn	33
 mf_nowarpto	34
 mf_nightmaredrop	35
-mf_restricted	36
+mf_zone	36
 mf_nocommand	37
 mf_nodrop	38
 mf_jexp	39
diff --git a/db/pre-re/item_noequip.txt b/db/pre-re/item_noequip.txt
deleted file mode 100644
index 6e8b65309..000000000
--- a/db/pre-re/item_noequip.txt
+++ /dev/null
@@ -1,60 +0,0 @@
-// The equipment/items/cards restriction file 
-// here you define which items may not be used at PvP / GvG 
-// format: <item id>,<mode>
-// mode
-// 1    - restricted in normal maps
-// 2    - restricted in PVP
-// 4    - restricted in GVG
-// 8    - restricted in Battlegrounds
-// Restricted zones - they're configured by 'restricted <number>' mapflag
-// 32   - restricted in zone 1
-// 64   - restricted in zone 2
-// 128  - restricted in zone 3
-// 256  - restricted in zone 4
-// 512  - restricted in zone 5
-// 1024 - restricted in zone 6
-// 2048 - restricted in zone 7
-
-//Examples:
-//1201,1 you can't use KNIFE(ID 1201) on normal maps
-//608,4 you can't use Yggdrasil Seed(ID 608) on both GvG and WoE Castles
-//4174,6 Forbid Deviling Card in every PVP or GVG map, and during woes.
-//501,32 you can't use Red Potion on map marked as 'restricted zone 1'
-//502,64 you can't use Orange Potion on map marked as 'restricted zone 2'
-//503,128 you can't use Yellow Potion on map marked as 'restricted zone 3'
-// you can even mix modes
-//519,322 (256+64+2) you can't use Milk on PVP, and maps marked as 'restricted zone 2' and 'restricted zone 4'
-
-//PVP
-14529,2 //Greed Scroll
-
-//GVG
-12218,4 //LV5 Assumptio Scroll
-14529,4 //Greed Scroll
-14590,4 //Party Assumptio 5 Scroll
-
-//BATTLEGROUND
-12218,8 //LV5 Assumptio Scroll
-14590,8 //Party Assumptio 5 Scroll
-
-
-//Zone 1 - Aldebaran Turbo Track
-601,32 //Fly Wing
-605,32 //Anodyne
-506,32 //Green Potion
-525,32 //Panacea
-
-//Zone 2 - Jail
-601,64 //Fly Wing - not really needed here but ...
-602,64 //Butterfly Wing - also not needed
-12212,64 //Giant Fly Wing
-14582,64
-14583,64
-14584,64
-14585,64
-
-//Zone 3 - Izlude Battle Arena
-601,128 //Fly Wing
-
-//Zone 7 - Towns
-14529,2048 //Greed Scroll
diff --git a/db/pre-re/map_zone_db.txt b/db/pre-re/map_zone_db.txt
new file mode 100644
index 000000000..996726575
--- /dev/null
+++ b/db/pre-re/map_zone_db.txt
@@ -0,0 +1,239 @@
+//====================================================
+//=       _   _                     _           
+//=      | | | |                   | |          
+//=      | |_| | ___ _ __ ___ _   _| | ___  ___ 
+//=      |  _  |/ _ \ '__/ __| | | | |/ _ \/ __|
+//=      | | | |  __/ | | (__| |_| | |  __/\__ \
+//=      \_| |_/\___|_|  \___|\__,_|_|\___||___/
+//=                                                  
+//=            http://hercules.ws/board/                        
+//====================================================
+//= Hercules Map Zone Database [Ind/Hercules]
+//==
+//= A unlimited number of zones may be created, a zone
+//= may be used to create a set of disabled items, disabled skills
+//= and mapflags to be used by as many maps as one chooses,
+//= maps can be linked to a specific zone through the zone mapflag
+//= '<map name><tab>mapflag<tab>zone<tab><zone name>'
+zones: (
+{
+	/* Normal zone is applied to all maps that are not pkable (where players cant fight each other)  */
+	/* However, it wont be applied to maps with its own zones (specified thru mapflag) */
+	name: "Normal" /* changing this name requires MAP_ZONE_NORMAL_NAME to also be changed in src/map/map.h file */
+	
+	disabled_skills: {
+		WM_LULLABY_DEEPSLEEP: true
+		WM_SIRCLEOFNATURE: true
+		WM_SATURDAY_NIGHT_FEVER: true
+		SO_ARRULLO: true
+		CG_HERMODE: true
+	}
+	
+	disabled_items: {
+	
+	}
+	mapflags: ( )
+},
+{
+	/* PvP zone is applied to all maps with a pvp mapflag */
+	name: "PvP" /* changing this name requires MAP_ZONE_PVP_NAME to also be changed in src/map/map.h file */
+	
+	disabled_skills: {
+		BS_GREED: true
+		CG_HERMODE: true
+	}
+	
+	disabled_items: {
+		Greed_Scroll: true
+	}
+},
+{
+	/* GvG zone is applied to all maps with a pvp mapflag */
+	name: "GvG" /* changing this name requires MAP_ZONE_GVG_NAME to also be changed in src/map/map.h file */
+	
+	disabled_skills: {
+		AL_TELEPORT: true
+		AL_WARP: true
+		WZ_ICEWALL: true
+		TF_BACKSLIDING: true
+		RG_INTIMIDATE: true
+		WE_CALLPARTNER: true
+		HP_ASSUMPTIO: true
+		HP_BASILICA: true
+		CG_MOONLIT: true
+		WE_CALLPARENT: true
+		WE_CALLBABY: true
+		CR_CULTIVATION: true
+		NJ_KIRIKAGE: true
+		CASH_ASSUMPTIO: true
+		BS_GREED: true
+		SC_FATALMENACE: true
+		SC_DIMENSIONDOOR: true
+	}
+	
+	disabled_items: {
+		Assumptio_5_Scroll: true
+		Greed_Scroll: true
+		Pty_Assumptio_Scroll: true
+	}
+},
+{
+	/* Battlegrounds zone is applied to all maps with a battlegrounds mapflag */
+	name: "Battlegrounds" /* changing this name requires MAP_ZONE_BG_NAME to also be changed in src/map/map.h file */
+	
+	disabled_skills: {
+		AL_TELEPORT: true
+		AL_WARP: true
+		WZ_ICEWALL: true
+		TF_BACKSLIDING: true
+		RG_INTIMIDATE: true
+		MO_BODYRELOCATION: true
+		WE_CALLPARTNER: true
+		HP_ASSUMPTIO: true
+		HP_BASILICA: true
+		CG_MOONLIT: true
+		WE_CALLPARENT: true
+		WE_CALLBABY: true
+		CR_CULTIVATION: true
+		TK_RUN: true
+		TK_HIGHJUMP: true
+		SG_FEEL: true
+		SG_SUN_WARM: true
+		SG_MOON_WARM: true
+		SG_STAR_WARM: true
+		SG_SUN_COMFORT: true
+		SG_MOON_COMFORT: true
+		SG_STAR_COMFORT: true
+		SG_HATE: true
+		SG_SUN_ANGER: true
+		SG_MOON_ANGER: true
+		SG_STAR_ANGER: true
+		SG_SUN_BLESS: true
+		SG_MOON_BLESS: true
+		SG_STAR_BLESS: true
+		NJ_KIRIKAGE: true
+		CASH_ASSUMPTIO: true
+		SC_FATALMENACE: true
+		SC_DIMENSIONDOOR: true
+	}
+	disabled_items: {
+		Assumptio_5_Scroll: true
+		Pty_Assumptio_Scroll: true
+	}
+},
+{
+	name: "Aldebaran Turbo Track"
+	
+	disabled_skills: {
+		SM_ENDURE: true
+		AL_TELEPORT: true
+		AL_WARP: true
+		AL_CURE: true
+		TF_HIDING: true
+		WZ_ICEWALL: true
+		AS_CLOAKING: true
+		RG_INTIMIDATE: true
+		MO_BODYRELOCATION: true
+		LK_CONCENTRATION: true
+		LK_BERSERK: true
+		HP_BASILICA: true
+		WS_CARTBOOST: true
+		ST_CHASEWALK: true
+		CG_MOONLIT: true
+		SC_FATALMENACE: true
+		SC_DIMENSIONDOOR: true
+		GN_CARTBOOST: true
+	}
+	
+	disabled_items: {
+		Wing_Of_Fly: true
+		Anodyne: true
+		Green_Potion: true
+		Panacea: true
+	}
+},
+{
+	name: "Jail"
+	
+	disabled_skills: {
+		TK_JUMPKICK: true
+		TK_HIGHJUMP: true
+	}
+	
+	disabled_items: {
+		Wing_Of_Fly: true
+		Wing_Of_Butterfly: true
+		Giant_Fly_Wing: true
+		WOB_Rune: true
+		WOB_Schwaltz: true
+		WOB_Rachel: true
+		WOB_Local: true
+	}
+},
+{
+	name: "Izlude Battle Arena"
+	
+	disabled_skills: {
+		RG_INTIMIDATE: true
+		AL_TELEPORT: true
+		SC_FATALMENACE: true
+		SC_DIMENSIONDOOR: true		
+	}
+	
+	disabled_items: {
+		Wing_Of_Fly: true
+	}
+},
+{
+	name: "GvG2"
+	inherit: ( "GvG" ) /* will import all gvg has */
+	
+	disabled_skills: {
+		TK_HIGHJUMP: true
+		SA_ABRACADABRA: true
+	}
+},
+{
+	name: "Sealed Shrine"
+	
+	disabled_skills: {
+		MG_SAFETYWALL: true
+		AL_TELEPORT: true
+		RG_INTIMIDATE: true
+		HP_ASSUMPTIO: true
+		CASH_ASSUMPTIO: true
+		SC_FATALMENACE: true
+		SC_DIMENSIONDOOR: true
+	}
+},
+{
+	name: "Memorial Dungeon" /* ETower, Orc's Memory, Nidhoggur's Nest, etc */
+	
+	disabled_skills: {
+		AL_TELEPORT: true
+		WZ_ICEWALL: true
+		RG_INTIMIDATE: true
+		PF_SPIDERWEB: true
+		NPC_EXPULSION: true
+		SC_FATALMENACE: true
+		SC_DIMENSIONDOOR: true
+	}
+},
+{
+	name: "Towns"
+	
+	disabled_skills: {
+		AM_CANNIBALIZE: true
+		AM_SPHEREMINE: true
+		CR_CULTIVATION: true
+		BS_GREED: true
+		SC_MANHOLE: true
+		WM_POEMOFNETHERWORLD: true
+		GN_WALLOFTHORN: true
+	}
+	
+	disabled_items: {
+		Greed_Scroll: true
+	}
+}
+)
\ No newline at end of file
diff --git a/db/pre-re/skill_nocast_db.txt b/db/pre-re/skill_nocast_db.txt
deleted file mode 100644
index 5e12477a9..000000000
--- a/db/pre-re/skill_nocast_db.txt
+++ /dev/null
@@ -1,154 +0,0 @@
-// Forbidden Skills Database
-//
-// Structure of Database:
-// SkillID,Flag
-//
-// Legend for 'Flag' field (bitmask):
-//  1 = Cannot be used in normal maps
-//  2 = Cannot be used in PvP maps (use this instead of 1 for PK-mode servers)
-//  4 = Cannot be used in GvG maps
-//  8 = Cannot be used in Battleground maps
-//  16 = Cannot be cloned (clones will not copy this skill)
-//  Restricted zones - they're configured by 'restricted <number>' mapflag
-//  32 = Cannot be used in zone 1 maps
-//  64 = Cannot be used in zone 2 maps
-//  128 = Cannot be used in zone 3 maps
-//  256 = Cannot be used in zone 4 maps
-//  512 = Cannot be used in zone 5 maps
-//  1024 = Cannot be used in zone 6 maps
-//  2048 = Cannot be used in zone 7 maps
-//
-// Example:
-// 8,6 = Endure cannot be used in PvP and GvG maps (2+4)
-
-//Normal
-2422,1	//WM_LULLABY_DEEPSLEEP
-2423,1	//WM_SIRCLEOFNATURE
-2430,1	//WM_SATURDAY_NIGHT_FEVER
-2455,1	//SO_ARRULLO
-
-//PVP
-1013,2	//BS_GREED
-
-//GVG
-26,4	//AL_TELEPORT
-27,4	//AL_WARP
-87,4	//WZ_ICEWALL
-150,4	//TF_BACKSLIDING
-219,4	//RG_INTIMIDATE
-336,4	//WE_CALLPARTNER
-361,4	//HP_ASSUMPTIO
-362,4	//HP_BASILICA
-395,4	//CG_MOONLIT
-409,4	//WE_CALLPARENT
-410,4	//WE_CALLBABY
-491,4	//CR_CULTIVATION
-530,4	//NJ_KIRIKAGE
-691,4	//CASH_ASSUMPTIO
-1013,4	//BS_GREED
-2284,4	//SC_FATALMENACE
-2300,4	//SC_DIMENSIONDOOR
-
-//BATTLEGROUND
-26,8	//AL_TELEPORT
-27,8	//AL_WARP
-87,8	//WZ_ICEWALL
-150,8	//TF_BACKSLIDING
-219,8	//RG_INTIMIDATE
-264,8	//MO_BODYRELOCATION
-336,8	//WE_CALLPARTNER
-361,8	//HP_ASSUMPTIO
-362,8	//HP_BASILICA
-395,8	//CG_MOONLIT
-409,8	//WE_CALLPARENT
-410,8	//WE_CALLBABY
-491,8	//CR_CULTIVATION
-411,8	//TK_RUN
-426,8	//TK_HIGHJUMP
-427,8	//SG_FEEL
-428,8	//SG_SUN_WARM
-429,8	//SG_MOON_WARM
-430,8	//SG_STAR_WARM
-431,8	//SG_SUN_COMFORT
-432,8	//SG_MOON_COMFORT
-433,8	//SG_STAR_COMFORT
-434,8	//SG_HATE
-435,8	//SG_SUN_ANGER
-436,8	//SG_MOON_ANGER
-437,8	//SG_STAR_ANGER
-438,8	//SG_SUN_BLESS
-439,8	//SG_MOON_BLESS
-440,8	//SG_STAR_BLESS
-530,8	//NJ_KIRIKAGE
-691,8	//CASH_ASSUMPITO
-2284,8	//SC_FATALMENACE
-2300,8	//SC_DIMENSIONDOOR
-
-//mixed
-488,3	//CG_HERMODE
-3013,3	//KO_KYOUGAKU
-
-//Clone Forbidden/pointless skills
-77,16	//PR_TURNUNDEAD
-79,16	//PR_MAGNUS
-
-//Zone 1 - Aldebaran Turbo Track
-8,32	//SM_ENDURE
-26,32	//AL_TELEPORT
-27,32	//AL_WARP
-35,32	//AL_CURE
-51,32	//TF_HIDING
-87,32	//WZ_ICEWALL
-135,32	//AS_CLOAKING
-219,32	//RG_INTIMIDATE
-264,32	//MO_BODYRELOCATION
-357,32	//LK_CONCENTRATION
-359,32	//LK_BERSERK
-362,32	//HP_BASILICA
-387,32	//WS_CARTBOOST
-389,32	//ST_CHASEWALK
-395,32	//CG_MOONLIT
-2284,32	//SC_FATALMENACE
-2300,32	//SC_DIMENSIONDOOR
-2478,32	//GN_CARTBOOST
-
-//Zone 2 - Jail
-421,64	//TK_JUMPKICK
-426,64	//TK_HIGHJUMP
-
-//Zone 3 - Izlude Battle Arena
-219,128 //RG_INTIMIDATE
-26,128	//AL_TELEPORT
-2284,128	//SC_FATALMENACE
-2300,128	//SC_DIMENSIONDOOR
-
-//Zone 4 - WoE:SE
-426,256 //TK_HIGHJUMP
-290,256	//SA_ABRACADABRA
-
-//Zone 5 - Sealed Shrine
-12,512	//MG_SAFETYWALL
-26,512	//AL_TELEPORT
-219,512	//RG_INTIMIDATE
-361,512	//HP_ASSUMPTIO
-691,512	//CASH_ASSUMPTIO
-2284,512	//SC_FATALMENACE
-2300,512	//SC_DIMENSIONDOOR
-
-//Zone 6 - Endless Tower, Orc's Memory, Nidhoggur's Nest
-26,1024	//AL_TELEPORT
-87,1024	//WZ_ICEWALL
-219,1024	//RG_INTIMIDATE
-405,1024	//PF_SPIDERWEB
-674,1024	//NPC_EXPULSION
-2284,1024	//SC_FATALMENACE
-2300,1024	//SC_DIMENSIONDOOR
-
-//Zone 7 - Towns
-232,2048	//AM_CANNIBALIZE
-233,2048	//AM_SPHEREMINE
-491,2048	//CR_CULTIVATION
-1013,2048	//BS_GREED
-2299,2048	//SC_MANHOLE
-2419,2048	//WM_POEMOFNETHERWORLD
-2482,2048	//GN_WALLOFTHORN
diff --git a/db/re/item_noequip.txt b/db/re/item_noequip.txt
deleted file mode 100644
index 6e8b65309..000000000
--- a/db/re/item_noequip.txt
+++ /dev/null
@@ -1,60 +0,0 @@
-// The equipment/items/cards restriction file 
-// here you define which items may not be used at PvP / GvG 
-// format: <item id>,<mode>
-// mode
-// 1    - restricted in normal maps
-// 2    - restricted in PVP
-// 4    - restricted in GVG
-// 8    - restricted in Battlegrounds
-// Restricted zones - they're configured by 'restricted <number>' mapflag
-// 32   - restricted in zone 1
-// 64   - restricted in zone 2
-// 128  - restricted in zone 3
-// 256  - restricted in zone 4
-// 512  - restricted in zone 5
-// 1024 - restricted in zone 6
-// 2048 - restricted in zone 7
-
-//Examples:
-//1201,1 you can't use KNIFE(ID 1201) on normal maps
-//608,4 you can't use Yggdrasil Seed(ID 608) on both GvG and WoE Castles
-//4174,6 Forbid Deviling Card in every PVP or GVG map, and during woes.
-//501,32 you can't use Red Potion on map marked as 'restricted zone 1'
-//502,64 you can't use Orange Potion on map marked as 'restricted zone 2'
-//503,128 you can't use Yellow Potion on map marked as 'restricted zone 3'
-// you can even mix modes
-//519,322 (256+64+2) you can't use Milk on PVP, and maps marked as 'restricted zone 2' and 'restricted zone 4'
-
-//PVP
-14529,2 //Greed Scroll
-
-//GVG
-12218,4 //LV5 Assumptio Scroll
-14529,4 //Greed Scroll
-14590,4 //Party Assumptio 5 Scroll
-
-//BATTLEGROUND
-12218,8 //LV5 Assumptio Scroll
-14590,8 //Party Assumptio 5 Scroll
-
-
-//Zone 1 - Aldebaran Turbo Track
-601,32 //Fly Wing
-605,32 //Anodyne
-506,32 //Green Potion
-525,32 //Panacea
-
-//Zone 2 - Jail
-601,64 //Fly Wing - not really needed here but ...
-602,64 //Butterfly Wing - also not needed
-12212,64 //Giant Fly Wing
-14582,64
-14583,64
-14584,64
-14585,64
-
-//Zone 3 - Izlude Battle Arena
-601,128 //Fly Wing
-
-//Zone 7 - Towns
-14529,2048 //Greed Scroll
diff --git a/db/re/map_zone_db.txt b/db/re/map_zone_db.txt
new file mode 100644
index 000000000..996726575
--- /dev/null
+++ b/db/re/map_zone_db.txt
@@ -0,0 +1,239 @@
+//====================================================
+//=       _   _                     _           
+//=      | | | |                   | |          
+//=      | |_| | ___ _ __ ___ _   _| | ___  ___ 
+//=      |  _  |/ _ \ '__/ __| | | | |/ _ \/ __|
+//=      | | | |  __/ | | (__| |_| | |  __/\__ \
+//=      \_| |_/\___|_|  \___|\__,_|_|\___||___/
+//=                                                  
+//=            http://hercules.ws/board/                        
+//====================================================
+//= Hercules Map Zone Database [Ind/Hercules]
+//==
+//= A unlimited number of zones may be created, a zone
+//= may be used to create a set of disabled items, disabled skills
+//= and mapflags to be used by as many maps as one chooses,
+//= maps can be linked to a specific zone through the zone mapflag
+//= '<map name><tab>mapflag<tab>zone<tab><zone name>'
+zones: (
+{
+	/* Normal zone is applied to all maps that are not pkable (where players cant fight each other)  */
+	/* However, it wont be applied to maps with its own zones (specified thru mapflag) */
+	name: "Normal" /* changing this name requires MAP_ZONE_NORMAL_NAME to also be changed in src/map/map.h file */
+	
+	disabled_skills: {
+		WM_LULLABY_DEEPSLEEP: true
+		WM_SIRCLEOFNATURE: true
+		WM_SATURDAY_NIGHT_FEVER: true
+		SO_ARRULLO: true
+		CG_HERMODE: true
+	}
+	
+	disabled_items: {
+	
+	}
+	mapflags: ( )
+},
+{
+	/* PvP zone is applied to all maps with a pvp mapflag */
+	name: "PvP" /* changing this name requires MAP_ZONE_PVP_NAME to also be changed in src/map/map.h file */
+	
+	disabled_skills: {
+		BS_GREED: true
+		CG_HERMODE: true
+	}
+	
+	disabled_items: {
+		Greed_Scroll: true
+	}
+},
+{
+	/* GvG zone is applied to all maps with a pvp mapflag */
+	name: "GvG" /* changing this name requires MAP_ZONE_GVG_NAME to also be changed in src/map/map.h file */
+	
+	disabled_skills: {
+		AL_TELEPORT: true
+		AL_WARP: true
+		WZ_ICEWALL: true
+		TF_BACKSLIDING: true
+		RG_INTIMIDATE: true
+		WE_CALLPARTNER: true
+		HP_ASSUMPTIO: true
+		HP_BASILICA: true
+		CG_MOONLIT: true
+		WE_CALLPARENT: true
+		WE_CALLBABY: true
+		CR_CULTIVATION: true
+		NJ_KIRIKAGE: true
+		CASH_ASSUMPTIO: true
+		BS_GREED: true
+		SC_FATALMENACE: true
+		SC_DIMENSIONDOOR: true
+	}
+	
+	disabled_items: {
+		Assumptio_5_Scroll: true
+		Greed_Scroll: true
+		Pty_Assumptio_Scroll: true
+	}
+},
+{
+	/* Battlegrounds zone is applied to all maps with a battlegrounds mapflag */
+	name: "Battlegrounds" /* changing this name requires MAP_ZONE_BG_NAME to also be changed in src/map/map.h file */
+	
+	disabled_skills: {
+		AL_TELEPORT: true
+		AL_WARP: true
+		WZ_ICEWALL: true
+		TF_BACKSLIDING: true
+		RG_INTIMIDATE: true
+		MO_BODYRELOCATION: true
+		WE_CALLPARTNER: true
+		HP_ASSUMPTIO: true
+		HP_BASILICA: true
+		CG_MOONLIT: true
+		WE_CALLPARENT: true
+		WE_CALLBABY: true
+		CR_CULTIVATION: true
+		TK_RUN: true
+		TK_HIGHJUMP: true
+		SG_FEEL: true
+		SG_SUN_WARM: true
+		SG_MOON_WARM: true
+		SG_STAR_WARM: true
+		SG_SUN_COMFORT: true
+		SG_MOON_COMFORT: true
+		SG_STAR_COMFORT: true
+		SG_HATE: true
+		SG_SUN_ANGER: true
+		SG_MOON_ANGER: true
+		SG_STAR_ANGER: true
+		SG_SUN_BLESS: true
+		SG_MOON_BLESS: true
+		SG_STAR_BLESS: true
+		NJ_KIRIKAGE: true
+		CASH_ASSUMPTIO: true
+		SC_FATALMENACE: true
+		SC_DIMENSIONDOOR: true
+	}
+	disabled_items: {
+		Assumptio_5_Scroll: true
+		Pty_Assumptio_Scroll: true
+	}
+},
+{
+	name: "Aldebaran Turbo Track"
+	
+	disabled_skills: {
+		SM_ENDURE: true
+		AL_TELEPORT: true
+		AL_WARP: true
+		AL_CURE: true
+		TF_HIDING: true
+		WZ_ICEWALL: true
+		AS_CLOAKING: true
+		RG_INTIMIDATE: true
+		MO_BODYRELOCATION: true
+		LK_CONCENTRATION: true
+		LK_BERSERK: true
+		HP_BASILICA: true
+		WS_CARTBOOST: true
+		ST_CHASEWALK: true
+		CG_MOONLIT: true
+		SC_FATALMENACE: true
+		SC_DIMENSIONDOOR: true
+		GN_CARTBOOST: true
+	}
+	
+	disabled_items: {
+		Wing_Of_Fly: true
+		Anodyne: true
+		Green_Potion: true
+		Panacea: true
+	}
+},
+{
+	name: "Jail"
+	
+	disabled_skills: {
+		TK_JUMPKICK: true
+		TK_HIGHJUMP: true
+	}
+	
+	disabled_items: {
+		Wing_Of_Fly: true
+		Wing_Of_Butterfly: true
+		Giant_Fly_Wing: true
+		WOB_Rune: true
+		WOB_Schwaltz: true
+		WOB_Rachel: true
+		WOB_Local: true
+	}
+},
+{
+	name: "Izlude Battle Arena"
+	
+	disabled_skills: {
+		RG_INTIMIDATE: true
+		AL_TELEPORT: true
+		SC_FATALMENACE: true
+		SC_DIMENSIONDOOR: true		
+	}
+	
+	disabled_items: {
+		Wing_Of_Fly: true
+	}
+},
+{
+	name: "GvG2"
+	inherit: ( "GvG" ) /* will import all gvg has */
+	
+	disabled_skills: {
+		TK_HIGHJUMP: true
+		SA_ABRACADABRA: true
+	}
+},
+{
+	name: "Sealed Shrine"
+	
+	disabled_skills: {
+		MG_SAFETYWALL: true
+		AL_TELEPORT: true
+		RG_INTIMIDATE: true
+		HP_ASSUMPTIO: true
+		CASH_ASSUMPTIO: true
+		SC_FATALMENACE: true
+		SC_DIMENSIONDOOR: true
+	}
+},
+{
+	name: "Memorial Dungeon" /* ETower, Orc's Memory, Nidhoggur's Nest, etc */
+	
+	disabled_skills: {
+		AL_TELEPORT: true
+		WZ_ICEWALL: true
+		RG_INTIMIDATE: true
+		PF_SPIDERWEB: true
+		NPC_EXPULSION: true
+		SC_FATALMENACE: true
+		SC_DIMENSIONDOOR: true
+	}
+},
+{
+	name: "Towns"
+	
+	disabled_skills: {
+		AM_CANNIBALIZE: true
+		AM_SPHEREMINE: true
+		CR_CULTIVATION: true
+		BS_GREED: true
+		SC_MANHOLE: true
+		WM_POEMOFNETHERWORLD: true
+		GN_WALLOFTHORN: true
+	}
+	
+	disabled_items: {
+		Greed_Scroll: true
+	}
+}
+)
\ No newline at end of file
diff --git a/db/re/skill_nocast_db.txt b/db/re/skill_nocast_db.txt
deleted file mode 100644
index 5e12477a9..000000000
--- a/db/re/skill_nocast_db.txt
+++ /dev/null
@@ -1,154 +0,0 @@
-// Forbidden Skills Database
-//
-// Structure of Database:
-// SkillID,Flag
-//
-// Legend for 'Flag' field (bitmask):
-//  1 = Cannot be used in normal maps
-//  2 = Cannot be used in PvP maps (use this instead of 1 for PK-mode servers)
-//  4 = Cannot be used in GvG maps
-//  8 = Cannot be used in Battleground maps
-//  16 = Cannot be cloned (clones will not copy this skill)
-//  Restricted zones - they're configured by 'restricted <number>' mapflag
-//  32 = Cannot be used in zone 1 maps
-//  64 = Cannot be used in zone 2 maps
-//  128 = Cannot be used in zone 3 maps
-//  256 = Cannot be used in zone 4 maps
-//  512 = Cannot be used in zone 5 maps
-//  1024 = Cannot be used in zone 6 maps
-//  2048 = Cannot be used in zone 7 maps
-//
-// Example:
-// 8,6 = Endure cannot be used in PvP and GvG maps (2+4)
-
-//Normal
-2422,1	//WM_LULLABY_DEEPSLEEP
-2423,1	//WM_SIRCLEOFNATURE
-2430,1	//WM_SATURDAY_NIGHT_FEVER
-2455,1	//SO_ARRULLO
-
-//PVP
-1013,2	//BS_GREED
-
-//GVG
-26,4	//AL_TELEPORT
-27,4	//AL_WARP
-87,4	//WZ_ICEWALL
-150,4	//TF_BACKSLIDING
-219,4	//RG_INTIMIDATE
-336,4	//WE_CALLPARTNER
-361,4	//HP_ASSUMPTIO
-362,4	//HP_BASILICA
-395,4	//CG_MOONLIT
-409,4	//WE_CALLPARENT
-410,4	//WE_CALLBABY
-491,4	//CR_CULTIVATION
-530,4	//NJ_KIRIKAGE
-691,4	//CASH_ASSUMPTIO
-1013,4	//BS_GREED
-2284,4	//SC_FATALMENACE
-2300,4	//SC_DIMENSIONDOOR
-
-//BATTLEGROUND
-26,8	//AL_TELEPORT
-27,8	//AL_WARP
-87,8	//WZ_ICEWALL
-150,8	//TF_BACKSLIDING
-219,8	//RG_INTIMIDATE
-264,8	//MO_BODYRELOCATION
-336,8	//WE_CALLPARTNER
-361,8	//HP_ASSUMPTIO
-362,8	//HP_BASILICA
-395,8	//CG_MOONLIT
-409,8	//WE_CALLPARENT
-410,8	//WE_CALLBABY
-491,8	//CR_CULTIVATION
-411,8	//TK_RUN
-426,8	//TK_HIGHJUMP
-427,8	//SG_FEEL
-428,8	//SG_SUN_WARM
-429,8	//SG_MOON_WARM
-430,8	//SG_STAR_WARM
-431,8	//SG_SUN_COMFORT
-432,8	//SG_MOON_COMFORT
-433,8	//SG_STAR_COMFORT
-434,8	//SG_HATE
-435,8	//SG_SUN_ANGER
-436,8	//SG_MOON_ANGER
-437,8	//SG_STAR_ANGER
-438,8	//SG_SUN_BLESS
-439,8	//SG_MOON_BLESS
-440,8	//SG_STAR_BLESS
-530,8	//NJ_KIRIKAGE
-691,8	//CASH_ASSUMPITO
-2284,8	//SC_FATALMENACE
-2300,8	//SC_DIMENSIONDOOR
-
-//mixed
-488,3	//CG_HERMODE
-3013,3	//KO_KYOUGAKU
-
-//Clone Forbidden/pointless skills
-77,16	//PR_TURNUNDEAD
-79,16	//PR_MAGNUS
-
-//Zone 1 - Aldebaran Turbo Track
-8,32	//SM_ENDURE
-26,32	//AL_TELEPORT
-27,32	//AL_WARP
-35,32	//AL_CURE
-51,32	//TF_HIDING
-87,32	//WZ_ICEWALL
-135,32	//AS_CLOAKING
-219,32	//RG_INTIMIDATE
-264,32	//MO_BODYRELOCATION
-357,32	//LK_CONCENTRATION
-359,32	//LK_BERSERK
-362,32	//HP_BASILICA
-387,32	//WS_CARTBOOST
-389,32	//ST_CHASEWALK
-395,32	//CG_MOONLIT
-2284,32	//SC_FATALMENACE
-2300,32	//SC_DIMENSIONDOOR
-2478,32	//GN_CARTBOOST
-
-//Zone 2 - Jail
-421,64	//TK_JUMPKICK
-426,64	//TK_HIGHJUMP
-
-//Zone 3 - Izlude Battle Arena
-219,128 //RG_INTIMIDATE
-26,128	//AL_TELEPORT
-2284,128	//SC_FATALMENACE
-2300,128	//SC_DIMENSIONDOOR
-
-//Zone 4 - WoE:SE
-426,256 //TK_HIGHJUMP
-290,256	//SA_ABRACADABRA
-
-//Zone 5 - Sealed Shrine
-12,512	//MG_SAFETYWALL
-26,512	//AL_TELEPORT
-219,512	//RG_INTIMIDATE
-361,512	//HP_ASSUMPTIO
-691,512	//CASH_ASSUMPTIO
-2284,512	//SC_FATALMENACE
-2300,512	//SC_DIMENSIONDOOR
-
-//Zone 6 - Endless Tower, Orc's Memory, Nidhoggur's Nest
-26,1024	//AL_TELEPORT
-87,1024	//WZ_ICEWALL
-219,1024	//RG_INTIMIDATE
-405,1024	//PF_SPIDERWEB
-674,1024	//NPC_EXPULSION
-2284,1024	//SC_FATALMENACE
-2300,1024	//SC_DIMENSIONDOOR
-
-//Zone 7 - Towns
-232,2048	//AM_CANNIBALIZE
-233,2048	//AM_SPHEREMINE
-491,2048	//CR_CULTIVATION
-1013,2048	//BS_GREED
-2299,2048	//SC_MANHOLE
-2419,2048	//WM_POEMOFNETHERWORLD
-2482,2048	//GN_WALLOFTHORN