Skip to content

Commit b2b9729

Browse files
hemagxhemagx
committed
HPM Hooks update
Signed-off-by: Ibrahim Zidan <brahem@aotsw.com>
1 parent 49f3a27 commit b2b9729

4 files changed

Lines changed: 200 additions & 68 deletions

File tree

‎src/plugins/HPMHooking/HPMHooking.Defs.inc‎

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6524,14 +6524,14 @@ typedef void (*HPMHOOK_pre_mob_name_constants) (void);
65246524
typedef void (*HPMHOOK_post_mob_name_constants) (void);
65256525
typedef void (*HPMHOOK_pre_mob_mobavail_removal_notice) (void);
65266526
typedef void (*HPMHOOK_post_mob_mobavail_removal_notice) (void);
6527+
typedef void (*HPMHOOK_pre_mob_race2_db_removal_notice) (void);
6528+
typedef void (*HPMHOOK_post_mob_race2_db_removal_notice) (void);
65276529
typedef bool (*HPMHOOK_pre_mob_parse_row_chatdb) (char ***str, const char **source, int *line, int **last_msg_id);
65286530
typedef bool (*HPMHOOK_post_mob_parse_row_chatdb) (bool retVal___, char **str, const char *source, int line, int *last_msg_id);
65296531
typedef void (*HPMHOOK_pre_mob_readchatdb) (void);
65306532
typedef void (*HPMHOOK_post_mob_readchatdb) (void);
65316533
typedef void (*HPMHOOK_pre_mob_readskilldb) (void);
65326534
typedef void (*HPMHOOK_post_mob_readskilldb) (void);
6533-
typedef bool (*HPMHOOK_pre_mob_readdb_race2) (char **fields[], int *columns, int *current);
6534-
typedef bool (*HPMHOOK_post_mob_readdb_race2) (bool retVal___, char *fields[], int columns, int current);
65356535
typedef bool (*HPMHOOK_pre_mob_readdb_itemratio) (char **str[], int *columns, int *current);
65366536
typedef bool (*HPMHOOK_post_mob_readdb_itemratio) (bool retVal___, char *str[], int columns, int current);
65376537
typedef void (*HPMHOOK_pre_mob_load) (bool *minimal);
@@ -7224,6 +7224,8 @@ typedef int (*HPMHOOK_pre_pc_resetfeel) (struct map_session_data **sd);
72247224
typedef int (*HPMHOOK_post_pc_resetfeel) (int retVal___, struct map_session_data *sd);
72257225
typedef int (*HPMHOOK_pre_pc_resethate) (struct map_session_data **sd);
72267226
typedef int (*HPMHOOK_post_pc_resethate) (int retVal___, struct map_session_data *sd);
7227+
typedef uint32 (*HPMHOOK_pre_pc_equip_costume_overlap) (uint32 *pos);
7228+
typedef uint32 (*HPMHOOK_post_pc_equip_costume_overlap) (uint32 retVal___, uint32 pos);
72277229
typedef int (*HPMHOOK_pre_pc_equipitem) (struct map_session_data **sd, int *n, int *req_pos);
72287230
typedef int (*HPMHOOK_post_pc_equipitem) (int retVal___, struct map_session_data *sd, int n, int req_pos);
72297231
typedef void (*HPMHOOK_pre_pc_equipitem_pos) (struct map_session_data **sd, struct item_data **id, int *n, int *pos);
@@ -7232,6 +7234,8 @@ typedef int (*HPMHOOK_pre_pc_unequipitem) (struct map_session_data **sd, int *n,
72327234
typedef int (*HPMHOOK_post_pc_unequipitem) (int retVal___, struct map_session_data *sd, int n, int flag);
72337235
typedef void (*HPMHOOK_pre_pc_unequipitem_pos) (struct map_session_data **sd, int *n, int *pos);
72347236
typedef void (*HPMHOOK_post_pc_unequipitem_pos) (struct map_session_data *sd, int n, int pos);
7237+
typedef void (*HPMHOOK_pre_pc_unequipitem_pos_sub) (struct map_session_data **sd, int *pos_combination, int **look, int *look_type, int *pos, int *pos_costume);
7238+
typedef void (*HPMHOOK_post_pc_unequipitem_pos_sub) (struct map_session_data *sd, int pos_combination, int *look, int look_type, int pos, int pos_costume);
72357239
typedef int (*HPMHOOK_pre_pc_checkitem) (struct map_session_data **sd);
72367240
typedef int (*HPMHOOK_post_pc_checkitem) (int retVal___, struct map_session_data *sd);
72377241
typedef int (*HPMHOOK_pre_pc_useitem) (struct map_session_data **sd, int *n);
@@ -7390,6 +7394,12 @@ typedef int (*HPMHOOK_pre_pc_read_attr_fix_db_entry) (struct config_setting_t **
73907394
typedef int (*HPMHOOK_post_pc_read_attr_fix_db_entry) (int retVal___, struct config_setting_t *def_attr, enum elements def_ele, const char *def_ele_name);
73917395
typedef int (*HPMHOOK_pre_pc_read_attr_fix_db_level) (struct config_setting_t **def_lv, enum elements *def_ele, int *lv, const char **def_ele_name);
73927396
typedef int (*HPMHOOK_post_pc_read_attr_fix_db_level) (int retVal___, struct config_setting_t *def_lv, enum elements def_ele, int lv, const char *def_ele_name);
7397+
typedef void (*HPMHOOK_pre_pc_level_penalty_txt_removal_notice) (void);
7398+
typedef void (*HPMHOOK_post_pc_level_penalty_txt_removal_notice) (void);
7399+
typedef bool (*HPMHOOK_pre_pc_read_level_penalty_db_sub) (const struct config_setting_t **it, int *n, const char **source);
7400+
typedef bool (*HPMHOOK_post_pc_read_level_penalty_db_sub) (bool retVal___, const struct config_setting_t *it, int n, const char *source);
7401+
typedef void (*HPMHOOK_pre_pc_read_level_penalty_db) (void);
7402+
typedef void (*HPMHOOK_post_pc_read_level_penalty_db) (void);
73937403
typedef int (*HPMHOOK_pre_pc_map_day_timer) (int *tid, int64 *tick, int *id, intptr_t *data);
73947404
typedef int (*HPMHOOK_post_pc_map_day_timer) (int retVal___, int tid, int64 tick, int id, intptr_t data);
73957405
typedef int (*HPMHOOK_pre_pc_map_night_timer) (int *tid, int64 *tick, int *id, intptr_t *data);
@@ -7458,8 +7468,6 @@ typedef int (*HPMHOOK_pre_pc_daynight_timer_sub) (struct map_session_data **sd,
74587468
typedef int (*HPMHOOK_post_pc_daynight_timer_sub) (int retVal___, struct map_session_data *sd, va_list ap);
74597469
typedef int (*HPMHOOK_pre_pc_charm_timer) (int *tid, int64 *tick, int *id, intptr_t *data);
74607470
typedef int (*HPMHOOK_post_pc_charm_timer) (int retVal___, int tid, int64 tick, int id, intptr_t data);
7461-
typedef bool (*HPMHOOK_pre_pc_readdb_levelpenalty) (char **fields[], int *columns, int *current);
7462-
typedef bool (*HPMHOOK_post_pc_readdb_levelpenalty) (bool retVal___, char *fields[], int columns, int current);
74637471
typedef int (*HPMHOOK_pre_pc_autosave) (int *tid, int64 *tick, int *id, intptr_t *data);
74647472
typedef int (*HPMHOOK_post_pc_autosave) (int retVal___, int tid, int64 tick, int id, intptr_t data);
74657473
typedef int (*HPMHOOK_pre_pc_follow_timer) (int *tid, int64 *tick, int *id, intptr_t *data);

‎src/plugins/HPMHooking/HPMHooking_map.HPMHooksCore.inc‎

Lines changed: 24 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -4520,14 +4520,14 @@ struct {
45204520
struct HPMHookPoint *HP_mob_name_constants_post;
45214521
struct HPMHookPoint *HP_mob_mobavail_removal_notice_pre;
45224522
struct HPMHookPoint *HP_mob_mobavail_removal_notice_post;
4523+
struct HPMHookPoint *HP_mob_race2_db_removal_notice_pre;
4524+
struct HPMHookPoint *HP_mob_race2_db_removal_notice_post;
45234525
struct HPMHookPoint *HP_mob_parse_row_chatdb_pre;
45244526
struct HPMHookPoint *HP_mob_parse_row_chatdb_post;
45254527
struct HPMHookPoint *HP_mob_readchatdb_pre;
45264528
struct HPMHookPoint *HP_mob_readchatdb_post;
45274529
struct HPMHookPoint *HP_mob_readskilldb_pre;
45284530
struct HPMHookPoint *HP_mob_readskilldb_post;
4529-
struct HPMHookPoint *HP_mob_readdb_race2_pre;
4530-
struct HPMHookPoint *HP_mob_readdb_race2_post;
45314531
struct HPMHookPoint *HP_mob_readdb_itemratio_pre;
45324532
struct HPMHookPoint *HP_mob_readdb_itemratio_post;
45334533
struct HPMHookPoint *HP_mob_load_pre;
@@ -5202,6 +5202,8 @@ struct {
52025202
struct HPMHookPoint *HP_pc_resetfeel_post;
52035203
struct HPMHookPoint *HP_pc_resethate_pre;
52045204
struct HPMHookPoint *HP_pc_resethate_post;
5205+
struct HPMHookPoint *HP_pc_equip_costume_overlap_pre;
5206+
struct HPMHookPoint *HP_pc_equip_costume_overlap_post;
52055207
struct HPMHookPoint *HP_pc_equipitem_pre;
52065208
struct HPMHookPoint *HP_pc_equipitem_post;
52075209
struct HPMHookPoint *HP_pc_equipitem_pos_pre;
@@ -5210,6 +5212,8 @@ struct {
52105212
struct HPMHookPoint *HP_pc_unequipitem_post;
52115213
struct HPMHookPoint *HP_pc_unequipitem_pos_pre;
52125214
struct HPMHookPoint *HP_pc_unequipitem_pos_post;
5215+
struct HPMHookPoint *HP_pc_unequipitem_pos_sub_pre;
5216+
struct HPMHookPoint *HP_pc_unequipitem_pos_sub_post;
52135217
struct HPMHookPoint *HP_pc_checkitem_pre;
52145218
struct HPMHookPoint *HP_pc_checkitem_post;
52155219
struct HPMHookPoint *HP_pc_useitem_pre;
@@ -5368,6 +5372,12 @@ struct {
53685372
struct HPMHookPoint *HP_pc_read_attr_fix_db_entry_post;
53695373
struct HPMHookPoint *HP_pc_read_attr_fix_db_level_pre;
53705374
struct HPMHookPoint *HP_pc_read_attr_fix_db_level_post;
5375+
struct HPMHookPoint *HP_pc_level_penalty_txt_removal_notice_pre;
5376+
struct HPMHookPoint *HP_pc_level_penalty_txt_removal_notice_post;
5377+
struct HPMHookPoint *HP_pc_read_level_penalty_db_sub_pre;
5378+
struct HPMHookPoint *HP_pc_read_level_penalty_db_sub_post;
5379+
struct HPMHookPoint *HP_pc_read_level_penalty_db_pre;
5380+
struct HPMHookPoint *HP_pc_read_level_penalty_db_post;
53715381
struct HPMHookPoint *HP_pc_map_day_timer_pre;
53725382
struct HPMHookPoint *HP_pc_map_day_timer_post;
53735383
struct HPMHookPoint *HP_pc_map_night_timer_pre;
@@ -5436,8 +5446,6 @@ struct {
54365446
struct HPMHookPoint *HP_pc_daynight_timer_sub_post;
54375447
struct HPMHookPoint *HP_pc_charm_timer_pre;
54385448
struct HPMHookPoint *HP_pc_charm_timer_post;
5439-
struct HPMHookPoint *HP_pc_readdb_levelpenalty_pre;
5440-
struct HPMHookPoint *HP_pc_readdb_levelpenalty_post;
54415449
struct HPMHookPoint *HP_pc_autosave_pre;
54425450
struct HPMHookPoint *HP_pc_autosave_post;
54435451
struct HPMHookPoint *HP_pc_follow_timer_pre;
@@ -12119,14 +12127,14 @@ struct {
1211912127
int HP_mob_name_constants_post;
1212012128
int HP_mob_mobavail_removal_notice_pre;
1212112129
int HP_mob_mobavail_removal_notice_post;
12130+
int HP_mob_race2_db_removal_notice_pre;
12131+
int HP_mob_race2_db_removal_notice_post;
1212212132
int HP_mob_parse_row_chatdb_pre;
1212312133
int HP_mob_parse_row_chatdb_post;
1212412134
int HP_mob_readchatdb_pre;
1212512135
int HP_mob_readchatdb_post;
1212612136
int HP_mob_readskilldb_pre;
1212712137
int HP_mob_readskilldb_post;
12128-
int HP_mob_readdb_race2_pre;
12129-
int HP_mob_readdb_race2_post;
1213012138
int HP_mob_readdb_itemratio_pre;
1213112139
int HP_mob_readdb_itemratio_post;
1213212140
int HP_mob_load_pre;
@@ -12801,6 +12809,8 @@ struct {
1280112809
int HP_pc_resetfeel_post;
1280212810
int HP_pc_resethate_pre;
1280312811
int HP_pc_resethate_post;
12812+
int HP_pc_equip_costume_overlap_pre;
12813+
int HP_pc_equip_costume_overlap_post;
1280412814
int HP_pc_equipitem_pre;
1280512815
int HP_pc_equipitem_post;
1280612816
int HP_pc_equipitem_pos_pre;
@@ -12809,6 +12819,8 @@ struct {
1280912819
int HP_pc_unequipitem_post;
1281012820
int HP_pc_unequipitem_pos_pre;
1281112821
int HP_pc_unequipitem_pos_post;
12822+
int HP_pc_unequipitem_pos_sub_pre;
12823+
int HP_pc_unequipitem_pos_sub_post;
1281212824
int HP_pc_checkitem_pre;
1281312825
int HP_pc_checkitem_post;
1281412826
int HP_pc_useitem_pre;
@@ -12967,6 +12979,12 @@ struct {
1296712979
int HP_pc_read_attr_fix_db_entry_post;
1296812980
int HP_pc_read_attr_fix_db_level_pre;
1296912981
int HP_pc_read_attr_fix_db_level_post;
12982+
int HP_pc_level_penalty_txt_removal_notice_pre;
12983+
int HP_pc_level_penalty_txt_removal_notice_post;
12984+
int HP_pc_read_level_penalty_db_sub_pre;
12985+
int HP_pc_read_level_penalty_db_sub_post;
12986+
int HP_pc_read_level_penalty_db_pre;
12987+
int HP_pc_read_level_penalty_db_post;
1297012988
int HP_pc_map_day_timer_pre;
1297112989
int HP_pc_map_day_timer_post;
1297212990
int HP_pc_map_night_timer_pre;
@@ -13035,8 +13053,6 @@ struct {
1303513053
int HP_pc_daynight_timer_sub_post;
1303613054
int HP_pc_charm_timer_pre;
1303713055
int HP_pc_charm_timer_post;
13038-
int HP_pc_readdb_levelpenalty_pre;
13039-
int HP_pc_readdb_levelpenalty_post;
1304013056
int HP_pc_autosave_pre;
1304113057
int HP_pc_autosave_post;
1304213058
int HP_pc_follow_timer_pre;

‎src/plugins/HPMHooking/HPMHooking_map.HookingPoints.inc‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2316,10 +2316,10 @@ struct HookingPointData HookingPoints[] = {
23162316
{ HP_POP(mob->read_db_viewdata_sub, HP_mob_read_db_viewdata_sub) },
23172317
{ HP_POP(mob->name_constants, HP_mob_name_constants) },
23182318
{ HP_POP(mob->mobavail_removal_notice, HP_mob_mobavail_removal_notice) },
2319+
{ HP_POP(mob->race2_db_removal_notice, HP_mob_race2_db_removal_notice) },
23192320
{ HP_POP(mob->parse_row_chatdb, HP_mob_parse_row_chatdb) },
23202321
{ HP_POP(mob->readchatdb, HP_mob_readchatdb) },
23212322
{ HP_POP(mob->readskilldb, HP_mob_readskilldb) },
2322-
{ HP_POP(mob->readdb_race2, HP_mob_readdb_race2) },
23232323
{ HP_POP(mob->readdb_itemratio, HP_mob_readdb_itemratio) },
23242324
{ HP_POP(mob->load, HP_mob_load) },
23252325
{ HP_POP(mob->clear_spawninfo, HP_mob_clear_spawninfo) },
@@ -2666,10 +2666,12 @@ struct HookingPointData HookingPoints[] = {
26662666
{ HP_POP(pc->resetskill_job, HP_pc_resetskill_job) },
26672667
{ HP_POP(pc->resetfeel, HP_pc_resetfeel) },
26682668
{ HP_POP(pc->resethate, HP_pc_resethate) },
2669+
{ HP_POP(pc->equip_costume_overlap, HP_pc_equip_costume_overlap) },
26692670
{ HP_POP(pc->equipitem, HP_pc_equipitem) },
26702671
{ HP_POP(pc->equipitem_pos, HP_pc_equipitem_pos) },
26712672
{ HP_POP(pc->unequipitem, HP_pc_unequipitem) },
26722673
{ HP_POP(pc->unequipitem_pos, HP_pc_unequipitem_pos) },
2674+
{ HP_POP(pc->unequipitem_pos_sub, HP_pc_unequipitem_pos_sub) },
26732675
{ HP_POP(pc->checkitem, HP_pc_checkitem) },
26742676
{ HP_POP(pc->useitem, HP_pc_useitem) },
26752677
{ HP_POP(pc->autocast_clear_current, HP_pc_autocast_clear_current) },
@@ -2749,6 +2751,9 @@ struct HookingPointData HookingPoints[] = {
27492751
{ HP_POP(pc->read_attr_fix_db, HP_pc_read_attr_fix_db) },
27502752
{ HP_POP(pc->read_attr_fix_db_entry, HP_pc_read_attr_fix_db_entry) },
27512753
{ HP_POP(pc->read_attr_fix_db_level, HP_pc_read_attr_fix_db_level) },
2754+
{ HP_POP(pc->level_penalty_txt_removal_notice, HP_pc_level_penalty_txt_removal_notice) },
2755+
{ HP_POP(pc->read_level_penalty_db_sub, HP_pc_read_level_penalty_db_sub) },
2756+
{ HP_POP(pc->read_level_penalty_db, HP_pc_read_level_penalty_db) },
27522757
{ HP_POP(pc->map_day_timer, HP_pc_map_day_timer) },
27532758
{ HP_POP(pc->map_night_timer, HP_pc_map_night_timer) },
27542759
{ HP_POP(pc->inventory_rentals, HP_pc_inventory_rentals) },
@@ -2783,7 +2788,6 @@ struct HookingPointData HookingPoints[] = {
27832788
{ HP_POP(pc->eventtimer, HP_pc_eventtimer) },
27842789
{ HP_POP(pc->daynight_timer_sub, HP_pc_daynight_timer_sub) },
27852790
{ HP_POP(pc->charm_timer, HP_pc_charm_timer) },
2786-
{ HP_POP(pc->readdb_levelpenalty, HP_pc_readdb_levelpenalty) },
27872791
{ HP_POP(pc->autosave, HP_pc_autosave) },
27882792
{ HP_POP(pc->follow_timer, HP_pc_follow_timer) },
27892793
{ HP_POP(pc->read_skill_tree, HP_pc_read_skill_tree) },

0 commit comments

Comments
 (0)