console-tetris 0.1.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b7a63eaef53112b4769b21342488b1f40eb0cda2
-  data.tar.gz: 94edf57be236fce05ad15668093522a3ee4abf2d
+  metadata.gz: ec554203ec195d6a53199cf13febb46771d537cd
+  data.tar.gz: c10cc6150bb6d5ca6d9d66521b51f5b33600291f
 SHA512:
-  metadata.gz: c4de5d34d902ecee323772f9437a3be3edfbf5b1fac57e6f906195b40933719afddd7dcc11ccfc6b68c52718a51bbe9a29f8945fbe8643e86057655c657572ef
-  data.tar.gz: 467dc3544d0bd71331916fa53936931cba34f2ff67a3c82c096f3db91eb5d5eb86349e3d416f12a97ef798aad530aa65ebc9d3c874c05b55c521efd265bd61f1
+  metadata.gz: 3459c8086bc005d632fe6588078104b73d1e9e8401697d3546e47f23c17ae0847f2251c86c874f6787067eab32c25d0e6250b0b08f85d32d527bc58c2a868edb
+  data.tar.gz: 503cd47c13fa2f107f6b895605dff24c609824232dc612c950d2490c0008561b260d78d98e0de2f87db6499ad1381133e1ebbf0b953cd09403732de7637e7a00

data/README.md

@@ -16,6 +16,12 @@ Or install it yourself as:
 
     $ gem install console-tetris
 
+## Start Game
+
+```
+$ console_tetris
+```
+
 ## Commands
 
 `.` : move right

data/console-tetris.gemspec

@@ -22,5 +22,6 @@ Gem::Specification.new do |spec|
 
   spec.add_development_dependency "bundler", "~> 1.13"
   spec.add_development_dependency "rake", "~> 10.0"
+  spec.add_development_dependency "pry"
   spec.add_dependency 'io-console'
 end

data/lib/console_tetris.rb

@@ -9,10 +9,11 @@ class ConsoleTetris
   def self.start
     @background_board = BackgroundBoard.new
 
-    type = "type_#{BLOCK_TYPES.sample}"
-    @tetrimino = Tetrimino.new(block_type: type)
+    @tetrimino = Tetrimino.new(block_type: "type_#{BLOCK_TYPES.sample}")
+    next_tetrimino = Tetrimino.new(block_type: "type_#{BLOCK_TYPES.sample}")
 
-    @background_board.print_block(@tetrimino.block)
+    @background_board.print_next_block(next_tetrimino)
+    @background_board.print_block(@tetrimino)
 
     Thread.new do
       catch :gameover do
@@ -20,26 +21,28 @@ class ConsoleTetris
           loop.with_index do |_, i|
             @tetrimino.down
 
-            @background_board.print_block(@tetrimino.block) unless @background_board.overlap?(@tetrimino.block)
+            @background_board.print_block(@tetrimino) unless @background_board.overlap?(@tetrimino)
 
             sleep 0.1
 
-            if @tetrimino.bottom_edge? || @background_board.overlap?(@tetrimino.block)
+            if @tetrimino.bottom_edge? || @background_board.overlap?(@tetrimino)
               throw :gameover if i == 0
 
-              @tetrimino.back_vertically if @background_board.overlap?(@tetrimino.block)
+              @tetrimino.back_vertically if @background_board.overlap?(@tetrimino)
 
               break
             end
           end
 
-          @background_board.stack!(@tetrimino.block)
+          @background_board.stack!(@tetrimino)
           @background_board.remove_filled_line!
 
-          @background_board.print_block(@tetrimino.block)
+          @background_board.print_block(@tetrimino)
 
-          type = "type_#{BLOCK_TYPES.sample}"
-          @tetrimino = Tetrimino.new(block_type: type)
+          @tetrimino = next_tetrimino
+          next_tetrimino = Tetrimino.new(block_type: "type_#{BLOCK_TYPES.sample}")
+
+          @background_board.print_next_block(next_tetrimino)
         end
       end
 
@@ -54,17 +57,17 @@ class ConsoleTetris
         next if @tetrimino.right_edge?
 
         @tetrimino.move_right
-        @tetrimino.back_horizontally if @background_board.overlap?(@tetrimino.block)
+        @tetrimino.back_horizontally if @background_board.overlap?(@tetrimino)
       when 'z'
         next if @tetrimino.left_edge?
 
         @tetrimino.move_left
-        @tetrimino.back_horizontally if @background_board.overlap?(@tetrimino.block)
+        @tetrimino.back_horizontally if @background_board.overlap?(@tetrimino)
       when "\r"
         @tetrimino.rotate
 
         loop do
