rubywarrior 0.1.0 → 0.1.1

data/CHANGELOG.rdoc

@@ -1,3 +1,14 @@
+0.1.1 (Jan 3, 2010)
+
+* Speeding up play speed a little
+
+* Ticking captive explosion now kills everything on the floor, adjusting level 6 to compensate
+
+* Adding intermediate level 7
+
+* Keep track of last level played in profile and go back to normal mode when level is added
+
+
 0.1.0 (Jan 2, 2010)
 
 * initial release

data/features/levels.feature

@@ -28,7 +28,6 @@ Feature: Play levels
     When I run rubywarrior
     Then I should see "Joe - beginner - level 1"
   
-  @focus
   Scenario: Replay levels as epic when finishing last level with grades
     When I copy fixture "short-tower" to "towers/short"
     Given a profile named "Bill" on "short"
@@ -49,3 +48,24 @@ Feature: Play levels
     Then I should see "grade for this tower"
     When I run rubywarrior
     Then I should see "Bill - short - first score 34 - epic score 34"
+  
+  Scenario: Continue normal mode after epic mode when level added
+    When I copy fixture "short-tower" to "towers/short"
+    Given a profile named "Bob" on "short"
+    When I copy fixture "walking_player.rb" to "tmp/rubywarrior/bob-short/player.rb"
+    And I run rubywarrior
+    And I choose "Bob - short - level 1" for "profile"
+    Then I answer "y" to "next level"
+    And I should see "the updated README in the rubywarrior/bob-short directory"
+    When I run rubywarrior
+    And I choose "Bob - short - level 2" for "profile"
+    Then I answer "y" to "epic"
+    And I should see "epic mode"
+    When I copy fixture "short-tower/level_002.rb" to "towers/short/level_003.rb"
+    And I run rubywarrior
+    And I choose "Bob - short - first score 34 - epic score 0" for "profile"
+    And I should see "Another level"
+    When I run rubywarrior
+    And I choose "Bob - short - level 3" for "profile"
+    Then I answer "y" to "epic"
+    And I should see "epic mode"

data/lib/ruby_warrior/abilities/explode.rb

@@ -2,13 +2,15 @@ module RubyWarrior
   module Abilities
     class Explode < Base
       def description
-        "Kills you. You probably don't want to do this intentionally."
+        "Kills you and all surrounding units. You probably don't want to do this intentionally."
       end
       
       def perform
         if @unit.position
-          @unit.say "explodes"
-          @unit.take_damage(@unit.health)
+          @unit.say "explodes, collapsing the cealing and damanging every unit."
+          @unit.position.floor.units.map do |unit|
+            unit.take_damage(100)
+          end
         end
       end
     end

data/lib/ruby_warrior/game.rb

@@ -13,7 +13,15 @@ module RubyWarrior
         make_game_directory unless File.exist?(Config.path_prefix + '/rubywarrior')
       end
       
-      profile.epic? ? play_epic_mode : play_normal_mode
+      if profile.epic?
+        if profile.level_after_epic?
+          go_back_to_normal_mode
+        else
+          play_epic_mode
+        end
+      else
+        play_normal_mode
+      end
     end
     
     def make_game_directory
@@ -111,6 +119,13 @@ module RubyWarrior
       profile.save # this saves score too
     end
     
+    def go_back_to_normal_mode
+      profile.enable_normal_mode
+      prepare_next_level
+      UI.puts "Another level has been added since you started epic, going back to normal mode."
+      UI.puts "See the updated README in the rubywarrior/#{profile.directory_name} directory."
+    end
+    
     
     # profiles
     

data/lib/ruby_warrior/profile.rb

@@ -2,7 +2,7 @@ require 'base64'
 
 module RubyWarrior
   class Profile
-    attr_accessor :score, :epic_score, :current_epic_score, :average_grade, :current_epic_grades, :abilities, :level_number, :tower_path, :warrior_name, :player_path
+    attr_accessor :score, :epic_score, :current_epic_score, :average_grade, :current_epic_grades, :abilities, :level_number, :last_level_number, :tower_path, :warrior_name, :player_path
     
     def initialize
       @tower_path = nil
@@ -14,6 +14,7 @@ module RubyWarrior
       @average_grade = nil
       @abilities = []
       @level_number = 0
+      @last_level_number = nil
     end
     
     def encode
@@ -81,12 +82,27 @@ module RubyWarrior
       @epic = true
       @epic_score ||= 0
       @current_epic_score ||= 0
+      @last_level_number ||= @level_number
+    end
+    
+    def enable_normal_mode
+      @epic = false
+      @epic_score = 0
+      @current_epic_score = 0
+      @current_epic_grades = {}
+      @average_grade = nil
+      @level_number = @last_level_number
+      @last_level_number = nil
     end
     
     def epic?
       @epic
     end
     
+    def level_after_epic?
+      Level.new(self, last_level_number+1).exists? if last_level_number
+    end
+    
     def update_epic_score
       if @current_epic_score > @epic_score
         @epic_score = @current_epic_score

data/lib/ruby_warrior/runner.rb

@@ -12,7 +12,7 @@ module RubyWarrior
     def run
       Config.in_stream = @stdin
       Config.out_stream = @stdout
-      Config.delay = 0.8
+      Config.delay = 0.6
       parse_options
       @game.start
     end

data/spec/ruby_warrior/abilities/explode_spec.rb

@@ -2,20 +2,21 @@ require File.dirname(__FILE__) + '/../../spec_helper'
 
 describe RubyWarrior::Abilities::Explode do
   before(:each) do
+    @floor = RubyWarrior::Floor.new
+    @floor.width = 2
+    @floor.height = 3
     @captive = RubyWarrior::Units::Captive.new
+    @floor.add(@captive, 0, 0)
     @explode = RubyWarrior::Abilities::Explode.new(@captive)
   end
   
-  it "should set health to 0" do
-    @captive.position = stub
+  it "should subtract 100 health from each unit on the floor" do
+    unit = RubyWarrior::Units::Base.new
+    unit.health = 20
+    @floor.add(unit, 0, 1)
     @captive.health = 10
     @explode.perform
-    @captive.health.should == 0
-  end
-  
-  it "should do nothing if no position" do
-    @captive.health = 10
-    @explode.perform
-    @captive.health.should == 10
+    @captive.health.should == -90
+    unit.health.should == -80
   end
 end

data/spec/ruby_warrior/profile_spec.rb

@@ -94,6 +94,33 @@ describe RubyWarrior::Profile do
     @profile.current_epic_grades = {}
     @profile.calculate_average_grade.should be_nil
   end
+
+  it "should remember current level number as last_level_number" do
+    @profile.level_number = 7
+    @profile.enable_epic_mode
+    @profile.last_level_number.should == 7
+  end
+
+  it "should enable normal mode by clearing epic scores and resetting last level number" do
+    @profile.last_level_number = 7
+    @profile.epic_score = 123
+    @profile.current_epic_score = 100
+    @profile.current_epic_grades = { 1 => 100 }
+    @profile.average_grade = "C"
+    @profile.enable_normal_mode
+    @profile.should_not be_epic
+    @profile.epic_score.should be_zero
+    @profile.current_epic_score.should be_zero
+    @profile.last_level_number.should be_nil
+    @profile.average_grade.should be_nil
+    @profile.current_epic_grades.should == {}
+    @profile.level_number.should == 7
+  end
+
+  it "should be no level after epic if last level isn't specified" do
+    @profile.last_level_number = nil
+    @profile.should_not be_level_after_epic
+  end
   
   describe "with tower path" do
     before(:each) do

data/towers/intermediate/level_006.rb

@@ -1,24 +1,22 @@
 #  ------
-# | SC  >|
-# |@  SC |
+# |Cs   >|
+# |@  sC |
 #  ------
 
 description "What's that ticking? Some captives have a timed bomb at their feet!"
-tip "It's best to rescue captives first that have space.ticking?, they'll soon go!"
+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."
 
 time_bonus 50
-ace_score 130
+ace_score 108
 size 6, 2
 stairs 5, 0
 
 warrior 0, 1, :east
 
-unit :thick_sludge, 1, 0, :west
-unit :thick_sludge, 3, 1, :west
-unit :captive, 2, 0, :west do |u|
-  u.bomb_time = 6
-end
+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 = 10
+  u.bomb_time = 7
 end

data/towers/intermediate/level_007.rb

@@ -0,0 +1,24 @@
+#  -----
+# | sC >|
+# |@ s C|
+# | s   |
+#  -----
+
+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."
+
+time_bonus 70
+ace_score 134
+size 5, 3
+stairs 4, 0
+
+warrior 0, 1, :east
+
+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
+end
+unit :captive, 2, 0, :west

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: rubywarrior
 version: !ruby/object:Gem::Version 
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors: 
 - Ryan Bates
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-01-02 00:00:00 -08:00
+date: 2010-01-03 00:00:00 -08:00
 default_executable: 
 dependencies: []
 
@@ -123,6 +123,7 @@ files:
 - towers/intermediate/level_004.rb
 - towers/intermediate/level_005.rb
 - towers/intermediate/level_006.rb
+- towers/intermediate/level_007.rb
 - templates/player.rb
 - templates/README.erb
 - bin/rubywarrior