summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorHaruna <haru@dotalux.com>2014-12-28 00:20:17 +0100
committerHaruna <haru@dotalux.com>2014-12-28 00:20:17 +0100
commitd0d09ad3afb792f1363ac9f24086c99d6e67b94a (patch)
tree70d0b3a70d0b858f140170127df112152148e819 /src
parent990c25267aeefe4d792bf941a366a6603afcb42b (diff)
parent24e82f2cac83b6e8d777efe32e5c0b7993d22a02 (diff)
downloadhercules-d0d09ad3afb792f1363ac9f24086c99d6e67b94a.tar.gz
hercules-d0d09ad3afb792f1363ac9f24086c99d6e67b94a.tar.bz2
hercules-d0d09ad3afb792f1363ac9f24086c99d6e67b94a.tar.xz
hercules-d0d09ad3afb792f1363ac9f24086c99d6e67b94a.zip
Merge pull request #427 from csnv/skillswork
PR_KYRIE Visual fix, EDP corrections. Preliminary fix Maya Purple Hack update position.
Diffstat (limited to 'src')
-rw-r--r--src/map/battle.c8
-rw-r--r--src/map/skill.c4
-rw-r--r--src/map/status.c1
3 files changed, 6 insertions, 7 deletions
diff --git a/src/map/battle.c b/src/map/battle.c
index f32919c85..77edb31f1 100644
--- a/src/map/battle.c
+++ b/src/map/battle.c
@@ -440,12 +440,12 @@ int64 battle_calc_weapon_damage(struct block_list *src, struct block_list *bl, u
if( sc && sc->count ){
if( sc->data[SC_ZENKAI] && watk->ele == sc->data[SC_ZENKAI]->val2 )
eatk += 200;
- #ifdef RENEWAL_EDP
+#ifdef RENEWAL_EDP
if( sc->data[SC_EDP] && skill_id != AS_GRIMTOOTH && skill_id != AS_VENOMKNIFE && skill_id != ASC_BREAKER ){
eatk = eatk * (sc->data[SC_EDP]->val4 / 100 - 1);
damage = damage * (sc->data[SC_EDP]->val4 / 100);
}
- #endif
+#endif
}
if( skill_id != ASC_METEORASSAULT ){
@@ -4878,10 +4878,8 @@ struct Damage battle_calc_weapon_attack(struct block_list *src,struct block_list
#ifndef RENEWAL_EDP
if( sc->data[SC_EDP] ){
switch(skill_id){
- case AS_SPLASHER:
- case AS_GRIMTOOTH:
+ case AS_SPLASHER: // Needs more info
case ASC_BREAKER:
- case AS_VENOMKNIFE:
case ASC_METEORASSAULT: break;
default:
ATK_ADDRATE(sc->data[SC_EDP]->val3);
diff --git a/src/map/skill.c b/src/map/skill.c
index 9130ab014..5eb319c02 100644
--- a/src/map/skill.c
+++ b/src/map/skill.c
@@ -5654,8 +5654,8 @@ int skill_castend_nodamage_id(struct block_list *src, struct block_list *bl, uin
case PR_KYRIE:
case MER_KYRIE:
- clif->skill_nodamage(bl,bl,skill_id,skill_lv,
- sc_start(src,bl,type,100,skill_lv,skill->get_time(skill_id,skill_lv)));
+ clif->skill_nodamage(bl, bl, skill_id, -1,
+ sc_start(src, bl, type, 100, skill_lv, skill->get_time(skill_id, skill_lv)));
break;
//Passive Magnum, should had been casted on yourself.
case SM_MAGNUM:
diff --git a/src/map/status.c b/src/map/status.c
index 36661f683..92c4ad3e0 100644
--- a/src/map/status.c
+++ b/src/map/status.c
@@ -10439,6 +10439,7 @@ int status_change_end_(struct block_list* bl, enum sc_type type, int tid, const
#ifdef ANTI_MAYAP_CHEAT
if (invisible && !(sc->option&(OPTION_HIDE|OPTION_CLOAK|OPTION_INVISIBLE))) {
+ clif->slide(bl, bl->x, bl->y);
clif->fixpos(bl);
}
#endif