minesweeper-cl 0.1.2 → 1.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c4c480ca41fdede1f0ab25f66f88d2f6b4f023b6
-  data.tar.gz: 17dff4c4323f1f26723b0cb58a48bbb40276f644
+  metadata.gz: ddfac9f3e1ba4cd189b026bafc4fb5285fd32a6a
+  data.tar.gz: fd73a710d135c59ac590f20938d0b4456d6b49de
 SHA512:
-  metadata.gz: e81ce953573f91a17a9854e2552a5b9018b906b29c50a5b66b71b5ddf58d24f6dfcc5327fb9d5e08808ae4a33c9bff7d8d4da912753c2aea8005be41aac35ee8
-  data.tar.gz: 70b6a22055d4974f1192a877337716e0aaf464c86b4404c9c30adda72a9de425eb473293c28964c7c7e7f06c75852f07afd116cd794ab49907e2383fd5d9d330
+  metadata.gz: 152addc517e56e4b3df345d3c23a1f433e1941c9f90b7f62565ce93f3f89dd7fe640a0654497286c50718a515d5f805514764df6e1ec40700c4d6f481808027e
+  data.tar.gz: 2ffc81e0202a8802a77620c0f81f7b4ef938b4505bdfa90a7d01105c4562a1e4c57dbfaa9901e10bcda8c4def9495e679aaee545f95293fd1a0acbba9291b701

data/bin/minesweeper

@@ -9,9 +9,9 @@ puts "Welcome to the game of minesweeper!"
 
 # Make the parser for parsing the data
 begin
-  options = MinesweeperParser.new.parse!(ARGV)
+  options = MinesweeperParser.new.parse(ARGV)
 rescue OptionParser::MissingArgument, OptionParser::InvalidArgument
-  help_msg = MinesweeperParser.parse!(["-h"])
+  help_msg = MinesweeperParser.new.parse(["-h"])
   puts help_msg
 end
 
@@ -29,8 +29,12 @@ while !game.game_over? && !game.win? do
 end
 
 if game.game_over?
+  puts "\n Underlying board shown below\n"
+  game.print_ending_board
   puts "Oops! You selected a bomb. Please play again!"
 elsif game.win?
+  puts "\n Underlying board shown below\n"
+  game.print_ending_board
   puts "Congrats you won the game!"
 end
 

data/lib/game_board.rb

@@ -1,6 +1,5 @@
 # GameBoard class will be used by the minesweeper game to keep track of tiles, 
 # bombs, and the conditions necessary to win the game.
-$LOAD_PATH.unshift("#{File.dirname(__FILE__)}/")
 require 'game_tile'
 
 class GameBoard
@@ -16,7 +15,7 @@ class GameBoard
       cols.times do |column|
         if rand < bomb_chance
           @board["(#{row}, #{column})"] = GameTile.new(self, nil, nil, nil, nil, nil, nil, nil, nil, true)
-          @win_value -= 1
+          # @win_value -= 1
         else
           @board["(#{row}, #{column})"] = GameTile.new(self, nil, nil, nil, nil, nil, nil, nil, nil, false)
         end

data/lib/game_tile.rb

@@ -20,7 +20,7 @@ class GameTile
     }
     @is_bomb = is_bomb
     @adjacent_bombs = 0
-    @adjacent_zeroes = {}
+    @adjacent_zeroes = []
     @been_played = false
     @been_flagged = false
     @board = board
@@ -45,22 +45,30 @@ class GameTile
   # This method will "play" all of the adjacent cells that have zero mines surrounding them.
   # The minesweeper game that comes standard with most computers has this behavior.
   def find_adjacent_zeroes
-    @adjacent.each do |key, value|
+    @adjacent.each do |key, tile|
       begin  
-        if value.adjacent_bombs == 0
-          @adjacent_zeroes[key] = value
+        if tile.adjacent_bombs == 0
+          @adjacent_zeroes << tile
         end
       rescue
       end
     end 
   end
   
-  def play_adjacent_zeroes
-    @adjacent_zeroes.each do |key, value|
-      value.adjacent_zeroes.each do |key1, value1|
-        if !value1.been_played  
-          value1.been_played = true
-          @board.num_played += 1
+  # Recusively play all of the zero tiles around the tile that has been played.
+  # The recursion stops when the method reaches a tile that has adjacent bombs.
+  def play_adjacent_zeroes(board)
+    if @adjacent_bombs > 0
+      @been_played = true
+      board.num_played += 1
+      return
+    else
+      board.num_played += 1 unless !@been_played
+      @been_played = true
+      @adjacent.each do |key, tile|
+        if !tile.nil? && !tile.been_played
+          tile.been_played = true
+          tile.play_adjacent_zeroes(board)
         end
       end
     end

