summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorshennetsind <ind@henn.et>2013-02-18 21:50:31 -0300
committershennetsind <ind@henn.et>2013-02-18 21:50:31 -0300
commit9c32aa600de9dc10a91d0d96f312a95757998e15 (patch)
tree03e474c81ac020398992c3d8afabb613afd29a56 /src
parentbf760554a5cf55d53f3ae23e2f3a1118ce9f13bd (diff)
parent1093763fb0807943bf4f26a3dcefc6ad7add0686 (diff)
downloadhercules-9c32aa600de9dc10a91d0d96f312a95757998e15.tar.gz
hercules-9c32aa600de9dc10a91d0d96f312a95757998e15.tar.bz2
hercules-9c32aa600de9dc10a91d0d96f312a95757998e15.tar.xz
hercules-9c32aa600de9dc10a91d0d96f312a95757998e15.zip
Merge branch 'master' of https://github.com/HerculesWS/Hercules
Diffstat (limited to 'src')
-rw-r--r--src/map/status.c11
1 files changed, 6 insertions, 5 deletions
diff --git a/src/map/status.c b/src/map/status.c
index b07625322..edac88af0 100644
--- a/src/map/status.c
+++ b/src/map/status.c
@@ -1,4 +1,4 @@
-// Copyright (c) Hercules Dev Team, licensed under GNU GPL.
+// Copyright (c) Hercules Dev Team, licensed under GNU GPL.
// See the LICENSE file
// Portions Copyright (c) Athena Dev Teams
@@ -4689,7 +4689,7 @@ static unsigned short status_calc_matk(struct block_list *bl, struct status_chan
if (sc->data[SC_IZAYOI])
matk += 50 * sc->data[SC_IZAYOI]->val1;
#endif
- if (sc->data[SC_MAGICPOWER])
+ if (sc->data[SC_MAGICPOWER] && sc->data[SC_MAGICPOWER]->val4)
matk += matk * sc->data[SC_MAGICPOWER]->val3/100;
if (sc->data[SC_MINDBREAKER])
matk += matk * sc->data[SC_MINDBREAKER]->val2/100;
@@ -6286,7 +6286,7 @@ int status_get_sc_def(struct block_list *bl, enum sc_type type, int rate, int ti
tick -= (status->int_ + status->luk) / 20 * 1000;
break;
case SC_STASIS:
- //5 second (fixed) + { Stasis Skill level * 5 - (Target�s VIT + DEX) / 20 }
+ //5 second (fixed) + { Stasis Skill level * 5 - (Target's VIT + DEX) / 20 }
tick -= (status->vit + status->dex) / 20 * 1000;
break;
case SC_WHITEIMPRISON:
@@ -10674,9 +10674,10 @@ int status_change_timer_sub(struct block_list* bl, va_list ap)
if (battle_check_target( src, bl, BCT_ENEMY ) > 0 &&
status_check_skilluse(src, bl, WZ_SIGHTBLASTER, 2))
{
- skill_attack(BF_MAGIC,src,src,bl,WZ_SIGHTBLASTER,1,tick,0);
- if (sce && !(bl->type&BL_SKILL)) //The hit is not counted if it's against a trap
+ if (sce && !(bl->type&BL_SKILL) //The hit is not counted if it's against a trap
+ && skill_attack(BF_MAGIC,src,src,bl,WZ_SIGHTBLASTER,1,tick,0)){
sce->val2 = 0; //This signals it to end.
+ }
}
break;
case SC_CLOSECONFINE: