Tetris 1.0.1 → 1.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 920049a38587822e567263172d651ade6c07cf21
-  data.tar.gz: 20876771f521d6ede743e1f8e4f65a98ef0fe603
+  metadata.gz: c424ad531190659c50649d57b2fb564cc77f5c0e
+  data.tar.gz: 0aeaa132f69651e0da58aeaa069d748cc8f927e5
 SHA512:
-  metadata.gz: 1fbbcc69193a3b7ea4fd169de8d464f5562d8ad6c67aa523cfccb6240fa224908c3513e540dae2affb02a3f647b035dc58685c097a3cb9a9493418d813b421b6
-  data.tar.gz: 0603d41a6d1b62e8ec2d1bccbf2e2592f9fbb3b933dda5b29bfb80e871611241cf2aad1156562c36c472499b27517e43f0c5b457d83815dff3d3cf036024f2e5
+  metadata.gz: 3d4a7c1c1343fe6301503aadadd62e8c71e76e783de9e66ca40ff4ffa802390b64530743160b2446cf8b8334d5543dd0e0d5afcd62fbea4e05df155c5754bf95
+  data.tar.gz: b93889efd142f39aadb142d7ad9b695fc2f41f1ad2ea427e7714eb8e124f68f141ae10b425f2f7d5a51bf1a7b9401bcaf573d8e97217d993e068b6e582be3f39

data/lib/block.rb

@@ -35,6 +35,7 @@ class Block
     @@image.draw(@x, @y, 0, 1, 1, @color)
   end
 
+  # Tests whether a block collides with other blocks
   def collides_with_blocks?
     @game.blocks.each do |block|
       return true if block.x == @x && block.y == @y

data/lib/shape.rb

@@ -4,6 +4,7 @@ require 'gosu'
 class Shape
   attr_accessor :rotation, :x, :y
   attr_reader :blocks
+  attr_writer :falling
 
   def initialize(game)
     @game = game
@@ -26,39 +27,46 @@ class Shape
   def update
     return unless @falling
 
-    old_x = @x
-    old_y = @y
+    # first handle x change
+    move_x
 
-    # first handle x change (handle keyboard - movement -
-    # and check for collision)
-    if update_move_x
-      if @game.button_down?(Gosu::KbLeft)
-        @x -= 32
-      elsif @game.button_down?(Gosu::KbRight)
-        @x += 32
-      end
+    # then handle y change
+    move_y
+  end
+
+  # Move the shape on the x axis, if there is the need to
+  def move_x
+    return unless update_move_x
 
-      @x = old_x if collides?
+    old_x = @x
+
+    if @game.button_down?(Gosu::KbLeft)
+      @x -= 32
+    elsif @game.button_down?(Gosu::KbRight)
+      @x += 32
     end
 
-    # then handle y change, so we can set @falling to false
-    # game speed check
+    @x = old_x if collides?
+  end
 
-    if update_move_y
-      @y += 32
+  # Move the shape on the y axis -- movement down
+  def move_y
+    return unless update_move_y
 
-      if collides?
-        @y = old_y
-        @falling = false
-      end
-    end
+    old_y = @y
+    @y += 32
+
+    return unless collides?
+
+    @y = old_y
+    @falling = false
   end
 
-  # Rotates the shape
+  # rotates the shape
   def rotate
     return if @rotation_block.nil?
 
-    (1..@rotation % @rotations).each do |_i|
+    (1..@rotation % @rotations).each do
       @blocks.each do |block|
         old_x = block.x
         old_y = block.y
@@ -68,21 +76,15 @@ class Shape
     end
   end
 
-  def shape_to_array
-    blocks_array = []
-    get_blocks.each do |block|
-      blocks_array << [block.x, block.y]
-    end
-    blocks_array
-  end
-
-  # updates move counter
+  # updates move_x counter
+  # returns nil if there is no need to update it
   def update_move_x
-    if @game.elapsed_seconds > @game.last_move_x + 0.05
-      @game.last_move_x = @game.elapsed_seconds
-    end
+    return unless @game.elapsed_seconds > @game.last_move_x + 0.05
+
+    @game.last_move_x = @game.elapsed_seconds
   end
 
+  # updates move_y counter, checks for speed up
   def update_move_y
     if @game.button_down?(Gosu::KbDown)
       @game.game_speed *= 0.2
@@ -90,19 +92,18 @@ class Shape
       @game.game_speed = 1
     end
 
-    if @game.elapsed_seconds > @game.last_move_y + @game.game_speed
-      @game.last_move_y = @game.elapsed_seconds
-    end
+    return unless @game.elapsed_seconds > @game.last_move_y + @game.game_speed
+
+    @game.last_move_y = @game.elapsed_seconds
   end
 
+  # checks whether the shape collides with walls or blocks
   def collides?
-    if collides_with_walls? || collides_with_blocks?
-      return true
-    end
-
+    return true if collides_with_walls? || collides_with_blocks?
     false
   end
 
+  # checks whether the shape collides with walls (and floor)
   def collides_with_walls?
     max_y = maximum_y_block
     min_x = minimum_x_block
@@ -111,6 +112,7 @@ class Shape
     min_x.x < 0 || max_x.x >= @game.screen_width || max_y.y + Block.height > @game.screen_height
   end
 
