bloodymines 0.1.8 → 0.1.9

data/bin/bloodymines

@@ -9,39 +9,29 @@ class Bloodymines
   include TUI
 end
 
-# main app
+# parse command line options
 options = {}
 optparse = OptionParser.new do |opts|
   opts.on('-h','--help', 'display this screen') { puts opts; exit }
   opts.on('-d', '--difficulty DIFFICULTY', [:beginner, :intermediate, :expert],
-          "Set the difficulty of the game") do |d|
-            options[:difficulty] = d
+          "beginner, intermediate or expert") do |d|
+    options[:difficulty] = d
           end
 end
 
 begin
   optparse.parse!
 rescue OptionParser::MissingArgument, OptionParser::InvalidArgument
-  puts "The following difficulty levels are available: beginner, intermediate, expert"
   puts optparse
   exit
 end
 
+# start game as curses app
 game = Bloodymines.new(:difficulty => options[:difficulty])
-game.cursor_x = 0
-game.cursor_y = 0
 
 Curses.program do |scr|
   while true
-    game.draw_field
-    case getch
-    when Key::UP : game.move(:direction => :up)
-    when Key::DOWN : game.move(:direction => :down)
-    when Key::LEFT : game.move(:direction => :left)
-    when Key::RIGHT : game.move(:direction => :right)
-    when 32 : game.uncover(game.cursor_x, game.cursor_y)
-    when 27, ?q, ?Q : break
-    end
+    game.turn
     if game.ended?
       game.draw_field
       setpos(0, 1)
@@ -51,11 +41,11 @@ Curses.program do |scr|
     end
   end
 
- close_screen
- if game.result[:finished]
-   puts "You completed the game on #{game.difficulty.to_s.upcase}!"
- else
-   puts "You did not manage to finish the game."
- end
- puts "Your final score was: #{game.result[:score]}"
+  close_screen
+  if game.result[:finished]
+    puts "You completed the game on #{game.difficulty.to_s.upcase}!"
+  else
+    puts "You did not manage to finish the game."
+  end
+  puts "Your final score was: #{game.result[:score]}"
 end

data/lib/bloodymines/tui.rb

@@ -18,6 +18,8 @@ module TUI
   attr_accessor :cursor_x, :cursor_y
 
   def draw_field
+    @cursor_x = @cursor_x || 0
+    @cursor_y = @cursor_y || 0
     clear
     0.upto(@width - 1) do |x|
       0.upto(@height - 1) do |y|
@@ -64,4 +66,17 @@ module TUI
       @cursor_x += 1 if @cursor_x < @width - 1
     end
   end
+
+  def turn
+    draw_field
+    case getch
+    when Key::UP : move(:direction => :up)
+    when Key::DOWN : move(:direction => :down)
+    when Key::LEFT : move(:direction => :left)
+    when Key::RIGHT : move(:direction => :right)
+    when 32 : uncover(@cursor_x, @cursor_y)
+    when 27, ?q, ?Q : break
+    end
+    
+  end
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: bloodymines
 version: !ruby/object:Gem::Version 
-  hash: 11
+  hash: 9
   prerelease: false
   segments: 
   - 0
   - 1
-  - 8
-  version: 0.1.8
+  - 9
+  version: 0.1.9
 platform: ruby
 authors: 
 - !binary |