Mirroristas/rathena
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixed bugreport:5655 Venom Impress boost against poison should now work.

Browse Source 
Additionally, Fixed Oratio Throns Trap and Elemental Fire Cloak elemental atrributes

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@16061 54d463be-8e91-2dee-dedb-b68131a5f0ec
This commit is contained in:
shennetsind 2012-05-03 02:52:32 +00:00
parent 43b976caa7
commit d0da5125a6
1 changed files with 17 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/map/battle.c
View File

@ -328,13 +328,23 @@ int battle_attr_fix(struct block_list *src, struct block_list *target, int damag
sg->limit = DIFF_TICK(gettick(),sg->tick)+300;
}
}
}
if( atk_elem == ELE_FIRE && tsc && tsc->count && tsc->data[SC_SPIDERWEB] ){
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, INVALID_TIMER);
}
if( tsc && tsc->count ) {
if( tsc->data[SC_SPIDERWEB] && atk_elem == ELE_FIRE ){
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, INVALID_TIMER);
}
if( tsc->data[SC_ORATIO] && atk_elem == ELE_HOLY )
ratio += tsc->data[SC_ORATIO]->val1 * 2;
if( tsc->data[SC_VENOMIMPRESS] && atk_elem == ELE_POISON )
ratio += tsc->data[SC_VENOMIMPRESS]->val2;
if( tsc->data[SC_THORNSTRAP] && atk_elem == ELE_FIRE )
status_change_end(target, SC_THORNSTRAP, -1);
if( tsc->data[SC_FIRE_CLOAK_OPTION] && atk_elem == ELE_FIRE )
damage -= damage * tsc->data[SC_FIRE_CLOAK_OPTION]->val2 / 100;
}
return damage*ratio/100;
}