diff options
| author | shennetsind <ind@henn.et> | 2014-02-10 13:59:24 -0200 |
|---|---|---|
| committer | shennetsind <ind@henn.et> | 2014-02-10 13:59:24 -0200 |
| commit | cd8d09337ba3108f46acbb5cfcd6a99ddb4b321e (patch) | |
| tree | 70e501ba613ef8d4586c5f6c4be7424f3e953198 /src/map/status.c | |
| parent | 9ca281d0a03ea083c4dba20de9d109d581a5ee4f (diff) | |
| parent | ac45ebca3e9537eca665ba042412ddc1e65e9f73 (diff) | |
| download | hercules-cd8d09337ba3108f46acbb5cfcd6a99ddb4b321e.tar.gz hercules-cd8d09337ba3108f46acbb5cfcd6a99ddb4b321e.tar.bz2 hercules-cd8d09337ba3108f46acbb5cfcd6a99ddb4b321e.tar.xz hercules-cd8d09337ba3108f46acbb5cfcd6a99ddb4b321e.zip | |
Merge branch 'master' of https://github.com/HerculesWS/Hercules
Diffstat (limited to 'src/map/status.c')
| -rw-r--r-- | src/map/status.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/map/status.c b/src/map/status.c index e204e9d92..df79cee74 100644 --- a/src/map/status.c +++ b/src/map/status.c @@ -8435,12 +8435,12 @@ int status_change_start(struct block_list* bl,enum sc_type type,int rate,int val tick = -1; //endless duration in the client break; case SC_EXEEDBREAK: - val1 *= 150; // 150 * skill_lv - if( sd && sd->inventory_data[sd->equip_index[EQI_HAND_R]] ) { // Chars. - val1 += (sd->inventory_data[sd->equip_index[EQI_HAND_R]]->weight/10 * sd->inventory_data[sd->equip_index[EQI_HAND_R]]->wlv * status->get_lv(bl) / 100); - val1 += 15 * (sd ? sd->status.job_level:50) + 100; - } else // Mobs - val1 += (400 * status->get_lv(bl) / 100) + (15 * (status->get_lv(bl) / 2)); // About 1138% at mob_lvl 99. Is an aproximation to a standard weapon. [pakpil] + if( sd ){ + short index = sd->equip_index[EQI_HAND_R]; + val1 = 15 * (sd->status.job_level + val1 * 10); + if( index >= 0 && sd->inventory_data[index] && sd->inventory_data[index]->type == IT_WEAPON ) + val1 += (sd->inventory_data[index]->weight / 10 * sd->inventory_data[index]->wlv) * status->get_lv(bl) / 100; + } break; case SC_PRESTIGE: // Based on suggested formula in iRO Wiki and some test, still need more test. [pakpil] val2 = ((st->int_ + st->luk) / 6) + 5; // Chance to evade magic damage. |