Merge pull request #1617 from AtlantisRO/siege_items_restriction

Fixes #686. Blocks Vellum and Siege equips/potions usage on non WOE/PVP maps.

1 files changed, 63 insertions, 99 deletions

diff --git a/db/re/map_zone_db.conf b/db/re/map_zone_db.conf
index 1dd4315b6..ae6f23f01 100644
--- a/db/re/map_zone_db.conf
+++ b/db/re/map_zone_db.conf
@@ -55,37 +55,6 @@ zones: (
 		//Both examples below disable apple (id 501)
 		//Apple: true
 		//ID501: true
-	}
-
-	mapflags: (
-	)
-
-	/* "command:min-group-lv-to-override" e.g. "heal: 70" */
-	disabled_commands: {
-		//Example Below makes @heal be used in maps within this zone only by those group lv 70 and above
-		//heal: 70
-	}
-	skill_damage_cap: {
-		//Example Below caps Cold Bolt damage in maps within this zone to a maximum 50 damage,
-		// (depends on HMAP_ZONE_DAMAGE_CAP_TYPE in src/config/core.h)
-		// when cast vs players and monsters.
-		//MG_COLDBOLT: (50,"PLAYER | MONSTER")
-	}
-},
-{
-	/* 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 through 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: "PLAYER"
-		WM_SIRCLEOFNATURE: "PLAYER"
-		WM_SATURDAY_NIGHT_FEVER: "PLAYER"
-		SO_ARRULLO: "PLAYER"
-		CG_HERMODE: "PLAYER"
-	}
-
-	disabled_items: {
 		Velum_Jamadhar: true
 		Velum_Scare: true
 		Velum_Buster: true
@@ -124,6 +93,37 @@ zones: (
 	mapflags: (
 	)
 
+	/* "command:min-group-lv-to-override" e.g. "heal: 70" */
+	disabled_commands: {
+		//Example Below makes @heal be used in maps within this zone only by those group lv 70 and above
+		//heal: 70
+	}
+	skill_damage_cap: {
+		//Example Below caps Cold Bolt damage in maps within this zone to a maximum 50 damage,
+		// (depends on HMAP_ZONE_DAMAGE_CAP_TYPE in src/config/core.h)
+		// when cast vs players and monsters.
+		//MG_COLDBOLT: (50,"PLAYER | MONSTER")
+	}
+},
+{
+	/* 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 through 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: "PLAYER"
+		WM_SIRCLEOFNATURE: "PLAYER"
+		WM_SATURDAY_NIGHT_FEVER: "PLAYER"
+		SO_ARRULLO: "PLAYER"
+		CG_HERMODE: "PLAYER"
+	}
+
+	disabled_items: {
+	}
+
+	mapflags: (
+	)
+
 },
 {
 	/* PvP zone is applied to all maps with a pvp mapflag */
@@ -137,6 +137,38 @@ zones: (
 	disabled_items: {
 		Greed_Scroll: true
 		C_Beginner_Cap: true
+		Velum_Jamadhar: false
+		Velum_Scare: false
+		Velum_Buster: false
+		Velum_Guillotine: false
+		Velum_Spear: false
+		Velum_Glaive: false
+		Velum_Bible: false
+		Velum_Encyclopedia: false
+		Velum_Claw: false
+		Velum_Arc_Wand: false
+		Velum_Damascus: false
+		Velum_Stunner: false
+		Velum_Flail: false
+		Velum_Arbalest: false
+		Velum_CrossBow: false
+		Velum_Claymore: false
+		Velum_Katzbalger: false
+		Siege_Arrow_A: false
+		Siege_Arrow_S: false
+		Siege_Greave: false
+		Siege_Boots: false
+		Siege_Shoes: false
+		Siege_Manteau: false
+		Siege_Muffler: false
+		Siege_White_Potion: false
+		Siege_Blue_Potion: false
+		Woe_Violet_Potion: false
+		Woe_White_Potion: false
+		Woe_Blue_Potion: false
+		Siege_Plate: false
+		Siege_Suits: false
+		Siege_Robe: false
 	}
 
 	/* cashshop disabled in pvp maps */
@@ -298,40 +330,6 @@ zones: (
 	disabled_items: {
 		Assumptio_5_Scroll: true
 		Pty_Assumptio_Scroll: true
-		Velum_Jamadhar: true
-		Velum_Scare: true
-		Velum_Buster: true
-		Velum_Guillotine: true
-		Velum_Spear: true
-		Velum_Glaive: true
-		Velum_Bible: true
-		Velum_Encyclopedia: true
-		Velum_Claw: true
-		Velum_Arc_Wand: true
-		Velum_Damascus: true
-		Velum_Stunner: true
-		Velum_Flail: true
-		Velum_Arbalest: true
-		Velum_CrossBow: true
-		Velum_Claymore: true
-		Velum_Katzbalger: true
-		Siege_Arrow_A: true
-		Siege_Arrow_S: true
-		Siege_Greave: true
-		Siege_Boots: true
-		Siege_Shoes: true
-		Siege_Manteau: true
-		Siege_Muffler: true
-		Siege_White_Potion: true
-		Siege_Blue_Potion: true
-		Woe_Violet_Potion: true
-		Woe_White_Potion: true
-		Woe_Blue_Potion: true
-		TE_White_Potion: true
-		TE_White_Slim_Potion: true
-		Siege_Plate: true
-		Siege_Suits: true
-		Siege_Robe: true
 		C_Beginner_Cap: true
 	}
 
@@ -474,40 +472,6 @@ zones: (
 
 	disabled_items: {
 		Greed_Scroll: true
-		Velum_Jamadhar: true
-		Velum_Scare: true
-		Velum_Buster: true
-		Velum_Guillotine: true
-		Velum_Spear: true
-		Velum_Glaive: true
-		Velum_Bible: true
-		Velum_Encyclopedia: true
-		Velum_Claw: true
-		Velum_Arc_Wand: true
-		Velum_Damascus: true
-		Velum_Stunner: true
-		Velum_Flail: true
-		Velum_Arbalest: true
-		Velum_CrossBow: true
-		Velum_Claymore: true
-		Velum_Katzbalger: true
-		Siege_Arrow_A: true
-		Siege_Arrow_S: true
-		Siege_Greave: true
-		Siege_Boots: true
-		Siege_Shoes: true
-		Siege_Manteau: true
-		Siege_Muffler: true
-		Siege_White_Potion: true
-		Siege_Blue_Potion: true
-		Woe_Violet_Potion: true
-		Woe_White_Potion: true
-		Woe_Blue_Potion: true
-		TE_White_Potion: true
-		TE_White_Slim_Potion: true
-		Siege_Plate: true
-		Siege_Suits: true
-		Siege_Robe: true
 	}
 }
 )