-          if @background_board.overlap?(@tetrimino.block)
+          if @background_board.overlap?(@tetrimino)
             @tetrimino.up
           else
             break
@@ -72,7 +75,7 @@ class ConsoleTetris
         end
       end
 
-      @background_board.print_block(@tetrimino.block)
+      @background_board.print_block(@tetrimino)
     end
   end
 end

data/lib/console_tetris/ascii_art.rb

@@ -121,7 +121,12 @@ class ConsoleTetris
 
       splitted_number_aas = number_aas.map {|n| n.split("\n") }
 
-      6.times.map {|i| splitted_number_aas.map {|aa| aa[i].to_s.ljust(8) }.join('') }.join("\n")
+      6.times.map {|i|
+        splitted_number_aas.map {|aa|
+          max_length = aa.map(&:size).max
+          aa[i].to_s.ljust(max_length)
+        }.join('')
+      }.join("\n")
     end
   end
 end

data/lib/console_tetris/background_board.rb

@@ -6,27 +6,23 @@ class ConsoleTetris
 
     BOARD_SIZE = {x: 10, y: 20}
 
-    class << self
-      def blank_board
-        BOARD_SIZE[:y].times.map { blank_line }
-      end
-
-      def blank_line
-        Array.new(BOARD_SIZE[:x]).fill(0)
-      end
-    end
-
     def initialize
-      @board = self.class.blank_board
+      @board = blank_board
       @point = 0
     end
 
-    def stack!(block)
-      @board = @board.map.with_index {|a, i| a.map.with_index {|e, j| e | block[i][j] } }
+    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 } }
     end
 
-    def overlap?(block)
-      @board.map.with_index {|a, i| a.map.with_index {|e, j| e & block[i][j] } }.any? {|a| a.any? {|e| e > 0 } }
+    def overlap?(tetrimino)
+      tetrimino.block.map.with_index.any? {|row, i|
+        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
+        }
+      }
     end
 
     def remove_filled_line!
@@ -35,22 +31,49 @@ class ConsoleTetris
       remove_size = BOARD_SIZE[:y] - @board.count
 
       @point = @point + remove_size * 1000
-      remove_size.times { @board.unshift(self.class.blank_line) }
+      remove_size.times { @board.unshift(blank_line) }
     end
 
-    def print_block(block)
-      print "\e[2J"
+    def print_point
+      print "\e[3;1H"
+
+      print "\e[13G"
+      print "\e[K"
+      print "#{@point.to_s.rjust(6, ' ')} P\n"
+
+      print "\e[13G"
+      print "\e[K"
+      print "-------- \n"
+    end
+
+    def print_next_block(tetrimino)
+      block = tetrimino.block.map {|row| row.map {|b| b == 1 ? '[]' : '  ' }.join('') }
+
+      print "\e[5;1H"
+      print "\e[1J"
       print "\e[1;1H"
 
-      print "\e[G _____________ \n"
-      print "\e[G| #{@point.to_s.rjust(11, ' ')} |\n"
-      print "\e[G ‾‾‾‾‾‾‾‾‾‾‾‾‾ \n"
+      print "\e[G ---------- \n"
+      print "\e[G| #{block[0].to_s.center(8, ' ')} |\n"
+      print "\e[G| #{block[1].to_s.center(8, ' ')} |\n"
+      print "\e[G ---------- \n"
+    end
+
+    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 } }
+
+      print_point
+
+      print "\e[5;1H"
+      print "\e[J"
 
       print "\e[G"
       print '__' * BOARD_SIZE[:x]
       print "\n"
 
-      @board.map.with_index {|a, i| a.map.with_index {|e, j| e | block[i][j] } }.each do |elements|
+      dup_board.each do |elements|
         print "\e[G"
 
         elements.each do |el|
