summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorskotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec>2006-08-04 13:43:44 +0000
committerskotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec>2006-08-04 13:43:44 +0000
commit57286000fb15cc498f1bcd240afee63102eadf45 (patch)
tree8ab6f3da87afc145151c4b19ffa575ad39d876fc /src
parent0db6b799de182c537757772723e55f14f01cd072 (diff)
downloadhercules-57286000fb15cc498f1bcd240afee63102eadf45.tar.gz
hercules-57286000fb15cc498f1bcd240afee63102eadf45.tar.bz2
hercules-57286000fb15cc498f1bcd240afee63102eadf45.tar.xz
hercules-57286000fb15cc498f1bcd240afee63102eadf45.zip
- Hide/Chasewalk will again stop screaming skill name (I guess displaying the skill animation wasn't such a good idea afterall)
- Soul Breaker will no longer receive Mastery damage. git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@8126 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'src')
-rw-r--r--src/map/battle.c7
-rw-r--r--src/map/skill.c2
2 files changed, 6 insertions, 3 deletions
diff --git a/src/map/battle.c b/src/map/battle.c
index 2bf410ca3..e4521d6ed 100644
--- a/src/map/battle.c
+++ b/src/map/battle.c
@@ -1753,8 +1753,11 @@ static struct Damage battle_calc_weapon_attack(
if (flag.rh && wd.damage < 1) wd.damage = 1;
if (flag.lh && wd.damage2 < 1) wd.damage2 = 1;
- if (sd && flag.weapon && skill_num != MO_INVESTIGATE && skill_num != MO_EXTREMITYFIST
- && skill_num != CR_GRANDCROSS)
+ if (sd && flag.weapon &&
+ skill_num != MO_INVESTIGATE &&
+ skill_num != MO_EXTREMITYFIST &&
+ skill_num != CR_GRANDCROSS &&
+ skill_num != ASC_BREAKER)
{ //Add mastery damage
wd.damage = battle_addmastery(sd,target,wd.damage,0);
if (flag.lh) wd.damage2 = battle_addmastery(sd,target,wd.damage2,1);
diff --git a/src/map/skill.c b/src/map/skill.c
index a3bf2b040..c52bb1729 100644
--- a/src/map/skill.c
+++ b/src/map/skill.c
@@ -4193,7 +4193,7 @@ int skill_castend_nodamage_id (struct block_list *src, struct block_list *bl, in
i = status_change_end(bl, type, -1);
else
i = sc_start(bl,type,100,skilllv,skill_get_time(skillid,skilllv));
- clif_skill_nodamage(src,bl,skillid,skilllv,i);
+ clif_skill_nodamage(src,bl,skillid,-1,i); //Hide skill-scream animation.
break;
case TK_RUN:
if (tsc && tsc->data[type].timer != -1)