From 04df65be4c876d645d1a7864fbe638a55b3a8e4f Mon Sep 17 00:00:00 2001 From: Gary Tierney Date: Thu, 24 Dec 2015 05:13:14 +0000 Subject: [PATCH] Move AttackRequirement to separate source unit --- data/plugins/combat/attack_requirements.rb | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/data/plugins/combat/attack_requirements.rb b/data/plugins/combat/attack_requirements.rb index 9c2fe1c6..3091fb43 100644 --- a/data/plugins/combat/attack_requirements.rb +++ b/data/plugins/combat/attack_requirements.rb @@ -24,11 +24,19 @@ class SpecialEnergyRequirement < AttackRequirement end def validate!(player) - throw AttackRequirementException.new('Not enough special attack energy.') unless player.special_energy >= @amount + if player.special_energy < @amount + player.using_special = false + + update_special_bar(player) + raise AttackRequirementException.new('Not enough special attack energy.') + end end def apply(player) player.special_energy = player.special_energy - @amount + player.using_special = false + + update_special_bar player end end