diff options
| author | reddozen <reddozen@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2008-01-08 00:29:33 +0000 |
|---|---|---|
| committer | reddozen <reddozen@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2008-01-08 00:29:33 +0000 |
| commit | e134818e33b34c84eba8770087a330f99607c4b6 (patch) | |
| tree | f9bba5db36ee0e47bd3faee885a7224dcc306564 | |
| parent | b0a605c97340b7248ab7902e5e17a2794449bc2d (diff) | |
| download | hercules-e134818e33b34c84eba8770087a330f99607c4b6.tar.gz hercules-e134818e33b34c84eba8770087a330f99607c4b6.tar.bz2 hercules-e134818e33b34c84eba8770087a330f99607c4b6.tar.xz hercules-e134818e33b34c84eba8770087a330f99607c4b6.zip | |
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@12031 54d463be-8e91-2dee-dedb-b68131a5f0ec
| -rw-r--r-- | Changelog-Trunk.txt | 2 | ||||
| -rw-r--r-- | src/map/skill.c | 6 |
2 files changed, 8 insertions, 0 deletions
diff --git a/Changelog-Trunk.txt b/Changelog-Trunk.txt index 651c64484..9505635ba 100644 --- a/Changelog-Trunk.txt +++ b/Changelog-Trunk.txt @@ -7,6 +7,8 @@ IF YOU HAVE A WORKING AND TESTED BUGFIX PUT IT INTO STABLE AS WELL AS TRUNK. * Added missing code to log main chat messages sent by whispering to main_chat_nick (bugreport:424) [ultramage] 2008/01/07 + * Small change to potion pitcher to allow potion healing rate item effects + to be included in potion pitcher's heal rate. [Reddozen] * Changed the code in status_change_timer so that a null pointer no longer causes a crash but prints an error instead. * Corrected clones not copying over a player's skills properly. [Skotlex] diff --git a/src/map/skill.c b/src/map/skill.c index 08b1d282b..2360067be 100644 --- a/src/map/skill.c +++ b/src/map/skill.c @@ -4082,6 +4082,12 @@ int skill_castend_nodamage_id (struct block_list *src, struct block_list *bl, in sp = sp * (100 + pc_checkskill(dstsd,MG_SRECOVERY)*10) / 100; } } + if (sd->itemgrouphealrate[37]>0) + { + hp += hp * sd->itemgrouphealrate[37] / 100; + sp += sp * sd->itemgrouphealrate[37] / 100; + } + if ((i = pc_skillheal_bonus(sd, skillid))) { hp += hp * i / 100; |