cnnct4 0.0.1 → 0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 18acb8b810dae3fe6c06643688995e5a710057226b4d3086e062cdbc1a995063
-  data.tar.gz: 0e41015987b4b2b03ced04ed37b2ea04c89e5b0772824e2fa36fccaa3c4620fe
+  metadata.gz: 363606068c9689a8d4d83de1c88ec11ab708709c4fa62c0c91ebf2e0649f4b9e
+  data.tar.gz: 57a2aa44535326e55e547500771ac0354009b4bb1b3984c5c6e3abb222847ac0
 SHA512:
-  metadata.gz: 569d45620763f463c3d488f25fd00117a2d1287fb2923a1ec24f116a33e3c721996462f15bd1f4ab5b005a271d232b6fcc52fc095b6690bd48a031a50be1d4af
-  data.tar.gz: 724da28d85b5f721966bd24a4c287a35a945d600104e8514aee536971561d46ef097bf86d284c613312cc854ae5592fa0f16397cf302d8c4118ab26fa6b83f91
+  metadata.gz: 1d0f918cb97449beec87502501e30d2bbc8c6b365711bd017d769ac2dad38868380b5de736e5b14e4838addde8c32078b5bc333e5f638d4ab8c8a1ab4f45d507
+  data.tar.gz: 30778a4c2b72b780420311622d6dd67bc0bed3e7ff93a5f6989143e87b10b7ffcc86a501ab4fa26021fb99de88280443c99bca96c96e2226f0c7ffc2014af3b3

data/Gemfile.lock

@@ -1,13 +1,18 @@
 PATH
   remote: .
   specs:
-    cnnct4 (0.0.0)
+    cnnct4 (0.1.0)
       thor
 
 GEM
   remote: https://rubygems.org/
   specs:
+    coderay (1.1.3)
     diff-lcs (1.5.0)
+    method_source (1.0.0)
+    pry (0.14.2)
+      coderay (~> 1.1)
+      method_source (~> 1.0)
     rake (13.0.6)
     rspec (3.12.0)
       rspec-core (~> 3.12.0)
@@ -26,11 +31,14 @@ GEM
 
 PLATFORMS
   x86_64-darwin-21
+  x86_64-darwin-22
+  x86_64-linux
 
 DEPENDENCIES
   cnnct4!
+  pry
   rake (~> 13.0)
   rspec (~> 3.0)
 
 BUNDLED WITH
-   2.4.5
+   2.4.3

data/cnnct4.gemspec

@@ -31,6 +31,7 @@ Gem::Specification.new do |spec|
   # Uncomment to register a new dependency of your gem
   # spec.add_dependency "example-gem", "~> 1.0"
   spec.add_dependency "thor"
+  spec.add_development_dependency "pry"
   spec.add_development_dependency "rspec", "~> 3.2"
 
   # For more information and examples about making a new gem, check out our

data/lib/cnnct4/board.rb

@@ -2,13 +2,22 @@ class Board
   attr_reader :board_array
 
   def initialize
-    @board_array = Array.new(6) { Array.new(7, ".")}
+    @board_array = [
+      [Cell.new(0, 'A'), Cell.new(0, 'B'), Cell.new(0, 'C'), Cell.new(0, 'D'), Cell.new(0, 'E'), Cell.new(0, 'F'), Cell.new(0, 'G')],
+      [Cell.new(1, 'A'), Cell.new(1, 'B'), Cell.new(1, 'C'), Cell.new(1, 'D'), Cell.new(1, 'E'), Cell.new(1, 'F'), Cell.new(1, 'G')],
+      [Cell.new(2, 'A'), Cell.new(2, 'B'), Cell.new(2, 'C'), Cell.new(2, 'D'), Cell.new(2, 'E'), Cell.new(2, 'F'), Cell.new(2, 'G')],
+      [Cell.new(3, 'A'), Cell.new(3, 'B'), Cell.new(3, 'C'), Cell.new(3, 'D'), Cell.new(3, 'E'), Cell.new(3, 'F'), Cell.new(3, 'G')],
+      [Cell.new(4, 'A'), Cell.new(4, 'B'), Cell.new(4, 'C'), Cell.new(4, 'D'), Cell.new(4, 'E'), Cell.new(4, 'F'), Cell.new(4, 'G')],
+      [Cell.new(5, 'A'), Cell.new(5, 'B'), Cell.new(5, 'C'), Cell.new(5, 'D'), Cell.new(5, 'E'), Cell.new(5, 'F'), Cell.new(5, 'G')]
+    ]
   end
 
   def render
     puts " A B C D E F G"
     @board_array.each do |row|