data/lib/minesweeper.rb

@@ -9,9 +9,9 @@ puts "Welcome to the game of minesweeper!"
 
 # Make the parser for parsing the data
 begin
-  options = MinesweeperParser.new.parse!(ARGV)
+  options = MinesweeperParser.new.parse(ARGV)
 rescue OptionParser::MissingArgument, OptionParser::InvalidArgument
-  help_msg = MinesweeperParser.parse!(["-h"])
+  help_msg = MinesweeperParser.new.parse(["-h"])
   puts help_msg
 end
 
@@ -29,8 +29,12 @@ while !game.game_over? && !game.win? do
 end
 
 if game.game_over?
+  puts "\n Underlying board shown below\n"
+  game.print_ending_board
   puts "Oops! You selected a bomb. Please play again!"
 elsif game.win?
+  puts "\n Underlying board shown below\n"
+  game.print_ending_board
   puts "Congrats you won the game!"
 end
 

data/lib/minesweeper_game.rb

@@ -27,7 +27,6 @@ class MinesweeperGame
       end
       puts
     end
-    
   end
 
   def play_the_game
@@ -37,18 +36,18 @@ class MinesweeperGame
     puts
     player_choice = gets.chomp
 
-    if /^(help|h)\z/.match(player_choice) then print_help_message end
+    if /^(help|h)\z/.match(player_choice.downcase) then print_help_message end
 
     # Now match the player response with a regular expression
-    while /^([pfPF]) (\d){1,2}, (\d){1,2}\z/.match(player_choice) == nil
+    while /^([pfPF]) (\d{1,2}), (\d{1,2})\z/.match(player_choice) == nil
       puts "Please put two numbers corresponding to the row and column that you'd like to play in the form"
       puts "<pf> <row>, <column>"
       puts "Numbers greater than the number of rows or cols will be truncated to the max row/col"
       puts
       player_choice = gets.chomp
-      if /^(help|h)\z/.match(player_choice) then print_help_message end
+      if /^(help|h)\z/.match(player_choice.downcase) then print_help_message end
     end
-    match = /^([pfPF]) (\d){1,2}, (\d){1,2}\z/.match(player_choice)
+    match = /^([pfPF]) (\d{1,2}), (\d{1,2})\z/.match(player_choice)
     row = match[2].to_i
     col = match[3].to_i
 
@@ -72,15 +71,16 @@ class MinesweeperGame
     if @board.board["(#{row}, #{column})"].is_bomb?
       @game_over = true
     else
+      @board.num_played += 1 unless @board.board["(#{row}, #{column})"].been_played || @board.board["(#{row}, #{column})"].adjacent_bombs == 0
       @board.board["(#{row}, #{column})"].been_played = true
-      @board.num_played += 1
       if @board.board["(#{row}, #{column})"].adjacent_bombs == 0
-        @board.board["(#{row}, #{column})"].play_adjacent_zeroes
+        @board.board["(#{row}, #{column})"].play_adjacent_zeroes(@board)
       end
       if @board.num_played == @board.win_value
         @win = true
       end
     end
+    
   end
  
   def flag_tile(row, column)
@@ -88,8 +88,8 @@ class MinesweeperGame
       @board.board["(#{row}, #{column})"].been_flagged = false
     else
       @board.board["(#{row}, #{column})"].been_flagged = true
+      @board.num_played += 1 unless @board.board["(#{row}, #{column})"].been_played
       @board.board["(#{row}, #{column})"].been_played = true
-      @board.num_played += 1
       if @board.num_played == @board.win_value
         @win = true
       end
@@ -103,6 +103,20 @@ class MinesweeperGame
   def win?
     @win
   end
+
+  def print_ending_board
+    @rows.times do |row|
+      @columns.times do |col|
+        if @board.board["(#{row}, #{col})"].is_bomb? 
+          print "[ *] " 
+        else
+          print "[ " + @board.board["(#{row}, #{col})"].adjacent_bombs.to_s + "] "
+        end
+      end
+      puts
+    end
+  end
+
   
   private
     def print_help_message

data/lib/minesweeper_parser.rb

@@ -9,7 +9,7 @@ class MinesweeperParser
   def initialize
   end
 
-  def parse!(args)
+  def parse(args)
     options = OpenStruct.new
     options.rows_cols_chance = {}
     options.inplace = false

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: minesweeper-cl
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 1.0.1
 platform: ruby
 authors:
 - gr1zzly_be4r