rubywarrior 0.1.1 → 0.1.2

data/CHANGELOG.rdoc

@@ -1,3 +1,16 @@
+0.1.2 (September 23, 2010)
+
+* Adding intermediate level 9 with distance_of ability
+
+* Adding intermediate level 8 with look and detonate abilities
+
+* Raising an exception when performing an ability with a bad direction.
+
+* Hard wrapping clue text to 80 characters
+
+* Mention direction when ability is performed
+
+
 0.1.1 (Jan 3, 2010)
 
 * Speeding up play speed a little

data/README.rdoc

@@ -136,12 +136,26 @@ Whenever you sense an area, often one or multiple spaces (in an array) will be r
   
   space.ticking?
     Returns true if this space contains a bomb which will explode in time.
+  
+  space.golem?
+    Returns true if a golem is occupying this space.
 
 You will often call these methods directly after a sense. For example, the "feel" sense returns one space. You can call "captive?" on this to determine if a captive is in front of you.
 
   warrior.feel.captive?
 
 
+== Golem
+
+Along your journey you may discover the ability to create a golem. This is a separate unit which you also control. The turn handling is done through a block. Here is an example.
+
+  warrior.form! do |golem|
+    golem.attack! if golem.feel.enemy?
+  end
+
+Complex logic can be placed in this block just like in the player turn method. You may want to move the logic into its own class or create multiple classes for different types of golems. You can create multiple golems in a level, but each one will take half of the warrior's health.
+
+
 == Epic Mode
   
 Once you reach the top of the tower, you will enter epic mode. When running rubywarrior again it will run your current player.rb through all levels in the tower without stopping.

data/lib/ruby_warrior.rb

@@ -25,6 +25,7 @@ require 'ruby_warrior/units/archer'
 require 'ruby_warrior/units/thick_sludge'
 require 'ruby_warrior/units/captive'
 require 'ruby_warrior/units/wizard'
+require 'ruby_warrior/units/golem'
 
 require 'ruby_warrior/abilities/base'
 require 'ruby_warrior/abilities/walk'
@@ -36,9 +37,11 @@ require 'ruby_warrior/abilities/look'
 require 'ruby_warrior/abilities/shoot'
 require 'ruby_warrior/abilities/rescue'
 require 'ruby_warrior/abilities/pivot'
-require 'ruby_warrior/abilities/distance'
+require 'ruby_warrior/abilities/distance_of'
 require 'ruby_warrior/abilities/bind'
 require 'ruby_warrior/abilities/listen'
 require 'ruby_warrior/abilities/direction_of_stairs'
 require 'ruby_warrior/abilities/direction_of'
 require 'ruby_warrior/abilities/explode'
+require 'ruby_warrior/abilities/detonate'
+require 'ruby_warrior/abilities/form'

data/lib/ruby_warrior/abilities/attack.rb

@@ -2,13 +2,14 @@ module RubyWarrior
   module Abilities
     class Attack < Base
       def description
-        "Attack the unit in given direction (forward by default)."
+        "Attacks a unit in given direction (forward by default)."
       end
       
       def perform(direction = :forward)
+        verify_direction(direction)
         receiver = unit(direction)
         if receiver
-          @unit.say "attacks #{receiver}"
+          @unit.say "attacks #{direction} and hits #{receiver}"
           if direction == :backward
             power = (@unit.attack_power/2.0).ceil
           else
@@ -16,7 +17,7 @@ module RubyWarrior
           end
           damage(receiver, power)
         else
-          @unit.say "attacks and hits nothing"
+          @unit.say "attacks #{direction} and hits nothing"
         end
       end
     end

data/lib/ruby_warrior/abilities/base.rb

@@ -1,27 +1,25 @@
 module RubyWarrior
   module Abilities
     class Base
-      DIRECTIONS = {
-        :forward  => [1, 0],
-        :right    => [0, 1],
-        :backward => [-1, 0],
-        :left     => [0, -1]
-      }
-      
       def initialize(unit)
         @unit = unit
       end
       
-      def offset(direction, amount = 1)
-        DIRECTIONS[direction].map { |i| i*amount }
+      def offset(direction, forward = 1, right = 0)
+        case direction
+        when :forward then [forward, -right]
+        when :backward then [-forward, right]
+        when :right then [right, forward]
+        when :left then [-right, -forward]
+        end
       end
       
