diff options
author | L0ne_W0lf <L0ne_W0lf@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2009-10-26 02:33:53 +0000 |
---|---|---|
committer | L0ne_W0lf <L0ne_W0lf@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2009-10-26 02:33:53 +0000 |
commit | 019d9618d50d3190a7b6fa3b8e9401add22beb8e (patch) | |
tree | 03fa7bdabe31e7164ae482406a239b94cb0a5c1a /src/map | |
parent | 6f41f8b501ba5fcad54e08ed175b0ab61f4dbd54 (diff) | |
download | hercules-019d9618d50d3190a7b6fa3b8e9401add22beb8e.tar.gz hercules-019d9618d50d3190a7b6fa3b8e9401add22beb8e.tar.bz2 hercules-019d9618d50d3190a7b6fa3b8e9401add22beb8e.tar.xz hercules-019d9618d50d3190a7b6fa3b8e9401add22beb8e.zip |
* The status SC_INVINCIBLE now reduces all damage to 1.
- Official behavior, and allows players to cancel NPC_ALLHEAL casts.
- If battle_config.invincible_nodamage is true, reflected damage is still 0.
* Minor updates and supporting data for Sealed Shrine.
- Zone 5 is now designated for sealed shrine restricted skills.
- Added new quest_db entries for Sealed Shine cooldown.
- Updated mob_db entries for Orc's Memory Instance. (improper stats)
- Updated Land Mine to have a splash effect. (Provided by Daegaladh)
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@14101 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'src/map')
-rw-r--r-- | src/map/battle.c | 2 | ||||
-rw-r--r-- | src/map/status.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/map/battle.c b/src/map/battle.c index b65a5fcde..a1105420a 100644 --- a/src/map/battle.c +++ b/src/map/battle.c @@ -298,7 +298,7 @@ int battle_calc_damage(struct block_list *src,struct block_list *bl,struct Damag sc = status_get_sc(bl); if( sc && sc->data[SC_INVINCIBLE] && !sc->data[SC_INVINCIBLEOFF] ) - return 0; + return 1; if (skill_num == PA_PRESSURE) return damage; //This skill bypass everything else. diff --git a/src/map/status.c b/src/map/status.c index 71d0f6770..84c396a9a 100644 --- a/src/map/status.c +++ b/src/map/status.c @@ -668,7 +668,7 @@ int status_damage(struct block_list *src,struct block_list *target,int hp, int s { if( !sp ) return 0; - hp = 0; + hp = 1; } if( hp && !(flag&1) ) { |