diff options
author | L0neW0lf.eAthena <L0neW0lf.eAthena@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2011-10-26 19:44:18 +0000 |
---|---|---|
committer | L0neW0lf.eAthena <L0neW0lf.eAthena@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2011-10-26 19:44:18 +0000 |
commit | b6620108c8dc2b0e394462a7d32cc77a446dddee (patch) | |
tree | 15769dda2b1454cda132c9b2409237a63bc975b9 /src/map/status.h | |
parent | 8c95a8ceb2891c898b80df3ce002351f5a89dd03 (diff) | |
download | hercules-b6620108c8dc2b0e394462a7d32cc77a446dddee.tar.gz hercules-b6620108c8dc2b0e394462a7d32cc77a446dddee.tar.bz2 hercules-b6620108c8dc2b0e394462a7d32cc77a446dddee.tar.xz hercules-b6620108c8dc2b0e394462a7d32cc77a446dddee.zip |
* Implemented first version of rebalanced Rune Knight skills.
* Implemented the rebalancing of most Archbishop skills.
* As a result, merged r14979 from trunk. (act/notify packet update)
* Added pc_isUseitem_check_runeskill care of Meyrawr (blocks rune usage based on skill delay.)
* Added more status effects that do NOT save on log out. A whole slew of them.
* Now only level 11 Dec. AGI will take the new config settings into account.
* Fixed Level 11 Dec. AGI duration faux pas, where it was multiplying it by 100.
* Added script command: setdragon: See documentation for details.
* Added script command: successruneuse: Will return 0 or 1. Handles runestone backfire effects.
* Modified script command: produce, now accepts <item id> as a second parameter.
* Corrected message that is displayed when attempting to generate items when that item has a limit.
* GM Item commands will no longer display 'Item created' messages on failure.
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/branches/renewal@14983 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'src/map/status.h')
-rw-r--r-- | src/map/status.h | 39 |
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, |