btetris_kp 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 425a26d38d0419d50ff8cb0126faaa1caaf6d1e0
-  data.tar.gz: f8f2deaa630c4a9bd247656156d7869aa2725142
+  metadata.gz: 0a70f6dc0867aa97326b8806f33db6826e0bc70a
+  data.tar.gz: 371d203951eb610f14f66e0b2baaf24bb9a939fb
 SHA512:
-  metadata.gz: ae3785d6fd1403caefa5074b9e10fde7da908ad09338bcdce001e32de21c5e464aa8cd5062d977573c109afa4b386457345286bbd5a222dd1bf6da8b099c1f57
-  data.tar.gz: e0eb2eda6ba106b60420ce7ea59a58c0c89f9af787fe8212660c98fa87514bdd912f1f7590bfd3e7b1b4169d5ba92a389dbb3af94aaf9197077e6df20263142d
+  metadata.gz: 7c2b705f40abcdd49b30656139a4f9cb57b45ef3d37fdcbafe1565e2d61aebfa1324b8928a6bc29dd9215cecd06b724d6aa88dab7e29b423fbfe85553486945a
+  data.tar.gz: 9e7edd9ae546d95e9628c322365247c99e65d176b6a220b99cb9e3f7c247344507c0ea93fd8d27a5031f5ca0f5e19de2ef7e209b4e6c87d0e9ee12c54a96b42e

data/btetris_kp.gemspec

@@ -5,7 +5,7 @@ require 'btetris_kp/version'
 
 Gem::Specification.new do |spec|
   spec.name          = "btetris_kp"
-  spec.version       = BtetrisKp::VERSION
+  spec.version       = BTetrisKp::VERSION
   spec.authors       = ["Pavel Kocka"]
   spec.email         = ["kockapav@gmail.com"]
   spec.description   = %q{Battle Tetris}

data/lib/btetris_kp/constants.rb

@@ -4,11 +4,18 @@ module BTetrisKp
     # Game window Const
     GAME_WIDTH = 800
     GAME_HEIGHT = 600
+    GAME_WIN_GAP = (GAME_WIDTH * 0.075).to_i
     GAME_CAPTION = 'Battle tetris'
     PAUSE_CAPTION = 'Paused!'
     GAME_OVER_CAPTION = 'Game over!'
     GAME_WON_CAPTION = 'You WIN!'
-    GAME_LOST_CAPTION = 'You LOOSE!'
+    GAME_LOST_CAPTION = 'You LOSE!'
+
+    # Font constants
+    FONT_GAP = 5
+    FONT_SMALL_SIZE = (GAME_WIDTH * 0.035).to_i
+    FONT_MED_SIZE = (GAME_WIDTH * 0.05).to_i
+    FONT_BIG_SIZE = (GAME_WIDTH * 0.1).to_i
 
     # File paths
     PATH = File.dirname(File.expand_path(__FILE__))

data/lib/btetris_kp/game.rb

@@ -10,7 +10,7 @@ module BTetrisKp
 
     def initialize(window, x, y)
       @window = window
-      @font = Gosu::Font.new(@window, Gosu.default_font_name, 80)
+      @font = Gosu::Font.new(@window, Gosu.default_font_name, Const::FONT_BIG_SIZE)
       @board = Board.new(@window, x, y)
       @paused, @game_over = false, false
       # press time, set 0 when left, right or down key is pressed

data/lib/btetris_kp/gui/menuitem.rb

@@ -10,7 +10,7 @@ module BTetrisKp
       @font = font
       @color = Const::MENU_ITEM_CLR
       @x = x
-      @y = y + id * (@font.height + 5)
+      @y = y + id * (@font.height + Const::FONT_GAP)
     end
 
     # updates menu item, changes item color depending on mouse_over?

data/lib/btetris_kp/menu.rb

@@ -10,7 +10,7 @@ module BTetrisKp
   class MenuState
     def initialize(window)
       @window = window
-      @font = Gosu::Font.new(@window, Gosu.default_font_name, 30)
+      @font = Gosu::Font.new(@window, Gosu.default_font_name, Const::FONT_SMALL_SIZE)
       initialize_title_image
       generate_back_board
       generate_menu
@@ -19,7 +19,7 @@ module BTetrisKp
     # loads title image and calculates position, size variables
     def initialize_title_image
       @title_image = Gosu::Image.new(@window, Const::PATH_IMAGE_TITLE, false)
-      @img_size_factor = (@window.width - 50.0) / @title_image.width
+      @img_size_factor = (@window.width - Const::GAME_WIN_GAP).to_f / @title_image.width
       @img_x = (@window.width - @title_image.width * @img_size_factor) / 2
       @img_y = 20
     end
@@ -41,8 +41,8 @@ module BTetrisKp
     # generates menu, menu items and callback procedures for menu items
     def generate_menu
       @items = []
-      @x = @window.width / 3 + 30
-      @y = @title_image.height
+      @x = @window.width / 3 + Const::FONT_SMALL_SIZE
+      @y = @title_image.height * @img_size_factor + Const::GAME_WIN_GAP
       n_g = proc { @window.state = GameState.new(@window, @window.width / 3, 40) }
       cr_n = proc { @window.state = NetSetupState.new(@window) }
       j_n = proc { @window.state = NetJoinState.new(@window) }

