diff options
author | skotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2006-08-01 01:54:20 +0000 |
---|---|---|
committer | skotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2006-08-01 01:54:20 +0000 |
commit | 0ed285a115bfd1bd844b04e3190398c2e1a9ab68 (patch) | |
tree | b5b5b9ed98f5a2d9a2e41db86fc9eb232a8f97ea | |
parent | 58d4cb0ae8affce8115d965bb03206b9bb692820 (diff) | |
download | hercules-0ed285a115bfd1bd844b04e3190398c2e1a9ab68.tar.gz hercules-0ed285a115bfd1bd844b04e3190398c2e1a9ab68.tar.bz2 hercules-0ed285a115bfd1bd844b04e3190398c2e1a9ab68.tar.xz hercules-0ed285a115bfd1bd844b04e3190398c2e1a9ab68.zip |
- Updated Poison React chance to counter and number of counters as per skill description updates.
- Fixed Sharpshooting being counted as a magic attack, and hence, using your MATK as base damage.
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@8019 54d463be-8e91-2dee-dedb-b68131a5f0ec
-rw-r--r-- | Changelog-Trunk.txt | 4 | ||||
-rw-r--r-- | src/map/battle.c | 4 | ||||
-rw-r--r-- | src/map/skill.c | 2 | ||||
-rw-r--r-- | src/map/status.c | 4 |
4 files changed, 9 insertions, 5 deletions
diff --git a/Changelog-Trunk.txt b/Changelog-Trunk.txt index 0af81eb68..329671a02 100644 --- a/Changelog-Trunk.txt +++ b/Changelog-Trunk.txt @@ -4,6 +4,10 @@ AS OF SVN REV. 5091, WE ARE NOW USING TRUNK. ALL UNTESTED BUGFIXES/FEATURES GO IF YOU HAVE A WORKING AND TESTED BUGFIX PUT IT INTO STABLE AS WELL AS TRUNK.
2006/07/31
+ * Updated Poison React chance to counter and number of counters as per
+ skill description updates. [Skotlex]
+ * Fixed Sharpshooting being counted as a magic attack, and hence, using
+ your MATK as base damage. [Skotlex]
* Fixed NPC_STOP id value in skill_cast_db [Skotlex]
* Bladestop will no longer stop when you push either of the characters
around. [Skotlex]
diff --git a/src/map/battle.c b/src/map/battle.c index c7f200e8a..ea7bd0d5e 100644 --- a/src/map/battle.c +++ b/src/map/battle.c @@ -325,8 +325,8 @@ int battle_calc_damage(struct block_list *src,struct block_list *bl,int damage,i return 0; } - //Now damage increasing effects // not sure for Throw Zeny - if(sc->data[SC_AETERNA].timer!=-1 && skill_num != PA_PRESSURE && skill_num != PF_SOULBURN && skill_num != NJ_ZENYNAGE){ + //Now damage increasing effects + if(sc->data[SC_AETERNA].timer!=-1 && skill_num != PA_PRESSURE && skill_num != PF_SOULBURN){ damage<<=1; status_change_end( bl,SC_AETERNA,-1 ); } diff --git a/src/map/skill.c b/src/map/skill.c index de7dc85ab..ed0c4358d 100644 --- a/src/map/skill.c +++ b/src/map/skill.c @@ -2748,7 +2748,7 @@ int skill_castend_damage_id (struct block_list* src, struct block_list *bl, int //line of sight between caster and target. map_foreachinpath (skill_attack_area,src->m,src->x,src->y,bl->x,bl->y, skill_get_splash(skillid, skilllv),BL_CHAR, - BF_MAGIC,src,src,skillid,skilllv,tick,flag,BCT_ENEMY); + skill_get_type(skillid),src,src,skillid,skilllv,tick,flag,BCT_ENEMY); break; case MO_INVESTIGATE: diff --git a/src/map/status.c b/src/map/status.c index 90fe8a87b..2e3607ec8 100644 --- a/src/map/status.c +++ b/src/map/status.c @@ -4684,8 +4684,8 @@ int status_change_start(struct block_list *bl,int type,int rate,int val1,int val val2 = val1 + 2; //Chance to Poison enemies. break; case SC_POISONREACT: - val2=val1/2 + val1%2; // Number of counters [Celest] - val3=50 + 5*val1; //Chance to counter. [Skotlex] + val2=(val1+1)/2 + val1/10; // Number of counters [Skotlex] + val3=50; // + 5*val1; //Chance to counter. [Skotlex] break; case SC_MAGICROD: val2 = val1*20; //SP gained |