diff options
| author | shennetsind <ind@henn.et> | 2013-10-10 18:19:16 -0300 |
|---|---|---|
| committer | shennetsind <ind@henn.et> | 2013-10-10 18:19:31 -0300 |
| commit | a2e01e40c9e60b8b2d75e4faf41d80a7041e8f93 (patch) | |
| tree | f91fcb5ddb1097dc483bfb4d646ae9278ea70368 /src/map/homunculus.h | |
| parent | d8f102fb65a6dc422a138862571a29d888182618 (diff) | |
| download | hercules-a2e01e40c9e60b8b2d75e4faf41d80a7041e8f93.tar.gz hercules-a2e01e40c9e60b8b2d75e4faf41d80a7041e8f93.tar.bz2 hercules-a2e01e40c9e60b8b2d75e4faf41d80a7041e8f93.tar.xz hercules-a2e01e40c9e60b8b2d75e4faf41d80a7041e8f93.zip | |
Homun-S Quest Updated
Partial Merge of 0b68607
Quest Changelog:
- 1.2 Replaced with official script. [Euphy]
Closes #177
Closes #178
Signed-off-by: shennetsind <ind@henn.et>
Diffstat (limited to 'src/map/homunculus.h')
| -rw-r--r-- | src/map/homunculus.h | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/src/map/homunculus.h b/src/map/homunculus.h index 9562ed5c3..2cb558930 100644 --- a/src/map/homunculus.h +++ b/src/map/homunculus.h @@ -11,7 +11,7 @@ #define MAX_HOM_SKILL_REQUIRE 5 #define homdb_checkid(id) (id >= HM_CLASS_BASE && id <= HM_CLASS_MAX) -#define homun_alive(x) ((x) && (x)->homunculus.vaporize != 1 && (x)->battle_status.hp > 0) +#define homun_alive(x) ((x) && (x)->homunculus.vaporize == HOM_ST_ACTIVE && (x)->battle_status.hp > 0) struct h_stats { unsigned int HP, SP; @@ -44,6 +44,12 @@ enum { SP_HUNGRY = 0x2, }; +enum homun_state { + HOM_ST_ACTIVE = 0,/* either alive or dead */ + HOM_ST_REST = 1,/* is resting (vaporized) */ + HOM_ST_MORPH = 2,/* in morph state */ +}; + struct homun_data { struct block_list bl; struct unit_data ud; @@ -94,7 +100,7 @@ struct homunculus_interface { enum homun_type (*class2type) (int class_); void (*damaged) (struct homun_data *hd); int (*dead) (struct homun_data *hd); - int (*vaporize) (struct map_session_data *sd, int flag); + int (*vaporize) (struct map_session_data *sd, enum homun_state flag); int (*delete) (struct homun_data *hd, int emote); int (*checkskill) (struct homun_data *hd, uint16 skill_id); int (*calc_skilltree) (struct homun_data *hd, int flag_evolve); |