3 files changed, 96 insertions, 0 deletions
diff --git a/src/plugins/HPMHooking/HPMHooking_map.HPMHooksCore.inc b/src/plugins/HPMHooking/HPMHooking_map.HPMHooksCore.inc
index 74e765cee..7b9eadb91 100644
--- a/src/plugins/HPMHooking/HPMHooking_map.HPMHooksCore.inc
+++ b/src/plugins/HPMHooking/HPMHooking_map.HPMHooksCore.inc
@@ -2587,6 +2587,8 @@ struct {
 	struct HPMHookPoint *HP_itemdb_clear_post;
 	struct HPMHookPoint *HP_itemdb_id2combo_pre;
 	struct HPMHookPoint *HP_itemdb_id2combo_post;
+	struct HPMHookPoint *HP_itemdb_is_item_usable_pre;
+	struct HPMHookPoint *HP_itemdb_is_item_usable_post;
 	struct HPMHookPoint *HP_logs_pick_pc_pre;
 	struct HPMHookPoint *HP_logs_pick_pc_post;
 	struct HPMHookPoint *HP_logs_pick_mob_pre;
@@ -3205,6 +3207,8 @@ struct {
 	struct HPMHookPoint *HP_npc_ontouch_event_post;
 	struct HPMHookPoint *HP_npc_ontouch2_event_pre;
 	struct HPMHookPoint *HP_npc_ontouch2_event_post;
+	struct HPMHookPoint *HP_npc_onuntouch_event_pre;
+	struct HPMHookPoint *HP_npc_onuntouch_event_post;
 	struct HPMHookPoint *HP_npc_enable_sub_pre;
 	struct HPMHookPoint *HP_npc_enable_sub_post;
 	struct HPMHookPoint *HP_npc_enable_pre;
@@ -3253,6 +3257,8 @@ struct {
 	struct HPMHookPoint *HP_npc_touchnext_areanpc_post;
 	struct HPMHookPoint *HP_npc_touch_areanpc_pre;
 	struct HPMHookPoint *HP_npc_touch_areanpc_post;
+	struct HPMHookPoint *HP_npc_untouch_areanpc_pre;
+	struct HPMHookPoint *HP_npc_untouch_areanpc_post;
 	struct HPMHookPoint *HP_npc_touch_areanpc2_pre;
 	struct HPMHookPoint *HP_npc_touch_areanpc2_post;
 	struct HPMHookPoint *HP_npc_check_areanpc_pre;
@@ -7658,6 +7664,8 @@ struct {
 	int HP_itemdb_clear_post;
 	int HP_itemdb_id2combo_pre;
 	int HP_itemdb_id2combo_post;
+	int HP_itemdb_is_item_usable_pre;
+	int HP_itemdb_is_item_usable_post;
 	int HP_logs_pick_pc_pre;
 	int HP_logs_pick_pc_post;
 	int HP_logs_pick_mob_pre;
@@ -8276,6 +8284,8 @@ struct {
 	int HP_npc_ontouch_event_post;
 	int HP_npc_ontouch2_event_pre;
 	int HP_npc_ontouch2_event_post;
+	int HP_npc_onuntouch_event_pre;
+	int HP_npc_onuntouch_event_post;
 	int HP_npc_enable_sub_pre;
 	int HP_npc_enable_sub_post;
 	int HP_npc_enable_pre;
@@ -8324,6 +8334,8 @@ struct {
 	int HP_npc_touchnext_areanpc_post;
 	int HP_npc_touch_areanpc_pre;
 	int HP_npc_touch_areanpc_post;
+	int HP_npc_untouch_areanpc_pre;
+	int HP_npc_untouch_areanpc_post;
 	int HP_npc_touch_areanpc2_pre;
 	int HP_npc_touch_areanpc2_post;
 	int HP_npc_check_areanpc_pre;
diff --git a/src/plugins/HPMHooking/HPMHooking_map.HookingPoints.inc b/src/plugins/HPMHooking/HPMHooking_map.HookingPoints.inc
index 5d0545f82..58af99107 100644
--- a/src/plugins/HPMHooking/HPMHooking_map.HookingPoints.inc
+++ b/src/plugins/HPMHooking/HPMHooking_map.HookingPoints.inc
@@ -1312,6 +1312,7 @@ struct HookingPointData HookingPoints[] = {
 	{ HP_POP(itemdb->final_sub, HP_itemdb_final_sub) },
 	{ HP_POP(itemdb->clear, HP_itemdb_clear) },
 	{ HP_POP(itemdb->id2combo, HP_itemdb_id2combo) },
+	{ HP_POP(itemdb->is_item_usable, HP_itemdb_is_item_usable) },
 /* logs */
 	{ HP_POP(logs->pick_pc, HP_logs_pick_pc) },
 	{ HP_POP(logs->pick_mob, HP_logs_pick_mob) },
@@ -1629,6 +1630,7 @@ struct HookingPointData HookingPoints[] = {
 	{ HP_POP(npc->isnear, HP_npc_isnear) },
 	{ HP_POP(npc->ontouch_event, HP_npc_ontouch_event) },
 	{ HP_POP(npc->ontouch2_event, HP_npc_ontouch2_event) },
+	{ HP_POP(npc->onuntouch_event, HP_npc_onuntouch_event) },
 	{ HP_POP(npc->enable_sub, HP_npc_enable_sub) },
 	{ HP_POP(npc->enable, HP_npc_enable) },
 	{ HP_POP(npc->name2id, HP_npc_name2id) },
@@ -1653,6 +1655,7 @@ struct HookingPointData HookingPoints[] = {
 	{ HP_POP(npc->touch_areanpc_sub, HP_npc_touch_areanpc_sub) },
 	{ HP_POP(npc->touchnext_areanpc, HP_npc_touchnext_areanpc) },
 	{ HP_POP(npc->touch_areanpc, HP_npc_touch_areanpc) },
+	{ HP_POP(npc->untouch_areanpc, HP_npc_untouch_areanpc) },
 	{ HP_POP(npc->touch_areanpc2, HP_npc_touch_areanpc2) },
 	{ HP_POP(npc->check_areanpc, HP_npc_check_areanpc) },
 	{ HP_POP(npc->checknear, HP_npc_checknear) },
diff --git a/src/plugins/HPMHooking/HPMHooking_map.Hooks.inc b/src/plugins/HPMHooking/HPMHooking_map.Hooks.inc
index 0169d43c7..62b1be620 100644
--- a/src/plugins/HPMHooking/HPMHooking_map.Hooks.inc
+++ b/src/plugins/HPMHooking/HPMHooking_map.Hooks.inc
@@ -34264,6 +34264,33 @@ struct item_combo* HP_itemdb_id2combo(unsigned short id) {
 	}
 	return retVal___;
 }
+bool HP_itemdb_is_item_usable(struct item_data *item) {
+	int hIndex = 0;
+	bool retVal___ = false;
+	if( HPMHooks.count.HP_itemdb_is_item_usable_pre ) {
+		bool (*preHookFunc) (struct item_data *item);
+		*HPMforce_return = false;
+		for(hIndex = 0; hIndex < HPMHooks.count.HP_itemdb_is_item_usable_pre; hIndex++ ) {
+			preHookFunc = HPMHooks.list.HP_itemdb_is_item_usable_pre[hIndex].func;
+			retVal___ = preHookFunc(item);
+		}
+		if( *HPMforce_return ) {
+			*HPMforce_return = false;
+			return retVal___;
+		}
+	}
+	{
+		retVal___ = HPMHooks.source.itemdb.is_item_usable(item);
+	}
+	if( HPMHooks.count.HP_itemdb_is_item_usable_post ) {
+		bool (*postHookFunc) (bool retVal___, struct item_data *item);
+		for(hIndex = 0; hIndex < HPMHooks.count.HP_itemdb_is_item_usable_post; hIndex++ ) {
+			postHookFunc = HPMHooks.list.HP_itemdb_is_item_usable_post[hIndex].func;
+			retVal___ = postHookFunc(retVal___, item);
+		}
+	}
+	return retVal___;
+}
 /* logs */
 void HP_logs_pick_pc(struct map_session_data *sd, e_log_pick_type type, int amount, struct item *itm, struct item_data *data) {
 	int hIndex = 0;
@@ -42784,6 +42811,33 @@ int HP_npc_ontouch2_event(struct map_session_data *sd, struct npc_data *nd) {
 	}
 	return retVal___;
 }
+int HP_npc_onuntouch_event(struct map_session_data *sd, struct npc_data *nd) {
+	int hIndex = 0;
+	int retVal___ = 0;
+	if( HPMHooks.count.HP_npc_onuntouch_event_pre ) {
+		int (*preHookFunc) (struct map_session_data *sd, struct npc_data *nd);
+		*HPMforce_return = false;
+		for(hIndex = 0; hIndex < HPMHooks.count.HP_npc_onuntouch_event_pre; hIndex++ ) {
+			preHookFunc = HPMHooks.list.HP_npc_onuntouch_event_pre[hIndex].func;
+			retVal___ = preHookFunc(sd, nd);
+		}
+		if( *HPMforce_return ) {
+			*HPMforce_return = false;
+			return retVal___;
+		}
+	}
+	{
+		retVal___ = HPMHooks.source.npc.onuntouch_event(sd, nd);
+	}
+	if( HPMHooks.count.HP_npc_onuntouch_event_post ) {
+		int (*postHookFunc) (int retVal___, struct map_session_data *sd, struct npc_data *nd);
+		for(hIndex = 0; hIndex < HPMHooks.count.HP_npc_onuntouch_event_post; hIndex++ ) {
+			postHookFunc = HPMHooks.list.HP_npc_onuntouch_event_post[hIndex].func;
+			retVal___ = postHookFunc(retVal___, sd, nd);
+		}
+	}
+	return retVal___;
+}
 int HP_npc_enable_sub(struct block_list *bl, va_list ap) {
 	int hIndex = 0;
 	int retVal___ = 0;
@@ -43454,6 +43508,33 @@ int HP_npc_touch_areanpc(struct map_session_data *sd, int16 m, int16 x, int16 y)
 	}
 	return retVal___;
 }
+int HP_npc_untouch_areanpc(struct map_session_data *sd, int16 m, int16 x, int16 y) {
+	int hIndex = 0;
+	int retVal___ = 0;
+	if( HPMHooks.count.HP_npc_untouch_areanpc_pre ) {
+		int (*preHookFunc) (struct map_session_data *sd, int16 *m, int16 *x, int16 *y);
+		*HPMforce_return = false;
+		for(hIndex = 0; hIndex < HPMHooks.count.HP_npc_untouch_areanpc_pre; hIndex++ ) {
+			preHookFunc = HPMHooks.list.HP_npc_untouch_areanpc_pre[hIndex].func;
+			retVal___ = preHookFunc(sd, &m, &x, &y);
+		}
+		if( *HPMforce_return ) {
+			*HPMforce_return = false;
+			return retVal___;
+		}
+	}
+	{
+		retVal___ = HPMHooks.source.npc.untouch_areanpc(sd, m, x, y);
+	}
+	if( HPMHooks.count.HP_npc_untouch_areanpc_post ) {
+		int (*postHookFunc) (int retVal___, struct map_session_data *sd, int16 *m, int16 *x, int16 *y);
+		for(hIndex = 0; hIndex < HPMHooks.count.HP_npc_untouch_areanpc_post; hIndex++ ) {
+			postHookFunc = HPMHooks.list.HP_npc_untouch_areanpc_post[hIndex].func;
+			retVal___ = postHookFunc(retVal___, sd, &m, &x, &y);
+		}
+	}
+	return retVal___;
+}
 int HP_npc_touch_areanpc2(struct mob_data *md) {
 	int hIndex = 0;
 	int retVal___ = 0;