-      print " #{row.join(" ")}"
+      mark_row = []
+      row.each {|cell| mark_row << cell.mark}
+      print " #{mark_row.join(" ")}"
       puts
     end
   end
@@ -20,8 +29,8 @@ class Board
       column = column.ord - 65
       row = 5
       while row >= 0
-        if @board_array[row][column] == "."
-          @board_array[row][column] = mark
+        if @board_array[row][column].mark == "."
+          @board_array[row][column].mark = mark
           return true
         else
           row -= 1
@@ -32,6 +41,13 @@ class Board
   end
 
   def reset
-    @board_array = Array.new(6) { Array.new(7, ".")}
+    @board_array = [
+      [Cell.new(0, 'A'), Cell.new(0, 'B'), Cell.new(0, 'C'), Cell.new(0, 'D'), Cell.new(0, 'E'), Cell.new(0, 'F'), Cell.new(0, 'G')],
+      [Cell.new(1, 'A'), Cell.new(1, 'B'), Cell.new(1, 'C'), Cell.new(1, 'D'), Cell.new(1, 'E'), Cell.new(1, 'F'), Cell.new(1, 'G')],
+      [Cell.new(2, 'A'), Cell.new(2, 'B'), Cell.new(2, 'C'), Cell.new(2, 'D'), Cell.new(2, 'E'), Cell.new(2, 'F'), Cell.new(2, 'G')],
+      [Cell.new(3, 'A'), Cell.new(3, 'B'), Cell.new(3, 'C'), Cell.new(3, 'D'), Cell.new(3, 'E'), Cell.new(3, 'F'), Cell.new(3, 'G')],
+      [Cell.new(4, 'A'), Cell.new(4, 'B'), Cell.new(4, 'C'), Cell.new(4, 'D'), Cell.new(4, 'E'), Cell.new(4, 'F'), Cell.new(4, 'G')],
+      [Cell.new(5, 'A'), Cell.new(5, 'B'), Cell.new(5, 'C'), Cell.new(5, 'D'), Cell.new(5, 'E'), Cell.new(5, 'F'), Cell.new(5, 'G')]
+    ]
   end
 end

data/lib/cnnct4/cell.rb

@@ -0,0 +1,10 @@
+class Cell
+  attr_reader :row_pos, :column_pos
+  attr_accessor :mark
+
+  def initialize (row_pos, column_pos)
+    @mark = "."
+    @row_pos = row_pos
+    @column_pos = column_pos
+  end
+end

data/lib/cnnct4/game.rb

@@ -19,7 +19,9 @@ class Game
 
   def check_for_win(array)
     array.each do |row|
-      row.each_cons(4) do |group|
+      mark_row = []
+      row.each {|cell| mark_row << cell.mark}
+      mark_row.each_cons(4) do |group|
         if group == ["X", "X", "X", "X"]
           @game_win = true
         elsif group == ["O", "O", "O", "O"] 
@@ -30,15 +32,13 @@ class Game
   end
 
   def check_for_draw
-    @game_draw = true if !@board.board_array.flatten.any?(/[.]/)
+    @game_draw = true if @board.board_array.flatten.none? {|cell| cell.mark == "."}
   end
   
   def vertical_sort
     @board.board_array.transpose
   end
 
-  # Look into .with_index
-  #possibly making both diagonal up and down one method with arguments
   def diagonal_up_sort
     padding = 5
     padded_matrix = []
@@ -60,4 +60,77 @@ class Game
     end
     padded_matrix.transpose.map {|array| array.compact}
   end
