diff options
| author | Michieru <Michieru@users.noreply.github.com> | 2014-09-07 16:06:10 +0200 |
|---|---|---|
| committer | Michieru <Michieru@users.noreply.github.com> | 2014-09-07 16:06:10 +0200 |
| commit | 1c71c00b96bfc6674a544e9f88e0ccc0dbe2aae4 (patch) | |
| tree | e7439df7e94c3eaa4647aae216613ace13127300 | |
| parent | 41e2a782a7c86140a2440b67258c428e09113195 (diff) | |
| parent | d9ffeb49b6f37e48d0770345d0d933bc37977ced (diff) | |
| download | hercules-1c71c00b96bfc6674a544e9f88e0ccc0dbe2aae4.tar.gz hercules-1c71c00b96bfc6674a544e9f88e0ccc0dbe2aae4.tar.bz2 hercules-1c71c00b96bfc6674a544e9f88e0ccc0dbe2aae4.tar.xz hercules-1c71c00b96bfc6674a544e9f88e0ccc0dbe2aae4.zip | |
Merge pull request #340 from csnv/aspdfix
Fix ASPD bonus with some skills
| -rw-r--r-- | src/map/skill.c | 6 | ||||
| -rw-r--r-- | src/map/status.c | 3 |
2 files changed, 8 insertions, 1 deletions
diff --git a/src/map/skill.c b/src/map/skill.c index 94aa32599..b263a8169 100644 --- a/src/map/skill.c +++ b/src/map/skill.c @@ -11020,7 +11020,13 @@ struct skill_unit_group* skill_unitsetting(struct block_list *src, uint16 skill_ case BA_ASSASSINCROSS: val1 = 10 + skill_lv + (st->agi/10); // ASPD increase if(sd) +#ifdef RENEWAL + val1 += 4 * pc->checkskill(sd,BA_MUSICALLESSON); +#else val1 += (pc->checkskill(sd,BA_MUSICALLESSON) + 1) / 2; + + val1 *= 10; // ASPD works with 1000 as 100% +#endif break; case DC_FORTUNEKISS: val1 = 10+skill_lv+(st->luk/10); // Critical increase diff --git a/src/map/status.c b/src/map/status.c index f20fc3fc1..4b22251e6 100644 --- a/src/map/status.c +++ b/src/map/status.c @@ -5569,7 +5569,8 @@ short status_calc_aspd_rate(struct block_list *bl, struct status_change *sc, int max = sc->data[SC_ASSNCROS]->val2; } } - aspd_rate -= 10 * max; // let's multiply here for consistency + + aspd_rate -= max; if(sc->data[SC_BERSERK]) aspd_rate -= 300; |