summaryrefslogtreecommitdiff
path: root/src/map/status.h
diff options
context:
space:
mode:
Diffstat (limited to 'src/map/status.h')
-rw-r--r--src/map/status.h39
1 files changed, 27 insertions, 12 deletions
diff --git a/src/map/status.h b/src/map/status.h
index 27c3e1782..033e7ca38 100644
--- a/src/map/status.h
+++ b/src/map/status.h
@@ -330,11 +330,21 @@ typedef enum sc_type {
SC_FOOD_DEX_CASH,
SC_FOOD_INT_CASH,
SC_FOOD_LUK_CASH,
- //SC_MOVHASTE_INFINITY,
- SC_PARTYFLEE = 310,
- //SC_ENDURE_MDEF, //311
-
+ SC_PARTYFLEE,
+
// Third Jobs - Maintaining SI order for SCs.
+ SC_FEAR, // 310,
+ SC_BURNING,
+ SC_ENCHANTBLADE,
+ SC_DEATHBOUND,
+ SC_REFRESH,
+ SC_GIANTGROWTH, //315
+ SC_STONEHARDSKIN,
+ SC_VITALITYACTIVATION,
+ SC_FIGHTINGSPIRIT,
+ SC_ABUNDANCE,
+ SC_MILLENNIUMSHIELD, // 320
+ //
SC_EPICLESIS = 325,
SC_ORATIO,
SC_LAUDAAGNUS,
@@ -344,7 +354,11 @@ typedef enum sc_type {
SC_DUPLELIGHT,
SC_ADORAMUS = 380,
SC_AB_SECRAMENT = 451,
+
+// SC_ALL_RIDING = 472,
+ SC_CRUSHSTRIKE = 599,
+
SC_MAX, //Automatically updated max, used in for's to check we are within bounds.
} sc_type;
@@ -666,8 +680,7 @@ enum si_type {
SI_CASH_PLUSONLYJOBEXP = 312,
SI_PARTYFLEE = 313,
// SI_ANGEL_PROTECT = 314,
-/*
- SI_ENDURE_MDEF = 315,
+// SI_ENDURE_MDEF = 315,
SI_ENCHANTBLADE = 316,
SI_DEATHBOUND = 317,
SI_REFRESH = 318,
@@ -676,12 +689,11 @@ enum si_type {
SI_VITALITYACTIVATION = 321,
SI_FIGHTINGSPIRIT = 322,
SI_ABUNDANCE = 323,
- SI_REUSE_MILLENNIUMSHIELD = 324,
- SI_REUSE_CRUSHSTRIKE = 325,
- SI_REUSE_REFRESH = 326,
- SI_REUSE_STORMBLAST = 327,
- SI_VENOMIMPRESS = 328,
-*/
+// SI_REUSE_MILLENNIUMSHIELD = 324,
+// SI_REUSE_CRUSHSTRIKE = 325,
+// SI_REUSE_REFRESH = 326,
+// SI_REUSE_STORMBLAST = 327,
+// SI_VENOMIMPRESS = 328,
SI_EPICLESIS = 329,
SI_ORATIO = 330,
SI_LAUDAAGNUS = 331,
@@ -973,7 +985,9 @@ enum si_type {
SI_BEER_BOTTLE_CAP = 617,
SI_OVERLAPEXPUP = 618,
SI_PC_IZ_DUN05 = 619,
+*/
SI_CRUSHSTRIKE = 620,
+/*
SI_MONSTER_TRANSFORM = 621,
SI_SIT = 622,
SI_ONAIR = 623,
@@ -1111,6 +1125,7 @@ enum {
OPTION_DRAGON3 = 0x01000000,
OPTION_DRAGON4 = 0x02000000,
OPTION_DRAGON5 = 0x04000000,
+ OPTION_ALL_RIDING= 0x08000000,
// compound constants
OPTION_CART = OPTION_CART1|OPTION_CART2|OPTION_CART3|OPTION_CART4|OPTION_CART5,
OPTION_DRAGON = OPTION_DRAGON1|OPTION_DRAGON2|OPTION_DRAGON3|OPTION_DRAGON4|OPTION_DRAGON5,