Hercules April 22 MEGA-ULTRA-LONG Patch~!

http://hercules.ws/board/topic/470-hercules-april-22-patch/
Signed-off-by: shennetsind <ind@henn.et>

1 files changed, 30 insertions, 21 deletions

diff --git a/src/map/map.h b/src/map/map.h
index dd0a47aaf..ae60b810c 100644
--- a/src/map/map.h
+++ b/src/map/map.h
@@ -13,6 +13,8 @@
 
 #include "../config/core.h"
 
+#include "atcommand.h"
+
 #include <stdarg.h>
 
 struct npc_data;
@@ -106,7 +108,7 @@ enum {
 	MAPID_ASSASSIN,
 	MAPID_STAR_GLADIATOR,
 	MAPID_KAGEROUOBORO = JOBL_2_1|0x0A,
-	MAPID_DEATH_KNIGHT = JOBL_2_1|0x0D,
+	MAPID_DEATH_KNIGHT = JOBL_2_1|0x0E,
 //2-2 Jobs
 	MAPID_CRUSADER = JOBL_2_2|0x1,
 	MAPID_SAGE,
@@ -497,13 +499,35 @@ struct mapflag_skill_adjust {
 	unsigned short skill_id;
 	unsigned short modifier;
 };
+
+enum map_zone_skill_subtype {
+	MZS_NONE	= 0x0,
+	MZS_CLONE	= 0x01,
+	MZS_BOSS	= 0x02,
+	
+	MZS_ALL		= 0xFFF,
+};
+
 struct map_zone_disabled_skill_entry {
 	unsigned short nameid;
 	enum bl_type type;
+	enum map_zone_skill_subtype subtype;
+};
+struct map_zone_disabled_command_entry {
+	AtCommandFunc cmd;
+	int group_lv;
+};
+
+struct map_zone_skill_damage_cap_entry {
+	unsigned short nameid;
+	unsigned int cap;
+	enum bl_type type;
+	enum map_zone_skill_subtype subtype;
 };
 
 #define MAP_ZONE_NAME_LENGTH 30
-#define MAP_ZONE_ALL_NAME "Normal"
+#define MAP_ZONE_ALL_NAME "All"
+#define MAP_ZONE_NORMAL_NAME "Normal"
 #define MAP_ZONE_PVP_NAME "PvP"
 #define MAP_ZONE_GVG_NAME "GvG"
 #define MAP_ZONE_BG_NAME "Battlegrounds"
@@ -518,6 +542,10 @@ struct map_zone_data {
 	int disabled_items_count;
 	char **mapflags;
 	int mapflags_count;
+	struct map_zone_disabled_command_entry **disabled_commands;
+	int disabled_commands_count;
+	struct map_zone_skill_damage_cap_entry **capped_skills;
+	int capped_skills_count;
 };
 void map_zone_init(void);
 void map_zone_remove(int m);
@@ -577,7 +605,6 @@ struct map_data {
 		unsigned fireworks : 1;
 		unsigned sakura : 1; // [Valaris]
 		unsigned leaves : 1; // [Valaris]
-		unsigned nogo : 1; // [Valaris]
 		unsigned nobaseexp	: 1; // [Lorky] added by Lupus
 		unsigned nojobexp	: 1; // [Lorky]
 		unsigned nomobloot	: 1; // [Lorky]
@@ -823,24 +850,6 @@ typedef struct elemental_data	TBL_ELEM;
 #define BL_CAST(type_, bl) \
 	( ((bl) == (struct block_list*)NULL || (bl)->type != (type_)) ? (T ## type_ *)NULL : (T ## type_ *)(bl) )
 
-
-#ifdef BETA_THREAD_TEST
-
-extern char default_codepage[32];
-extern int map_server_port;
-extern char map_server_ip[32];
-extern char map_server_id[32];
-extern char map_server_pw[32];
-extern char map_server_db[32];
-
-extern char log_db_ip[32];
-extern int log_db_port;
-extern char log_db_id[32];
-extern char log_db_pw[32];
-extern char log_db_db[32];
-
-#endif
-
 #include "../common/sql.h"
 
 extern int db_use_sqldbs;