summaryrefslogtreecommitdiff
path: root/src/map/battle.c
diff options
context:
space:
mode:
authorInkfish <Inkfish@54d463be-8e91-2dee-dedb-b68131a5f0ec>2009-05-20 12:42:06 +0000
committerInkfish <Inkfish@54d463be-8e91-2dee-dedb-b68131a5f0ec>2009-05-20 12:42:06 +0000
commit9847103a4169a5593a1da851d8f0823a158694b9 (patch)
tree5fc4cfcb6c70a7a10320f4f7ebbfdea10cd9cbdf /src/map/battle.c
parent701fc9b87e2688f357ac3fde17c0970def7d68ed (diff)
downloadhercules-9847103a4169a5593a1da851d8f0823a158694b9.tar.gz
hercules-9847103a4169a5593a1da851d8f0823a158694b9.tar.bz2
hercules-9847103a4169a5593a1da851d8f0823a158694b9.tar.xz
hercules-9847103a4169a5593a1da851d8f0823a158694b9.zip
* Now fiberlocking a fiberlocked target doesn't renew the timer but instead increases its fireweakness [Inkfish]
- This makes doublecasting firebolts on a double fiberlocked target having double damage from both 2 bolts possible = =(bugreport:3061) git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@13799 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'src/map/battle.c')
-rw-r--r--src/map/battle.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/src/map/battle.c b/src/map/battle.c
index 224f01c62..3eced353a 100644
--- a/src/map/battle.c
+++ b/src/map/battle.c
@@ -252,13 +252,13 @@ int battle_attr_fix(struct block_list *src, struct block_list *target, int damag
if(sc->data[SC_DELUGE] && atk_elem == ELE_WATER)
ratio += enchant_eff[sc->data[SC_DELUGE]->val1-1];
}
- if (tsc && tsc->count)
+ if( atk_elem == ELE_FIRE && tsc && tsc->count && tsc->data[SC_SPIDERWEB] )
{
- if(tsc->data[SC_SPIDERWEB] && atk_elem == ELE_FIRE)
- { // [Celest]
- damage <<= 1;
- status_change_end(target, SC_SPIDERWEB, -1);
- }
+ tsc->data[SC_SPIDERWEB]->val1 = 0; // free to move now
+ if( tsc->data[SC_SPIDERWEB]->val2-- > 0 )
+ damage <<= 1; // double damage
+ if( tsc->data[SC_SPIDERWEB]->val2 == 0 )
+ status_change_end(target,SC_SPIDERWEB,-1);
}
return damage*ratio/100;
}