-end
+
+  def comp_check
+    if check_for_3(vertical_sort)
+      true
+    elsif check_for_3(@board.board_array)
+      true
+    elsif check_for_3(diagonal_up_sort)
+      true
+    elsif check_for_3(diagonal_down_sort)
+      true
+    else
+      false
+    end
+  end
+
+  def check_for_3(method)
+    catch(:done) do
+      method.each do |row|
+        row.each_cons(4) do |cell_row|
+          mark_row = []
+          cell_row.each {|cell| mark_row << cell.mark}
+          check_win(cell_row, mark_row)
+          check_block(cell_row, mark_row)
+        end
+      end
+      false
+    end
+  end
+  
+  def check_one_mark_down_and_place(cell_row, dot_pos)
+    cell_down = @board.board_array.flatten.select do |cell| 
+      cell.row_pos == cell_row[dot_pos].row_pos + 1 && cell.column_pos == cell_row[dot_pos].column_pos
+    end
+    if cell_down[0]&.mark != "."
+      @board.place(cell_row[dot_pos].column_pos, "O")
+      
+      throw(:done, true)
+    end
+  end
+  
+  def check_win(cell_row, mark_row)
+    if mark_row == [".", "O", "O", "O"]
+      dot_pos = 0
+      check_one_mark_down_and_place(cell_row, dot_pos)
+    elsif mark_row == ["O", ".", "O", "O"]
+      dot_pos = 1
+      check_one_mark_down_and_place(cell_row, dot_pos)
+    elsif mark_row == ["O", "O", ".", "O"]
+      dot_pos = 2
+      check_one_mark_down_and_place(cell_row, dot_pos)
+    elsif mark_row == ["O", "O", "O", "."]
+      dot_pos = 3
+      check_one_mark_down_and_place(cell_row, dot_pos)
+    end
+  end
+  
+  def check_block(cell_row, mark_row)
+    if mark_row == [".", "X", "X", "X"]
+      dot_pos = 0
+      check_one_mark_down_and_place(cell_row, dot_pos)
+    elsif mark_row == ["X", ".", "X", "X"]
+      dot_pos = 1
+      check_one_mark_down_and_place(cell_row, dot_pos)
+    elsif mark_row == ["X", "X", ".", "X"]
+      dot_pos = 2
+      check_one_mark_down_and_place(cell_row, dot_pos)
+    elsif mark_row == ["X", "X", "X", "."]
+      dot_pos = 3
+      check_one_mark_down_and_place(cell_row, dot_pos)
+    end
+  end
+end
+
+

data/lib/cnnct4/game_play.rb

@@ -7,9 +7,9 @@ include Playable
     @player1_name = nil
     @player2_name = nil
     @game = Game.new
-    @player_turns = [] 
+    @player1_turns = [] 
     @player2_turns = []
-    @comp_turns = [] 
+    @comp_turns = [] #Need functionality for comp_check turns to be shoveled here
     @player_wins = 0 
     @player2_wins = 0
     @comp_wins = 0 
@@ -19,10 +19,10 @@ include Playable
   def player1_turn
     column = gets.chomp
       if @game.board.place(column, 'X')
-        @player_turns << column
+        @player1_turns << column
         @game.win?
       else
-        puts 'That is not a valid selection, please select a new column'
+        invalid_selection_message
         player1_turn
       end
   end
@@ -33,19 +33,23 @@ include Playable
         @player2_turns << column
         @game.win?
       else
-        puts 'That is not a valid selection, please select a new column'
+        invalid_selection_message
         player2_turn
       end
   end
   
   def computer_turn
-    comp_column = (65 + rand(7)).chr
-    if @game.board.place(comp_column, 'O')
-    @comp_turns << comp_column
-    @game.win?
-    comp_column
-    else 
-      computer_turn
+    if @game.comp_check
+      @game.win?
+    else
+      comp_column = (65 + rand(7)).chr
+      if @game.board.place(comp_column, 'O')
+        @comp_turns << comp_column
+        @game.win?
+        comp_column
+      else 
+        computer_turn
+      end
     end
   end
 
@@ -64,35 +68,29 @@ include Playable
       obtain_player_names
       clear_terminal
     end
-    two_player_turns(@player1_name, @player2_name, @player_turns, @player2_turns)
+    two_player_turns(@player1_name, @player2_name, @player1_turns, @player2_turns)
     game_end_two_player
   end
 
   def turn_round
