diff options
| author | skotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2006-08-04 16:38:54 +0000 |
|---|---|---|
| committer | skotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2006-08-04 16:38:54 +0000 |
| commit | dca477622e54f10689d47969153121734a411a2d (patch) | |
| tree | 1a7affc325c8e5faac6dfa678dcf86c5c2b57127 /src/map/battle.c | |
| parent | 57286000fb15cc498f1bcd240afee63102eadf45 (diff) | |
| download | hercules-dca477622e54f10689d47969153121734a411a2d.tar.gz hercules-dca477622e54f10689d47969153121734a411a2d.tar.bz2 hercules-dca477622e54f10689d47969153121734a411a2d.tar.xz hercules-dca477622e54f10689d47969153121734a411a2d.zip | |
- Enabled Mastery damage on Soul Breaker again, moved adv katar mastery out of the mastery function so that it may apply to all skills except Soul Breaker.
- Changed name of the setting log_pick to log_filter since that's what it does now.
- Modified enable_logs so that instead of a 0/1 setting, you can specify which kind of events to log (so you can use a combination), see log_athena for the bitmask configuration.
- Cleaned a bit the contents of log_athena.conf
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@8129 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'src/map/battle.c')
| -rw-r--r-- | src/map/battle.c | 16 |
1 files changed, 10 insertions, 6 deletions
diff --git a/src/map/battle.c b/src/map/battle.c index e4521d6ed..a2a5147bc 100644 --- a/src/map/battle.c +++ b/src/map/battle.c @@ -627,9 +627,6 @@ int battle_addmastery(struct map_session_data *sd,struct block_list *target,int damage += (skill * 3); break; case W_KATAR: - if((skill = pc_checkskill(sd,ASC_KATAR)) > 0) - //Advanced Katar Research by zanetheinsane - damage += damage*(10 +skill * 2)/100; if((skill = pc_checkskill(sd,AS_KATAR)) > 0) damage += (skill * 3); break; @@ -1756,12 +1753,19 @@ static struct Damage battle_calc_weapon_attack( if (sd && flag.weapon && skill_num != MO_INVESTIGATE && skill_num != MO_EXTREMITYFIST && - skill_num != CR_GRANDCROSS && - skill_num != ASC_BREAKER) + skill_num != CR_GRANDCROSS) { //Add mastery damage + if(skill_num != ASC_BREAKER && sd->status.weapon == W_KATAR && + (skill=pc_checkskill(sd,ASC_KATAR)) > 0) + { //Adv Katar Mastery is does not applies to ASC_BREAKER, + // but other masteries DO apply >_> + ATK_ADDRATE(10+ 2*skill); + } + wd.damage = battle_addmastery(sd,target,wd.damage,0); if (flag.lh) wd.damage2 = battle_addmastery(sd,target,wd.damage2,1); - + + if((skill=pc_checkskill(sd,SG_STAR_ANGER)) >0 && (t_class == sd->hate_mob[2] || (sc && sc->data[SC_MIRACLE].timer!=-1))) { skillratio = (sd->status.base_level + sstatus->str + sstatus->dex + sstatus->luk)/(skill<4?12-3*skill:1); |