summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorshennetsind <ind@henn.et>2013-04-24 10:58:00 -0300
committershennetsind <ind@henn.et>2013-04-24 10:58:00 -0300
commit4a6e655a6fb39123363905b468a3e5dcd1451f8d (patch)
tree1acc3928a9c728f2fab6308ecbd27edeb357167f
parent5a74f3f57a671e7729d8f48cdcc1d6f9454f504b (diff)
downloadhercules-4a6e655a6fb39123363905b468a3e5dcd1451f8d.tar.gz
hercules-4a6e655a6fb39123363905b468a3e5dcd1451f8d.tar.bz2
hercules-4a6e655a6fb39123363905b468a3e5dcd1451f8d.tar.xz
hercules-4a6e655a6fb39123363905b468a3e5dcd1451f8d.zip
Fixed Map Zone DB Documentation
Added missing description on CLONE and MOB_BOSS target types, special thanks to frenzmu06! http://hercules.ws/board/topic/302-introducing-hercules-map-zone-database/?p=3508 Also fixed map zone target type "All" to include "mob_boss" and "clone" Signed-off-by: shennetsind <ind@henn.et>
-rw-r--r--db/pre-re/map_zone_db.conf2
-rw-r--r--db/re/map_zone_db.conf2
-rw-r--r--src/map/map.c5
3 files changed, 5 insertions, 4 deletions
diff --git a/db/pre-re/map_zone_db.conf b/db/pre-re/map_zone_db.conf
index 6fb18084b..ea995b712 100644
--- a/db/pre-re/map_zone_db.conf
+++ b/db/pre-re/map_zone_db.conf
@@ -16,7 +16,7 @@
//= maps can be linked to a specific zone through the zone mapflag
//= '<map name><tab>mapflag<tab>zone<tab><zone name>'
//== available types for 'disabled_skills':
-//= PLAYER, HOMUN, MERCENARY, MONSTER, PET, ELEMENTAL, ALL and NONE
+//= PLAYER, HOMUN, MERCENARY, MONSTER, PET, ELEMENTAL, MOB_BOSS, CLONE, ALL and NONE
//== More on
//= http://hercules.ws/board/topic/302-introducing-hercules-map-zone-database/
//= (TODO: replace with wiki link and detail the wiki page in a decent format ^)
diff --git a/db/re/map_zone_db.conf b/db/re/map_zone_db.conf
index 6fb18084b..ea995b712 100644
--- a/db/re/map_zone_db.conf
+++ b/db/re/map_zone_db.conf
@@ -16,7 +16,7 @@
//= maps can be linked to a specific zone through the zone mapflag
//= '<map name><tab>mapflag<tab>zone<tab><zone name>'
//== available types for 'disabled_skills':
-//= PLAYER, HOMUN, MERCENARY, MONSTER, PET, ELEMENTAL, ALL and NONE
+//= PLAYER, HOMUN, MERCENARY, MONSTER, PET, ELEMENTAL, MOB_BOSS, CLONE, ALL and NONE
//== More on
//= http://hercules.ws/board/topic/302-introducing-hercules-map-zone-database/
//= (TODO: replace with wiki link and detail the wiki page in a decent format ^)
diff --git a/src/map/map.c b/src/map/map.c
index c65157cb2..1bbad1d40 100644
--- a/src/map/map.c
+++ b/src/map/map.c
@@ -4500,9 +4500,10 @@ enum bl_type map_zone_bl_type(const char *entry, enum map_zone_skill_subtype *su
bl |= BL_ELEM;
else if( strcmpi(parse,"pet") == 0 )
bl |= BL_PET;
- else if( strcmpi(parse,"all") == 0 )
+ else if( strcmpi(parse,"all") == 0 ) {
bl |= BL_ALL;
- else if( strcmpi(parse,"none") == 0 ) {
+ *subtype |= MZS_ALL;
+ } else if( strcmpi(parse,"none") == 0 ) {
bl = BL_NUL;
} else {
ShowError("map_zone_db: '%s' unknown type, skipping...\n",parse);