ruby_armor 0.0.3alpha → 0.0.4alpha

data/bin/ruby_armor

@@ -1,3 +1,7 @@
 #!/usr/bin/env ruby
 
-require "ruby_armor"
+# For running from the gem, so path will already be set.
+
+require "ruby_armor"
+
+RubyArmor::Window.new.show unless defined? Ocra

data/config/default_config.yml

@@ -0,0 +1,5 @@
+---
+
+:description: This is the config file for RubyArmor and does not affect the game in any way if using RubyWarrior natively.
+:turn_delay: 0.5 # seconds
+:warrior_class: :valkyrie # :valkyrie, :mercenary, :monk, :burglar

data/lib/ruby_armor/base_user_data.rb

@@ -0,0 +1,38 @@
+module RubyArmor
+  class BaseUserData
+    #include Log
+
+    def initialize(user_file, default_file)
+      @user_file = user_file
+
+      @data = if File.exists?(@user_file)
+                begin
+                  YAML.load_file @user_file
+                rescue Psych::SyntaxError                  #log.warn { "Failed to load #{@user_file}; cleared settings" }
+
+                  {}
+                end
+              else
+                {}
+              end
+
+      @data = YAML.load_file(default_file).deep_merge @data
+
+      #log.info { "Read and merged user data:\n#{@data}" }
+
+      save
+    end
+
+    protected
+    def data; @data; end
+
+    protected
+    def save
+      FileUtils.mkdir_p File.dirname(@user_file)
+
+      File.open(@user_file, "w") {|f| YAML.dump(@data, f) }
+
+      #log.info { "Saved #{File.basename(@user_file)}" }
+    end
+  end
+end

data/lib/ruby_armor/states/choose_profile.rb

@@ -1,11 +1,15 @@
 module RubyArmor
   class ChooseProfile < Fidgit::GuiState
+    DEFAULT_WARRIOR_CLASS = :valkyrie
+
     def setup
       super
 
       # Create the game.
       @game = RubyWarrior::Game.new
 
+      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
 
@@ -13,44 +17,73 @@ module RubyArmor
 
         # Use existing profile.
         vertical padding: 0, align_h: :center do
-          @game.profiles.each do |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} - #{profile.tower.name} - level #{profile.level_number} - 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)) do
-              play profile
+          scroll_window height: 200, 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}"
+
+              # Can be disabled because of a bug in RubyWarrior paths.
+              button title, button_options.merge(tip: tip, enabled: File.directory?(profile.tower_path),
+                                                 icon: warrior_sprites[0, Play::WARRIORS[config.warrior_class]], icon_options: { factor: 2 }) do
+                play profile, config
+              end
             end
           end
         end
 
         # Option to create a new profile.
-        horizontal align: :center, padding: 0 do
-          @new_name = text_area width: 300, max_height: 60, font_height: 24 do |_, text|
-            duplicate = @game.profiles.any? {|p| p.warrior_name.downcase == text.downcase }
-            @new_profile_button.enabled = !(text.empty? or duplicate)
+        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|
+              duplicate = @game.profiles.any? {|p| p.warrior_name.downcase == text.downcase }
+              @new_profile_button.enabled = !(text.empty? or duplicate)
+            end
+
+            @new_profile_button = button "New", button_options.merge(width: 90, tip: "Create a new profile") do
+              play *new_profile(@new_name.text)
+            end
+
+            new_name = File.basename File.expand_path("~")
+            new_name = "Player" if new_name.empty?
+            @new_name.text = new_name
           end
 
-          @new_profile_button = button "New", button_options.merge(width: 90, tip: "Create a new profile") do
-            play new_profile(@new_name.text)
+          # Choose class; just cosmetic.
+          @warrior_class = group align_h: :center do
+            horizontal padding: 0, align_h: :center do
+              Play::WARRIORS.each do |warrior, row|
+                radio_button "", warrior, tip: "Play as a #{warrior.capitalize} (The difference between classes is purely cosmetic!)",
+                             :icon => warrior_sprites[0, row], :icon_options => { :factor => 4 }
+              end
+            end
           end
 
-          new_name = File.basename File.expand_path("~")
-          new_name = "Player" if new_name.empty?
-          @new_name.text = new_name
+          @warrior_class.value = DEFAULT_WARRIOR_CLASS
         end
       end
     end
 
-    def play(profile)
+    def finalize
+      super
+      container.clear
+    end
+
+    def play(profile, config)
       @game.instance_variable_set :@profile, profile
