nraya 0.0.5 → 0.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1c1802e4a9d9d4f368836a482f9dae706aae585c
-  data.tar.gz: 55b51135ed17a5d74c44297e4f5fc06f02ced012
+  metadata.gz: dc3e2dff8f3f3ee27bfa2839435adfba9291890f
+  data.tar.gz: 5d39881fe3b442dcb29ba24990dafa305b0eb541
 SHA512:
-  metadata.gz: 3c636c411ab031a54c4d94eaba75acb902652fbd43bc88cf9d4d4ffe7e194f187565cdb54dca58dd1a03a1bcda6beee10e6d6cdaeac1597b585ae408b9a4d976
-  data.tar.gz: 324d2f24acaf843985f7194b352692c04482aa50781472c662ac8e2688581d6ffdbc3b894b8ae82aac5c033bc07fd390862920e8d589b0df8a23fbf712610845
+  metadata.gz: 8ee706ba6b0ba7cdc41b1985bb4aa69edeb190fc124978a858dec7aa2d0b3d4a672281039e3d6c2dc7086b42fedd120e9540c10453e125b956c55342b0be7b0b
+  data.tar.gz: 06ac1c8fd719eabbd302bd419c339132202d62cf2cbddb2b47989dce18d90c73bc71e0cab736555597b4bca2c5c2bf744f43ea9b530c77cf375c35ad32ffc4e2

data/lib/main.rb

@@ -3,7 +3,7 @@ require 'player'
 require 'nrayaex'
 
 class Game
-  attr_reader :cols, :rows, :n, :x, :tokens
+  attr_reader :cols, :rows, :n, :x, :tokens, :winner
   def initialize(n, players)
     @cols = 2*n+1
     @rows = 2*n-1
@@ -11,6 +11,7 @@ class Game
     @players = players
     @tokens = ((2*n-1)*(2*n-2)/players)
     @playersArray = Array.new()
+    @winner = false
   end
 
   def initGame
@@ -36,25 +37,25 @@ class Game
   end
 
   def turns
-    player = @playersArray.shift
-    if player.tokens != 0
-      $stdout.print "> Enter the column that you like play "
-      $stdout.print "(#{player.name.chomp} :: #{player.sym} :: #{player.tokens}): "
-      $stdout.flush
-      x = gets.to_i
-      y = $board.setPoint(x, player.sym)
-      player.setPosition(x,y)
-      player.getPositions()
-      player.restToken()
-      @playersArray.push(player)
-    else
-      raise NoMoreTokens
-    end
-    if player.checkWin == true then
-      puts "Congrats #{player.name.chomp}! You won on nraya game!"
-      raise WeHaveWin
-    else
-      turns()
+    while @winner == false do
+      player = @playersArray.shift
+      if player.tokens != 0
+        $stdout.print "> Enter the column that you like play "
+        $stdout.print "(#{player.name.chomp} :: #{player.sym} :: #{player.tokens}): "
+        $stdout.flush
+        x = gets.to_i
+        y = $board.setPoint(x, player.sym)
+        player.setPosition(x,y)
+        player.restToken()
+        @playersArray.push(player)
+      else
+        raise NoMoreTokens
+      end
+      if player.checkWin == true then
+        @winner = true
+        puts "Congrats #{player.name.chomp}! You won on nraya game!"
+        raise WeHaveWin
+      end
     end
   end
 end

data/lib/player.rb

@@ -6,7 +6,7 @@ class Player
     @name = name
     @sym = sym
     @tokens = tokens
-    @positions = Array.new()
+    @positions = Array.new($game.cols) {Array.new($game.cols, '.')}
   end
 
   public
@@ -15,34 +15,28 @@ class Player
   end
 
   def setPosition(x,y)
-    point = [x,y]
-    @positions.push(point)
-  end
-
-  def getPositions
-    return @positions
+    @positions[y][x-1] = @sym
   end
   
   def checkWin
     #V: Vertical - #H: Horizontal - DR: Diagonal Right - DL: Diagonal Left
     i, j, k, v, h, dr, dl = [0]*7
-    matriz = $board.getMatriz
-    until i >= $game.rows do
+    matriz = @positions
+    matrizSize = matriz.size
+    until i >= matrizSize do
       j = 0
-      until j >= $game.cols do
+      until j >= matrizSize do
         if matriz[j][i] == @sym then v += 1 else v = 0 end
-        if matriz[i+2][j] == @sym then h += 1 else h = 0 end
-        if matriz[i][j] == @sym && i > ($game.rows - $game.n + 1) then
+        if matriz[i][j] == @sym then h += 1 else h = 0 end
+        if matriz[i][j] == @sym && i < (matrizSize - $game.n + 1) then
           k = 0
-          until k >= $game.n
+          until k >= $game.n do
             if matriz[i+k][j+k] == @sym then dl += 1 else dl = 0 end
             if matriz[i+k][j-k] == @sym then dr += 1 else dr = 0 end
             k += 1
           end
         end
-        if ( v == $game.n || h == $game.n || dr == $game.n || dl == $game.n ) then
-          return true
-        end
+        if ( v == $game.n || h == $game.n || dr == $game.n || dl == $game.n ) then return true end
         j += 1
       end
       i += 1

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: nraya
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.6
 platform: ruby
 authors:
 - Josue Daniel Bustamante - Santiago Baena