summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorrud0lp20 <rud0lp20@54d463be-8e91-2dee-dedb-b68131a5f0ec>2013-01-08 12:30:25 +0000
committerrud0lp20 <rud0lp20@54d463be-8e91-2dee-dedb-b68131a5f0ec>2013-01-08 12:30:25 +0000
commit97d488e67801d315730cbe20eef9e0f70e56c0a6 (patch)
tree3653f920b979bbb9799c1d000cd10d9d4fc964a6 /src
parent8b05b9b81972cb95bf3cc8bb0e1f5dc9d2368756 (diff)
downloadhercules-97d488e67801d315730cbe20eef9e0f70e56c0a6.tar.gz
hercules-97d488e67801d315730cbe20eef9e0f70e56c0a6.tar.bz2
hercules-97d488e67801d315730cbe20eef9e0f70e56c0a6.tar.xz
hercules-97d488e67801d315730cbe20eef9e0f70e56c0a6.zip
Fixed bugreport:7125 changed CH_PALMSTRIKE to aspd based like official.
Fixed bugreport:7131 where negative def in PRE causes instant death to target. git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@17088 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'src')
-rw-r--r--src/map/battle.c4
-rw-r--r--src/map/skill.c2
2 files changed, 3 insertions, 3 deletions
diff --git a/src/map/battle.c b/src/map/battle.c
index 074319b2f..e67cf16ed 100644
--- a/src/map/battle.c
+++ b/src/map/battle.c
@@ -3242,8 +3242,8 @@ static struct Damage battle_calc_weapon_attack(struct block_list *src,struct blo
#else
if (def1 > 100) def1 = 100;
ATK_RATE2(
- flag.idef ?100:(flag.pdef ? (flag.pdef*(def1+vit_def)) : (100-def1)),
- flag.idef2?100:(flag.pdef2? (flag.pdef2*(def1+vit_def)) : (100-def1))
+ flag.idef ?100:(flag.pdef ? (def1+vit_def) : (100-def1)),
+ flag.idef2?100:(flag.pdef2? (def1+vit_def) : (100-def1))
);
ATK_ADD2(
flag.idef ||flag.pdef ?0:-vit_def,
diff --git a/src/map/skill.c b/src/map/skill.c
index 797d5aeda..03e4c4baf 100644
--- a/src/map/skill.c
+++ b/src/map/skill.c
@@ -3911,7 +3911,7 @@ int skill_castend_damage_id (struct block_list* src, struct block_list *bl, uint
case CH_PALMSTRIKE: // Palm Strike takes effect 1sec after casting. [Skotlex]
// clif_skill_nodamage(src,bl,skill_id,skill_lv,0); //Can't make this one display the correct attack animation delay :/
clif_damage(src,bl,tick,status_get_amotion(src),0,-1,1,4,0); //Display an absorbed damage attack.
- skill_addtimerskill(src, tick + 1000, bl->id, 0, 0, skill_id, skill_lv, BF_WEAPON, flag);
+ skill_addtimerskill(src, tick + (1000+status_get_amotion(src)), bl->id, 0, 0, skill_id, skill_lv, BF_WEAPON, flag);
break;
case PR_TURNUNDEAD: