ruby_armor 0.0.4alpha → 0.0.5alpha

data/config/gui/schema.yml

@@ -64,8 +64,10 @@
     :rail_width: 14
     :rail_color: ?light_background
     :handle_color: ?handle
+
     
   :ScrollWindow: # < Composite
     :scroll_bar_thickness: 12
     :border_color: ?light_border
+    :background_color: ?dark_background
 

data/lib/ruby_armor.rb

@@ -11,6 +11,8 @@ include Chingu
 
 $LOAD_PATH.unshift File.expand_path("..", __FILE__)
 
+require "ruby_armor/version"
+
 require "ruby_armor/ruby_warrior_ext/position"
 require "ruby_armor/ruby_warrior_ext/ui"
 require "ruby_armor/ruby_warrior_ext/units/base"
@@ -20,6 +22,7 @@ require "ruby_armor/floating_text"
 require "ruby_armor/sprite_sheet"
 require "ruby_armor/states/choose_profile"
 require "ruby_armor/states/play"
+require "ruby_armor/states/review_code"
 require "ruby_armor/window"
 require "ruby_armor/warrior_config"
 

data/lib/ruby_armor/ruby_warrior_ext/abilities/rest.rb

@@ -5,7 +5,8 @@ module RubyWarrior
       def perform
         original = @unit.health
         original_perform
-        $window.current_game_state.unit_health_changed(@unit, @unit.health - original) if @unit.health > original
+        state = $window.game_state_manager.inside_state || $window.current_game_state
+        state.unit_health_changed(@unit, @unit.health - original) if @unit.health > original
       end
     end
   end

data/lib/ruby_armor/ruby_warrior_ext/units/base.rb

@@ -3,8 +3,9 @@ module RubyWarrior
     class Base
       alias_method :original_take_damage, :take_damage
       def take_damage(amount)
-        $window.current_game_state.unit_health_changed self, -amount
-        original_take_damage(amount)
+        state = $window.game_state_manager.inside_state || $window.current_game_state
+        state.unit_health_changed self, -amount
+        original_take_damage amount
       end
     end
   end

data/lib/ruby_armor/states/choose_profile.rb

@@ -10,19 +10,23 @@ module RubyArmor
 
       warrior_sprites = SpriteSheet.new "warriors.png", Play::SPRITE_WIDTH, Play::SPRITE_HEIGHT, 4
 
-      vertical align_h: :center, spacing: 50 do
-        label "RubyArmor", align: :center, font_height: 120, padding_top: 50
+      vertical align_h: :center, spacing: 40 do
+        vertical align: :center, padding: 0 do
+          label "RubyArmor", align: :center, font_height: 80, padding_top: 50
+          label "by Spooner", align: :center, font_height: 12
+        end
 
         button_options = { width: 400, align: :center, justify: :center }
 
         # Use existing profile.
         vertical padding: 0, align_h: :center do
-          scroll_window height: 200, width: 460 do
+          scroll_window height: 250, width: 460 do
             @game.profiles.each do |profile|
               config = WarriorConfig.new profile
 
