diff options
Diffstat (limited to 'src/map/status.h')
| -rw-r--r-- | src/map/status.h | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/src/map/status.h b/src/map/status.h index fbce95f17..a469dc71f 100644 --- a/src/map/status.h +++ b/src/map/status.h @@ -147,7 +147,7 @@ typedef enum sc_type { SC_VOLCANO, //100, SC_DELUGE, SC_VIOLENTGALE, - SC_WATK_ELEMENT, + SC_SUB_WEAPONPROPERTY, SC_ARMOR, SC_ARMORPROPERTY, SC_NOCHAT, @@ -672,6 +672,7 @@ typedef enum sc_type { SC_HANBOK, SC_MONSTER_TRANSFORM, + SC_ANGEL_PROTECT, SC_MAX, //Automatically updated max, used in for's to check we are within bounds. } sc_type; @@ -993,7 +994,7 @@ enum si_type { SI_INVINCIBLE = 311, SI_CASH_PLUSONLYJOBEXP = 312, SI_PARTYFLEE = 313, -// SI_ANGEL_PROTECT = 314, + SI_ANGEL_PROTECT = 314, // SI_ENDURE_MDEF = 315, SI_ENCHANTBLADE = 316, SI_DEATHBOUND = 317, @@ -1850,11 +1851,12 @@ int status_check_visibility(struct block_list *src, struct block_list *target); int status_change_spread( struct block_list *src, struct block_list *bl ); defType status_calc_def(struct block_list *bl, struct status_change *sc, int, bool); -signed short status_calc_def2(struct block_list *,struct status_change *, int, bool); +signed short status_calc_def2(struct block_list *, struct status_change *, int, bool); defType status_calc_mdef(struct block_list *bl, struct status_change *sc, int, bool); -signed short status_calc_mdef2(struct block_list *,struct status_change *, int, bool); +signed short status_calc_mdef2(struct block_list *, struct status_change *, int, bool); #ifdef RENEWAL +unsigned short status_calc_batk(struct block_list *, struct status_change *, int, bool); unsigned short status_base_matk(const struct status_data* status, int level); int status_get_weapon_atk(struct block_list *src, struct weapon_atk *watk, int flag); int status_get_total_mdef(struct block_list *src); |