diff options
| author | rud0lp20 <rud0lp20@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2012-05-16 16:56:43 +0000 |
|---|---|---|
| committer | rud0lp20 <rud0lp20@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2012-05-16 16:56:43 +0000 |
| commit | 3089bee74700694461fdc50bf9e9aa01fe589730 (patch) | |
| tree | cf330782d4f381fe4caad9915824f51dcdd39648 /src/map/battle.c | |
| parent | f3bc6581829e1b0111110c4bd42626cd0886593d (diff) | |
| download | hercules-3089bee74700694461fdc50bf9e9aa01fe589730.tar.gz hercules-3089bee74700694461fdc50bf9e9aa01fe589730.tar.bz2 hercules-3089bee74700694461fdc50bf9e9aa01fe589730.tar.xz hercules-3089bee74700694461fdc50bf9e9aa01fe589730.zip | |
Fixed bugreport:5749 Amplify Magic Power should now work properly on multi-hit magical skills.
Fixed bugreport:5748 Masquerade-Groomy now removes Dragon and Warg.
Fixed bugreport:5751 Implemented script command in checking/mounting Dragon, Warg and MADO Gear, also made a clean up regarding MADO Gear and Warg conditions.
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@16114 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'src/map/battle.c')
| -rw-r--r-- | src/map/battle.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/map/battle.c b/src/map/battle.c index b38214d52..a010eed4f 100644 --- a/src/map/battle.c +++ b/src/map/battle.c @@ -781,7 +781,7 @@ int battle_calc_damage(struct block_list *src,struct block_list *bl,struct Damag mobskill_event((TBL_MOB*)bl,src,gettick(),MSC_SKILLUSED|(skill_num<<16)); } if( sd ) { - if( (sd->sc.option&OPTION_MADOGEAR) && rnd()%100 < 50 ) { + if( pc_ismadogear(sd) && rnd()%100 < 50 ) { short element = skill_get_ele(skill_num, skill_lv); if( !skill_num || element == -1 ) { //Take weapon's element struct status_data *sstatus = NULL; @@ -952,7 +952,7 @@ int battle_addmastery(struct map_session_data *sd,struct block_list *target,int damage += (skill * 5); if( (skill = pc_checkskill(sd,NC_RESEARCHFE)) > 0 && (status->def_ele == ELE_FIRE || status->def_ele == ELE_EARTH) ) damage += (skill * 10); - if( (sd->sc.option&OPTION_MADOGEAR) ) + if( pc_ismadogear(sd) ) damage += 20 + 20 * pc_checkskill(sd, NC_MADOLICENCE); if((skill = pc_checkskill(sd,HT_BEASTBANE)) > 0 && (status->race==RC_BRUTE || status->race==RC_INSECT) ) { |