rubtris 0.0.5 → 0.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 78200817740afc610e6c602f5930fc1cea1cf46f
-  data.tar.gz: 298413daeec207e1dae84d8f3444648e33c57413
+  metadata.gz: 1249241ab00bf1ec7d0a107b099df5363fc721d2
+  data.tar.gz: ef04585863280c256655954a961719a24d395a12
 SHA512:
-  metadata.gz: a732126696a3ce05eb1567dc755e9a8901ee78f056ffd6cf0955c4c9a5b5a50ef223885cc156506c8295df06183e7699c17644dcb3ffc7f9e60422373aa29d55
-  data.tar.gz: d54ed54432f0e9c2ce6afb5328cee4e50ad97596b8bbec9376ddfa29589c0e53664061e52cbca5f22ca8f206a1df83a918fda9a1438916d9e02a8a31829fbd9b
+  metadata.gz: 15d5fd979d5665eaa68a538d922ddcfeb8c4395b79eec664ae37383504acbfddb06f9e7a2387eacb1a8ad2342826c6c362ebf406ba4c301cfb675c80f84a00e0
+  data.tar.gz: e7fba568c8e2f21fe8dcb552c568b810e8f0dc41f5952073ce1d4d3c82480604200e192c49ac0b646ffb7e96a10341c7e7610efd33bfcf4336903955e3ab5cdc

data/bin/rubtris

@@ -1,5 +1,3 @@
 #!/usr/bin/env ruby
 
-require 'rubtris'
-t = Rubtris.new
-t.run
+require 'rubtris'

data/lib/block.rb

@@ -13,7 +13,7 @@ class Block
     Pattern.new(:right_l,    [[0, 2], [1, 2], [2, 2], [2, 1]], 3, :green),
     Pattern.new(:t_block,    [[1, 1], [2, 0], [2, 1], [2, 2]], 3, :red),
     Pattern.new(:n_block_1,  [[0, 0], [1, 0], [1, 1], [2, 1]], 3, :yellow),
-    Pattern.new(:n_block_2,  [[0, 1], [1, 1], [1, 0], [2, 0]], 3, :black)
+    Pattern.new(:n_block_2,  [[0, 1], [1, 1], [1, 0], [2, 0]], 3, :magenta)
   ]
   
   

data/lib/board.rb

@@ -14,7 +14,7 @@ class Board
   def initialize
     @grid, @over, @completed_lines = Array.new(HEIGHT) { Array.new(WIDTH) }, false, 0
     @start_time, @time_limit, @line_limit = Time.now, nil, nil
-    @score, @level =  0, 0
+    @level =  0, 0
   end
   
   def [](coord)
@@ -29,7 +29,7 @@ class Board
     str = ""
     @grid.each_with_index do |row, i|
       row.each do |pos|
-         str += pos.nil? ? "  " : "  ".colorize(background: pos.pattern.color)
+         str += pos.nil? ? "  " : "[]".colorize(pos.pattern.color)
       end
       str+= "*"
       if i == 1
@@ -44,7 +44,7 @@ class Board
   end
   
   def summary_s
-    "LINES: #{@completed_lines}  LEVEL: #{level}  SCORE: #{@score}"
+    "LINES: #{@completed_lines}  LEVEL: #{level}"
   end
   
   def level
@@ -85,20 +85,22 @@ class Board
     true
   end
   
+  def check_spaces(old_spaces, new_spaces)
+    new_territory = new_spaces - old_spaces
+    return false unless new_spaces.all? { |coord| on_board?(coord) }
+    return false if any_filled?(new_territory)
+    true
+  end
+  
   def change_direction(block, options = {})
     i, j, turn = options[:i], options[:j], options[:turn]
     new_upper_left = (i && j) ? [block.upper_left.first + i, block.upper_left.last + j] : block.upper_left
     new_rotation = (turn) ? block.rotation + turn : block.rotation
     old_spaces = block.spaces_occupied
     new_spaces = block.spaces_occupied(pos: new_upper_left, rotation: new_rotation)
-    old_territory = old_spaces - new_spaces
-    new_territory = new_spaces - old_spaces
-    # p "i: #{i} j: #{j} turn: #{turn} new_upper_left: #{new_upper_left} new_rotation: #{new_rotation}"
-    # p "old_spaces: #{old_spaces} new_spaces: #{new_spaces} old_territory: #{old_territory} new_territory: #{new_territory}"
-    return false unless new_spaces.all? { |coord| on_board?(coord) }
-    return false if any_filled?(new_territory)
-    remove_from_spaces(old_territory)
-    add_to_spaces(block, new_territory)
+    return false unless check_spaces(old_spaces, new_spaces)
+    remove_from_spaces(old_spaces)
+    add_to_spaces(block, new_spaces)
     block.upper_left, block.rotation = new_upper_left, new_rotation
     true 
   end
@@ -108,15 +110,15 @@ class Board
   end
   
   def push_selected_down
-    unless change_direction(@selected, i: 5, j: 0)
-      move_selected_down
-    end
+    move_selected_down unless change_direction(@selected, i: 5, j: 0)
   end
   
   def move_to_bottom
-    id = @selected.object_id
-    while change_direction(@selected, i: 1, j: 0) && id == @selected.object_id
-      move_selected_down
+    while change_direction(@selected, i: 1, j: 0)
+      old_spaces = @selected.spaces_occupied
+      new_upper_left = [@selected.upper_left.first + 1, @selected.upper_left.last]
+      new_spaces = @selected.spaces_occupied(pos: new_upper_left, rotation: @selected.rotation)
+      break unless check_spaces(old_spaces, new_spaces)
     end
   end
   
