Skip to content

Commit 52dea5d

Browse files
committed
Regenerate HPM Hook
1 parent 7a1268b commit 52dea5d

File tree

5 files changed

+248
-8
lines changed

5 files changed

+248
-8
lines changed

src/common/HPMDataCheck.h

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -590,8 +590,12 @@ HPExport const struct s_HPMDataCheck HPMDataCheck[] = {
590590
{ "mob_chat", sizeof(struct mob_chat), SERVER_TYPE_MAP },
591591
{ "mob_data", sizeof(struct mob_data), SERVER_TYPE_MAP },
592592
{ "mob_db", sizeof(struct mob_db), SERVER_TYPE_MAP },
593+
{ "mob_drop", sizeof(struct mob_drop), SERVER_TYPE_MAP },
593594
{ "mob_interface", sizeof(struct mob_interface), SERVER_TYPE_MAP },
594595
{ "mob_skill", sizeof(struct mob_skill), SERVER_TYPE_MAP },
596+
{ "optdrop_group", sizeof(struct optdrop_group), SERVER_TYPE_MAP },
597+
{ "optdrop_group_option", sizeof(struct optdrop_group_option), SERVER_TYPE_MAP },
598+
{ "optdrop_group_optslot", sizeof(struct optdrop_group_optslot), SERVER_TYPE_MAP },
595599
{ "spawn_info", sizeof(struct spawn_info), SERVER_TYPE_MAP },
596600
#else
597601
#define MAP_MOB_H

src/plugins/HPMHooking/HPMHooking.Defs.inc

Lines changed: 16 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5312,8 +5312,10 @@ typedef int (*HPMHOOK_pre_mob_ai_lazy) (int *tid, int64 *tick, int *id, intptr_t
53125312
typedef int (*HPMHOOK_post_mob_ai_lazy) (int retVal___, int tid, int64 tick, int id, intptr_t data);
53135313
typedef int (*HPMHOOK_pre_mob_ai_hard) (int *tid, int64 *tick, int *id, intptr_t *data);
53145314
typedef int (*HPMHOOK_post_mob_ai_hard) (int retVal___, int tid, int64 tick, int id, intptr_t data);
5315-
typedef struct item_drop* (*HPMHOOK_pre_mob_setdropitem) (int *nameid, int *qty, struct item_data **data);
5316-
typedef struct item_drop* (*HPMHOOK_post_mob_setdropitem) (struct item_drop* retVal___, int nameid, int qty, struct item_data *data);
5315+
typedef void (*HPMHOOK_pre_mob_setdropitem_options) (struct item **item, struct optdrop_group **options);
5316+
typedef void (*HPMHOOK_post_mob_setdropitem_options) (struct item *item, struct optdrop_group *options);
5317+
typedef struct item_drop* (*HPMHOOK_pre_mob_setdropitem) (int *nameid, struct optdrop_group **options, int *qty, struct item_data **data);
5318+
typedef struct item_drop* (*HPMHOOK_post_mob_setdropitem) (struct item_drop* retVal___, int nameid, struct optdrop_group *options, int qty, struct item_data *data);
53175319
typedef struct item_drop* (*HPMHOOK_pre_mob_setlootitem) (struct item **item);
53185320
typedef struct item_drop* (*HPMHOOK_post_mob_setlootitem) (struct item_drop* retVal___, struct item *item);
53195321
typedef int (*HPMHOOK_pre_mob_delay_item_drop) (int *tid, int64 *tick, int *id, intptr_t *data);
@@ -5378,6 +5380,14 @@ typedef unsigned int (*HPMHOOK_pre_mob_drop_adjust) (int *baserate, int *rate_ad
53785380
typedef unsigned int (*HPMHOOK_post_mob_drop_adjust) (unsigned int retVal___, int baserate, int rate_adjust, unsigned short rate_min, unsigned short rate_max);
53795381
typedef void (*HPMHOOK_pre_mob_item_dropratio_adjust) (int *nameid, int *mob_id, int **rate_adjust);
53805382
typedef void (*HPMHOOK_post_mob_item_dropratio_adjust) (int nameid, int mob_id, int *rate_adjust);
5383+
typedef bool (*HPMHOOK_pre_mob_read_optdrops_option) (struct config_setting_t **option, struct optdrop_group_optslot **entry, int **idx, bool **calc_rate, int *slot, const char **group);
5384+
typedef bool (*HPMHOOK_post_mob_read_optdrops_option) (bool retVal___, struct config_setting_t *option, struct optdrop_group_optslot *entry, int *idx, bool *calc_rate, int slot, const char *group);
5385+
typedef bool (*HPMHOOK_pre_mob_read_optdrops_optslot) (struct config_setting_t **optslot, int *n, int *group_id, const char **group);
5386+
typedef bool (*HPMHOOK_post_mob_read_optdrops_optslot) (bool retVal___, struct config_setting_t *optslot, int n, int group_id, const char *group);
5387+
typedef bool (*HPMHOOK_pre_mob_read_optdrops_group) (struct config_setting_t **group, int *n);
5388+
typedef bool (*HPMHOOK_post_mob_read_optdrops_group) (bool retVal___, struct config_setting_t *group, int n);
5389+
typedef bool (*HPMHOOK_pre_mob_read_optdrops_db) (void);
5390+
typedef bool (*HPMHOOK_post_mob_read_optdrops_db) (bool retVal___);
53815391
typedef void (*HPMHOOK_pre_mob_readdb) (void);
53825392
typedef void (*HPMHOOK_post_mob_readdb) (void);
53835393
typedef bool (*HPMHOOK_pre_mob_lookup_const) (const struct config_setting_t **it, const char **name, int **value);
@@ -5398,6 +5408,8 @@ typedef void (*HPMHOOK_pre_mob_read_db_mvpdrops_sub) (struct mob_db **entry, str
53985408
typedef void (*HPMHOOK_post_mob_read_db_mvpdrops_sub) (struct mob_db *entry, struct config_setting_t *t);
53995409
typedef uint32 (*HPMHOOK_pre_mob_read_db_mode_sub) (struct mob_db **entry, struct config_setting_t **t);
54005410
typedef uint32 (*HPMHOOK_post_mob_read_db_mode_sub) (uint32 retVal___, struct mob_db *entry, struct config_setting_t *t);
5411+
typedef struct optdrop_group* (*HPMHOOK_pre_mob_read_db_drops_option) (struct mob_db **entry, const char **item_name, struct config_setting_t **drop, int **drop_rate);
5412+
typedef struct optdrop_group* (*HPMHOOK_post_mob_read_db_drops_option) (struct optdrop_group* retVal___, struct mob_db *entry, const char *item_name, struct config_setting_t *drop, int *drop_rate);
54015413
typedef void (*HPMHOOK_pre_mob_read_db_stats_sub) (struct mob_db **entry, struct config_setting_t **t);
54025414
typedef void (*HPMHOOK_post_mob_read_db_stats_sub) (struct mob_db *entry, struct config_setting_t *t);
54035415
typedef void (*HPMHOOK_pre_mob_name_constants) (void);
@@ -5428,6 +5440,8 @@ typedef int (*HPMHOOK_pre_mob_final_ratio_sub) (union DBKey *key, struct DBData
54285440
typedef int (*HPMHOOK_post_mob_final_ratio_sub) (int retVal___, union DBKey key, struct DBData *data, va_list ap);
54295441
typedef void (*HPMHOOK_pre_mob_destroy_mob_db) (int *index);
54305442
typedef void (*HPMHOOK_post_mob_destroy_mob_db) (int index);
5443+
typedef void (*HPMHOOK_pre_mob_destroy_drop_groups) (void);
5444+
typedef void (*HPMHOOK_post_mob_destroy_drop_groups) (void);
54315445
typedef bool (*HPMHOOK_pre_mob_skill_db_libconfig) (const char **filename, bool *ignore_missing);
54325446
typedef bool (*HPMHOOK_post_mob_skill_db_libconfig) (bool retVal___, const char *filename, bool ignore_missing);
54335447
typedef bool (*HPMHOOK_pre_mob_skill_db_libconfig_sub) (struct config_setting_t **it, int *n);

src/plugins/HPMHooking/HPMHooking_map.HPMHooksCore.inc

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3888,6 +3888,8 @@ struct {
38883888
struct HPMHookPoint *HP_mob_ai_lazy_post;
38893889
struct HPMHookPoint *HP_mob_ai_hard_pre;
38903890
struct HPMHookPoint *HP_mob_ai_hard_post;
3891+
struct HPMHookPoint *HP_mob_setdropitem_options_pre;
3892+
struct HPMHookPoint *HP_mob_setdropitem_options_post;
38913893
struct HPMHookPoint *HP_mob_setdropitem_pre;
38923894
struct HPMHookPoint *HP_mob_setdropitem_post;
38933895
struct HPMHookPoint *HP_mob_setlootitem_pre;
@@ -3954,6 +3956,14 @@ struct {
39543956
struct HPMHookPoint *HP_mob_drop_adjust_post;
39553957
struct HPMHookPoint *HP_mob_item_dropratio_adjust_pre;
39563958
struct HPMHookPoint *HP_mob_item_dropratio_adjust_post;
3959+
struct HPMHookPoint *HP_mob_read_optdrops_option_pre;
3960+
struct HPMHookPoint *HP_mob_read_optdrops_option_post;
3961+
struct HPMHookPoint *HP_mob_read_optdrops_optslot_pre;
3962+
struct HPMHookPoint *HP_mob_read_optdrops_optslot_post;
3963+
struct HPMHookPoint *HP_mob_read_optdrops_group_pre;
3964+
struct HPMHookPoint *HP_mob_read_optdrops_group_post;
3965+
struct HPMHookPoint *HP_mob_read_optdrops_db_pre;
3966+
struct HPMHookPoint *HP_mob_read_optdrops_db_post;
39573967
struct HPMHookPoint *HP_mob_readdb_pre;
39583968
struct HPMHookPoint *HP_mob_readdb_post;
39593969
struct HPMHookPoint *HP_mob_lookup_const_pre;
@@ -3974,6 +3984,8 @@ struct {
39743984
struct HPMHookPoint *HP_mob_read_db_mvpdrops_sub_post;
39753985
struct HPMHookPoint *HP_mob_read_db_mode_sub_pre;
39763986
struct HPMHookPoint *HP_mob_read_db_mode_sub_post;
3987+
struct HPMHookPoint *HP_mob_read_db_drops_option_pre;
3988+
struct HPMHookPoint *HP_mob_read_db_drops_option_post;
39773989
struct HPMHookPoint *HP_mob_read_db_stats_sub_pre;
39783990
struct HPMHookPoint *HP_mob_read_db_stats_sub_post;
39793991
struct HPMHookPoint *HP_mob_name_constants_pre;
@@ -4004,6 +4016,8 @@ struct {
40044016
struct HPMHookPoint *HP_mob_final_ratio_sub_post;
40054017
struct HPMHookPoint *HP_mob_destroy_mob_db_pre;
40064018
struct HPMHookPoint *HP_mob_destroy_mob_db_post;
4019+
struct HPMHookPoint *HP_mob_destroy_drop_groups_pre;
4020+
struct HPMHookPoint *HP_mob_destroy_drop_groups_post;
40074021
struct HPMHookPoint *HP_mob_skill_db_libconfig_pre;
40084022
struct HPMHookPoint *HP_mob_skill_db_libconfig_post;
40094023
struct HPMHookPoint *HP_mob_skill_db_libconfig_sub_pre;
@@ -10563,6 +10577,8 @@ struct {
1056310577
int HP_mob_ai_lazy_post;
1056410578
int HP_mob_ai_hard_pre;
1056510579
int HP_mob_ai_hard_post;
10580+
int HP_mob_setdropitem_options_pre;
10581+
int HP_mob_setdropitem_options_post;
1056610582
int HP_mob_setdropitem_pre;
1056710583
int HP_mob_setdropitem_post;
1056810584
int HP_mob_setlootitem_pre;
@@ -10629,6 +10645,14 @@ struct {
1062910645
int HP_mob_drop_adjust_post;
1063010646
int HP_mob_item_dropratio_adjust_pre;
1063110647
int HP_mob_item_dropratio_adjust_post;
10648+
int HP_mob_read_optdrops_option_pre;
10649+
int HP_mob_read_optdrops_option_post;
10650+
int HP_mob_read_optdrops_optslot_pre;
10651+
int HP_mob_read_optdrops_optslot_post;
10652+
int HP_mob_read_optdrops_group_pre;
10653+
int HP_mob_read_optdrops_group_post;
10654+
int HP_mob_read_optdrops_db_pre;
10655+
int HP_mob_read_optdrops_db_post;
1063210656
int HP_mob_readdb_pre;
1063310657
int HP_mob_readdb_post;
1063410658
int HP_mob_lookup_const_pre;
@@ -10649,6 +10673,8 @@ struct {
1064910673
int HP_mob_read_db_mvpdrops_sub_post;
1065010674
int HP_mob_read_db_mode_sub_pre;
1065110675
int HP_mob_read_db_mode_sub_post;
10676+
int HP_mob_read_db_drops_option_pre;
10677+
int HP_mob_read_db_drops_option_post;
1065210678
int HP_mob_read_db_stats_sub_pre;
1065310679
int HP_mob_read_db_stats_sub_post;
1065410680
int HP_mob_name_constants_pre;
@@ -10679,6 +10705,8 @@ struct {
1067910705
int HP_mob_final_ratio_sub_post;
1068010706
int HP_mob_destroy_mob_db_pre;
1068110707
int HP_mob_destroy_mob_db_post;
10708+
int HP_mob_destroy_drop_groups_pre;
10709+
int HP_mob_destroy_drop_groups_post;
1068210710
int HP_mob_skill_db_libconfig_pre;
1068310711
int HP_mob_skill_db_libconfig_post;
1068410712
int HP_mob_skill_db_libconfig_sub_pre;

src/plugins/HPMHooking/HPMHooking_map.HookingPoints.inc

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1993,6 +1993,7 @@ struct HookingPointData HookingPoints[] = {
19931993
{ HP_POP(mob->ai_sub_lazy, HP_mob_ai_sub_lazy) },
19941994
{ HP_POP(mob->ai_lazy, HP_mob_ai_lazy) },
19951995
{ HP_POP(mob->ai_hard, HP_mob_ai_hard) },
1996+
{ HP_POP(mob->setdropitem_options, HP_mob_setdropitem_options) },
19961997
{ HP_POP(mob->setdropitem, HP_mob_setdropitem) },
19971998
{ HP_POP(mob->setlootitem, HP_mob_setlootitem) },
19981999
{ HP_POP(mob->delay_item_drop, HP_mob_delay_item_drop) },
@@ -2026,6 +2027,10 @@ struct HookingPointData HookingPoints[] = {
20262027
{ HP_POP(mob->clone_delete, HP_mob_clone_delete) },
20272028
{ HP_POP(mob->drop_adjust, HP_mob_drop_adjust) },
20282029
{ HP_POP(mob->item_dropratio_adjust, HP_mob_item_dropratio_adjust) },
2030+
{ HP_POP(mob->read_optdrops_option, HP_mob_read_optdrops_option) },
2031+
{ HP_POP(mob->read_optdrops_optslot, HP_mob_read_optdrops_optslot) },
2032+
{ HP_POP(mob->read_optdrops_group, HP_mob_read_optdrops_group) },
2033+
{ HP_POP(mob->read_optdrops_db, HP_mob_read_optdrops_db) },
20292034
{ HP_POP(mob->readdb, HP_mob_readdb) },
20302035
{ HP_POP(mob->lookup_const, HP_mob_lookup_const) },
20312036
{ HP_POP(mob->get_const, HP_mob_get_const) },
@@ -2036,6 +2041,7 @@ struct HookingPointData HookingPoints[] = {
20362041
{ HP_POP(mob->read_db_drops_sub, HP_mob_read_db_drops_sub) },
20372042
{ HP_POP(mob->read_db_mvpdrops_sub, HP_mob_read_db_mvpdrops_sub) },
20382043
{ HP_POP(mob->read_db_mode_sub, HP_mob_read_db_mode_sub) },
2044+
{ HP_POP(mob->read_db_drops_option, HP_mob_read_db_drops_option) },
20392045
{ HP_POP(mob->read_db_stats_sub, HP_mob_read_db_stats_sub) },
20402046
{ HP_POP(mob->name_constants, HP_mob_name_constants) },
20412047
{ HP_POP(mob->readdb_mobavail, HP_mob_readdb_mobavail) },
@@ -2051,6 +2057,7 @@ struct HookingPointData HookingPoints[] = {
20512057
{ HP_POP(mob->set_item_drop_ratio, HP_mob_set_item_drop_ratio) },
20522058
{ HP_POP(mob->final_ratio_sub, HP_mob_final_ratio_sub) },
20532059
{ HP_POP(mob->destroy_mob_db, HP_mob_destroy_mob_db) },
2060+
{ HP_POP(mob->destroy_drop_groups, HP_mob_destroy_drop_groups) },
20542061
{ HP_POP(mob->skill_db_libconfig, HP_mob_skill_db_libconfig) },
20552062
{ HP_POP(mob->skill_db_libconfig_sub, HP_mob_skill_db_libconfig_sub) },
20562063
{ HP_POP(mob->skill_db_libconfig_sub_skill, HP_mob_skill_db_libconfig_sub_skill) },

0 commit comments

Comments
 (0)