+  # checks whether the shape collides with any blocks
   def collides_with_blocks?
     get_blocks.each do |block|
       return true if block.collides_with_blocks?
@@ -119,15 +121,18 @@ class Shape
     false
   end
 
+  # gets the maximum y block of the shape
   # note that maximum y means the lowest block!
   def maximum_y_block
     get_blocks.max_by(&:y)
   end
 
+  # gets the lefmost block of the shape
   def minimum_x_block
     get_blocks.min_by(&:x)
   end
 
+  # gets the rightmost block of the shape
   def maximum_x_block
     get_blocks.max_by(&:x)
   end
@@ -149,6 +154,4 @@ class Shape
   def falling?
     @falling
   end
-
-  attr_writer :falling
 end

data/lib/shapeI.rb

@@ -1,5 +1,5 @@
-require 'shape.rb'
-require 'block.rb'
+require_relative 'shape'
+require_relative 'block'
 
 # [ ]
 # [ ]
@@ -22,6 +22,7 @@ class ShapeI < Shape
     end
   end
 
+  # updates shape position and returns its blocks
   def get_blocks
     @blocks[0].x = @x
     @blocks[1].x = @x

data/lib/shapeJ.rb

@@ -1,10 +1,10 @@
-require 'shapeL.rb'
-require 'block.rb'
+require_relative 'shapeL'
 
 #    [ ]
 #    [ ]
 # [ ][ ]
 class ShapeJ < ShapeL
+  # updates shape position and returns its blocks
   def get_blocks
     old_rotation = @rotation
     @rotation = 0

data/lib/shapeL.rb

@@ -1,5 +1,5 @@
-require 'shape.rb'
-require 'block.rb'
+require_relative 'shape'
+require_relative 'block'
 
 # [ ]
 # [ ]
@@ -21,6 +21,7 @@ class ShapeL < Shape
     end
   end
 
+  # updates shape position and returns its blocks
   def get_blocks
     @blocks[0].x = @x
     @blocks[1].x = @x

data/lib/shapeO.rb

@@ -1,5 +1,5 @@
-require 'shape.rb'
-require 'block.rb'
+require_relative 'shape'
+require_relative 'block'
 
 # [ ][ ]
 # [ ][ ]
@@ -19,6 +19,7 @@ class ShapeO < Shape
     end
   end
 
+  # updates shape position and returns its blocks
   def get_blocks
     @blocks[0].x = @x
     @blocks[1].x = @x + Block.width

data/lib/shapeS.rb

@@ -1,5 +1,5 @@
-require 'shape.rb'
-require 'block.rb'
+require_relative 'shape'
+require_relative 'block'
 
 # [ ]
 # [ ][ ]
@@ -21,6 +21,7 @@ class ShapeS < Shape
     end
   end
 
+  # updates shape position and returns its blocks
   def get_blocks
     @blocks[0].x = @x
     @blocks[1].x = @x

data/lib/shapeT.rb

@@ -1,5 +1,5 @@
-require 'shape.rb'
-require 'block.rb'
+require_relative 'shape'
+require_relative 'block'
 
 # [ ][ ][ ]
 #    [ ]
@@ -21,6 +21,7 @@ class ShapeT < Shape
     end
   end
 
+  # updates shape position and returns its blocks
   def get_blocks
     @blocks[0].x = @x
     @blocks[1].x = @x + Block.width

data/lib/shapeZ.rb

@@ -1,10 +1,10 @@
-require 'shapeS.rb'
-require 'block.rb'
+require_relative 'shapeS'
 
 #    [ ]
 # [ ][ ]
 # [ ]
 class ShapeZ < ShapeS
+  # updates shape position and returns its blocks
   def get_blocks
     super
     translate_by_y

data/lib/tetris.rb

@@ -1,13 +1,13 @@
 require 'rubygems'
 require 'gosu'
-require 'block.rb'
-require 'shapeL.rb'
-require 'shapeJ.rb'
-require 'shapeI.rb'
-require 'shapeO.rb'
-require 'shapeT.rb'
-require 'shapeZ.rb'
-require 'shapeS.rb'
+require_relative 'block'
+require_relative 'shapeL'
+require_relative 'shapeJ'
+require_relative 'shapeI'
+require_relative 'shapeO'
+require_relative 'shapeT'
+require_relative 'shapeZ'
+require_relative 'shapeS'
 
 # Main class for Tetris.
 class Game < Gosu::Window

metadata

@@ -1,16 +1,17 @@
 --- !ruby/object:Gem::Specification
 name: Tetris
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.0.2
 platform: ruby
 authors:
-- Filip Vondrasek
+- Filip Vondrášek
 autorequire: 
 bindir: bin
 cert_chain: []
 date: 2015-02-10 00:00:00.000000000 Z
 dependencies: []
-description: A simple Tetris game
+description: A simple Tetris game created as a semestral project for Programming in
+  Ruby course at FIT CTU.
 email: filip@vondrasek.net
 executables: []
 extensions: []
@@ -41,9 +42,9 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '='
+  - - "~>"
     - !ruby/object:Gem::Version
-      version: 2.0.0
+      version: '2.0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
@@ -54,5 +55,5 @@ rubyforge_project:
 rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
-summary: A simple Tetris game
+summary: A simple Tetris game.
 test_files: []