summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorcsnv <ctt@csnv.es>2014-09-03 01:44:12 +0200
committercsnv <ctt@csnv.es>2014-09-03 01:44:12 +0200
commit964d174a44c668dfe9feb1c542a0c59bfcd75108 (patch)
treee563030a87afcd3915a5ce20bfed97e73fa6c68c
parentfa6d3eb080a69ba5b0ee5d73ddfdf67ccf9018a6 (diff)
downloadhercules-964d174a44c668dfe9feb1c542a0c59bfcd75108.tar.gz
hercules-964d174a44c668dfe9feb1c542a0c59bfcd75108.tar.bz2
hercules-964d174a44c668dfe9feb1c542a0c59bfcd75108.tar.xz
hercules-964d174a44c668dfe9feb1c542a0c59bfcd75108.zip
Fixes bard song assassin cross of sunset. Thanks to Juvia
Corrected skill level/status formula and Musical Lesson bonus
-rw-r--r--src/map/skill.c8
-rw-r--r--src/map/status.c2
2 files changed, 2 insertions, 8 deletions
diff --git a/src/map/skill.c b/src/map/skill.c
index 9f008d65b..59ce06111 100644
--- a/src/map/skill.c
+++ b/src/map/skill.c
@@ -11018,15 +11018,9 @@ struct skill_unit_group* skill_unitsetting(struct block_list *src, uint16 skill_
}
break;
case BA_ASSASSINCROSS:
-#ifdef RENEWAL
val1 = 10 + skill_lv + (st->agi/10); // ASPD increase
if(sd)
- val1 += 4*pc->checkskill(sd,BA_MUSICALLESSON);
-#else
- val1 = 100+(10*skill_lv)+(st->agi/10); // ASPD increase
- if(sd)
- val1 += 5*pc->checkskill(sd,BA_MUSICALLESSON);
-#endif
+ val1 += (pc->checkskill(sd,BA_MUSICALLESSON) + 1) / 2;
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 718deaefc..f20fc3fc1 100644
--- a/src/map/status.c
+++ b/src/map/status.c
@@ -5569,7 +5569,7 @@ short status_calc_aspd_rate(struct block_list *bl, struct status_change *sc, int
max = sc->data[SC_ASSNCROS]->val2;
}
}
- aspd_rate -= max;
+ aspd_rate -= 10 * max; // let's multiply here for consistency
if(sc->data[SC_BERSERK])
aspd_rate -= 300;