diff options
| author | skotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2008-01-10 22:02:33 +0000 |
|---|---|---|
| committer | skotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2008-01-10 22:02:33 +0000 |
| commit | 234ababd8c1a9df4391c6c54f9167f625e432dc2 (patch) | |
| tree | 6e7e67c85594893c8aab0730789f36e5c5d4f2ef /src/map/status.h | |
| parent | f9e689d36895ff10c03fc3c488da28693636d454 (diff) | |
| download | hercules-234ababd8c1a9df4391c6c54f9167f625e432dc2.tar.gz hercules-234ababd8c1a9df4391c6c54f9167f625e432dc2.tar.bz2 hercules-234ababd8c1a9df4391c6c54f9167f625e432dc2.tar.xz hercules-234ababd8c1a9df4391c6c54f9167f625e432dc2.zip | |
- Fixed getmonsterinfo to return "null" when returning the name of a non-existing mob instead of -1.
- Extended the status_percent_damage define to include a bolean to specify whether or not the target can be killed from it.
- Corrected CR_CULTIVATION to fail when the target cell has some BL_CHAR on it already.
- Changed the meaning of 'flag' in status_percent_change, to enable differentiation between damage that can kill the object and damage that cannot.
- Script command percentheal will no longer kill the player if the specified amount is negative (and not -100).
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@12051 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'src/map/status.h')
| -rw-r--r-- | src/map/status.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/map/status.h b/src/map/status.h index d204c3f39..97aea9d2b 100644 --- a/src/map/status.h +++ b/src/map/status.h @@ -588,10 +588,10 @@ int status_damage(struct block_list *src,struct block_list *target,int hp,int sp int status_charge(struct block_list* bl, int hp, int sp); int status_percent_change(struct block_list *src,struct block_list *target,signed char hp_rate, signed char sp_rate, int flag); //Easier handling of status_percent_change -#define status_percent_heal(bl, hp_rate, sp_rate) status_percent_change(NULL, bl, -(hp_rate), -(sp_rate), 1) -#define status_percent_damage(src, target, hp_rate, sp_rate) status_percent_change(src, target, hp_rate, sp_rate, 0) +#define status_percent_heal(bl, hp_rate, sp_rate) status_percent_change(NULL, bl, -(hp_rate), -(sp_rate), 0) +#define status_percent_damage(src, target, hp_rate, sp_rate, kill) status_percent_change(src, target, hp_rate, sp_rate, (kill)?1:2) //Instant kill with no drops/exp/etc -#define status_kill(bl) status_percent_damage(NULL, bl, 100, 0) +#define status_kill(bl) status_percent_damage(NULL, bl, 100, 0, true) //Used to set the hp/sp of an object to an absolute value (can't kill) int status_set_hp(struct block_list *bl, unsigned int hp, int flag); int status_set_sp(struct block_list *bl, unsigned int sp, int flag); |