diff options
| author | ai4rei <ai4rei@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2011-02-17 20:16:42 +0000 |
|---|---|---|
| committer | ai4rei <ai4rei@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2011-02-17 20:16:42 +0000 |
| commit | f1a6d574ac8217f9fcdf6efc92e71ee1b451310d (patch) | |
| tree | d0901e553dc92efee5b86bb603cbbede3be28b53 /src/map/status.h | |
| parent | bd57369de85d0249cdc3e21102d5197c6dbb646a (diff) | |
| download | hercules-f1a6d574ac8217f9fcdf6efc92e71ee1b451310d.tar.gz hercules-f1a6d574ac8217f9fcdf6efc92e71ee1b451310d.tar.bz2 hercules-f1a6d574ac8217f9fcdf6efc92e71ee1b451310d.tar.xz hercules-f1a6d574ac8217f9fcdf6efc92e71ee1b451310d.zip | |
* Merged enumeration update from renewal [14699/branches/renewal] for a future commit.
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@14709 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'src/map/status.h')
| -rw-r--r-- | src/map/status.h | 15 |
1 files changed, 14 insertions, 1 deletions
diff --git a/src/map/status.h b/src/map/status.h index e46494a36..718fd2e88 100644 --- a/src/map/status.h +++ b/src/map/status.h @@ -910,6 +910,7 @@ enum si_type { SI_WATER_INSIGNIA = 568, SI_WIND_INSIGNIA = 569, SI_EARTH_INSIGNIA = 570, + SI_EQUIPED_FLOOR = 571, */ }; @@ -955,7 +956,9 @@ enum { OPT1_STUN, OPT1_SLEEP, //Aegis uses OPT1 = 5 to identify undead enemies (which also grants them immunity to the other opt1 changes) - OPT1_STONEWAIT=6 //Petrifying + OPT1_STONEWAIT=6, //Petrifying + OPT1_BURNING, + OPT1_IMPRISON, }; //opt2: Stackable status changes. @@ -968,6 +971,7 @@ enum { OPT2_ANGELUS = 0x0020, OPT2_BLEEDING = 0x0040, OPT2_DPOISON = 0x0080, + OPT2_FEAR = 0x0100, }; //opt3: (SHOW_EFST_*) @@ -1014,9 +1018,18 @@ enum { OPTION_XMAS = 0x00010000, OPTION_TRANSFORM = 0x00020000, OPTION_SUMMER = 0x00040000, + OPTION_DRAGON1 = 0x00080000, + OPTION_WUG = 0x00100000, + OPTION_WUGRIDER = 0x00200000, + OPTION_MADOGEAR = 0x00400000, + OPTION_DRAGON2 = 0x00800000, + OPTION_DRAGON3 = 0x01000000, + OPTION_DRAGON4 = 0x02000000, + OPTION_DRAGON5 = 0x04000000, }; #define OPTION_CART (OPTION_CART1|OPTION_CART2|OPTION_CART3|OPTION_CART4|OPTION_CART5) +#define OPTION_DRAGON (OPTION_DRAGON1|OPTION_DRAGON2|OPTION_DRAGON3|OPTION_DRAGON4|OPTION_DRAGON5) #define OPTION_MASK ~0x40 |