-      def space(direction, amount = 1)
-        @unit.position.relative_space(*offset(direction, amount))
+      def space(direction, forward = 1, right = 0)
+        @unit.position.relative_space(*offset(direction, forward, right))
       end
       
-      def unit(direction, amount = 1)
-        space(direction, amount).unit
+      def unit(direction, forward = 1, right = 0)
+        space(direction, forward, right).unit
       end
       
       def damage(receiver, amount)
@@ -31,6 +29,16 @@ module RubyWarrior
       
       def description
       end
+      
+      def pass_turn
+        # callback which is triggered every turn
+      end
+      
+      def verify_direction(direction)
+        unless Position::RELATIVE_DIRECTIONS.include? direction
+          raise "Unknown direction #{direction.inspect}. Should be :forward, :backward, :left or :right."
+        end
+      end
     end
   end
 end

data/lib/ruby_warrior/abilities/bind.rb

@@ -2,16 +2,17 @@ module RubyWarrior
   module Abilities
     class Bind < Base
       def description
-        "Bind unit in given direction to keep him from moving (forward by default)."
+        "Binds a unit in given direction to keep him from moving (forward by default)."
       end
       
       def perform(direction = :forward)
+        verify_direction(direction)
         receiver = unit(direction)
         if receiver
-          @unit.say "binds #{receiver}"
+          @unit.say "binds #{direction} and restricts #{receiver}"
           receiver.bind
         else
-          @unit.say "binds nothing"
+          @unit.say "binds #{direction} and restricts nothing"
         end
       end
     end

data/lib/ruby_warrior/abilities/detonate.rb

@@ -0,0 +1,34 @@
+module RubyWarrior
+  module Abilities
+    class Detonate < Base
+      def description
+        "Detonate a bomb in a given direction (forward by default) which damages that space and surrounding 4 spaces (including yourself)."
+      end
+      
+      def perform(direction = :forward)
+        verify_direction(direction)
+        if @unit.position
+          @unit.say "detonates a bomb #{direction} launching a deadly explosion."
+          bomb(direction, 1, 0, 8)
+          [[1, 1], [1, -1], [2, 0], [0, 0]].each do |x, y|
+            bomb(direction, x, y, 4)
+          end
+        end
+      end
+      
+      def bomb(direction, x, y, damage_amount)
+        if @unit.position
+          receiver = space(direction, x, y).unit
+          if receiver
+            if receiver.abilities[:explode!]
+              receiver.say "caught in bomb's flames which detonates ticking explosive"
+              receiver.abilities[:explode!].perform
+            else
+              damage(receiver, damage_amount)
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/lib/ruby_warrior/abilities/direction_of_stairs.rb

@@ -10,4 +10,4 @@ module RubyWarrior
       end
     end
   end
-end
+end

data/lib/ruby_warrior/abilities/distance_of.rb

@@ -0,0 +1,13 @@
+module RubyWarrior
+  module Abilities
+    class DistanceOf < Base
+      def description
+        "Pass a Space as an argument, and it will return an integer representing the distance to that space."
+      end
+      
+      def perform(space)
+        @unit.position.distance_of(space)
+      end
+    end
+  end
+end

data/lib/ruby_warrior/abilities/explode.rb

@@ -1,18 +1,28 @@
 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
       
       def perform
         if @unit.position
-          @unit.say "explodes, collapsing the cealing and damanging every unit."
+          @unit.say "explodes, collapsing the ceiling and damanging every unit."
           @unit.position.floor.units.map do |unit|
             unit.take_damage(100)
           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

data/lib/ruby_warrior/abilities/feel.rb

@@ -6,6 +6,7 @@ module RubyWarrior
       end
       
       def perform(direction = :forward)
+        verify_direction(direction)
         space(direction)
       end
     end

data/lib/ruby_warrior/abilities/form.rb

@@ -0,0 +1,25 @@
+module RubyWarrior
+  module Abilities
+    class Form < Base
+      def description
+        "Forms a golem in given direction taking half of invoker's health. The passed block is executed for each golem turn."
+      end
+      
+      def perform(direction = :forward, &block)
+        verify_direction(direction)
+        if space(direction).empty?
+          x, y = @unit.position.translate_offset(*offset(direction))
+          health = (@unit.health/2.0).floor
+          golem = @unit.base_golem
+          golem.max_health = health
+          golem.turn = block
+          @unit.health -= health
+          @unit.position.floor.add(golem, x, y, @unit.position.direction)
+          @unit.say "forms a golem #{direction} and gives half of his health (#{health})"
+        else
+          @unit.say "fails to form golem because something is blocking the way."
+        end
+      end
+    end
+  end
+end

