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

Fixed bugreport:6353

Browse Source 
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@16526 54d463be-8e91-2dee-dedb-b68131a5f0ec
This commit is contained in:
shennetsind 2012-07-29 01:50:09 +00:00
parent 6e1dda68d4
commit b08737ab8c
1 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/map/battle.c
View File

@ -351,18 +351,23 @@ int battle_attr_fix(struct block_list *src, struct block_list *target, int damag
status_change_end(target, SC_CRYSTALIZE, INVALID_TIMER); status_change_end(target, SC_CRYSTALIZE, INVALID_TIMER);
} }
} }
if( src->type == BL_PC || target->type == BL_PC ){ if( src->type == BL_PC ){
struct map_session_data *sd = BL_CAST(BL_PC, src); struct map_session_data *sd = BL_CAST(BL_PC, src);
struct map_session_data *tsd = BL_CAST(BL_PC, target); int s;
int s, t;
ARR_FIND(1, 6, s, sd->talisman[s] > 0); ARR_FIND(1, 6, s, sd->talisman[s] > 0);
ARR_FIND(1, 6, t, tsd->talisman[t] > 0);
if( s < 5 && atk_elem == s ) if( s < 5 && atk_elem == s )
ratio += sd->talisman[s] * 2; // +2% custom value ratio += sd->talisman[s] * 2; // +2% custom value
}
if( target->type == BL_PC ) {
struct map_session_data *tsd = BL_CAST(BL_PC, target);
int t;
ARR_FIND(1, 6, t, tsd->talisman[t] > 0);
if( t < 5 && atk_elem == t ) if( t < 5 && atk_elem == t )
damage -= damage * tsd->talisman[t] * 3 / 100; // -3% custom value damage -= damage * tsd->talisman[t] * 3 / 100; // -3% custom value
} }
return damage*ratio/100; return damage*ratio/100;
} }