-    loop do
-      clear_terminal
-      show_last_moves('You', 'computer', @player_turns, @comp_turns)
-      render_board_with_lines
-      column_choice("intrepid player")
-      player1_turn
-      break if game_over?
-      computer_turn
-      break if game_over?
-    end
+    player_v_comp_turns('You', 'the computer', @player1_turns, @comp_turns)
     game_end
   end
 
   def game_end
     if @game.game_win == true
       clear_terminal
+      @game.board.render
       @player_wins += 1
       puts 'YOU WON! HOW COOL!'
     elsif @game.game_win == false
       clear_terminal
+      @game.board.render
       @comp_wins += 1
       puts "YOU LOST! You're not smart enough to beat a computer choosing random columns? Sad day."
     elsif @game.game_draw == true
       clear_terminal
+      @game.board.render
       @draws += 1
       puts "That was a draw. BOOOOOOOORRRRRRIIIIIINGGGGGGGG. You're literally not smart enough to beat a computer choosing random columns."
     end
@@ -104,14 +102,17 @@ include Playable
   def game_end_two_player
     if @game.game_win == true
       clear_terminal
+      @game.board.render
       @player_wins += 1
       puts "#{@player1_name.capitalize} WON! HOW COOL!"
     elsif @game.game_win == false
       clear_terminal
+      @game.board.render
       @player2_wins += 1
       puts "#{@player2_name.capitalize} WON! HOW COOL!"
     elsif @game.game_draw == true
       clear_terminal
+      @game.board.render
       @draws += 1
       puts "That was a draw. BOOOOOOOORRRRRRIIIIIINGGGGGGGG."
     end

data/lib/cnnct4/playable.rb

@@ -21,7 +21,7 @@ _________                                     __       _____
       \______  /\____|__  /\____|__  /_______  / \_______  /\___/   /_______  / |____|_  /
              \/         \/         \/        \/          \/                 \/         \/ '
   end
-  #don't know how to write a test for this. 
+   
   def reset_turns
     @game.board.reset
     @game.game_win = nil
@@ -31,6 +31,10 @@ _________                                     __       _____
     @comp_turns = []
   end
 
+  def invalid_selection_message
+    puts 'That is not a valid selection, please select a new column'
+  end
+
   def clear_terminal
     puts `clear`
   end
@@ -92,19 +96,18 @@ _________                                     __       _____
       break if game_over?
       clear_terminal
     end
+  end
 
-    def player_v_comp_turns(p1_name, p2_name, p1_turns, p2_turns)
-      loop do
-        clear_terminal
-        show_last_moves('You', 'computer', p1_turns, p2_turns)
-        render_board_with_lines
-        column_choice("intrepid player")
-        player1_turn
-        break if game_over?
-        computer_turn
-        break if game_over?
-      end
+  def player_v_comp_turns(p1_name, p2_name, p1_turns, p2_turns)
+    loop do
+      clear_terminal
+      show_last_moves(p1_name, p2_name, p1_turns, p2_turns)
+      render_board_with_lines
+      column_choice("intrepid player")
+      player1_turn
+      break if game_over?
+      computer_turn
+      break if game_over?
     end
   end
-
 end

data/lib/cnnct4/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Cnnct4
-  VERSION = "0.0.1"
+  VERSION = "0.1.0"
 end

data/lib/cnnct4.rb

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 require_relative "cnnct4/version"
+require_relative 'cnnct4/cell'
 require_relative 'cnnct4/board'
 require_relative 'cnnct4/game'
 require_relative 'cnnct4/game_play'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cnnct4
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.1.0
 platform: ruby
 authors:
 - Reid Miller
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2023-02-23 00:00:00.000000000 Z
+date: 2023-02-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -24,6 +24,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: pry
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -56,6 +70,7 @@ files:
 - exe/cnnct4
 - lib/cnnct4.rb
 - lib/cnnct4/board.rb
+- lib/cnnct4/cell.rb
 - lib/cnnct4/cli.rb
 - lib/cnnct4/game.rb
 - lib/cnnct4/game_play.rb