-      push_game_state Play.new(@game)
+      push_game_state Play.new(@game, config)
     end
 
     def new_profile(name)
       new_profile = RubyWarrior::Profile.new
       new_profile.tower_path = @game.towers[0].path
       new_profile.warrior_name = name
-      new_profile
+
+      config = WarriorConfig.new new_profile
+      config.warrior_class = @warrior_class.value
+
+      [new_profile, config]
     end
   end
 end

data/lib/ruby_armor/states/play.rb

@@ -7,6 +7,22 @@ module RubyArmor
     SPRITE_OFFSET_X, SPRITE_OFFSET_Y = 64, 64
     SPRITE_SCALE = 5
 
+    # Sprites to show based on player facing.
+    FACINGS = {
+        :east => 0,
+        :south => 1,
+        :west => 2,
+        :north => 3,
+    }
+
+    # Rows in the warriors.png to use for each warrior type.
+    WARRIORS = {
+        :valkyrie => 0,
+        :mercenary => 1,
+        :monk => 2,
+        :burglar => 3,
+    }
+
     ENEMY_TYPES = [
         RubyWarrior::Units::Wizard,
         RubyWarrior::Units::ThickSludge,
@@ -23,8 +39,8 @@ module RubyArmor
 
     trait :timer
 
-    def initialize(game)
-      @game = game
+    def initialize(game, config)
+      @game, @config = game, config
       super()
     end
 
@@ -34,9 +50,12 @@ module RubyArmor
       RubyWarrior::UI.proxy = self
 
       @tiles = SpriteSheet.new "tiles.png", TILE_WIDTH, TILE_HEIGHT, 8
-      @sprites = SpriteSheet.new "characters.png", SPRITE_WIDTH, SPRITE_HEIGHT, 4
+      @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
           # Space for the game graphics.
@@ -44,26 +63,32 @@ module RubyArmor
 
           vertical padding: 0, height: $window.height * 0.5, width: 100 do
             # Labels at top-right.
-            @tower_label = label ""
-            @level_label = label "Level:"
-            @turn_label = label "Turn:"
-            @health_label = label "Health:"
+            @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, border_thickness: 0, }
-            @start_button = button "Start", button_options do
+            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
 
-            @reset_button = button "Reset", button_options do
+            @reset_button = button "Reset", button_options.merge(tip: "Restart the level") do
               prepare_level
             end
 
-            @hint_button = button "Hint", button_options do
+            @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 do
+            @continue_button = button "Continue", button_options.merge(tip: "Climb up the stairs to the next level") do
               @game.prepare_next_level
               prepare_level
             end
@@ -71,11 +96,13 @@ module RubyArmor
             # 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|
-                @turn_duration = value * 0.001
+              @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
-              @turn_duration_slider.value = 500
+
+              @turn_duration_slider.value = (@config.turn_delay * 1000).round
             end
           end
         end
@@ -94,7 +121,7 @@ module RubyArmor
                   # Default editor for Windows.
                   ENV['EDITOR'] = "notepad" if Gem.win_platform? and ENV['EDITOR'].nil?
 
-                  tip = ENV['EDITOR'] ? "Edit file in #{ ENV['EDITOR']}" : "ENV['EDITOR'] not set"
+                  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}"
@@ -159,22 +186,30 @@ module RubyArmor
 
       # Continually poll the player code file to see when it is edited.
       stop_timer :refresh_code
-      converted_line_endings = false
+      friendly_line_endings = false
       every(100, :name => :refresh_code) do
         begin
           player_file = File.join level.player_path, "player.rb"
           player_code = File.read player_file
-          unless @code_display.stripped_text.strip == player_code.strip
+          stripped_code = player_code.strip
+          @loaded_code ||= ""
+          unless @loaded_code == stripped_code
+            $stdout.puts "Detected change in player.rb"
+
             # Rewrite file as Windows text file if it is the default (a unix file).
-            if !converted_line_endings and Gem.win_platform? and
-                (File.open(player_file, "rb", &:read).strip == player_code.strip)
+            # If the file loaded in binary == the code loaded as text, then the file
+            # must have Unix endings (\n => same as a text file in memory) rather than
+            # Windows endings (\r\n => different than text file in memory).
+            if !friendly_line_endings and Gem.win_platform? and
+                (File.open(player_file, "rb", &:read).strip == stripped_code)
 
               File.open(player_file, "w") {|f| f.puts player_code }
               $stdout.puts "Converted to Windows line endings: #{player_file}"
             end
-            converted_line_endings = true # Either will have or don't need to.
+            friendly_line_endings = true # Either will have or don't need to.
 
-            @code_display.text = player_code
+            @code_display.text = stripped_code
+            @loaded_code = stripped_code
             prepare_level
           end
         rescue Errno::ENOENT
@@ -182,7 +217,7 @@ module RubyArmor
         end
       end
 
-      @_level = profile.current_level
+      @level = profile.current_level # Need to store this because it gets forgotten by the profile/game :(
       @turn = 0
       @playing = false
       level.load_level
@@ -217,7 +252,7 @@ module RubyArmor
       @reset_button.enabled = true
       @start_button.enabled = false
       @playing = true
-      @take_next_turn_at = Time.now + @turn_duration
+      @take_next_turn_at = Time.now + @config.turn_delay
       refresh_labels
     end
 
@@ -240,17 +275,18 @@ module RubyArmor
       @warrior_pattern ||= /([@G])/ # Player and golem
 
       # Used in log.
-      string.gsub(/\|(.*)\|/i) {|c|
-                c.gsub(@enemy_pattern, '<c=ff0000>\1</c>')
-                 .gsub(@friend_pattern, '<c=00dd00>\1</c>')
-                 .gsub(@warrior_pattern, '<c=aaaaff>\1</c>')
+      string.gsub(/\|.*\|/i) {|c|
+                 c = c.gsub @enemy_pattern, '<c=ff0000>\1</c>'
+                 c.gsub! @friend_pattern, '<c=00dd00>\1</c>'
+                 c.gsub! @warrior_pattern, '<c=aaaaff>\1</c>'
+                 c.gsub '|', '<c=777777>|</c>'
              }
             .gsub(/^(#{profile.warrior_name}.*)/, '<c=aaaaff>\1</c>')   # Player doing stuff.
-            .gsub(/(\-{3,}| \| )/, '<c=777777>\1</c>')                  # Walls.
+            .gsub(/(\-{3,})/, '<c=777777>\1</c>')                  # Walls.
     end
 
     def profile; @game.profile; end
-    def level; @_level; end
+    def level; @level; end
     def floor; level.floor; end
 
     def play_turn
@@ -268,7 +304,7 @@ module RubyArmor
       @turn += 1
       level.time_bonus -= 1 if level.time_bonus > 0
 
-      @take_next_turn_at = Time.now + @turn_duration
+      @take_next_turn_at = Time.now + @config.turn_delay
 
       refresh_labels
 
@@ -297,11 +333,15 @@ module RubyArmor
       self.puts
       self.puts exception.backtrace.join("\n")
 
-      exception.message =~ /:(\d+):/
-      exception_line = $1.to_i - 1
-      code_lines = @code_display.text.split "\n"
-      code_lines[exception_line] = "<c=ff0000>#{code_lines[exception_line]}</c>"
-      @code_display.text = code_lines.join "\n"
+      # 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[exception_line] = "<c=ff0000>{code_lines[exception_line]}</c>"
+      #@code_display.text = code_lines.join "\n"
+
+      @start_button.enabled = false
+
       @exception = exception
     end
 
@@ -354,19 +394,19 @@ module RubyArmor
           floor.units.each do |unit|
             sprite = case unit
                        when RubyWarrior::Units::Warrior
-                         @sprites[0, 0]
+                         @warrior_sprites[FACINGS[unit.position.direction], WARRIORS[@config.warrior_class]]
                        when RubyWarrior::Units::Wizard
-                         @sprites[0, 1]
+                         @mob_sprites[0, 1]
                        when RubyWarrior::Units::ThickSludge
-                         @sprites[2, 1]
+                         @mob_sprites[2, 1]
                        when RubyWarrior::Units::Sludge
-                         @sprites[1, 1]
+                         @mob_sprites[1, 1]
                        when RubyWarrior::Units::Archer
-                         @sprites[3, 1]
+                         @mob_sprites[3, 1]
                        when RubyWarrior::Units::Captive
-                         @sprites[0, 2]
+                         @mob_sprites[0, 2]
                        when RubyWarrior::Units::Golem
-                         @sprites[1, 2]
+                         @mob_sprites[1, 2]
                        else
                          raise "unknown unit: #{unit.class}"
                      end
@@ -374,7 +414,7 @@ module RubyArmor
             sprite.draw unit.position.x * SPRITE_WIDTH, unit.position.y * SPRITE_HEIGHT, unit.position.y
 
             if unit.bound?
-              @sprites[2, 2].draw unit.position.x * SPRITE_WIDTH, unit.position.y * SPRITE_HEIGHT, unit.position.y
+              @mob_sprites[2, 2].draw unit.position.x * SPRITE_WIDTH, unit.position.y * SPRITE_HEIGHT, unit.position.y
             end
           end
         end

data/lib/ruby_armor/version.rb

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

data/lib/ruby_armor/warrior_config.rb

@@ -0,0 +1,24 @@
+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"
+
+    def initialize(profile)
+      super File.join(profile.player_path, CONFIG_FILE), DEFAULT_CONFIG
+    end
+
+    def turn_delay; data[:turn_delay]; end
+    def turn_delay=(delay)
+      data[:turn_delay] = delay
+      save
+    end
+
+    def warrior_class; data[:warrior_class]; end
+    def warrior_class=(warrior_class)
+      data[:warrior_class] = warrior_class
+      save
+    end
+  end
+end

data/lib/ruby_armor.rb

@@ -21,6 +21,7 @@ require "ruby_armor/sprite_sheet"
 require "ruby_armor/states/choose_profile"
 require "ruby_armor/states/play"
 require "ruby_armor/window"
+require "ruby_armor/warrior_config"
 
 ROOT_PATH = File.expand_path('../../', __FILE__)
 
@@ -33,5 +34,3 @@ Font.autoload_dirs.unshift File.join(media_dir, 'fonts')
 
 Fidgit::Element.schema.merge_schema! YAML.load(File.read(File.expand_path('config/gui/schema.yml', ROOT_PATH)))
 
-RubyArmor::Window.new.show
-

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ruby_armor
 version: !ruby/object:Gem::Version
-  version: 0.0.3alpha
+  version: 0.0.4alpha
   prerelease: 5
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-02-25 00:00:00.000000000 Z
+date: 2012-02-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rubywarrior
-  requirement: &28574112 !ruby/object:Gem::Requirement
+  requirement: &25413276 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: 0.1.2
   type: :runtime
   prerelease: false
-  version_requirements: *28574112
+  version_requirements: *25413276
 - !ruby/object:Gem::Dependency
   name: gosu
-  requirement: &28573560 !ruby/object:Gem::Requirement
+  requirement: &25412196 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: 0.7.41
   type: :runtime
   prerelease: false
-  version_requirements: *28573560
+  version_requirements: *25412196
 - !ruby/object:Gem::Dependency
   name: chingu
-  requirement: &28573128 !ruby/object:Gem::Requirement
+  requirement: &25411440 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,18 +43,29 @@ dependencies:
         version: 0.9rc7
   type: :runtime
   prerelease: false
-  version_requirements: *28573128
+  version_requirements: *25411440
 - !ruby/object:Gem::Dependency
   name: fidgit
-  requirement: &28572804 !ruby/object:Gem::Requirement
+  requirement: &25409844 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.2.1
+        version: 0.2.2
   type: :runtime
   prerelease: false
-  version_requirements: *28572804
+  version_requirements: *25409844
+- !ruby/object:Gem::Dependency
+  name: releasy
+  requirement: &25406592 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.2.2
+  type: :development
+  prerelease: false
+  version_requirements: *25406592
 description: 
 email:
 - bil.bagpuss@gmail.com
@@ -63,7 +74,9 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
+- config/default_config.yml
 - config/gui/schema.yml
+- lib/ruby_armor/base_user_data.rb
 - lib/ruby_armor/floating_text.rb
 - lib/ruby_armor/ruby_warrior_ext/abilities/rest.rb
 - lib/ruby_armor/ruby_warrior_ext/position.rb
@@ -73,12 +86,14 @@ files:
 - lib/ruby_armor/states/choose_profile.rb
 - lib/ruby_armor/states/play.rb
 - lib/ruby_armor/version.rb
+- lib/ruby_armor/warrior_config.rb
 - lib/ruby_armor/window.rb
 - lib/ruby_armor.rb
 - media/fonts/Licence.txt
 - media/fonts/ProggyCleanSZ.ttf
-- media/images/characters.png
+- media/images/mobs.png
 - media/images/tiles.png
+- media/images/warriors.png
 - README.md
 - bin/ruby_armor
 homepage: http://spooner.github.com/libraries/ruby_armor/
@@ -96,7 +111,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 39949075
+      hash: -574849791
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: