summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAsheraf <acheraf1998@gmail.com>2017-03-16 20:22:49 +0000
committerAsheraf <acheraf1998@gmail.com>2017-03-16 21:04:29 +0000
commit0023b7380e028676e6e81f4e3ccd63932386b3c8 (patch)
tree73e389225155fb4a57f3415e0c7fd6d614487a5d
parent1e03a5b09d71741e267147cfcd522f9ad7a53dc2 (diff)
downloadhercules-0023b7380e028676e6e81f4e3ccd63932386b3c8.tar.gz
hercules-0023b7380e028676e6e81f4e3ccd63932386b3c8.tar.bz2
hercules-0023b7380e028676e6e81f4e3ccd63932386b3c8.tar.xz
hercules-0023b7380e028676e6e81f4e3ccd63932386b3c8.zip
Correct Castling skill to use cooldown
-rw-r--r--db/re/skill_db.conf13
-rw-r--r--src/map/skill.c10
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