-              title = "#{profile.warrior_name.ljust(20)} #{profile.tower.name.rjust(12)}:#{profile.level_number} #{profile.score.to_s.rjust(5)}"
-              tip = "Play as #{profile.warrior_name} the #{config.warrior_class.capitalize} - #{profile.tower.name} - level #{profile.level_number} - score #{profile.score}"
+              name_of_level = profile.epic? ? "EPIC" : profile.level_number.to_s
+              title = "#{profile.warrior_name.ljust(20)} #{profile.tower.name.rjust(12)}:#{name_of_level[0, 1]} #{profile.score.to_s.rjust(5)}"
+              tip = "Play as #{profile.warrior_name} the #{config.warrior_class.capitalize} - #{profile.tower.name} - level #{name_of_level} - score #{profile.score}"
 
               # Can be disabled because of a bug in RubyWarrior paths.
               button title, button_options.merge(tip: tip, enabled: File.directory?(profile.tower_path),
@@ -36,7 +40,7 @@ module RubyArmor
         # Option to create a new profile.
         vertical padding: 0, align: :center do
           horizontal align: :center, padding: 0 do
-            @new_name = text_area width: 300, height: 35, font_height: 24 do |_, text|
+            @new_name = text_area width: 300, height: 30, font_height: 20 do |_, text|
               duplicate = @game.profiles.any? {|p| p.warrior_name.downcase == text.downcase }
               @new_profile_button.enabled = !(text.empty? or duplicate)
             end
@@ -65,6 +69,11 @@ module RubyArmor
       end
     end
 
+    def update
+      super
+      @new_name.focus self unless @new_name.focused?
+    end
+
     def finalize
       super
       container.clear

data/lib/ruby_armor/states/play.rb

@@ -4,9 +4,16 @@ module RubyArmor
 
     TILE_WIDTH, TILE_HEIGHT = 8, 12
     SPRITE_WIDTH, SPRITE_HEIGHT = 8, 8
-    SPRITE_OFFSET_X, SPRITE_OFFSET_Y = 64, 64
     SPRITE_SCALE = 5
 
+    MAX_TURN_DELAY = 1
+    MIN_TURN_DELAY = 0
+    TURN_DELAY_STEP = 0.1
+
+    MAX_TURNS = 100
+
+    SHORTCUT_COLOR = Color.rgb(175, 255, 100)
+
     # Sprites to show based on player facing.
     FACINGS = {
         :east => 0,
@@ -39,6 +46,15 @@ module RubyArmor
 
     trait :timer
 
+    attr_reader :turn
+    def turn=(turn)
+      @turn = turn
+      @take_next_turn_at = Time.now + @config.turn_delay
+      @log_contents["current turn"].text = replace_log @turn_logs[turn]
+
+      turn
+    end
+
     def initialize(game, config)
       @game, @config = game, config
       super()
@@ -52,129 +68,259 @@ module RubyArmor
       @tiles = SpriteSheet.new "tiles.png", TILE_WIDTH, TILE_HEIGHT, 8
       @warrior_sprites = SpriteSheet.new "warriors.png", SPRITE_WIDTH, SPRITE_HEIGHT, 4
       @mob_sprites = SpriteSheet.new "mobs.png", SPRITE_WIDTH, SPRITE_HEIGHT, 4
-      @max_turns = 100 # Just to recognise a stalemate ;)
 
       on_input(:escape) { pop_game_state }
 
-      vertical spacing: 0, padding: 10 do
-        horizontal padding: 0, height: $window.height * 0.5, width: 780 do
+      on_input(:right_arrow) do
+        if @turn_slider.enabled? and @turn_slider.value < turn
+          @turn_slider.value += 1
+        end
+      end
+      on_input(:left_arrow) do
+        if @turn_slider.enabled? and @turn_slider.value > 0
+          @turn_slider.value -= 1
+        end
+      end
+
+      vertical spacing: 10, padding: 10 do
+        horizontal padding: 0, height: 260, width: 780, spacing: 10 do
           # Space for the game graphics.
-          vertical padding: 0, height: $window.height * 0.5, align_h: :fill
-
-          vertical padding: 0, height: $window.height * 0.5, width: 100 do
-            # Labels at top-right.
-            @tower_label = label "", tip: "Each tower has a different difficulty level"
-            @level_label = label "Level:", tip: "Each tower contains 9 levels"
-            @turn_label = label "Turn:", tip: "Current turn; starvation at #{@max_turns} to avoid endless games"
-            @health_label = label "Health:", tip: "The warrior's remaining health; death occurs at 0"
-
-            # Buttons underneath them.
-            button_options = {
-                :width => 70,
-                :justify => :center,
-                shortcut: :auto,
-                shortcut_color: Color.rgb(150, 255, 0),
-                border_thickness: 0,
-            }
-            @start_button = button "Start", button_options.merge(tip: "Start running player.rb in this level") do
-              start_level
-            end
+          @game_window = vertical padding: 0, width: 670, height: 260
 
-            @reset_button = button "Reset", button_options.merge(tip: "Restart the level") do
-              prepare_level
-            end
+          create_ui_bar
+        end
 
-            @hint_button = button "Hint", button_options.merge(tip: "Get hint on how best to approach the level") do
-              message replace_syntax(level.tip)
-            end
+        @turn_slider = slider width: 774, range: 0..MAX_TURNS, value: 0, enabled: false, tip: "Turn" do |_, turn|
+          @log_contents["current turn"].text = replace_log @turn_logs[turn]
+          refresh_labels
+        end
 
-            @continue_button = button "Continue", button_options.merge(tip: "Climb up the stairs to the next level") do
-              @game.prepare_next_level
-              prepare_level
-            end
+        # Text areas at the bottom.
+        horizontal padding: 0, spacing: 10 do
+          create_file_tabs
+          create_log_tabs
+        end
+      end
 
-            # Choose turn-duration with a slider.
-            horizontal padding: 0, spacing: 0 do
-              @turn_duration_label = label "", font_height: 12
-              @turn_duration_slider = slider width: 55, range: 0..1000,
-                                             tip: "Turn duration (ms)" do |_, value|
-                @config.turn_delay = value * 0.001
-                @turn_duration_label.text = "%4dms" % value.to_s
-              end
+      # Return to normal mode if extra levels have been added.
+      if profile.epic?
+        if profile.level_after_epic?
+          # TODO: do something with log.
+          log = record_log do
+            @game.go_back_to_normal_mode
+          end
+        else
+          # TODO: do something with log.
+          log = record_log do
+            @game.play_epic_mode
+          end
+        end
+      end
 
-              @turn_duration_slider.value = (@config.turn_delay * 1000).round
-            end
+      prepare_level
+    end
+
+    def create_ui_bar
+      vertical padding: 0, height: 260, width: 100, spacing: 6 do
+        # Labels at top-right.
+        @tower_label = label "", tip: "Each tower has a different difficulty level"
+        @level_label = label "Level:"
+        @turn_label = label "Turn:", tip: "Current turn; starvation at #{MAX_TURNS} to avoid endless games"
+        @health_label = label "Health:", tip: "The warrior's remaining health; death occurs at 0"
+
+        # Buttons underneath them.
+        button_options = {
+            :width => 70,
+            :justify => :center,
+            shortcut: :auto,
+            shortcut_color: SHORTCUT_COLOR,
+            border_thickness: 0,
+        }
+        @start_button = button "Start", button_options.merge(tip: "Start running player.rb in this level") do
+          start_level
+        end
+
+        @reset_button = button "Reset", button_options.merge(tip: "Restart the level") do
+          profile.level_number = 0 if profile.epic?
+          prepare_level
+        end
+
+        @hint_button = button "Hint", button_options.merge(tip: "Get hint on how best to approach the level") do
+          message replace_syntax(level.tip)
+        end
+
+        @continue_button = button "Continue", button_options.merge(tip: "Climb up the stairs to the next level") do
+          save_player_code
+
+          # Move to next level.
+          if @game.next_level.exists?
+            @game.prepare_next_level
+          else
+            @game.prepare_epic_mode
           end
+
+          prepare_level
         end
 
-        # Text areas at the bottom.
-        horizontal padding: 0, spacing: 10 do
-          # Tabs to contain README and player code to the left.
-          vertical padding: 0, spacing: 0 do
-            @tabs_group = group do
-              @tab_buttons = horizontal padding: 0, spacing: 4 do
-                %w[README player.rb].each do |name|
-                  radio_button(name.to_s, name, border_thickness: 0, tip: "View #{name}")
-                end
-
-                horizontal padding: 0, padding_left: 70 do
-                  # Default editor for Windows.
-                  ENV['EDITOR'] = "notepad" if Gem.win_platform? and ENV['EDITOR'].nil?
-
-                  tip = ENV['EDITOR'] ? "Edit file in #{ENV['EDITOR']} (set ENV['EDITOR'] to use a different editor)" : "ENV['EDITOR'] not set"
-                  button "edit", tip: tip, enabled: ENV['EDITOR'], font_height: 12, border_thickness: 0 do
-                    command = %<"#{ENV['EDITOR']}" "#{File.join(level.player_path, @tabs_group.value)}">
-                    $stdout.puts "SYSTEM: #{command}"
-                    Thread.new { system command }
-                  end
-                end
-              end
+        horizontal padding: 0, spacing: 21 do
+          options = { padding: 4, border_thickness: 0, shortcut: :auto, shortcut_color: SHORTCUT_COLOR }
+          @turn_slower_button = button "-", options.merge(tip: "Make turns run slower") do
+            @config.turn_delay = [@config.turn_delay + TURN_DELAY_STEP, MAX_TURN_DELAY].min if @config.turn_delay < MAX_TURN_DELAY
+            update_turn_delay
+          end
 
-              subscribe :changed do |_, value|
-                current = @tab_buttons.find {|elem| elem.value == value }
-                @tab_buttons.each {|t| t.enabled = (t != current) }
-                current.color, current.background_color = current.background_color, current.color
+          @turn_duration_label = label "", align: :center
 
-                @tab_contents.clear
-                @tab_contents.add @tab_windows[value]
+          @turn_faster_button = button "+", options.merge(tip: "Make turns run faster") do
+            @config.turn_delay = [@config.turn_delay - TURN_DELAY_STEP, MIN_TURN_DELAY].max if @config.turn_delay > MIN_TURN_DELAY
+            update_turn_delay
+          end
+
+          update_turn_delay
+        end
+
+        # Review old level code.
+        @review_button = button "Review", button_options.merge(tip: "Review code used for each level",
+                                enabled: false, border_thickness: 0, shortcut: :v) do
+          ReviewCode.new(profile).show
+        end
+      end
+    end
+
+    def save_player_code
+      # Save the code used to complete the level for posterity.
+      File.open File.join(profile.player_path, "ruby_armor/player_#{profile.epic? ? "EPIC" : level.number.to_s.rjust(3, '0')}.rb"), "w" do |file|
+        file.puts @loaded_code
+
+        file.puts
+        file.puts
+        file.puts "#" * 40
+        file.puts "=begin"
+        file.puts
+        file.puts record_log { level.tally_points }
+        file.puts
+
+        if profile.epic? and @game.final_report
+          file.puts @game.final_report
+        else
+          file.puts "Completed in #{turn} turns."
+        end
+
+        file.puts
+        file.puts "=end"
+        file.puts "#" * 40
+      end
+    end
+
+    def create_log_tabs
+      vertical padding: 0, spacing: 0 do
+        @log_tabs_group = group do
+          @log_tab_buttons = horizontal padding: 0, spacing: 4 do
+            ["current turn", "full log"].each do |name|
+              radio_button(name.capitalize, name, border_thickness: 0, tip: "View #{name}")
+            end
+
+            horizontal padding_left: 50, padding: 0 do
+              button "copy", tip: "Copy displayed log to clipboard", font_height: 12, border_thickness: 0, padding: 4 do
+                Clipboard.copy @log_contents[@log_tabs_group.value].stripped_text
               end
             end
+          end
 
-            # Contents of those tabs.
-            @tab_contents = vertical padding: 0, width: 380, spacing: 10, height: $window.height * 0.45
+          subscribe :changed do |_, value|
+            current = @log_tab_buttons.find {|elem| elem.value == value }
+            @log_tab_buttons.each {|t| t.enabled = (t != current) }
+            current.color, current.background_color = current.background_color, current.color
 
-            create_tab_windows
-            @tabs_group.value = "README"
+            @log_tab_contents.clear
+            @log_tab_contents.add @log_tab_windows[value]
           end
+        end
+
+        # Contents of those tabs.
+        @log_tab_contents = vertical padding: 0, width: 380, height: $window.height * 0.5
+
+        create_log_tab_windows
+        @log_tabs_group.value = "current turn"
+      end
+    end
+
+
+    def create_file_tabs
+      # Tabs to contain README and player code to the left.
+      vertical padding: 0, spacing: 0 do
+        @file_tabs_group = group do
+          @file_tab_buttons = horizontal padding: 0, spacing: 4 do
+            %w[README player.rb].each do |name|
+              radio_button(name.to_s, name, border_thickness: 0, tip: "View #{File.join profile.player_path, name}")
+            end
+
+            horizontal padding_left: 50, padding: 0 do
+              button "copy", tip: "Copy displayed file to clipboard", font_height: 12, border_thickness: 0, padding: 4 do
+                Clipboard.copy @file_contents[@file_tabs_group.value].stripped_text
+              end
+
+              # Default editor for Windows.
+              ENV['EDITOR'] = "notepad" if Gem.win_platform? and ENV['EDITOR'].nil?
 
-          # Log on the right
-          vertical padding: 0, width: 380, height: 278 do
-            @log_window = scroll_window width: 380, height: 278 do
-              @log_display = text_area width: 368, editable: false
+              tip = ENV['EDITOR'] ? "Edit file in #{ENV['EDITOR']} (set EDITOR environment variable to use a different editor)" : "ENV['EDITOR'] not set"
+              button "edit", tip: tip, enabled: ENV['EDITOR'], font_height: 12, border_thickness: 0, padding: 4 do
+                command = %<#{ENV['EDITOR']} "#{File.join(level.player_path, @file_tabs_group.value)}">
+                $stdout.puts "SYSTEM: #{command}"
+                Thread.new { system command }
+              end
             end
-            @log_window.background_color = @log_display.background_color
+          end
+
+          subscribe :changed do |_, value|
+            current = @file_tab_buttons.find {|elem| elem.value == value }
+            @file_tab_buttons.each {|t| t.enabled = (t != current) }
+            current.color, current.background_color = current.background_color, current.color
+
+            @file_tab_contents.clear
+            @file_tab_contents.add @file_tab_windows[value]
           end
         end
+
+        # Contents of those tabs.
+        @file_tab_contents = vertical padding: 0, width: 380, height: $window.height * 0.5
+
+        create_file_tab_windows
+        @file_tabs_group.value = "README"
       end
+    end
 
-      prepare_level
+    def update_turn_delay
+      @turn_duration_label.text = "%2d" % [(MAX_TURN_DELAY / TURN_DELAY_STEP) + 1 - (@config.turn_delay / TURN_DELAY_STEP)]
+      @turn_slower_button.enabled = @config.turn_delay < MAX_TURN_DELAY
+      @turn_faster_button.enabled = @config.turn_delay > MIN_TURN_DELAY
+      @turn_duration_label.tip = "Speed of turns (high is faster; currently turns take #{(@config.turn_delay * 1000).to_i}ms)"
     end
 
-    def create_tab_windows
-      @tab_windows = {}
-      @tab_windows["README"] = Fidgit::ScrollWindow.new width: 380, height: 250 do
-        @readme_display = text_area width: 368, editable: false
+    def create_log_tab_windows
+      @log_tab_windows = {}
+      @log_contents = {}
+      ["current turn", "full log"].each do |log|
+        @log_tab_windows[log] = Fidgit::ScrollWindow.new width: 380, height: 250 do
+          @log_contents[log] = text_area width: 368, editable: false
+        end
       end
-      @tab_windows["README"].background_color = @readme_display.background_color
+    end
 
-      @tab_windows["player.rb"] = Fidgit::ScrollWindow.new width: 380, height: 250 do
-        @code_display = text_area width: 368, editable: false
+    def create_file_tab_windows
+      @file_tab_windows = {}
+      @file_contents = {}
+      ["README", "player.rb"].each do |file|
+        @file_tab_windows[file] = Fidgit::ScrollWindow.new width: 380, height: 250 do
+          @file_contents[file] = text_area width: 368, editable: false
+        end
       end
-      @tab_windows["player.rb"].background_color = @code_display.background_color
     end
 
     def prepare_level
-      @log_display.text = ""
+      @recorded_log = nil # Not initially logging.
+
+      @log_contents["full log"].text = "" #unless profile.epic? # TODO: Might need to avoid this, since it could get REALLY long.
       @continue_button.enabled = false
       @hint_button.enabled = false
       @reset_button.enabled = false
@@ -182,9 +328,68 @@ module RubyArmor
 
       @exception = nil
 
-      @game.prepare_next_level unless profile.current_level.number > 0
+      if profile.current_level.number.zero?
+        if profile.epic?
+          @game.prepare_epic_mode
+          profile.level_number += 1
+          profile.current_epic_score = 0
+          profile.current_epic_grades = {}
+        else
+          @game.prepare_next_level 
+        end
+      end
+
+      create_sync_timer
+
+      @level = profile.current_level # Need to store this because it gets forgotten by the profile/game :(
+      @playing = false
+      level.load_level
+
+      # List of log entries, unit drawings and health made in each turn.
+      @turn_logs = Hash.new {|h, k| h[k] = "" }
+      @units_record = Array.new
+      @health = [level.warrior.health]
 
-      # Continually poll the player code file to see when it is edited.
+      @review_button.enabled = ReviewCode.saved_levels? profile # Can't review code unless some has been saved.
+
+      self.turn = 0
+
+      @file_contents["README"].text = replace_syntax File.read(File.join(level.player_path, "README"))
+
+      # Initial log entry.
+      self.puts "- turn   0 -"
+      self.print floor.character
+      self.print "#{profile.warrior_name} climbs up to level #{level.number}\n"
+      @log_contents["full log"].text += @log_contents["current turn"].text
+
+      @tile_set = %w[beginner intermediate].index(profile.tower.name) || 2 # We don't know what the last tower will be called.
+
+      warrior = floor.units.find {|u| u.is_a? RubyWarrior::Units::Warrior }
+      @entry_x, @entry_y = warrior.position.x, warrior.position.y
+
+      # Reset the time-line slider.
+      @turn_slider.enabled = false
+      @turn_slider.value = 0
+
+      refresh_labels
+
+      # Work out how to offset the level graphics based on how large it is (should be centered in the level area.
+      level_width = floor.width * SPRITE_SCALE * SPRITE_WIDTH
+      level_height = floor.height * SPRITE_SCALE * SPRITE_HEIGHT
+      @level_offset_x = (@game_window.width - level_width) / 2
+      @level_offset_y =  (@game_window.height - level_height) / 2
+
+      # Load the player's own code, which might explode!
+      begin
+        level.load_player
+      rescue SyntaxError, StandardError => ex
+        handle_exception ex
+        return
+      end
+    end
+
+    # Continually poll the player code file to see when it is edited.
+    def create_sync_timer
       stop_timer :refresh_code
       friendly_line_endings = false
       every(100, :name => :refresh_code) do
@@ -208,7 +413,7 @@ module RubyArmor
             end
             friendly_line_endings = true # Either will have or don't need to.
 
-            @code_display.text = stripped_code
+            @file_contents["player.rb"].text = stripped_code
             @loaded_code = stripped_code
             prepare_level
           end
@@ -216,43 +421,25 @@ module RubyArmor
           # This can happen if the file is busy.
         end
       end
+    end
 
-      @level = profile.current_level # Need to store this because it gets forgotten by the profile/game :(
-      @turn = 0
-      @playing = false
-      level.load_level
-
-      @readme_display.text = replace_syntax File.read(File.join(level.player_path, "README"))
-
-      print "#{profile.warrior_name} climbs up to level #{level.number}\n"
-      @tile_set = %w[beginner intermediate].index(profile.tower.name) || 2 # We don't know what the last tower will be called.
-
-      warrior = floor.units.find {|u| u.is_a? RubyWarrior::Units::Warrior }
-      @entry_x, @entry_y = warrior.position.x, warrior.position.y
-
-      refresh_labels
-
-      # Load the player's own code, which might explode!
-      begin
-        level.load_player
-      rescue SyntaxError, StandardError => ex
-        handle_exception ex
-        return
-      end
+    def effective_turn
+      @turn_slider.enabled? ? @turn_slider.value : @turn
     end
 
     def refresh_labels
       @tower_label.text =  profile.tower.name.capitalize
-      @level_label.text =  "Level:   #{level.number}"
-      @turn_label.text =   "Turn:   #{(@turn + 1).to_s.rjust(2)}"
-      @health_label.text = "Health: #{level.warrior.health.to_s.rjust(2)}"
+      @level_label.text =  "Level:  #{profile.epic? ? "E" : " "}#{level.number}"
+      @level_label.tip = profile.epic? ? "Playing in EPIC mode" : "Playing in normal mode"
+      @turn_label.text =   "Turn:   #{effective_turn.to_s.rjust(2)}"
+      @health_label.text = "Health: #{@health[effective_turn].to_s.rjust(2)}"
     end
 
     def start_level
       @reset_button.enabled = true
       @start_button.enabled = false
       @playing = true
-      @take_next_turn_at = Time.now + @config.turn_delay
+      self.turn = 0
       refresh_labels
     end
 
@@ -289,40 +476,97 @@ module RubyArmor
     def level; @level; end
     def floor; level.floor; end
 
+    def recording_log?; not @recorded_log.nil?; end
+    def record_log
+      raise "block required" unless block_given?
+      @recorded_log = ""
+      record = ""
+      begin
+        yield
+      ensure
+        record = @recorded_log
+        @recorded_log = nil
+      end
+      record
+    end
+
     def play_turn
-      self.puts "- turn #{@turn+1} -"
-      self.print floor.character
+      self.turn += 1
+      self.puts "- turn #{turn.to_s.rjust(3)} -"
 
       begin
-        floor.units.each(&:prepare_turn)
-        floor.units.each(&:perform_turn)
+        actions = record_log do
+          floor.units.each(&:prepare_turn)
+          floor.units.each(&:perform_turn)
+        end
+
+        self.print floor.character # State after
+        self.print actions
       rescue => ex
         handle_exception ex
         return
       end
 
-      @turn += 1
-      level.time_bonus -= 1 if level.time_bonus > 0
+      @health[turn] = level.warrior.health # Record health for later playback.
 
-      @take_next_turn_at = Time.now + @config.turn_delay
+      level.time_bonus -= 1 if level.time_bonus > 0
 
       refresh_labels
 
       if level.passed?
-        if @game.next_level.exists?
-          @continue_button.enabled = true
+        @reset_button.enabled = false if profile.epic? # Continue will save performance; reset won't.
+        @continue_button.enabled = true
+
+        if profile.next_level.exists?
           self.puts "Success! You have found the stairs."
+          level.tally_points
+
+          if profile.epic?
+            # Start the next level immediately.
+            self.puts "\n#{"-" * 25}\n"
+
+            # Rush onto the next level immediately!
+            profile.level_number += 1
+            prepare_level
+            start_level
+          end
         else
           self.puts "CONGRATULATIONS! You have climbed to the top of the tower and rescued the fair maiden Ruby."
+          level.tally_points
+
+          if profile.epic?
+            self.puts @game.final_report if @game.final_report
+            profile.save
+          end
         end
-        level.tally_points
+
+        level_ended
+
       elsif level.failed?
-        @hint_button.enabled = true
+        level_ended
         self.puts "Sorry, you failed level #{level.number}. Change your script and try again."
+
       elsif out_of_time?
-        @hint_button.enabled = true
+        level_ended
         self.puts "Sorry, you starved to death on level #{level.number}. Change your script and try again."
+
       end
+
+      # Add the full turn's text into the main log at once, to save on re-calculations.
+      @log_contents["full log"].text += @log_contents["current turn"].text
+      @log_tab_windows["full log"].offset_y = Float::INFINITY
+
+      self.puts
+    end
+
+    # Not necessarily complete; just finished.
+    def level_ended
+      return if profile.epic?
+
+      @hint_button.enabled = true
+      @turn_slider.enabled = true
+      @turn_slider.instance_variable_set :@range, 0..turn
+      @turn_slider.value = turn
     end
 
     def handle_exception(exception)
@@ -336,9 +580,9 @@ module RubyArmor
       # TODO: Make this work without it raising exceptions in Fidgit :(
       #exception.message =~ /:(\d+):/
       #exception_line = $1.to_i - 1
-      #code_lines = @code_display.text.split "\n"
+      #code_lines = @file_contents["player.rb"].text.split "\n"
       #code_lines[exception_line] = "<c=ff0000>{code_lines[exception_line]}</c>"
-      #@code_display.text = code_lines.join "\n"
+      #@file_contents["player.rb"].text = code_lines.join "\n"
 
       @start_button.enabled = false
 
@@ -346,7 +590,7 @@ module RubyArmor
     end
 
     def out_of_time?
-      @turn > @max_turns
+      turn >= MAX_TURNS
     end
 
     def puts(message = "")
@@ -354,80 +598,101 @@ module RubyArmor
     end
 
     def print(message)
-      #$stdout.puts message
-      @log_display.text += replace_log message
-      @log_window.offset_y = Float::INFINITY
+      if recording_log?
+        @recorded_log << message
+      else
+        @turn_logs[turn] << message
+        @log_contents["current turn"].text = replace_log @turn_logs[turn]
+      end
     end
 
     def draw
       super
 
-      $window.translate SPRITE_OFFSET_X, SPRITE_OFFSET_Y do
+      $window.translate @level_offset_x, @level_offset_y do
         $window.scale SPRITE_SCALE do
-          # Draw horizontal walls.
-          floor.width.times do |x|
-            light = x % 2
-            light = 2 if light == 1 and (Gosu::milliseconds / 500) % 2 == 0
-            @tiles[light + 3, @tile_set].draw x * SPRITE_WIDTH, -SPRITE_HEIGHT, 0
-            @tiles[3, @tile_set].draw x * SPRITE_WIDTH, floor.height * SPRITE_HEIGHT, floor.height
-          end
-          # Draw vertical walls.
-          (-1..floor.height).each do |y|
-            @tiles[3, @tile_set].draw -SPRITE_WIDTH, y * SPRITE_HEIGHT, y
-            @tiles[3, @tile_set].draw floor.width * SPRITE_WIDTH, y * SPRITE_HEIGHT, y
-          end
-
-          # Draw floor
-          floor.width.times do |x|
-            floor.height.times do |y|
-              @tiles[(x + y + 1) % 2, @tile_set].draw x * SPRITE_WIDTH, y * SPRITE_HEIGHT, 0, 1, 1, FLOOR_COLOR
-            end
-          end
+          draw_map
 
           # Draw stairs (exit)
-          @tiles[2, @tile_set].draw floor.stairs_location[0] * SPRITE_WIDTH, floor.stairs_location[1] * SPRITE_HEIGHT, 0
+          if floor.stairs_location[0] == 0
+            # flip when on the left hand side.
+            @tiles[2, @tile_set].draw (floor.stairs_location[0] + 1) * SPRITE_WIDTH, floor.stairs_location[1] * SPRITE_HEIGHT, 0, -1
+          else
+            @tiles[2, @tile_set].draw floor.stairs_location[0] * SPRITE_WIDTH, floor.stairs_location[1] * SPRITE_HEIGHT, 0
+          end
 
           # Draw trapdoor (entrance)
           @tiles[6, @tile_set].draw @entry_x * SPRITE_WIDTH, @entry_y * SPRITE_HEIGHT, 0
 
-          # Draw units.
-          floor.units.each do |unit|
-            sprite = case unit
-                       when RubyWarrior::Units::Warrior
-                         @warrior_sprites[FACINGS[unit.position.direction], WARRIORS[@config.warrior_class]]
-                       when RubyWarrior::Units::Wizard
-                         @mob_sprites[0, 1]
-                       when RubyWarrior::Units::ThickSludge
-                         @mob_sprites[2, 1]
-                       when RubyWarrior::Units::Sludge
-                         @mob_sprites[1, 1]
-                       when RubyWarrior::Units::Archer
-                         @mob_sprites[3, 1]
-                       when RubyWarrior::Units::Captive
-                         @mob_sprites[0, 2]
-                       when RubyWarrior::Units::Golem
-                         @mob_sprites[1, 2]
-                       else
-                         raise "unknown unit: #{unit.class}"
-                     end
-
-            sprite.draw unit.position.x * SPRITE_WIDTH, unit.position.y * SPRITE_HEIGHT, unit.position.y
-
-            if unit.bound?
-              @mob_sprites[2, 2].draw unit.position.x * SPRITE_WIDTH, unit.position.y * SPRITE_HEIGHT, unit.position.y
-            end
+          draw_units
+        end
+      end
+    end
+
+    def draw_map
+      # Draw horizontal walls.
+      floor.width.times do |x|
+        light = x % 2
+        light = 2 if light == 1 and (Gosu::milliseconds / 500) % 2 == 0
+        @tiles[light + 3, @tile_set].draw x * SPRITE_WIDTH, -SPRITE_HEIGHT, 0
+        @tiles[3, @tile_set].draw x * SPRITE_WIDTH, floor.height * SPRITE_HEIGHT, floor.height
+      end
+      # Draw vertical walls.
+      (-1..floor.height).each do |y|
+        @tiles[3, @tile_set].draw -SPRITE_WIDTH, y * SPRITE_HEIGHT, y
+        @tiles[3, @tile_set].draw floor.width * SPRITE_WIDTH, y * SPRITE_HEIGHT, y
+      end
+
+      # Draw floor
+      floor.width.times do |x|
+        floor.height.times do |y|
+          @tiles[(x + y + 1) % 2, @tile_set].draw x * SPRITE_WIDTH, y * SPRITE_HEIGHT, 0, 1, 1, FLOOR_COLOR
+        end
+      end
+    end
+
+    def draw_units
+      @units_record[effective_turn] ||= $window.record 1, 1 do
+        floor.units.sort_by {|u| u.position.y }.each do |unit|
+          sprite = case unit
+                     when RubyWarrior::Units::Warrior
+                       @warrior_sprites[FACINGS[unit.position.direction], WARRIORS[@config.warrior_class]]
+                     when RubyWarrior::Units::Wizard
+                       @mob_sprites[0, 1]
+                     when RubyWarrior::Units::ThickSludge
+                       @mob_sprites[2, 1]
+                     when RubyWarrior::Units::Sludge
+                       @mob_sprites[1, 1]
+                     when RubyWarrior::Units::Archer
+                       @mob_sprites[3, 1]
+                     when RubyWarrior::Units::Captive
+                       @mob_sprites[0, 2]
+                     when RubyWarrior::Units::Golem
+                       @mob_sprites[1, 2]
+                     else
+                       raise "unknown unit: #{unit.class}"
+                   end
+
+          sprite.draw unit.position.x * SPRITE_WIDTH, unit.position.y * SPRITE_HEIGHT, unit.position.y
+
+          if unit.bound?
+            @mob_sprites[2, 2].draw unit.position.x * SPRITE_WIDTH, unit.position.y * SPRITE_HEIGHT, 0
           end
         end
       end
+
+      @units_record[effective_turn].draw 0, 0, 0
     end
 
     def unit_health_changed(unit, amount)
+      return unless @level_offset_x # Ignore changes out of order, such as between epic levels.
+
       color = (amount > 0) ? Color::GREEN : Color::RED
       y_offset = (amount > 0) ? -0.15 : +0.15
       FloatingText.create "#{amount > 0 ? "+" : ""}#{amount}",
                           :color => color,
-                          :x => unit.position.x * SPRITE_SCALE * SPRITE_WIDTH  + (SPRITE_SCALE * SPRITE_WIDTH / 2) + SPRITE_OFFSET_X,
-                          :y => (unit.position.y + y_offset) * SPRITE_SCALE * SPRITE_HEIGHT + SPRITE_OFFSET_Y
+                          :x => unit.position.x * SPRITE_SCALE * SPRITE_WIDTH  + (SPRITE_SCALE * SPRITE_WIDTH / 2) + @level_offset_x,
+                          :y => (unit.position.y + y_offset) * SPRITE_SCALE * SPRITE_HEIGHT + @level_offset_y
     end
 
     def update

data/lib/ruby_armor/states/review_code.rb

@@ -0,0 +1,73 @@
+module RubyArmor
+  class ReviewCode < Fidgit::DialogState
+    LEVELS = (1..9).to_a + [:EPIC]
+
+    class << self
+      def path_for_level(profile, level)
+        File.join(profile.player_path, "ruby_armor/player_#{level.is_a?(Symbol) ? level : level.to_s.rjust(3, '0')}.rb")
+      end
+
+      # Check if there are levels saved that can be recalled.
+      def saved_levels?(profile)
+        LEVELS.any? {|level| File.exists? path_for_level(profile, level) }
+      end
+    end
+
+    def initialize(profile)
+      super(shadow_full: true)
+
+      @profile = profile
+
+      vertical spacing: 10, align: :center, background_color: Color::BLACK do
+        label "Reviewing code that completed levels in #{profile.tower.name} tower", font_height: 20
+
+        @tab_group = group do
+          @tab_buttons = horizontal padding: 0, spacing: 4 do
+            LEVELS.each do |level|
+              if File.exists?(path_for_level(level))
+                radio_button level.to_s, level, border_thickness: 0,
+                           tip: "View code used to complete level #{level}"
+              else
+                button level.to_s, border_thickness: 0, enabled: false,
+                       tip: "No code saved for level #{level}"
+              end
+            end
+
+            horizontal padding_left: 50, padding: 0 do
+              button "copy", tip: "Copy displayed code to clipboard", font_height: 12, border_thickness: 0, padding: 4 do
+                Clipboard.copy @code.stripped_text
+              end
+            end
+          end
+
+          subscribe :changed do |_, value|
+            buttons = @tab_buttons.each.grep Fidgit::RadioButton
+            current = buttons.find {|b| b.value == value }
+            buttons.each {|b| b.enabled = (b != current) }
+            current.color, current.background_color = current.background_color, current.color
+
+            @code.text = File.read path_for_level(value)
+          end
+        end
+
+        # Contents of those tabs.
+        vertical padding: 0 do
+          scroll_window width: 700, height: 430 do
+            @code = text_area width: 680
+          end
+        end
+
+        button "Close", shortcut: :escape, align_h: :center, border_thickness: 0 do
+          hide
+        end
+
+        # Pick the last level we have completed (and saved the code).
+        @tab_group.value = LEVELS.to_a.reverse.find {|level| File.exists? path_for_level(level) }
+      end
+    end
+
+    def path_for_level(level)
+      self.class.path_for_level @profile, level
+    end
+  end
+end

data/lib/ruby_armor/version.rb

@@ -1,3 +1,3 @@
 module RubyArmor
-  VERSION = "0.0.4alpha"
+  VERSION = "0.0.5alpha"
 end

data/lib/ruby_armor/warrior_config.rb

@@ -1,12 +1,23 @@
+require 'fileutils'
+
 require_relative "base_user_data"
 
 module RubyArmor
   class WarriorConfig < BaseUserData
     DEFAULT_CONFIG = File.expand_path "../../../config/default_config.yml", __FILE__
-    CONFIG_FILE = "ruby_armour.yml"
+    OLD_CONFIG_FILE = "ruby_armour.yml"
+    CONFIG_FILE = "ruby_armor/config.yml"
 
     def initialize(profile)
-      super File.join(profile.player_path, CONFIG_FILE), DEFAULT_CONFIG
+      # Originally, config file was just in the folder. Move into its own folder, so we can put more in there.
+      old_config_file = File.join(profile.player_path, OLD_CONFIG_FILE)
+      config_file = File.join(profile.player_path, CONFIG_FILE)
+      if File.exists? old_config_file
+        FileUtils.mkdir_p File.dirname(config_file)
+        FileUtils.mv old_config_file, config_file
+      end
+
+      super config_file, DEFAULT_CONFIG
     end
 
     def turn_delay; data[:turn_delay]; end

data/lib/ruby_armor/window.rb

@@ -5,7 +5,7 @@ module RubyArmor
 
       Gosu::enable_undocumented_retrofication
 
-      self.caption = "RubyArmor for RubyWarrior"
+      self.caption = "RubyArmor v#{RubyArmor::VERSION} (for RubyWarrior)"
       push_game_state ChooseProfile
     end
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ruby_armor
 version: !ruby/object:Gem::Version
-  version: 0.0.4alpha
+  version: 0.0.5alpha
   prerelease: 5
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-02-26 00:00:00.000000000 Z
+date: 2012-02-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rubywarrior
-  requirement: &25413276 !ruby/object:Gem::Requirement
+  requirement: &21159480 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: 0.1.2
   type: :runtime
   prerelease: false
-  version_requirements: *25413276
+  version_requirements: *21159480
 - !ruby/object:Gem::Dependency
   name: gosu
-  requirement: &25412196 !ruby/object:Gem::Requirement
+  requirement: &21157404 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: 0.7.41
   type: :runtime
   prerelease: false
-  version_requirements: *25412196
+  version_requirements: *21157404
 - !ruby/object:Gem::Dependency
   name: chingu
-  requirement: &25411440 !ruby/object:Gem::Requirement
+  requirement: &21155796 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,21 +43,21 @@ dependencies:
         version: 0.9rc7
   type: :runtime
   prerelease: false
-  version_requirements: *25411440
+  version_requirements: *21155796
 - !ruby/object:Gem::Dependency
   name: fidgit
-  requirement: &25409844 !ruby/object:Gem::Requirement
+  requirement: &21154332 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.2.2
+        version: 0.2.4
   type: :runtime
   prerelease: false
-  version_requirements: *25409844
+  version_requirements: *21154332
 - !ruby/object:Gem::Dependency
   name: releasy
-  requirement: &25406592 !ruby/object:Gem::Requirement
+  requirement: &21153432 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -65,7 +65,7 @@ dependencies:
         version: 0.2.2
   type: :development
   prerelease: false
-  version_requirements: *25406592
+  version_requirements: *21153432
 description: 
 email:
 - bil.bagpuss@gmail.com
@@ -85,6 +85,7 @@ files:
 - lib/ruby_armor/sprite_sheet.rb
 - lib/ruby_armor/states/choose_profile.rb
 - lib/ruby_armor/states/play.rb
+- lib/ruby_armor/states/review_code.rb
 - lib/ruby_armor/version.rb
 - lib/ruby_armor/warrior_config.rb
 - lib/ruby_armor/window.rb
@@ -106,12 +107,9 @@ require_paths:
 required_ruby_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
-  - - ! '>='
+  - - ~>
     - !ruby/object:Gem::Version
-      version: '0'
-      segments:
-      - 0
-      hash: -574849791
+      version: 1.9.2
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: