Skip to content

Commit

Permalink
Revert parts of 12c96a9 to fix doubled backstab damage in right panel
Browse files Browse the repository at this point in the history
  • Loading branch information
ln-zookeeper committed Mar 4, 2016
1 parent d9716ca commit e0ac69c
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 13 deletions.
10 changes: 1 addition & 9 deletions data/core/macros/abilities.cfg
Expand Up @@ -402,16 +402,8 @@ Enemy units cannot see this unit while it is in deep water, except if they have
name= _ "backstab"
description= _ "When used offensively, this attack deals double damage if there is an enemy of the target on the opposite side of the target, and that unit is not incapacitated (turned to stone or otherwise paralyzed)."
multiply=2
backstab=yes
active_on=offense
[filter_opponent]
[filter_adjacent]
adjacent=$other_unit.facing
is_enemy=yes
[not]
status=petrified
[/not]
[/filter_adjacent]
[/filter_opponent]
[/damage]
#enddef

Expand Down
4 changes: 0 additions & 4 deletions src/unit_abilities.cpp
Expand Up @@ -1006,10 +1006,6 @@ effect::effect(const unit_ability_list& list, int def, bool backstab) :
const config& cfg = *ability.first;
std::string const &effect_id = cfg[cfg["id"].empty() ? "name" : "id"];

if (!cfg["backstab"].blank()) {
lg::wml_error << "The backstab= key in weapon specials is deprecated; use [filter_adjacent] instead\n";
}

if (!backstab && cfg["backstab"].to_bool())
continue;
if (!filter_base_matches(cfg, def))
Expand Down

0 comments on commit e0ac69c

Please sign in to comment.