@@ -124,7 +126,9 @@ class Board
     unless change_direction(@selected, i: 1, j: 0)
       remove_completed_line_and_increase_score
       @over = !add_block
+      return false
     end
+    true
   end
   
   def move_selected_left
@@ -155,16 +159,17 @@ class Board
     lines = 0
     i = HEIGHT - 1
     until i == 0
+      p i
       spaces_on_row = [i].product((0...WIDTH).to_a)
-        if all_filled?(spaces_on_row)
-          remove_and_shift(i)
-          lines += 1
-        else
-          i -= 1
-        end
+      
+      if all_filled?(spaces_on_row)
+        remove_and_shift(i)
+        lines += 1
+      else
+        i -= 1
+      end
     end
     @completed_lines += lines
-    @score += (lines * SCORE_MULTIPLIER) ** 2
   end
   
   def over?

data/lib/rubtris.rb

@@ -1,141 +1,4 @@
-require_relative 'board'
-require 'timeout'
-require 'io/console'
-require_relative 'menu'
+require_relative 'game'
 
-class Rubtris
-  
-  REFRESH_RATE            = 0.1
-  BEGINNING_ADVANCE_RATE  = 0.3
-  MINIMUM_ADVANCE_RATE    = 0.05
-  DIF_BTWN_LEVEL          = 0.04
-
-
-  def run
-    set_up_game
-    until over?
-      do_turn
-    end
-    end_game
-    run if !force_quit? && play_again
-  end
-  
-  def get_mode
-    options = [
-      {title: "Unlimited", type: :none, value: true},
-      {title: "Timed", type: :increment, value: 3, unit: 'min.'},
-      {title: "Lines", type: :increment, value: 40}
-    ]
-    prompt = "Welcome to Rubtris.\nSelect the mode you want to play!"
-    menu = Menu.new(options, prompt)
-    @game_mode = menu.open
-  end
-  
-  def play_again
-    options = [
-      {title: "Yes", type: :none, value: true},
-      {title: "No", type: :none, value: false}
-    ]
-    prompt = "#{@board.summary_s}\nPlay again?"
-    menu = Menu.new(options, prompt)
-    menu.open[:value]
-  end
-  
-  def set_up_game
-    @board = Board.new
-    STDIN.echo = false
-    @force_quit = false
-    @board.add_block
-    @board.render
-    @start_time, @last_advanced, @level = Time.now, Time.now, 0
-    @time_limit, @line_limit = nil, nil
-    config = get_mode
-    add_win_condition(config[:title], config[:value])
-  end
-  
-  def do_turn
-    auto_advance if auto_advance_needed?
-    system "clear" or system "cls"
-    @board.render
-    action = get_input
-    take_action(action) if action
-  end
-  
-  def end_game
-    STDIN.echo = true
-  end
-  
-  def current_advance_rate
-    [BEGINNING_ADVANCE_RATE - (@level * DIF_BTWN_LEVEL), MINIMUM_ADVANCE_RATE].max
-  end
-  
-  def auto_advance_needed?
-    Time.now - @last_advanced > current_advance_rate
-  end
-  
-  def auto_advance
-    @last_advanced = Time.now
-    @board.move_selected_down
-  end
-  
-  def get_input
-    action = nil
-    begin
-      action = Timeout::timeout(REFRESH_RATE) { STDIN.getch }
-    rescue
-    end
-    action
-  end
-  
-  def force_quit?
-    @force_quit
-  end
-
-  def take_action(action)
-    case action.downcase
-    when "w"
-      @board.move_to_bottom
-    when "a"
-      @board.move_selected_left
-    when "s"
-      @board.move_selected_down
-    when "d"
-      @board.move_selected_right
-    when "\r"
-      @board.push_selected_down
-    when "e"
-      @board.rotate_selected_right
-    when "q"
-      @board.rotate_selected_left
-    when "["
-      @board.rotate_selected_left
-    when "]"
-      @board.rotate_selected_right
-    when "\e"
-      @force_quit = true
-    end
-    nil
-  end
-  
-  def over?
-    force_quit? || @board.over? || over_time? || over_lines?
-  end
-  
-  def over_time?
-    @time_limit && (@last_advanced - @start_time) >= @time_limit
-  end
-  
-  def over_lines?
-    @line_limit && @board.completed_lines >= @line_limit
-  end
-  
-  def add_win_condition(condition, value)
-    case condition
-    when "Timed"
-      @time_limit = value * 60
-    when "Lines"
-      @line_limit = value
-    end
-  end
-
-end
+t = Game.new
+t.run

metadata

@@ -1,11 +1,10 @@
 --- !ruby/object:Gem::Specification
 name: rubtris
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.6
 platform: ruby
 authors:
 - Ben Henderson
-- Danny Burt
 autorequire: 
 bindir: bin
 cert_chain: []
@@ -15,17 +14,19 @@ dependencies:
   name: colorize
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0'
-description: Command line Tetrino based puzzle game!
+description: Rubtris is a Ruby clone of everyone's favorite tetromino-based puzzle
+  game, played entirely on the command line. Install the Gem and simply run 'rubtris'
+  on the command line to play. Thanks to Danny Burt for his contributions.
 email: benjamin.c.henderson@gmail.com
 executables:
 - rubtris
@@ -61,5 +62,5 @@ rubyforge_project:
 rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
-summary: Command line Tetrino based puzzle game!
+summary: Command line puzzle game action!
 test_files: []