diff options
| -rw-r--r-- | Changelog-Trunk.txt | 2 | ||||
| -rw-r--r-- | db/Changelog.txt | 1 | ||||
| -rw-r--r-- | db/skill_db.txt | 2 | ||||
| -rw-r--r-- | src/map/battle.c | 6 |
4 files changed, 6 insertions, 5 deletions
diff --git a/Changelog-Trunk.txt b/Changelog-Trunk.txt index 59b35b2ec..88a55bedf 100644 --- a/Changelog-Trunk.txt +++ b/Changelog-Trunk.txt @@ -4,6 +4,8 @@ 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. 2007/03/06 + * Simplified the Utsusemi/Bunsinjyutsu check to only block weapon skills + that do not ignore offensive cards. [Skotlex] * Added support for the 2 new packet versions. [Zephiris] * Fixed the loginlog's `user` column length (use upgrade_svn9957.sql) 2007/03/05 diff --git a/db/Changelog.txt b/db/Changelog.txt index 64d06facc..be1767beb 100644 --- a/db/Changelog.txt +++ b/db/Changelog.txt @@ -20,6 +20,7 @@ ======================== 03/06 + * Soul Breaker no longer ignores elemental adjustments. [Skotlex] * Added the 2 new packet versions to packet_db.txt [Zephiris] 03/02 * Updated the stun length to 5 secs of: Meteor Storm, Sonic Blow, Throw diff --git a/db/skill_db.txt b/db/skill_db.txt index acb55d075..c9ec2a498 100644 --- a/db/skill_db.txt +++ b/db/skill_db.txt @@ -416,7 +416,7 @@ 376,0,0,0,0,0x1,0,5,1,no,0,0,0,weapon,0 //ASC_KATAR#Advanced Katar Mastery# //377,0,0,4,0,0x1,0,10,1,no,0,0,0,misc,0 //ASC_HALLUCINATION#Hallucination Walk# 378,0,6,4,5,0x1,0,5,1,no,0,0,0,weapon,0 //ASC_EDP#Deadly Poison Enchantment# -379,9,6,1,-1,0x18,0,10,1,yes,0,0,0,weapon,0 //ASC_BREAKER#Soul Destroyer# +379,9,6,1,-1,0x8,0,10,1,yes,0,0,0,weapon,0 //ASC_BREAKER#Soul Destroyer# 380,0,6,4,0,0x1,0,10,1,no,0,0,0,weapon,0 //SN_SIGHT#Falcon Eyes# 381,5,8,1,0,0x40,0,5,1,yes,0,0,0,misc,0 //SN_FALCONASSAULT#Falcon Assault# 382,4,8,1,-1,0,2,5,1,yes,0,0,0,weapon,0 //SN_SHARPSHOOTING#Focused Arrow Strike# diff --git a/src/map/battle.c b/src/map/battle.c index 12438ea62..0b4aa2f69 100644 --- a/src/map/battle.c +++ b/src/map/battle.c @@ -295,7 +295,7 @@ int battle_calc_damage(struct block_list *src,struct block_list *bl,int damage,i if (sc && sc->count) { //First, sc_*'s that reduce damage to 0. - if (sc->data[SC_SAFETYWALL].timer!=-1 && flag&BF_SHORT && (skill_num != NPC_GUIDEDATTACK && skill_num != AM_DEMONSTRATION) + if (sc->data[SC_SAFETYWALL].timer!=-1 && flag&BF_SHORT && skill_num != NPC_GUIDEDATTACK ) { struct skill_unit_group *group = (struct skill_unit_group *)sc->data[SC_SAFETYWALL].val3; if (group) { @@ -363,9 +363,7 @@ int battle_calc_damage(struct block_list *src,struct block_list *bl,int damage,i if ((sc->data[SC_UTSUSEMI].timer != -1 || sc->data[SC_BUNSINJYUTSU].timer != -1) && - (flag&BF_WEAPON || (flag&(BF_MISC|BF_SHORT)) == (BF_MISC|BF_SHORT)) && - !(skill_get_nk(skill_num)&NK_NO_CARDFIX) - ) + flag&BF_WEAPON && !(skill_get_nk(skill_num)&NK_NO_CARDFIX)) { if (sc->data[SC_UTSUSEMI].timer != -1) { clif_specialeffect(bl, 462, AREA); |