diff options
| author | Inkfish <Inkfish@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2009-07-29 04:33:00 +0000 |
|---|---|---|
| committer | Inkfish <Inkfish@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2009-07-29 04:33:00 +0000 |
| commit | e7d01f7b12e109ac54dcc29f9d368e20512c57e6 (patch) | |
| tree | dfdd2ac4d8db3cec19a455d9fe9bb8542664d95e | |
| parent | df3489bd7cd6da79c1654d97600aa7f3ba213fd3 (diff) | |
| download | hercules-e7d01f7b12e109ac54dcc29f9d368e20512c57e6.tar.gz hercules-e7d01f7b12e109ac54dcc29f9d368e20512c57e6.tar.bz2 hercules-e7d01f7b12e109ac54dcc29f9d368e20512c57e6.tar.xz hercules-e7d01f7b12e109ac54dcc29f9d368e20512c57e6.zip | |
* Kaahi heals no matter if attack connects. (bugreport:2440)
* Fixed a typo causing skillitem always resets skill delay. (bugreport:3431)
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@13977 54d463be-8e91-2dee-dedb-b68131a5f0ec
| -rw-r--r-- | Changelog-Trunk.txt | 3 | ||||
| -rw-r--r-- | src/map/battle.c | 3 | ||||
| -rw-r--r-- | src/map/skill.c | 6 | ||||
| -rw-r--r-- | src/map/unit.c | 4 |
4 files changed, 8 insertions, 8 deletions
diff --git a/Changelog-Trunk.txt b/Changelog-Trunk.txt index 5e33d992a..b4115916c 100644 --- a/Changelog-Trunk.txt +++ b/Changelog-Trunk.txt @@ -3,6 +3,9 @@ Date Added AS OF SVN REV. 5091, WE ARE NOW USING TRUNK. ALL UNTESTED BUGFIXES/FEATURES GO INTO TRUNK. IF YOU HAVE A WORKING AND TESTED BUGFIX PUT IT INTO STABLE AS WELL AS TRUNK. +09/07/28 + * Kaahi heals no matter if attack connects. (bugreport:2440) [Inkfish] + * Fixed a typo causing skillitem always resets skill delay. (bugreport:3431) [Inkfish] 09/07/25 * Rewrote Quest Log system. [Inkfish] * Fixed message display for FullStrip and SelfProvoke. (bugreport: 3011, bugreport: 3415) [Inkfish] diff --git a/src/map/battle.c b/src/map/battle.c index 8852d19bd..17073a447 100644 --- a/src/map/battle.c +++ b/src/map/battle.c @@ -3004,6 +3004,9 @@ enum damage_lv battle_weapon_attack(struct block_list* src, struct block_list* t return (damage_lv)skill_attack(BF_MAGIC,src,src,target,NPC_MAGICALATTACK,sc->data[SC_MAGICALATTACK]->val1,tick,0); } + if(tsc && tsc->data[SC_KAAHI] && tsc->data[SC_KAAHI]->val4 == -1) + tsc->data[SC_KAAHI]->val4 = add_timer(tick + skill_get_time2(SL_KAAHI,tsc->data[SC_KAAHI]->val1), kaahi_heal_timer, target->id, SC_KAAHI); //Activate heal. + wd = battle_calc_weapon_attack(src, target, 0, 0, flag); if (sd && sd->state.arrow_atk) //Consume arrow. diff --git a/src/map/skill.c b/src/map/skill.c index 861a073a1..4e4cf1734 100644 --- a/src/map/skill.c +++ b/src/map/skill.c @@ -1206,12 +1206,6 @@ int skill_counter_additional_effect (struct block_list* src, struct block_list * } switch(skillid){ - case 0: //Normal Attack - if(tsc && tsc->data[SC_KAAHI] && tsc->data[SC_KAAHI]->val4 == -1) - tsc->data[SC_KAAHI]->val4 = add_timer( - tick+skill_get_time2(SL_KAAHI,tsc->data[SC_KAAHI]->val1), - kaahi_heal_timer, bl->id, SC_KAAHI); //Activate heal. - break; case MO_EXTREMITYFIST: sc_start(src,status_skill2sc(skillid),100,skilllv,skill_get_time2(skillid,skilllv)); break; diff --git a/src/map/unit.c b/src/map/unit.c index 1adfe16c6..4fce9b2d7 100644 --- a/src/map/unit.c +++ b/src/map/unit.c @@ -1074,7 +1074,7 @@ int unit_skilluse_id2(struct block_list *src, int target_id, short skill_num, sh if( casttime <= 0 ) ud->state.skillcastcancel = 0; - if( !sd || sd->skillitem != ud->skillid || skill_get_cast(skill_num,skill_lv) ) + if( !sd || sd->skillitem != skill_num || skill_get_cast(skill_num,skill_lv) ) ud->canact_tick = tick + casttime + 100; if( sd ) { @@ -1180,7 +1180,7 @@ int unit_skilluse_pos2( struct block_list *src, short skill_x, short skill_y, sh casttime = skill_castfix_sc(src, casttime); ud->state.skillcastcancel = castcancel&&casttime>0?1:0; - if( !sd || sd->skillitem != ud->skillid || skill_get_cast(skill_num,skill_lv) ) + if( !sd || sd->skillitem != skill_num || skill_get_cast(skill_num,skill_lv) ) ud->canact_tick = tick + casttime + 100; // if( sd ) // { |