diff options
| author | Playtester <Playtester@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2009-05-15 16:41:27 +0000 |
|---|---|---|
| committer | Playtester <Playtester@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2009-05-15 16:41:27 +0000 |
| commit | 77f24b6eb0152c3b101535495354ce294a71b103 (patch) | |
| tree | c5fc1a5613a4dd2367fe24c33d3ebcc31e93f6e8 | |
| parent | fe7d2b3c24dda787b4362e8418e6b3698d999aca (diff) | |
| download | hercules-77f24b6eb0152c3b101535495354ce294a71b103.tar.gz hercules-77f24b6eb0152c3b101535495354ce294a71b103.tar.bz2 hercules-77f24b6eb0152c3b101535495354ce294a71b103.tar.xz hercules-77f24b6eb0152c3b101535495354ce294a71b103.zip | |
* AutoSpellWhenHit now triggers on normal+skill by default (bugreport:1652)
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@13777 54d463be-8e91-2dee-dedb-b68131a5f0ec
| -rw-r--r-- | Changelog-Trunk.txt | 1 | ||||
| -rw-r--r-- | src/map/pc.c | 4 |
2 files changed, 3 insertions, 2 deletions
diff --git a/Changelog-Trunk.txt b/Changelog-Trunk.txt index 7b904f45d..2a68cd1de 100644 --- a/Changelog-Trunk.txt +++ b/Changelog-Trunk.txt @@ -4,6 +4,7 @@ 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. 09/05/15 + * AutoSpellWhenHit now triggers on normal+skill by default (bugreport:1652) [Playtester] * Removed the undocumented custom level feature from monster spawn lines (bugreport:3076) [ultramage] 09/05/13 * Fixed combo wait was not canceled when TK's Kick skill was successfully used. (bugreport:1345) [Inkfish] diff --git a/src/map/pc.c b/src/map/pc.c index 16e32d7d3..35eb6cd4b 100644 --- a/src/map/pc.c +++ b/src/map/pc.c @@ -2668,7 +2668,7 @@ int pc_bonus3(struct map_session_data *sd,int type,int type2,int type3,int val) int target = skill_get_inf(type2); //Support or Self (non-auto-target) skills should pick self. target = target&INF_SUPPORT_SKILL || (target&INF_SELF_SKILL && !(skill_get_inf2(type2)&INF2_NO_TARGET_SELF)); pc_bonus_autospell(sd->autospell2, ARRAYLENGTH(sd->autospell2), - target?-type2:type2, type3, val, 0, current_equip_card_id); + target?-type2:type2, type3, val, BF_NORMAL|BF_SKILL, current_equip_card_id); } break; case SP_SP_DRAIN_RATE: @@ -2762,7 +2762,7 @@ int pc_bonus4(struct map_session_data *sd,int type,int type2,int type3,int type4 case SP_AUTOSPELL_WHENHIT: if(sd->state.lr_flag != 2) - pc_bonus_autospell(sd->autospell2, ARRAYLENGTH(sd->autospell2), (val&1?type2:-type2), (val&2?-type3:type3), type4, 0, current_equip_card_id); + pc_bonus_autospell(sd->autospell2, ARRAYLENGTH(sd->autospell2), (val&1?type2:-type2), (val&2?-type3:type3), type4, BF_NORMAL|BF_SKILL, current_equip_card_id); break; case SP_AUTOSPELL_ONSKILL: |