@@ -75,5 +98,15 @@ class ConsoleTetris
       print "#{AsciiArt.number_to_aa(point).gsub(/^/, "\e[G")} Points!!!!\n"
       print AsciiArt::GAMEOVER.gsub(/^/, "\e[G")
     end
+
+    private
+
+    def blank_board
+      BOARD_SIZE[:y].times.map { blank_line }
+    end
+
+    def blank_line
+      Array.new(BOARD_SIZE[:x]).fill(0)
+    end
   end
 end

data/lib/console_tetris/block.rb

@@ -0,0 +1,145 @@
+class ConsoleTetris
+  module Block
+    module_function
+
+    def type_j(degree)
+      case degree
+      when 0
+        [
+          [1, 1, 1, 1],
+          [0, 0, 0, 1]
+        ]
+      when 90
+        [
+          [0, 1],
+          [0, 1],
+          [0, 1],
+          [1, 1]
+        ]
+      when 180
+        [
+          [1, 0, 0, 0],
+          [1, 1, 1, 1]
+        ]
+      when 270
+        [
+          [1, 1],
+          [1, 0],
+          [1, 0],
+          [1, 0]
+        ]
+      end
+    end
+
+    def type_l(degree)
+      case degree
+      when 0
+        [
+          [1, 1, 1, 1],
+          [1, 0, 0, 0]
+        ]
+      when 90
+        [
+          [1, 1],
+          [0, 1],
+          [0, 1],
+          [0, 1]
+        ]
+      when 180
+        [
+          [0, 0, 0, 1],
+          [1, 1, 1, 1]
+        ]
+      when 270
+        [
+          [1, 0],
+          [1, 0],
+          [1, 0],
+          [1, 1]
+        ]
+      end
+    end
+
+    def type_i(degree)
+      case degree
+      when 0, 180
+        [
+          [1, 1, 1, 1]
+        ]
+      when 90, 270
+        [
+          [1],
+          [1],
+          [1],
+          [1]
+        ]
+      end
+    end
+
+    def type_o(degree)
+      [
+        [1, 1],
+        [1, 1]
+      ]
+    end
+
+    def type_s(degree)
+      case degree
+      when 0, 180
+        [
+          [0, 1, 1],
+          [1, 1, 0]
+        ]
+      when 90, 270
+        [
+          [1, 0],
+          [1, 1],
+          [0, 1]
+        ]
+      end
+    end
+
+    def type_z(degree)
+      case degree
+      when 0, 180
+        [
+          [1, 1, 0],
+          [0, 1, 1]
+        ]
+      when 90, 270
+        [
+          [0, 1],
+          [1, 1],
+          [1, 0]
+        ]
+      end
+    end
+
+    def type_t(degree)
+      case degree
+      when 0
+        [
+          [1, 1, 1],
+          [0, 1, 0]
+        ]
+      when 90
+        [
+          [0, 1],
+          [1, 1],
+          [0, 1]
+        ]
+      when 180
+        [
+          [0, 1, 0],
+          [1, 1, 1]
+        ]
+      when 270
+        [
+          [1, 0],
+          [1, 1],
+          [1, 0]
+        ]
+      end
+    end
+  end
+end

data/lib/console_tetris/tetrimino.rb

@@ -1,7 +1,9 @@
-require_relative './background_board'
+require_relative './block'
 
 class ConsoleTetris
   class Tetrimino
+    attr_accessor :x_coordinate, :y_coordinate
+
     def initialize(x = 0, y = 0, degree = 0, block_type:)
       @x_coordinate = x
       @y_coordinate = y
@@ -49,170 +51,27 @@ class ConsoleTetris
       @degree += 90
       @degree = 0 if @degree == 360
 
-      @y_coordinate = @y_coordinate - before_block.max.count(1).times.count {|i| BackgroundBoard.blank_board[@y_coordinate + i].nil? }
-      @x_coordinate = @x_coordinate - before_block.map {|a| a.any? {|e| e == 1} ? 1 : 0 }.count(1).times.count {|i| BackgroundBoard.blank_board[@y_coordinate][@x_coordinate + i].nil? }
+      @y_coordinate = 20 - block.size if @y_coordinate + block.size > 20
+      @x_coordinate = 10 - block.first.size if @x_coordinate + block.first.size > 10
 
       @y_coordinate = 0 if @y_coordinate.negative?
       @x_coordinate = 0 if @x_coordinate.negative?
     end
 
     def block
-      send(@block_type)
+      Block.send(@block_type, @degree)
     end
 
     def left_edge?
-      block.any? {|a| a.first == 1 }
+      @x_coordinate == 0
     end
 
     def right_edge?
-      block.any? {|a| a.last == 1 }
+      @x_coordinate + block.first.size > 9
     end
 
     def bottom_edge?
-      block.last.any? {|e| e == 1 }
-    end
-
-    private
-
-    def type_j
-      board = BackgroundBoard.blank_board
-
-      case @degree
-      when 0
-        4.times {|i| board[@y_coordinate][@x_coordinate + i] = 1 }
-
-        board[@y_coordinate + 1][@x_coordinate + 3] = 1
-      when 90
-        4.times {|i| board[@y_coordinate + i][@x_coordinate + 1] = 1 }
-
-        board[@y_coordinate + 3][@x_coordinate] = 1
-      when 180
-        4.times {|i| board[@y_coordinate][@x_coordinate + i] = 1 }
-
-        board[@y_coordinate - 1][@x_coordinate] = 1
-      when 270
-        4.times {|i| board[@y_coordinate + i][@x_coordinate] = 1 }
-
-        board[@y_coordinate][@x_coordinate + 1] = 1
-      end
-
-      board
-    end
-
-    def type_l
-      board = BackgroundBoard.blank_board
-
-      case @degree
-      when 0
-        4.times {|i| board[@y_coordinate][@x_coordinate + i] = 1 }
-
-        board[@y_coordinate + 1][@x_coordinate] = 1
-      when 90
-        4.times {|i| board[@y_coordinate + i][@x_coordinate + 1] = 1 }
-
-        board[@y_coordinate][@x_coordinate] = 1
-      when 180
-        4.times {|i| board[@y_coordinate + 1][@x_coordinate + i] = 1 }
-
-        board[@y_coordinate][@x_coordinate + 3] = 1
-      when 270
-        4.times {|i| board[@y_coordinate + i][@x_coordinate] = 1 }
-
-        board[@y_coordinate + 3][@x_coordinate + 1] = 1
-      end
-
-      board
-    end
-
-    def type_i
-      board = BackgroundBoard.blank_board
-
-      case @degree
-      when 0
-        4.times {|i| board[@y_coordinate][@x_coordinate + i] = 1 }
-      when 90
-        4.times {|i| board[@y_coordinate + i][@x_coordinate + 2] = 1 }
-      when 180
-        4.times {|i| board[@y_coordinate + 2][@x_coordinate + i] = 1 }
-      when 270
-        4.times {|i| board[@y_coordinate + i][@x_coordinate] = 1 }
-      end
-
-      board
-    end
-
-    def type_o
-      board = BackgroundBoard.blank_board
-
-      2.times {|i|
-        board[@y_coordinate][@x_coordinate + i] = 1
-        board[@y_coordinate + 1][@x_coordinate + i] = 1
-      }
-
-      board
-    end
-
-    def type_s
-      board = BackgroundBoard.blank_board
-
-      case @degree
-      when 0, 180
-        2.times {|i|
-          board[@y_coordinate][@x_coordinate + i + 1] = 1
-          board[@y_coordinate + 1][@x_coordinate + i] = 1
-        }
-      when 90, 270
-        2.times {|i|
-          board[@y_coordinate + i][@x_coordinate] = 1
-          board[@y_coordinate + i + 1][@x_coordinate + 1] = 1
-        }
-      end
-
-      board
-    end
-
-    def type_z
-      board = BackgroundBoard.blank_board
-
-      case @degree
-      when 0, 180
-        2.times {|i|
-          board[@y_coordinate][@x_coordinate + i] = 1
-          board[@y_coordinate + 1][@x_coordinate + i + 1] = 1
-        }
-      when 90, 270
-        2.times {|i|
-          board[@y_coordinate + i + 1][@x_coordinate] = 1
-          board[@y_coordinate + i][@x_coordinate + 1] = 1
-        }
-      end
-
-      board
-    end
-
-    def type_t
-      board = BackgroundBoard.blank_board
-
-      case @degree
-      when 0
-        3.times {|i| board[@y_coordinate + 1][@x_coordinate + i] = 1 }
-
-        board[@y_coordinate + 2][@x_coordinate + 1] = 1
-      when 90
-        3.times {|i| board[@y_coordinate + i][@x_coordinate + 1] = 1 }
-
-        board[@y_coordinate + 1][@x_coordinate] = 1
-      when 180
-        3.times {|i| board[@y_coordinate + 1][@x_coordinate + i] = 1 }
-
-        board[@y_coordinate][@x_coordinate + 1] = 1
-      when 270
-        3.times {|i| board[@y_coordinate + i][@x_coordinate + 1] = 1 }
-
-        board[@y_coordinate + 1][@x_coordinate + 2] = 1
-      end
-
-      board
+      @y_coordinate + block.size > 19
     end
   end
 end

data/lib/console_tetris/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: console-tetris
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors:
 - pekepek
@@ -38,6 +38,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '10.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: io-console
   requirement: !ruby/object:Gem::Requirement
@@ -69,6 +83,7 @@ files:
 - lib/console_tetris.rb
 - lib/console_tetris/ascii_art.rb
 - lib/console_tetris/background_board.rb
+- lib/console_tetris/block.rb
 - lib/console_tetris/tetrimino.rb
 - lib/console_tetris/version.rb
 homepage: https://github.com/pekepek/console-tetris