console-tetris 0.1.3 → 0.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ec554203ec195d6a53199cf13febb46771d537cd
-  data.tar.gz: c10cc6150bb6d5ca6d9d66521b51f5b33600291f
+  metadata.gz: 9e49ef4242beccb88b45d908f61f8853712db7d4
+  data.tar.gz: bc42a43f768919cc054fc67f7cfbe589604a12a2
 SHA512:
-  metadata.gz: 3459c8086bc005d632fe6588078104b73d1e9e8401697d3546e47f23c17ae0847f2251c86c874f6787067eab32c25d0e6250b0b08f85d32d527bc58c2a868edb
-  data.tar.gz: 503cd47c13fa2f107f6b895605dff24c609824232dc612c950d2490c0008561b260d78d98e0de2f87db6499ad1381133e1ebbf0b953cd09403732de7637e7a00
+  metadata.gz: 71ca0528a5749153d655461b5dbbab43fc6ff8fc7cb70c0919c7eddab185dfe2a86413fd2d89590a9c008360e9dc1b4b9db721902740aeece23b039aa1b72c4e
+  data.tar.gz: f9816aab6389c409e77f9ab1e54c1acf512f71a7d33755422f159f4271f2f89a1faaaf0f188fdd4f3775cf4896ba0c42f967661e23f46349e61587cd3d2b2400

data/lib/console_tetris/background_board.rb

@@ -12,7 +12,7 @@ class ConsoleTetris
     end
 
     def stack!(tetrimino)
-      tetrimino.block.each.with_index {|row, i| row.each.with_index {|value, j| @board[tetrimino.y_coordinate + i][tetrimino.x_coordinate + j] |= value } }
+      tetrimino.block.each.with_index {|row, i| row.each.with_index {|value, j| @board[tetrimino.y_coordinate + i][tetrimino.x_coordinate + j] += value } }
     end
 
     def overlap?(tetrimino)
@@ -20,13 +20,13 @@ class ConsoleTetris
         row.map.with_index.any? {|value, j|
           return false if @board[tetrimino.y_coordinate + i].nil?
 
-          @board[tetrimino.y_coordinate + i][tetrimino.x_coordinate + j] & value > 0
+          @board[tetrimino.y_coordinate + i][tetrimino.x_coordinate + j] > 0 && value > 0
         }
       }
     end
 
     def remove_filled_line!
-      @board.reject! {|a| a.all? {|e| e == 1 } }
+      @board.reject! {|a| a.all? {|e| e != 0 } }
 
       remove_size = BOARD_SIZE[:y] - @board.count
 
@@ -47,7 +47,13 @@ class ConsoleTetris
     end
 
     def print_next_block(tetrimino)
-      block = tetrimino.block.map {|row| row.map {|b| b == 1 ? '[]' : '  ' }.join('') }
+      block = tetrimino.block.map {|row|
+        row.map {|b|
+          next '  ' if b == 0
+
+          "\e[3#{b}m[]"
+        }.join('') + "\e[0m"
+      }
 
       print "\e[5;1H"
       print "\e[1J"
@@ -62,7 +68,13 @@ class ConsoleTetris
     def print_block(tetrimino)
       dup_board = @board.map {|board| board.dup }
 
-      tetrimino.block.each.with_index {|row, i| row.each.with_index {|value, j| dup_board[tetrimino.y_coordinate + i][tetrimino.x_coordinate + j] |= value } }
+      tetrimino.block.each.with_index {|row, i|
+        row.each.with_index {|value, j|
+          next if dup_board[tetrimino.y_coordinate + i][tetrimino.x_coordinate + j].nil?
+
+          dup_board[tetrimino.y_coordinate + i][tetrimino.x_coordinate + j] += value
+        }
+      }
 
       print_point
 
@@ -80,11 +92,13 @@ class ConsoleTetris
           print case el
             when 0
               '  '
-            when 1
-              '[]'
+            when 1..7
+              "\e[3#{el}m[]"
             end
         end
 
