summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorshennetsind <ind@henn.et>2013-07-21 16:24:57 -0300
committershennetsind <ind@henn.et>2013-07-21 16:24:57 -0300
commit68fb17f516928242d9d1b4144038d933bfdd7eec (patch)
treeca8bda1a505fb51872219d13552ff2b30d397003 /src
parentdede3fb8bdfdbb8c49ebc7e9b5a0a2665033f8e8 (diff)
downloadhercules-68fb17f516928242d9d1b4144038d933bfdd7eec.tar.gz
hercules-68fb17f516928242d9d1b4144038d933bfdd7eec.tar.bz2
hercules-68fb17f516928242d9d1b4144038d933bfdd7eec.tar.xz
hercules-68fb17f516928242d9d1b4144038d933bfdd7eec.zip
Fixed Bug #7526
Skill from items with instantaneous casting are no longer affected by magic power http://hercules.ws/board/tracker/issue-7526-item-skill-error/ Signed-off-by: shennetsind <ind@henn.et>
Diffstat (limited to 'src')
-rw-r--r--src/map/pc.c1
-rw-r--r--src/map/skill.c2
2 files changed, 2 insertions, 1 deletions
diff --git a/src/map/pc.c b/src/map/pc.c
index 855b103b1..e14f9b807 100644
--- a/src/map/pc.c
+++ b/src/map/pc.c
@@ -4222,6 +4222,7 @@ int pc_isUseitem(struct map_session_data *sd,int n)
return 0;
if( (item->package || item->group) && pc_is90overweight(sd) ) {
+ //##TODO## find official response to this
clif->colormes(sd->fd,COLOR_RED,msg_txt(1477));// Item cannot be open when overweight by 90%
return 0;
}
diff --git a/src/map/skill.c b/src/map/skill.c
index f27a42ac9..28c5245bb 100644
--- a/src/map/skill.c
+++ b/src/map/skill.c
@@ -13882,7 +13882,7 @@ int skill_vfcastfix (struct block_list *bl, double time, uint16 skill_id, uint16
if (sc && sc->count && !(skill->get_castnodex(skill_id, skill_lv)&2) ) {
// All variable cast additive bonuses must come first
- if (sc->data[SC_MAGICPOWER] )
+ if ( sc->data[SC_MAGICPOWER] && !( sd && time == 0 && sd->skillitem == skill_id ))
time += 700;
if (sc->data[SC_SLOWCAST])
VARCAST_REDUCTION(-sc->data[SC_SLOWCAST]->val2);