diff options
| author | Inkfish <Inkfish@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2010-02-27 03:20:17 +0000 |
|---|---|---|
| committer | Inkfish <Inkfish@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2010-02-27 03:20:17 +0000 |
| commit | 4353985f60c01d1145778a37d80c54d75d006637 (patch) | |
| tree | eb50ca0cb0111d694fe0337527c956dd12e146e0 | |
| parent | 385d55c279e8d3dce294b04fca389dffb8782fd6 (diff) | |
| download | hercules-4353985f60c01d1145778a37d80c54d75d006637.tar.gz hercules-4353985f60c01d1145778a37d80c54d75d006637.tar.bz2 hercules-4353985f60c01d1145778a37d80c54d75d006637.tar.xz hercules-4353985f60c01d1145778a37d80c54d75d006637.zip | |
Fixed Poison Status killing monsters with low max hp(like plants).
Mental Strenth costs 200 sp instead of 50% max sp.
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@14252 54d463be-8e91-2dee-dedb-b68131a5f0ec
| -rw-r--r-- | Changelog-Trunk.txt | 2 | ||||
| -rw-r--r-- | db/Changelog.txt | 2 | ||||
| -rw-r--r-- | db/skill_require_db.txt | 2 | ||||
| -rw-r--r-- | src/map/status.c | 2 |
4 files changed, 6 insertions, 2 deletions
diff --git a/Changelog-Trunk.txt b/Changelog-Trunk.txt index 864fee82e..dc41be305 100644 --- a/Changelog-Trunk.txt +++ b/Changelog-Trunk.txt @@ -3,6 +3,8 @@ 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. +2010/02/27 + * Fixed Posion Status killing monsters with low max hp(like plants). [Inkfish] 2010/02/19 * Fixed racial bonuses for RC_NONDEMIHUMAN applying to right cardfix value (cardfix) instead of left cardfix value (cardfix_) in the case of melee attacks where left_cardfix_to_right is set to 'no'. [Paradox924X] * Fixed NPC_INVINCIBLE can be dispelled. (bugreport:4046) [Inkfish] diff --git a/db/Changelog.txt b/db/Changelog.txt index 42adb17f4..e6f14ca2b 100644 --- a/db/Changelog.txt +++ b/db/Changelog.txt @@ -8,6 +8,8 @@ 1475 Equestrian's Spear: NEED INFO. 13005 Angelic Wing Dagger: NEED INFO. ======================= +2010/02/27 + * Mental Strenth costs 200 sp instead of 50% max sp. [Inkfish] 2010/01/28 * Rev. 14233 Changed the element for SN/MA_SHARPSHOOTING back to -1 (weapon element.) [L0ne_w0lf] * Rev. 14232 Updated skill_db information for the skill SN_SHARPSHOOTING. (Bugreport:3909) [L0ne_w0lf] diff --git a/db/skill_require_db.txt b/db/skill_require_db.txt index bd76b9ed1..c7d868c46 100644 --- a/db/skill_require_db.txt +++ b/db/skill_require_db.txt @@ -194,7 +194,7 @@ 266,0,0,10:14:17:19:20,0,0,0,99,0,0,none,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 //MO_INVESTIGATE#?# 267,0,0,10,0,0,0,99,0,0,none,1:2:3:4:5,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 //MO_FINGEROFFENSIVE#w?# -268,0,0,1,0,50,0,99,0,0,none,5,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 //MO_STEELBODY## +268,0,0,200,0,0,0,99,0,0,none,5,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 //MO_STEELBODY## 269,0,0,10,0,0,0,0:1:2:3:4:5:6:7:8:9:10:12:13:14:15:16:17:18:19:20:21:22,0,0,none,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 //MO_BLADESTOP#n# 270,0,0,15,0,0,0,99,0,0,none,5,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 //MO_EXPLOSIONSPIRITS#g# 271,0,0,1,0,0,0,0:1:2:3:4:5:6:7:8:9:10:12:13:14:15:16:17:18:19:20:21:22,0,0,explosionspirits,5,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 //MO_EXTREMITYFIST#Ce# diff --git a/src/map/status.c b/src/map/status.c index 16eec43c1..5c40712fa 100644 --- a/src/map/status.c +++ b/src/map/status.c @@ -6953,7 +6953,7 @@ int status_change_timer(int tid, unsigned int tick, int id, intptr data) break; case SC_POISON: - if(status->hp <= status->max_hp>>2) //Stop damaging after 25% HP left. + if(status->hp <= max(status->max_hp>>2, sce->val4)) //Stop damaging after 25% HP left. break; case SC_DPOISON: if (--(sce->val3) > 0) { |