diff options
| author | Hercules.ws <Hercules@efficiently.awesome> | 2014-08-08 10:53:09 +0200 |
|---|---|---|
| committer | HerculesWSAPI <Hercules@efficiently.awesome> | 2014-08-08 10:53:09 +0200 |
| commit | 93891737444f5f92aebdb2302eddf8633d9387cf (patch) | |
| tree | 5f565e989ebc0a3046b15adf489134cf06808697 | |
| parent | 781ba96bc45e706d8033c755897e3a7aafb80645 (diff) | |
| download | hercules-93891737444f5f92aebdb2302eddf8633d9387cf.tar.gz hercules-93891737444f5f92aebdb2302eddf8633d9387cf.tar.bz2 hercules-93891737444f5f92aebdb2302eddf8633d9387cf.tar.xz hercules-93891737444f5f92aebdb2302eddf8633d9387cf.zip | |
HPM Hooks Update
Signed-off-by: HerculesWSAPI <Hercules@efficiently.awesome>
| -rw-r--r-- | src/map/battle.c | 4 | ||||
| -rw-r--r-- | src/map/skill.c | 14 | ||||
| -rw-r--r-- | src/map/status.c | 2 |
3 files changed, 10 insertions, 10 deletions
diff --git a/src/map/battle.c b/src/map/battle.c index dae29e76b..d960b7316 100644 --- a/src/map/battle.c +++ b/src/map/battle.c @@ -335,7 +335,7 @@ int64 battle_attr_fix(struct block_list *src, struct block_list *target, int64 d ratio += skill->enchant_eff[sc->data[SC_VIOLENTGALE]->val1-1]; if(sc->data[SC_DELUGE] && atk_elem == ELE_WATER) ratio += skill->enchant_eff[sc->data[SC_DELUGE]->val1-1]; - if(sc->data[SC_FIRE_CLOAK_OPTION] && atk_elem == ELE_FIRE)
+ if(sc->data[SC_FIRE_CLOAK_OPTION] && atk_elem == ELE_FIRE) damage += damage * sc->data[SC_FIRE_CLOAK_OPTION]->val2 / 100; } if( target && target->type == BL_SKILL ) { @@ -2867,7 +2867,7 @@ int64 battle_calc_damage(struct block_list *src,struct block_list *bl,struct Dam damage >>= 2; //75% reduction } - if ( sc->data[SC_WATER_BARRIER] )
+ if ( sc->data[SC_WATER_BARRIER] ) damage = damage * ( 100 - 20 ) / 100; // Compressed code, fixed by map.h [Epoque] diff --git a/src/map/skill.c b/src/map/skill.c index 5f6a6bf41..de86c461e 100644 --- a/src/map/skill.c +++ b/src/map/skill.c @@ -12305,13 +12305,13 @@ int skill_unit_onleft(uint16 skill_id, struct block_list *bl, int64 tick) { case SC_BLOODYLUST: if (sce) status_change_end(bl, type, INVALID_TIMER); - break;
- case SO_FIRE_INSIGNIA:
- case SO_WATER_INSIGNIA:
- case SO_WIND_INSIGNIA:
- case SO_EARTH_INSIGNIA:
- if (sce && bl->type != BL_ELEM)
- status_change_end(bl, type, INVALID_TIMER);
+ break; + case SO_FIRE_INSIGNIA: + case SO_WATER_INSIGNIA: + case SO_WIND_INSIGNIA: + case SO_EARTH_INSIGNIA: + if (sce && bl->type != BL_ELEM) + status_change_end(bl, type, INVALID_TIMER); break; case BA_POEMBRAGI: case BA_WHISTLE: diff --git a/src/map/status.c b/src/map/status.c index 61a626b42..4a2a6c344 100644 --- a/src/map/status.c +++ b/src/map/status.c @@ -4925,7 +4925,7 @@ defType status_calc_def(struct block_list *bl, struct status_change *sc, int def def -= def * 5 * (10-sc->data[SC_CAMOUFLAGE]->val4) / 100; if( sc->data[SC_OVERED_BOOST] && bl->type == BL_PC ) def -= def * 50 / 100; - if( sc->data[SC_NEUTRALBARRIER] )
+ if( sc->data[SC_NEUTRALBARRIER] ) def += def * (10 + 5*sc->data[SC_NEUTRALBARRIER]->val1) / 100; if( sc && sc->data[SC_GENTLETOUCH_REVITALIZE] && sc->data[SC_GENTLETOUCH_REVITALIZE]->val4 ) def += 2 * sc->data[SC_GENTLETOUCH_REVITALIZE]->val4; |