summaryrefslogtreecommitdiff
path: root/src/map/map.h
diff options
context:
space:
mode:
authorskotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec>2006-07-30 18:56:33 +0000
committerskotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec>2006-07-30 18:56:33 +0000
commit1dc97e8a346414a600bedc25969d5ae21c28f401 (patch)
treed3143bd27af5046d7de7ddb96ebc47939b55f7b8 /src/map/map.h
parent0cc1e7bfbd0d93024a12ee6f5d2aaf8f95b408d1 (diff)
downloadhercules-1dc97e8a346414a600bedc25969d5ae21c28f401.tar.gz
hercules-1dc97e8a346414a600bedc25969d5ae21c28f401.tar.bz2
hercules-1dc97e8a346414a600bedc25969d5ae21c28f401.tar.xz
hercules-1dc97e8a346414a600bedc25969d5ae21c28f401.zip
- Added bNoMiscDamage setting so you can specify misc-damage blocking from skills. Modified battle_calc_damage so that even Pressure and similar skills will be affected by this setting.
- Removed SC_LANDPROTECTOR as it wasn't being used by anything. git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@7982 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'src/map/map.h')
-rw-r--r--src/map/map.h5
1 files changed, 2 insertions, 3 deletions
diff --git a/src/map/map.h b/src/map/map.h
index c6a7b168e..cdb91a0f1 100644
--- a/src/map/map.h
+++ b/src/map/map.h
@@ -544,7 +544,7 @@ struct map_session_data {
struct guild *gmaster_flag;
} state;
struct {
- unsigned char no_weapon_damage, no_magic_damage;
+ unsigned char no_weapon_damage, no_magic_damage, no_misc_damage;
unsigned killer : 1;
unsigned killable : 1;
unsigned restart_full_recover : 1;
@@ -1152,7 +1152,7 @@ enum {
SP_DELAYRATE,SP_HP_DRAIN_RATE_RACE,SP_SP_DRAIN_RATE_RACE, // 1083-1085
SP_RESTART_FULL_RECOVER=2000,SP_NO_CASTCANCEL,SP_NO_SIZEFIX,SP_NO_MAGIC_DAMAGE,SP_NO_WEAPON_DAMAGE,SP_NO_GEMSTONE, // 2000-2005
- SP_NO_CASTCANCEL2,SP_FREE1,SP_UNBREAKABLE_WEAPON,SP_UNBREAKABLE_ARMOR, SP_UNBREAKABLE_HELM, // 2006-2010
+ SP_NO_CASTCANCEL2,SP_NO_MISC_DAMAGE,SP_UNBREAKABLE_WEAPON,SP_UNBREAKABLE_ARMOR, SP_UNBREAKABLE_HELM, // 2006-2010
SP_UNBREAKABLE_SHIELD, SP_LONG_ATK_RATE, // 2011-2012
SP_CRIT_ATK_RATE, SP_CRITICAL_ADDRACE, SP_NO_REGEN, SP_ADDEFF_WHENHIT, SP_AUTOSPELL_WHENHIT, // 2013-2017
@@ -1165,7 +1165,6 @@ enum {
SP_ADD_SKILL_BLOW, SP_SP_VANISH_RATE //2041
//Before adding another, note that
//1077 (SP_FREE, previously disguise),
- //2007 (SP_FREE2, previously Infinite Endure)
//are available!
};