data/lib/ruby_warrior/abilities/look.rb

@@ -2,10 +2,11 @@ module RubyWarrior
   module Abilities
     class Look < Base
       def description
-        "Returns an array of Spaces in given direction (forward by default)."
+        "Returns an array of up to three Spaces in the given direction (forward by default)."
       end
       
       def perform(direction = :forward)
+        verify_direction(direction)
         [1, 2, 3].map do |amount|
           space(direction, amount)
         end

data/lib/ruby_warrior/abilities/pivot.rb

@@ -8,6 +8,7 @@ module RubyWarrior
       end
       
       def perform(direction = :backward)
+        verify_direction(direction)
         @unit.position.rotate(ROTATION_DIRECTIONS.index(direction))
         @unit.say "pivots #{direction}"
       end

data/lib/ruby_warrior/abilities/rescue.rb

@@ -6,16 +6,17 @@ module RubyWarrior
       end
       
       def perform(direction = :forward)
+        verify_direction(direction)
         if space(direction).captive?
           recipient = unit(direction)
-          @unit.say "unbinds #{recipient}"
+          @unit.say "unbinds #{direction} and rescues #{recipient}"
           recipient.unbind
           if recipient.kind_of? Units::Captive
             recipient.position = nil
             @unit.earn_points(20)
           end
         else
-          @unit.say "rescues nothing"
+          @unit.say "unbinds #{direction} and rescues nothing"
         end
       end
     end

data/lib/ruby_warrior/abilities/shoot.rb

@@ -6,9 +6,10 @@ module RubyWarrior
       end
       
       def perform(direction = :forward)
+        verify_direction(direction)
         receiver = multi_unit(direction, 1..3).compact.first
         if receiver
-          @unit.say "shoots #{receiver}"
+          @unit.say "shoots #{direction} and hits #{receiver}"
           damage(receiver, @unit.shoot_power)
         else
           @unit.say "shoots and hits nothing"

data/lib/ruby_warrior/abilities/walk.rb

@@ -2,10 +2,11 @@ module RubyWarrior
   module Abilities
     class Walk < Base
       def description
-        "Move in given direction (forward by default)."
+        "Move in the given direction (forward by default)."
       end
       
       def perform(direction = :forward)
+        verify_direction(direction)
         if @unit.position
           @unit.say "walks #{direction}"
           if space(direction).empty?

data/lib/ruby_warrior/core_additions.rb