+        print "\e[0m"
+
         print "|\n"
       end
 

data/lib/console_tetris/block.rb

@@ -6,27 +6,27 @@ class ConsoleTetris
       case degree
       when 0
         [
-          [1, 1, 1, 1],
-          [0, 0, 0, 1]
+          [4, 4, 4, 4],
+          [0, 0, 0, 4]
         ]
       when 90
         [
-          [0, 1],
-          [0, 1],
-          [0, 1],
-          [1, 1]
+          [0, 4],
+          [0, 4],
+          [0, 4],
+          [4, 4]
         ]
       when 180
         [
-          [1, 0, 0, 0],
-          [1, 1, 1, 1]
+          [4, 0, 0, 0],
+          [4, 4, 4, 4]
         ]
       when 270
         [
-          [1, 1],
-          [1, 0],
-          [1, 0],
-          [1, 0]
+          [4, 4],
+          [4, 0],
+          [4, 0],
+          [4, 0]
         ]
       end
     end
@@ -35,27 +35,27 @@ class ConsoleTetris
       case degree
       when 0
         [
-          [1, 1, 1, 1],
-          [1, 0, 0, 0]
+          [7, 7, 7, 7],
+          [7, 0, 0, 0]
         ]
       when 90
         [
-          [1, 1],
-          [0, 1],
-          [0, 1],
-          [0, 1]
+          [7, 7],
+          [0, 7],
+          [0, 7],
+          [0, 7]
         ]
       when 180
         [
-          [0, 0, 0, 1],
-          [1, 1, 1, 1]
+          [0, 0, 0, 7],
+          [7, 7, 7, 7]
         ]
       when 270
         [
-          [1, 0],
-          [1, 0],
-          [1, 0],
-          [1, 1]
+          [7, 0],
+          [7, 0],
+          [7, 0],
+          [7, 7]
         ]
       end
     end
@@ -64,22 +64,22 @@ class ConsoleTetris
       case degree
       when 0, 180
         [
-          [1, 1, 1, 1]
+          [6, 6, 6, 6]
         ]
       when 90, 270
         [
-          [1],
-          [1],
-          [1],
-          [1]
+          [6],
+          [6],
+          [6],
+          [6]
         ]
       end
     end
 
     def type_o(degree)
       [
-        [1, 1],
-        [1, 1]
+        [3, 3],
+        [3, 3]
       ]
     end
 
@@ -87,14 +87,14 @@ class ConsoleTetris
       case degree
       when 0, 180
         [
-          [0, 1, 1],
-          [1, 1, 0]
+          [0, 2, 2],
+          [2, 2, 0]
         ]
       when 90, 270
         [
-          [1, 0],
-          [1, 1],
-          [0, 1]
+          [2, 0],
+          [2, 2],
+          [0, 2]
         ]
       end
     end
@@ -119,25 +119,25 @@ class ConsoleTetris
       case degree
       when 0
         [
-          [1, 1, 1],
-          [0, 1, 0]
+          [5, 5, 5],
+          [0, 5, 0]
         ]
       when 90
         [
-          [0, 1],
-          [1, 1],
-          [0, 1]
+          [0, 5],
+          [5, 5],
+          [0, 5]
         ]
       when 180
         [
-          [0, 1, 0],
-          [1, 1, 1]
+          [0, 5, 0],
+          [5, 5, 5]
         ]
       when 270
         [
-          [1, 0],
-          [1, 1],
-          [1, 0]
+          [5, 0],
+          [5, 5],
+          [5, 0]
         ]
       end
     end

data/lib/console_tetris/version.rb

@@ -1,3 +1,3 @@
 class ConsoleTetris
-  VERSION = "0.1.3"
+  VERSION = "0.1.4"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: console-tetris
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.4
 platform: ruby
 authors:
 - pekepek
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-01-21 00:00:00.000000000 Z
+date: 2017-01-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler