diff options
| author | Haru <haru@dotalux.com> | 2017-03-23 10:34:12 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-03-23 10:34:12 +0100 |
| commit | 04f57d1c837e6b4e03f1d003862bddb8e064459a (patch) | |
| tree | 9b8aa54666bca26d7495259776387fd5e40f8d04 | |
| parent | c07dcc80c3d5a6375c3f78eaa517e3df3020d69a (diff) | |
| parent | 0023b7380e028676e6e81f4e3ccd63932386b3c8 (diff) | |
| download | hercules-04f57d1c837e6b4e03f1d003862bddb8e064459a.tar.gz hercules-04f57d1c837e6b4e03f1d003862bddb8e064459a.tar.bz2 hercules-04f57d1c837e6b4e03f1d003862bddb8e064459a.tar.xz hercules-04f57d1c837e6b4e03f1d003862bddb8e064459a.zip | |
Merge pull request #1638 from Asheraf/hami
Correct Castling skill to use cooldown
| -rw-r--r-- | db/re/skill_db.conf | 13 | ||||
| -rw-r--r-- | src/map/skill.c | 10 |
2 files changed, 9 insertions, 14 deletions
diff --git a/db/re/skill_db.conf b/db/re/skill_db.conf index 03d35b687..ffc5e4e52 100644 --- a/db/re/skill_db.conf +++ b/db/re/skill_db.conf @@ -33989,18 +33989,7 @@ skill_db: ( NoDamage: true } NumberOfHits: 0 - SkillData2: { - Lv1: 60000 - Lv2: 70000 - Lv3: 80000 - Lv4: 90000 - Lv5: 129000 - Lv6: 129000 - Lv7: 129000 - Lv8: 129000 - Lv9: 129000 - Lv10: 129000 - } + CoolDown: 1000 FixedCastTime: -1 Requirements: { SPCost: 10 diff --git a/src/map/skill.c b/src/map/skill.c index cd7006de0..70db5b341 100644 --- a/src/map/skill.c +++ b/src/map/skill.c @@ -8181,8 +8181,14 @@ int skill_castend_nodamage_id(struct block_list *src, struct block_list *bl, uin int x,y; x = src->x; y = src->y; - if (hd) - skill->blockhomun_start(hd, skill_id, skill->get_time2(skill_id,skill_lv)); + if (hd) { +#ifdef RENEWAL + skill->blockhomun_start(hd, skill_id, skill->get_cooldown(skill_id, skill_lv)); +#else + skill->blockhomun_start(hd, skill_id, skill->get_time2(skill_id, skill_lv)); +#endif + } + if (unit->movepos(src,bl->x,bl->y,0,0)) { clif->skill_nodamage(src,src,skill_id,skill_lv,1); // Homun |