From 8faef4ff7ef37f52f24ac6e1e026a418b19db1fe Mon Sep 17 00:00:00 2001 From: malufett Date: Wed, 10 Dec 2014 00:57:50 +0800 Subject: RENEWAL Updates: -Homunculus Official Statuses -Updated RE @mobinfo to show proper status data.(Follow up 28a8b0f7b06a6af86aff6ececf7d9541d457e297) -Some official behaviors. Signed-off-by: malufett --- src/map/status.h | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) (limited to 'src/map/status.h') diff --git a/src/map/status.h b/src/map/status.h index 00c243543..63f9854d5 100644 --- a/src/map/status.h +++ b/src/map/status.h @@ -1939,6 +1939,13 @@ struct status_change { #define status_get_size(bl) (status->get_status_data(bl)->size) #define status_get_mode(bl) (status->get_status_data(bl)->mode) +#define status_get_homstr(bl) (st->str + ((TBL_HOM*)bl)->homunculus.str_value) +#define status_get_homagi(bl) (st->agi + ((TBL_HOM*)bl)->homunculus.agi_value) +#define status_get_homvit(bl) (st->vit + ((TBL_HOM*)bl)->homunculus.vit_value) +#define status_get_homint(bl) (st->int_ + ((TBL_HOM*)bl)->homunculus.int_value) +#define status_get_homdex(bl) (st->dex + ((TBL_HOM*)bl)->homunculus.dex_value) +#define status_get_homluk(bl) (st->luk + ((TBL_HOM*)bl)->homunculus.luk_value) + //Short version, receives rate in 1->100 range, and does not uses a flag setting. #define sc_start(src, bl, type, rate, val1, tick) (status->change_start((src),(bl),(type),100*(rate),(val1),0,0,0,(tick),SCFLAG_NONE)) #define sc_start2(src, bl, type, rate, val1, val2, tick) (status->change_start((src),(bl),(type),100*(rate),(val1),(val2),0,0,(tick),SCFLAG_NONE)) @@ -2062,7 +2069,7 @@ struct status_interface { defType (*calc_mdef) (struct block_list *bl, struct status_change *sc, int mdef, bool viewable); short (*calc_mdef2) (struct block_list *bl, struct status_change *sc, int mdef2, bool viewable); unsigned short (*calc_batk)(struct block_list *bl, struct status_change *sc, int batk, bool viewable); - unsigned short (*base_matk) (const struct status_data *st, int level); + unsigned short(*base_matk) (struct block_list *bl, const struct status_data *st, int level); int (*get_weapon_atk) (struct block_list *src, struct weapon_atk *watk, int flag); int (*get_total_mdef) (struct block_list *src); int (*get_total_def) (struct block_list *src); -- cgit v1.2.3-60-g2f50