diff options
| author | Playtester <Playtester@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2007-10-22 11:03:40 +0000 |
|---|---|---|
| committer | Playtester <Playtester@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2007-10-22 11:03:40 +0000 |
| commit | 3b58ef0dd6af4117ccecaa8fadbf4e481646a247 (patch) | |
| tree | b4d7963bfbf8f29f037b1feb73150895d311d05e | |
| parent | 1ac2141ca69fd1a345cb55dcd7d75b08dae22021 (diff) | |
| download | hercules-3b58ef0dd6af4117ccecaa8fadbf4e481646a247.tar.gz hercules-3b58ef0dd6af4117ccecaa8fadbf4e481646a247.tar.bz2 hercules-3b58ef0dd6af4117ccecaa8fadbf4e481646a247.tar.xz hercules-3b58ef0dd6af4117ccecaa8fadbf4e481646a247.zip | |
* Heat isn't supposed to consume SP when used against players
- please report if it still consumes SP in pvp
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@11544 54d463be-8e91-2dee-dedb-b68131a5f0ec
| -rw-r--r-- | Changelog-Trunk.txt | 3 | ||||
| -rw-r--r-- | src/map/skill.c | 6 |
2 files changed, 6 insertions, 3 deletions
diff --git a/Changelog-Trunk.txt b/Changelog-Trunk.txt index 536d7a200..a1f5e854d 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. +2007/10/22 + * Heat isn't supposed to consume SP when used against players [Playtester] + - please report if it still consumes SP in pvp 2007/10/21 * Fixed a small mistake in r11503 causing a fatal error&exit on unix when you try to do a graceful exit (by ctrl+c for example) [ultramage] diff --git a/src/map/skill.c b/src/map/skill.c index 46d47432b..bd58f6a9b 100644 --- a/src/map/skill.c +++ b/src/map/skill.c @@ -7400,12 +7400,12 @@ int skill_unit_onplace_timer (struct skill_unit *src, struct block_list *bl, uns int x = bl->x, y = bl->y; //If target isn't knocked back it should hit every 20ms [Playtester] while (count++ < SKILLUNITTIMER_INTERVAL/sg->interval && x == bl->x && y == bl->y && !status_isdead(bl)){ - if (!status_charge(ss, 0, 2)){ //should end when out of sp. + if (bl->type==BL_PC) + status_zap(bl, 0, 15); //Only damage SP [Skotlex] + else if (!status_charge(ss, 0, 2)){ //should end when out of sp. sg->limit=DIFF_TICK(tick,sg->tick); break; } - else if (bl->type==BL_PC) - status_zap(bl, 0, 15); //Only damage SP [Skotlex] else skill_attack(BF_WEAPON,ss,&src->bl,bl,sg->skill_id,sg->skill_lv,tick+count*20,0); } |