data/lib/btetris_kp/netgame.rb

@@ -10,7 +10,7 @@ module BTetrisKp
     def initialize(window, socket)
       @window = window
       @socket = socket
-      @font = Gosu::Font.new(@window, Gosu.default_font_name, 80)
+      @font = Gosu::Font.new(@window, Gosu.default_font_name, Const::FONT_BIG_SIZE)
       @game = GameState.new(@window, 10, 40)
       @o_board = Board.new(@window, 2 * @window.width / 3 - 10, 40)
       @winner = 0

data/lib/btetris_kp/netjoin.rb

@@ -8,7 +8,7 @@ module BTetrisKp
   class NetJoinState
     def initialize(window)
       @window = window
-      @font = Gosu::Font.new(@window, Gosu.default_font_name, 40)
+      @font = Gosu::Font.new(@window, Gosu.default_font_name, Const::FONT_MED_SIZE)
       @connecting = false
       initialize_title_image
       initialize_textfields
@@ -18,7 +18,7 @@ module BTetrisKp
     # loads title image and calculates position, size variables
     def initialize_title_image
       @title_image = Gosu::Image.new(@window, Const::PATH_IMAGE_TITLE, false)
-      @img_size_factor = (@window.width - 50.0) / @title_image.width
+      @img_size_factor = (@window.width - Const::GAME_WIN_GAP).to_f / @title_image.width
       @img_x = (@window.width - @title_image.width * @img_size_factor) / 2
       @img_y = 20
     end
@@ -26,16 +26,16 @@ module BTetrisKp
     # initializes text fields for reading ip and port
     # initializes positions for texts and textfields
     def initialize_textfields
-      @text_x = @window.width / 3 + 10
+      @text_x = @window.width / 3 + 2 * Const::FONT_GAP
       @text_y = @window.height / 3
-      @ip_x = @text_x - @font.text_width(Const::IP_CAPTION) - 15
-      @port_x = @text_x - @font.text_width(Const::PORT_CAPTION) - 15
+      @ip_x = @text_x - @font.text_width(Const::IP_CAPTION) - 3 * Const::FONT_GAP
+      @port_x = @text_x - @font.text_width(Const::PORT_CAPTION) - 3 * Const::FONT_GAP
       @text_fields = []
       @text_fields << TextField.new(@window, @font, @text_x,
                                     @text_y, Const::DEF_IP, /[^0-9.]/,
                                     @font.text_width('000.000.000.000'), 15)
       @text_fields << TextField.new(@window, @font, @text_x,
-                                    @text_y + @font.height + 10,
+                                    @text_y + @font.height + 2 * Const::FONT_GAP,
                                     Const::DEF_PORT, /[^0-9]/,
                                     @font.text_width('00000'), 5)
     end
@@ -77,9 +77,9 @@ module BTetrisKp
       @font.draw(Const::IP_CAPTION, @ip_x,
                  @text_y, 0)
       @font.draw(Const::PORT_CAPTION, @port_x,
-                 @text_y + @font.height + 10, 0)
+                 @text_y + @font.height + 2 * Const::FONT_GAP, 0)
       @font.draw(Const::CONNECTING, @text_x,
-                 @text_y + 3 * (@font.height + 10), 0) if @connecting
+                 @text_y + 3 * (@font.height + 2 * Const::FONT_GAP), 0) if @connecting
       @title_image.draw(@img_x, @img_y, 1, @img_size_factor, @img_size_factor)
     end
 

data/lib/btetris_kp/netsetup.rb

@@ -8,7 +8,7 @@ module BTetrisKp
   class NetSetupState
     def initialize(window)
       @window = window
-      @font = Gosu::Font.new(@window, Gosu.default_font_name, 40)
+      @font = Gosu::Font.new(@window, Gosu.default_font_name, Const::FONT_MED_SIZE)
       initialize_title_image
       setup_server
       @connected = false
@@ -28,7 +28,7 @@ module BTetrisKp
     # loads title image and calculates position, size variables
     def initialize_title_image
       @title_image = Gosu::Image.new(@window, Const::PATH_IMAGE_TITLE, false)
-      @img_size_factor = (@window.width - 50.0) / @title_image.width
+      @img_size_factor = (@window.width - Const::GAME_WIN_GAP).to_f / @title_image.width
       @img_x = (@window.width - @title_image.width * @img_size_factor) / 2
       @img_y = 20
     end
@@ -60,7 +60,7 @@ module BTetrisKp
     # draws net setup window
     def draw
       @font.draw(Const::SERVER_WAIT, @window.width / 5,
-                 @window.height / 2 - 60, 0)
+                 @window.height / 2 - Const::GAME_WIN_GAP, 0)
       @font.draw("#{Const::SERVER_PORT}#{@port}", @window.width / 3.5,
                  @window.height / 2, 0)
       @title_image.draw(@img_x, @img_y, 1, @img_size_factor, @img_size_factor)

data/lib/btetris_kp/version.rb

@@ -1,3 +1,3 @@
-module BtetrisKp
-  VERSION = '0.0.1'
+module BTetrisKp
+  VERSION = '0.0.2'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: btetris_kp
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - Pavel Kocka
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-05 00:00:00.000000000 Z
+date: 2014-02-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler