diff options
| author | Euphy <euphy@rathena.org> | 2013-06-20 22:29:03 -0400 |
|---|---|---|
| committer | Euphy <euphy@rathena.org> | 2013-06-20 22:29:03 -0400 |
| commit | 86c43fa2e2c164362cae4f3c2d9cf0ccd22bc528 (patch) | |
| tree | df955a23899586104e67359dc490891221b2875b /src/map/battle.c | |
| parent | caa8a41b40a5ce3c96eb793619ff75f191ca558b (diff) | |
| parent | 0f7c29113d7d898150108d66d1358f15bb018e0a (diff) | |
| download | hercules-86c43fa2e2c164362cae4f3c2d9cf0ccd22bc528.tar.gz hercules-86c43fa2e2c164362cae4f3c2d9cf0ccd22bc528.tar.bz2 hercules-86c43fa2e2c164362cae4f3c2d9cf0ccd22bc528.tar.xz hercules-86c43fa2e2c164362cae4f3c2d9cf0ccd22bc528.zip | |
Merge remote-tracking branch 'upstream/master'
Conflicts:
conf/plugins.conf
db/pre-re/skill_tree.txt
db/re/skill_tree.txt
db/sc_config.txt
npc/mobs/citycleaners.txt
src/map/atcommand.c
src/map/battle.c
src/map/clif.c
src/map/map.c
src/map/packets.h
src/map/pc.c
src/map/script.c
src/map/skill.c
src/map/status.c
src/map/storage.c
src/map/trade.h
Merged master.
Diffstat (limited to 'src/map/battle.c')
| -rw-r--r-- | src/map/battle.c | 32 |
1 files changed, 32 insertions, 0 deletions
diff --git a/src/map/battle.c b/src/map/battle.c index 31fe502f6..f6695915b 100644 --- a/src/map/battle.c +++ b/src/map/battle.c @@ -753,8 +753,13 @@ int battle_calc_masteryfix(struct block_list *src, struct block_list *target, ui int ratio = sd->status.base_level + status_get_dex(src) + status_get_luk(src); if ( i == 2 ) ratio += status_get_str(src); //Star Anger if (skill < 4 ) +<<<<<<< HEAD ratio /= 12 - 3 * skill; damage += damage * ratio; +======= + ratio /= (12 - 3 * skill); + damage += damage * ratio / 100; +>>>>>>> upstream/master } if( sc ){ @@ -820,7 +825,11 @@ int battle_calc_elefix(struct block_list *src, struct block_list *target, uint16 { // Descriptions indicate this means adding a percent of a normal attack in another element. [Skotlex] damage = #ifndef RENEWAL +<<<<<<< HEAD battle->calc_base_damage(sstatus, &sstatus->rhw, sc, tstatus->size, ((TBL_PC*)src), (flag?2:0)) +======= + battle->calc_base_damage(sstatus, &sstatus->rhw, sc, tstatus->size, BL_CAST(BL_PC, src), (flag?2:0)) +>>>>>>> upstream/master #else battle->calc_base_damage(src, target, skill_id, skill_lv, nk, n_ele, s_ele, s_ele_, EQI_HAND_R, (flag?2:0)|(sc && sc->data[SC_MAXIMIZEPOWER]?1:0)|(sc && sc->data[SC_WEAPONPERFECT]?8:0), 0) #endif @@ -830,7 +839,11 @@ int battle_calc_elefix(struct block_list *src, struct block_list *target, uint16 if( left ){ damage = #ifndef RENEWAL +<<<<<<< HEAD battle->calc_base_damage(sstatus, &sstatus->lhw, sc, tstatus->size, ((TBL_PC*)src), (flag?2:0)) +======= + battle->calc_base_damage(sstatus, &sstatus->lhw, sc, tstatus->size, BL_CAST(BL_PC, src), (flag?2:0)) +>>>>>>> upstream/master #else battle->calc_base_damage(src, target, skill_id, skill_lv, nk, n_ele, s_ele, s_ele_, EQI_HAND_L, (flag?2:0)|(sc && sc->data[SC_MAXIMIZEPOWER]?1:0)|(sc && sc->data[SC_WEAPONPERFECT]?8:0), 0) #endif @@ -4345,6 +4358,7 @@ struct Damage battle_calc_weapon_attack(struct block_list *src,struct block_list wd.damage = sstatus->max_hp* 9/100; wd.damage2 = 0; break; +<<<<<<< HEAD #ifdef RENEWAL case MO_EXTREMITYFIST: // [malufett] @@ -4354,6 +4368,13 @@ struct Damage battle_calc_weapon_attack(struct block_list *src,struct block_list flag.tdef = 1; break; case NJ_ISSEN: // [malufett] +======= + case NJ_ISSEN: // [malufett] +#ifndef RENEWAL + wd.damage = 40*sstatus->str +skill_lv*(sstatus->hp/10 + 35); + wd.damage2 = 0; +#else +>>>>>>> upstream/master { short totaldef = status_get_total_def(target); i = 0; @@ -4367,12 +4388,23 @@ struct Damage battle_calc_weapon_attack(struct block_list *src,struct block_list ATK_RATE(50); flag.idef = 1; } +<<<<<<< HEAD #else wd.damage = 40*sstatus->str +skill_lv*(sstatus->hp/10 + 35); wd.damage2 = 0; #endif break; +======= + break; + case MO_EXTREMITYFIST: // [malufett] + wd.damage = battle->calc_base_damage(src, target, skill_id, skill_lv, nk, n_ele, s_ele, s_ele_, EQI_HAND_R, (sc && sc->data[SC_MAXIMIZEPOWER]?1:0)|8, wd.flag); + // first value is still not confirm. + wd.damage = status_get_sp(src) + 10 * status_get_sp(src) * wd.damage / 100 + 8 * wd.damage; + flag.tdef = 1; +#endif + break; +>>>>>>> upstream/master #ifndef RENEWAL case LK_SPIRALPIERCE: case ML_SPIRALPIERCE: |