@@ -22,4 +22,8 @@ class String
   def titleize
     underscore.humanize.gsub(/\b('?[a-z])/) { $1.capitalize }
   end
+  
+  def hard_wrap(width = 80)
+    gsub(/(.{1,#{width}})(\s+|$)/, "\\1\n").strip
+  end
 end

data/lib/ruby_warrior/game.rb

@@ -87,7 +87,7 @@ module RubyWarrior
         continue = false
         UI.puts "Sorry, you failed level #{current_level.number}. Change your script and try again."
         if !Config.skip_input? && current_level.clue && UI.ask("Would you like to read the additional clues for this level?")
-          UI.puts current_level.clue
+          UI.puts current_level.clue.hard_wrap
         end
       end
       continue

data/lib/ruby_warrior/position.rb

@@ -38,8 +38,12 @@ module RubyWarrior
     end
     
     def distance_from_stairs
-      stairs_x, stairs_y = *@floor.stairs_location
-      (@x - stairs_x).abs + (@y - stairs_y).abs
+      distance_of(@floor.stairs_space)
+    end
+    
+    def distance_of(space)
+      x, y = *space.location
+      (@x - x).abs + (@y - y).abs
     end
     
     def relative_direction_of_stairs
@@ -66,8 +70,6 @@ module RubyWarrior
       RELATIVE_DIRECTIONS[offset]
     end
     
-    private
-    
     def translate_offset(forward, right)
       case direction
       when :north then [@x + right, @y - forward]

data/lib/ruby_warrior/space.rb

@@ -12,8 +12,16 @@ module RubyWarrior
       unit.kind_of? Units::Warrior
     end
     
+    def golem?
+      unit.kind_of? Units::Golem
+    end
+    
+    def player?
+      warrior? || golem?
+    end
+    
     def enemy?
-      unit && !warrior? && !captive?
+      unit && !player? && !captive?
     end
     
     def captive?
@@ -29,7 +37,7 @@ module RubyWarrior
     end
     
     def ticking?
-      unit.respond_to?(:bomb_time) && unit.bomb_time
+      unit && unit.abilities.include?(:explode!)
     end
     
     def unit

data/lib/ruby_warrior/units/archer.rb

@@ -8,7 +8,7 @@ module RubyWarrior
       def play_turn(turn)
         [:forward, :left, :right].each do |direction|
           turn.look(direction).each do |space|
-            if space.warrior?
+            if space.player?
               turn.shoot!(direction)
               return
             elsif !space.empty?

data/lib/ruby_warrior/units/base.rb

@@ -73,9 +73,14 @@ module RubyWarrior
       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
       

data/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 @@ module RubyWarrior
       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

data/lib/ruby_warrior/units/golem.rb

@@ -0,0 +1,20 @@
+module RubyWarrior
+  module Units
+    class Golem < Base
+      attr_writer :turn
+      attr_accessor :max_health
+      
+      def play_turn(turn)
+        @turn.call(turn) if @turn
+      end
+      
+      def attack_power
+        3
+      end
+      
+      def character
+        "G"
+      end
+    end
+  end
+end

data/lib/ruby_warrior/units/sludge.rb

@@ -7,7 +7,7 @@ module RubyWarrior
       
       def play_turn(turn)
         [:forward, :left, :right, :backward].each do |direction|
-          if turn.feel(direction).warrior?
+          if turn.feel(direction).player?
             turn.attack!(direction)
             return
           end

data/lib/ruby_warrior/units/warrior.rb

@@ -6,6 +6,7 @@ module RubyWarrior
       
       def initialize
         @score = 0 # TODO make score dynamic
+        @golem_abilities = []
       end
       
       def play_turn(turn)
@@ -53,6 +54,20 @@ module RubyWarrior
         say "does nothing" if @current_turn.action.nil?
         super
       end
+      
+      def add_golem_abilities(*abilities)
+        @golem_abilities += abilities
+      end
+      
+      def has_golem?
+        !@golem_abilities.empty?
+      end
+      
+      def base_golem
+        golem = Golem.new
+        golem.add_abilities *@golem_abilities
+        golem
+      end
     end
   end
 end

data/lib/ruby_warrior/units/wizard.rb

@@ -8,7 +8,7 @@ module RubyWarrior
       def play_turn(turn)
         [:forward, :left, :right].each do |direction|
           turn.look(direction).each do |space|
-            if space.warrior?
+            if space.player?
               turn.shoot!(direction)
               return
             elsif !space.empty?

data/spec/ruby_warrior/abilities/base_spec.rb

@@ -13,12 +13,26 @@ describe RubyWarrior::Abilities::Base do
     @ability.offset(:left).should == [0, -1]
   end
   
+  it "should have offset for relative forward/right amounts" do
+    @ability.offset(:forward, 2).should == [2, 0]
+    @ability.offset(:forward, 2, 1).should == [2, -1]
+    @ability.offset(:right, 2, 1).should == [1, 2]
+    @ability.offset(:backward, 2, 1).should == [-2, 1]
+    @ability.offset(:left, 2, 1).should == [-1, -2]
+  end
+  
   it "should fetch unit at given direction with distance" do
-    @ability.expects(:space).with(:right, 3).returns(stub(:unit => 'unit'))
-    @ability.unit(:right, 3).should == 'unit'
+    @ability.expects(:space).with(:right, 3, 1).returns(stub(:unit => 'unit'))
+    @ability.unit(:right, 3, 1).should == 'unit'
   end
   
   it "should have no description" do
     @ability.description.should be_nil
   end
+  
+  it "should raise an exception if direction isn't recognized" do
+    lambda {
+      @ability.verify_direction(:foo)
+    }.should raise_error("Unknown direction :foo. Should be :forward, :backward, :left or :right.")
+  end
 end

data/spec/ruby_warrior/abilities/distance_of_spec.rb

@@ -0,0 +1,13 @@
+require File.dirname(__FILE__) + '/../../spec_helper'
+
+describe RubyWarrior::Abilities::DistanceOf do
+  before(:each) do
+    @position = stub
+    @distance = RubyWarrior::Abilities::DistanceOf.new(stub(:position => @position, :say => nil))
+  end
+  
+  it "should return distance from stairs" do
+    @position.stubs(:distance_of).with(:space).returns(5)
+    @distance.perform(:space).should == 5
+  end
+end

data/spec/ruby_warrior/abilities/explode_spec.rb

@@ -19,4 +19,14 @@ describe RubyWarrior::Abilities::Explode do
     @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

data/spec/ruby_warrior/abilities/form_spec.rb

@@ -0,0 +1,48 @@
+require File.dirname(__FILE__) + '/../../spec_helper'
+
+describe RubyWarrior::Abilities::Form do
+  before(:each) do
+    @floor = RubyWarrior::Floor.new
+    @floor.width = 2
+    @floor.height = 3
+    @warrior = RubyWarrior::Units::Warrior.new
+    @floor.add(@warrior, 0, 0, :east)
+    @form = RubyWarrior::Abilities::Form.new(@warrior)
+  end
+  
+  it "should form a golem in front of warrior" do
+    @form.perform
+    @floor.get(1, 0).should be_kind_of(RubyWarrior::Units::Golem)
+  end
+  
+  it "should form a golem in given direction" do
+    @form.perform(:right)
+    @floor.get(0, 1).should be_kind_of(RubyWarrior::Units::Golem)
+  end
+  
+  it "should not form golem if space isn't empty" do
+    @floor.add(RubyWarrior::Units::Base.new, 1, 0)
+    @form.perform(:forward)
+    @form.perform(:left)
+    @floor.units.size.should == 2
+  end
+  
+  it "should reduce warrior's health by half (rounding down) and give it to the golem" do
+    @warrior.health = 19
+    @form.perform
+    @warrior.health.should == 10
+    @floor.get(1, 0).max_health.should == 9
+  end
+  
+  it "should add passed block as golem's turn block" do
+    @passed = nil
+    @form.perform(:forward) { |turn| @passed = turn }
+    @floor.get(1, 0).play_turn(:turn)
+    @passed.should == :turn
+  end
+  
+  it "should start in same direction as warrior" do
+    @form.perform(:right)
+    @floor.get(0, 1).position.direction.should == :east
+  end
+end

data/spec/ruby_warrior/abilities/throw_spec.rb

@@ -0,0 +1,46 @@
+require File.dirname(__FILE__) + '/../../spec_helper'
+
+describe RubyWarrior::Abilities::Detonate do
+  before(:each) do
+    @floor = RubyWarrior::Floor.new
+    @floor.width = 3
+    @floor.height = 3
+    @warrior = RubyWarrior::Units::Warrior.new
+    @floor.add(@warrior, 0, 0, :south)
+    @detonate = RubyWarrior::Abilities::Detonate.new(@warrior)
+  end
+  
+  it "should subtract 8 from forward unit and 4 from surrounding units" do
+    target_unit = RubyWarrior::Units::Base.new
+    target_unit.health = 15
+    second_unit = RubyWarrior::Units::Base.new
+    second_unit.health = 15
+    @floor.add(target_unit, 0, 1)
+    @floor.add(second_unit, 1, 1)
+    @detonate.perform
+    target_unit.health.should == 7
+    second_unit.health.should == 11
+  end
+  
+  it "should subtract 8 from left unit and 4 from surrounding units" do
+    target_unit = RubyWarrior::Units::Base.new
+    target_unit.health = 15
+    second_unit = RubyWarrior::Units::Base.new
+    second_unit.health = 15
+    @floor.add(target_unit, 1, 0)
+    @floor.add(second_unit, 1, 1)
+    @detonate.perform(:left)
+    target_unit.health.should == 7
+    second_unit.health.should == 11
+  end
+  
+  it "should detonate an explosive if any unit has one" do
+    captive = RubyWarrior::Units::Captive.new
+    captive.health = 1
+    captive.add_abilities :explode!
+    @floor.add(captive, 1, 1)
+    @detonate.perform
+    captive.health.should == -99
+    @warrior.health.should == -80
+  end
+end

data/spec/ruby_warrior/core_additions_spec.rb

@@ -0,0 +1,7 @@
+require File.dirname(__FILE__) + '/../spec_helper'
+
+describe String do
+  it "should wrap text at white space when over a specific character length" do
+    "foo bar blah".hard_wrap(10).should == "foo bar\nblah"
+  end
+end

data/spec/ruby_warrior/position_spec.rb

@@ -100,4 +100,9 @@ describe RubyWarrior::Position do
   it "should return a space at the same location as position" do
     @position.space.location.should == [1, 2]
   end
+  
+  it "should return distance of given space" do
+    @position.distance_of(@floor.space(5, 3)).should == 5
+    @position.distance_of(@floor.space(4, 2)).should == 3
+  end
 end

data/spec/ruby_warrior/space_spec.rb

@@ -74,6 +74,10 @@ describe RubyWarrior::Space do
       @space.should be_warrior
     end
     
+    it "should be player" do
+      @space.should be_warrior
+    end
+    
     it "should not be enemy" do
       @space.should_not be_enemy
     end
@@ -126,7 +130,8 @@ describe RubyWarrior::Space do
   
   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 +144,7 @@ describe RubyWarrior::Space do
     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
     
@@ -148,6 +153,26 @@ describe RubyWarrior::Space do
     end
   end
   
+  describe "with golem" do
+    before(:each) do
+      @golem = RubyWarrior::Units::Golem.new
+      @floor.add(@golem, 0, 0)
+      @space = @floor.space(0, 0)
+    end
+    
+    it "should be golem" do
+      @space.should be_golem
+    end
+    
+    it "should not be enemy" do
+      @space.should_not be_enemy
+    end
+    
+    it "should be player" do
+      @space.should be_player
+    end
+  end
+  
   describe "at stairs" do
     before(:each) do
       @floor.place_stairs(0, 0)

data/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 @@ describe RubyWarrior::Units::ThickSludge do
     @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

data/spec/ruby_warrior/units/golem_spec.rb

@@ -0,0 +1,28 @@
+require File.dirname(__FILE__) + '/../../spec_helper'
+
+describe RubyWarrior::Units::Golem do
+  before(:each) do
+    @golem = RubyWarrior::Units::Golem.new
+  end
+  
+  it "should execute turn proc when playing turn" do
+    proc = Object.new
+    proc.expects(:call).with(:turn)
+    @golem.turn = proc
+    @golem.play_turn(:turn)
+  end
+  
+  it "should set max health and update current health" do
+    @golem.max_health = 10
+    @golem.max_health.should == 10
+    @golem.health.should == 10
+  end
+  
+  it "should have attack power of 3" do
+    @golem.attack_power.should == 3
+  end
+  
+  it "should appear as G on map" do
+    @golem.character.should == "G"
+  end
+end

data/spec/ruby_warrior/units/warrior_spec.rb

@@ -57,4 +57,9 @@ describe RubyWarrior::Units::Warrior do
   it "should appear as @ on map" do
     @warrior.character.should == "@"
   end
+  
+  it "should be able to add golem abilities which are used on base golem" do
+    @warrior.add_golem_abilities :walk!
+    @warrior.base_golem.abilities.keys.should == [:walk!]
+  end
 end

data/templates/README.erb

@@ -12,9 +12,22 @@ Tip: <%= level.tip %>
 <%- end -%>
 
 
-Available Abilities:
+Warrior Abilities:
 <%- level.warrior.abilities.each do |name, ability| -%>
 
   warrior.<%= name %>
     <%= ability.description %>
 <%- end -%>
+<%- if level.warrior.has_golem? -%>
+
+
+Golem Abilities:
+<%- level.warrior.base_golem.abilities.each do |name, ability| -%>
+
+  golem.<%= name %>
+    <%= ability.description %>
+<%- end -%>
+<%- end -%>
+
+
+When you're done editing player.rb, run the rubywarrior command again.

data/towers/intermediate/level_006.rb

@@ -5,7 +5,7 @@
 
 description "What's that ticking? Some captives have a timed bomb at their feet!"
 tip "Hurry and rescue captives first that have space.ticking?, they'll soon go!"
-clue "Avoid fighting enemies at first. Go around them until you've rescued all of the ticking captives."
+clue "Avoid fighting enemies at first. Use warrior.listen and space.ticking? and quickly rescue those captives."
 
 time_bonus 50
 ace_score 108
@@ -18,5 +18,6 @@ unit :sludge, 1, 0, :west
 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

data/towers/intermediate/level_007.rb

@@ -6,7 +6,7 @@
 
 description "Another ticking sound, but some sludge is blocking the way."
 tip "Quickly kill the sludge and rescue the captive before the bomb goes off. You can't simply go around them."
-clue "You'll need to bind the two other sludge first before killing the one blocking the way to the ticking captive."
+clue "Determine the direction of the ticking captive and kill any enemies blocking that path. You may need to bind surrounding enemies first."
 
 time_bonus 70
 ace_score 134
@@ -19,6 +19,7 @@ unit :sludge, 1, 0, :south
 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

data/towers/intermediate/level_008.rb

@@ -0,0 +1,23 @@
+#  -------
+# |@ Ss C>|
+#  -------
+
+description "You discover a satchel of bombs which will help when facing a mob of enemies."
+tip "Detonate a bomb when you see a couple enemies ahead of you (warrior.look). Watch out for your health too."
+clue "Calling warrior.look will return an array of Spaces. If the first two contain enemies, detonate a bomb with warrior.detonate!."
+
+time_bonus 30
+size 7, 1
+stairs 6, 0
+
+warrior 0, 0, :east do |u|
+  u.add_abilities :look
+  u.add_abilities :detonate!
+end
+
+unit :captive, 5, 0, :west do |u|
+  u.add_abilities :explode!
+  u.abilities[:explode!].time = 9
+end
+unit :thick_sludge, 2, 0, :west
+unit :sludge, 3, 0, :west

data/towers/intermediate/level_009.rb

@@ -0,0 +1,31 @@
+#  ----
+# |ssC>|
+# |@sss|
+# |ssC |
+#  ----
+
+description "Never before have you seen a room so full of sludge. Start the fireworks!"
+tip "Be careful not to let the ticking captive get caught in the flames. Use warrior.distance_of to avoid the captives."
+clue "Be sure to bind the surrounding enemies before fighting. Check your health before detonating explosives."
+
+time_bonus 70
+size 4, 3
+stairs 3, 0
+
+warrior 0, 1, :east do |u|
+  u.add_abilities :distance_of
+end
+
+unit :captive, 2, 0, :south do |u|
+  u.add_abilities :explode!
+  u.abilities[:explode!].time = 20
+end
+unit :captive, 2, 2, :north
+
+unit :sludge, 0, 0, :south
+unit :sludge, 1, 0, :south
+unit :sludge, 1, 1, :east
+unit :sludge, 2, 1, :east
+unit :sludge, 3, 1, :east
+unit :sludge, 0, 2, :north
+unit :sludge, 1, 2, :north

metadata

@@ -1,7 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: rubywarrior
 version: !ruby/object:Gem::Version 
-  version: 0.1.1
+  hash: 31
+  prerelease: false
+  segments: 
+  - 0
+  - 1
+  - 2
+  version: 0.1.2
 platform: ruby
 authors: 
 - Ryan Bates
@@ -9,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-01-03 00:00:00 -08:00
+date: 2010-09-23 00:00:00 -07:00
 default_executable: 
 dependencies: []
 
@@ -19,19 +25,19 @@ executables:
 - rubywarrior
 extensions: []
 
-extra_rdoc_files: 
-- README.rdoc
-- CHANGELOG.rdoc
-- LICENSE
+extra_rdoc_files: []
+
 files: 
 - lib/ruby_warrior/abilities/attack.rb
 - lib/ruby_warrior/abilities/base.rb
 - lib/ruby_warrior/abilities/bind.rb
+- lib/ruby_warrior/abilities/detonate.rb
 - lib/ruby_warrior/abilities/direction_of.rb
 - lib/ruby_warrior/abilities/direction_of_stairs.rb
-- lib/ruby_warrior/abilities/distance.rb
+- lib/ruby_warrior/abilities/distance_of.rb
 - lib/ruby_warrior/abilities/explode.rb
 - lib/ruby_warrior/abilities/feel.rb
+- lib/ruby_warrior/abilities/form.rb
 - lib/ruby_warrior/abilities/health.rb
 - lib/ruby_warrior/abilities/listen.rb
 - lib/ruby_warrior/abilities/look.rb
@@ -57,6 +63,7 @@ files:
 - lib/ruby_warrior/units/archer.rb
 - lib/ruby_warrior/units/base.rb
 - lib/ruby_warrior/units/captive.rb
+- lib/ruby_warrior/units/golem.rb
 - lib/ruby_warrior/units/sludge.rb
 - lib/ruby_warrior/units/thick_sludge.rb
 - lib/ruby_warrior/units/warrior.rb
@@ -70,9 +77,10 @@ files:
 - spec/ruby_warrior/abilities/bind_spec.rb
 - spec/ruby_warrior/abilities/direction_of_spec.rb
 - spec/ruby_warrior/abilities/direction_of_stairs_spec.rb
-- spec/ruby_warrior/abilities/distance_spec.rb
+- spec/ruby_warrior/abilities/distance_of_spec.rb
 - spec/ruby_warrior/abilities/explode_spec.rb
 - spec/ruby_warrior/abilities/feel_spec.rb
+- spec/ruby_warrior/abilities/form_spec.rb
 - spec/ruby_warrior/abilities/health_spec.rb
 - spec/ruby_warrior/abilities/listen_spec.rb
 - spec/ruby_warrior/abilities/look_spec.rb
@@ -80,7 +88,9 @@ files:
 - spec/ruby_warrior/abilities/rescue_spec.rb
 - spec/ruby_warrior/abilities/rest_spec.rb
 - spec/ruby_warrior/abilities/shoot_spec.rb
+- spec/ruby_warrior/abilities/throw_spec.rb
 - spec/ruby_warrior/abilities/walk_spec.rb
+- spec/ruby_warrior/core_additions_spec.rb
 - spec/ruby_warrior/floor_spec.rb
 - spec/ruby_warrior/game_spec.rb
 - spec/ruby_warrior/level_loader_spec.rb
@@ -95,6 +105,7 @@ files:
 - spec/ruby_warrior/units/archer_spec.rb
 - spec/ruby_warrior/units/base_spec.rb
 - spec/ruby_warrior/units/captive_spec.rb
+- spec/ruby_warrior/units/golem_spec.rb
 - spec/ruby_warrior/units/sludge_spec.rb
 - spec/ruby_warrior/units/thick_sludge_spec.rb
 - spec/ruby_warrior/units/warrior_spec.rb
@@ -124,43 +135,48 @@ files:
 - towers/intermediate/level_005.rb
 - towers/intermediate/level_006.rb
 - towers/intermediate/level_007.rb
+- towers/intermediate/level_008.rb
+- towers/intermediate/level_009.rb
 - templates/player.rb
 - templates/README.erb
 - bin/rubywarrior
+- CHANGELOG.rdoc
 - LICENSE
-- README.rdoc
 - Rakefile
-- CHANGELOG.rdoc
+- README.rdoc
 has_rdoc: true
 homepage: http://github.com/ryanb/ruby-warrior
 licenses: []
 
 post_install_message: 
-rdoc_options: 
-- --line-numbers
-- --inline-source
-- --title
-- RubyWarrior
-- --main
-- README.rdoc
+rdoc_options: []
+
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
       version: "0"
-  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      version: "1.2"
-  version: 
+      hash: 19
+      segments: 
+      - 1
+      - 3
+      - 4
+      version: 1.3.4
 requirements: []
 
-rubyforge_project: 
-rubygems_version: 1.3.5
+rubyforge_project: rubywarrior
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: Game written in Ruby for learning Ruby and artificial intelligence.

data/lib/ruby_warrior/abilities/distance.rb

@@ -1,13 +0,0 @@
-module RubyWarrior
-  module Abilities
-    class Distance < Base
-      def description
-        "Returns the number of spaces the stairs are away."
-      end
-      
-      def perform
-        @unit.position.distance_from_stairs
-      end
-    end
-  end
-end

data/spec/ruby_warrior/abilities/distance_spec.rb

@@ -1,13 +0,0 @@
-require File.dirname(__FILE__) + '/../../spec_helper'
-
-describe RubyWarrior::Abilities::Distance do
-  before(:each) do
-    @position = stub
-    @distance = RubyWarrior::Abilities::Distance.new(stub(:position => @position, :say => nil))
-  end
-  
-  it "should return distance from stairs" do
-    @position.stubs(:distance_from_stairs).returns(5)
-    @distance.perform.should == 5
-  end
-end