moving timed bomb behavior into explode ability so it is not specific to Captives

Author: ryanb

lib/ruby_warrior/abilities/base.rb

@@ -29,6 +29,10 @@ def damage(receiver, amount)
 
       def description
       end
+      
+      def pass_turn
+        # callback which is triggered every turn
+      end
     end
   end
 end

lib/ruby_warrior/abilities/explode.rb

@@ -1,6 +1,8 @@
 module RubyWarrior
   module Abilities
     class Explode < Base
+      attr_accessor :time
+      
       def description
         "Kills you and all surrounding units. You probably don't want to do this intentionally."
       end
@@ -13,6 +15,14 @@ def perform
           end
         end
       end
+      
+      def pass_turn
+        if @time && @unit.position
+          @unit.say "is ticking"
+          @time -= 1
+          perform if @time.zero?
+        end
+      end
     end
   end
 end

lib/ruby_warrior/space.rb

@@ -29,7 +29,7 @@ def stairs?
     end
 
     def ticking?
-      unit.respond_to?(:bomb_time) && unit.bomb_time
+      unit && unit.abilities.include?(:explode!)
     end
 
     def unit

lib/ruby_warrior/units/base.rb

@@ -73,9 +73,14 @@ def prepare_turn
       end
 
       def perform_turn
-        if @current_turn.action && @position && !bound?
-          name, *args = @current_turn.action
-          abilities[name].perform(*args)
+        if @position
+          abilities.values.each do |ability|
+            ability.pass_turn
+          end
+          if @current_turn.action && !bound?
+            name, *args = @current_turn.action
+            abilities[name].perform(*args)
+          end
         end
       end
 

lib/ruby_warrior/units/captive.rb

@@ -1,10 +1,7 @@
 module RubyWarrior
   module Units
     class Captive < Base
-      attr_accessor :bomb_time
-      
       def initialize
-        add_abilities :explode!
         bind
       end
 
@@ -15,16 +12,6 @@ def max_health
       def character
         "C"
       end
-      
-      def play_turn(turn)
-        if @bomb_time
-          @bomb_time -= 1
-          if @bomb_time.zero?
-            @bound = false # unbind so it can perform an action
-            turn.explode!
-          end
-        end
-      end
     end
   end
 end

spec/ruby_warrior/abilities/explode_spec.rb

@@ -19,4 +19,14 @@
     @captive.health.should == -90
     unit.health.should == -80
   end
+  
+  it "should explode when bomb time reaches zero" do
+    @captive.health = 10
+    @explode.time = 3
+    @explode.pass_turn
+    @explode.pass_turn
+    @captive.health.should == 10
+    @explode.pass_turn
+    @captive.health.should == -90
+  end
 end

spec/ruby_warrior/abilities/throw_spec.rb

@@ -37,7 +37,7 @@
   it "should detonate an explosive if any unit has one" do
     captive = RubyWarrior::Units::Captive.new
     captive.health = 1
-    captive.bomb_time = 3
+    captive.add_abilities :explode!
     @floor.add(captive, 1, 2)
     @throw.perform
     captive.health.should == -99

spec/ruby_warrior/space_spec.rb

@@ -126,7 +126,8 @@
 
   describe "with captive" do
     before(:each) do
-      @floor.add(RubyWarrior::Units::Captive.new, 0, 0)
+      @captive = RubyWarrior::Units::Captive.new
+      @floor.add(@captive, 0, 0)
       @space = @floor.space(0, 0)
     end
 
@@ -139,7 +140,7 @@
     end
 
     it "should be ticking if captive has time bomb" do
-      @space.unit.bomb_time = 10
+      @captive.add_abilities :explode!
       @space.should be_ticking
     end
 

spec/ruby_warrior/units/captive_spec.rb

@@ -1,6 +1,6 @@
 require File.dirname(__FILE__) + '/../../spec_helper'
 
-describe RubyWarrior::Units::ThickSludge do
+describe RubyWarrior::Units::Captive do
   before(:each) do
     @captive = RubyWarrior::Units::Captive.new
   end
@@ -17,18 +17,7 @@
     @captive.should be_bound
   end
 
-  it "should explode when bomb time reaches 0 and unbind itself" do
-    @captive.bomb_time = 3
-    @captive.play_turn(stub)
-    @captive.play_turn(stub)
-    @captive.should be_bound
-    turn = stub
-    turn.expects(:explode!)
-    @captive.play_turn(turn)
-    @captive.should_not be_bound
-  end
-  
-  it "should have explode ability" do
-    @captive.abilities.keys.should include(:explode!)
+  it "should not have explode ability by default (this should be added when needed)" do
+    @captive.abilities.should_not include(:explode!)
   end
 end

towers/intermediate/level_006.rb

@@ -18,5 +18,6 @@
 unit :sludge, 3, 1, :west
 unit :captive, 0, 0, :west
 unit :captive, 4, 1, :west do |u|
-  u.bomb_time = 7
+  u.add_abilities :explode!
+  u.abilities[:explode!].time = 7
 end

towers/intermediate/level_007.rb

@@ -19,6 +19,7 @@
 unit :sludge, 1, 2, :north
 unit :sludge, 2, 1, :west
 unit :captive, 4, 1, :west do |u|
-  u.bomb_time = 10
+  u.add_abilities :explode!
+  u.abilities[:explode!].time = 10
 end
 unit :captive, 2, 0, :west