Skip to content

Commit

Permalink
Make gold conduct electroshock attacks
Browse files Browse the repository at this point in the history
  • Loading branch information
fergus-dall committed Aug 30, 2013
1 parent e331b4b commit 09fd949
Showing 1 changed file with 2 additions and 1 deletion.
3 changes: 2 additions & 1 deletion melee.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -1186,7 +1186,8 @@ void player::melee_special_effects(game *g, monster *z, player *p, bool crit,
// Bonus attacks!
bool shock_them = (has_active_bionic("bio_shock") && power_level >= 2 &&
(unarmed_attack() || weapon.made_of("iron") ||
weapon.made_of("steel") ||weapon.made_of("silver")) &&
weapon.made_of("steel") || weapon.made_of("silver") ||
weapon.made_of("gold")) &&
(!mon || !z->has_flag(MF_ELECTRIC)) && one_in(3));

bool drain_them = (has_active_bionic("bio_heat_absorb") && power_level >= 1 &&
Expand Down

0 comments on commit 09fd949

Please sign in to comment.