diff options
Diffstat (limited to 'src/map/battle.h')
| -rw-r--r-- | src/map/battle.h | 26 |
1 files changed, 24 insertions, 2 deletions
diff --git a/src/map/battle.h b/src/map/battle.h index 233c325cf..6bc2659b9 100644 --- a/src/map/battle.h +++ b/src/map/battle.h @@ -5,8 +5,8 @@ #ifndef MAP_BATTLE_H #define MAP_BATTLE_H -#include "map.h" //ELE_MAX -#include "../common/cbasetypes.h" +#include "map/map.h" //ELE_MAX +#include "common/cbasetypes.h" /** * Declarations @@ -77,6 +77,27 @@ enum e_battle_check_target { //New definitions [Skotlex] }; /** + * Values used by (struct Damage).type, as well as clif->damage(type) and clif->skill_damage(type) + * + * Note: some values may not apply in some contexts. + */ +enum battle_dmg_type { + BDT_NORMAL = 0, // Normal attack + //BDT_PICKUP = 1, // Pick up item + //BDT_SITDOWN = 2, // Sit down + //BDT_STANDUP = 3, // Stand up + BDT_ENDURE = 4, // Damage (endure) + BDT_SPLASH = 5, // Splash + BDT_SKILL = 6, // Skill + //BDT_REPEAT = 7, // (repeat damage?) + BDT_MULTIHIT = 8, // Multi-hit damage + BDT_MULTIENDURE = 9, // Multi-hit damage (endure) + BDT_CRIT = 10, // Critical hit + BDT_PDODGE = 11, // Lucky dodge + //BDT_TOUCH = 12, // (touch skill?) +}; + +/** * Structures **/ @@ -558,6 +579,7 @@ struct battle_interface { int64 (*attr_fix) (struct block_list *src, struct block_list *target, int64 damage, int atk_elem, int def_type, int def_lv); /* applies card modifiers */ int64 (*calc_cardfix) (int attack_type, struct block_list *src, struct block_list *target, int nk, int s_ele, int s_ele_, int64 damage, int left, int flag); + int64 (*calc_cardfix2) (struct block_list *src, struct block_list *bl, int64 damage, int s_ele, int nk, int flag); /* applies element modifiers */ int64 (*calc_elefix) (struct block_list *src, struct block_list *target, uint16 skill_id, uint16 skill_lv, int64 damage, int nk, int n_ele, int s_ele, int s_ele_, bool left, int flag); /* applies mastery modifiers */ |