blast_mavens_multiplayer 0.1.3 → 0.1.4

data/lib/bomb.rb

@@ -1,11 +1,11 @@
 class Bomb
   include Tileable
-
   attr_accessor :time_counter, :solid
+
   def initialize(x,y)
     register!(x, y)
     @t_size       = Processor::TileSize
-    @sprites      = Gosu::Image.load_tiles(Processor.game_window, BLAST_IMG_PATH + "dynamite.png", @t_size, @t_size, false)
+    @sprites      = Gosu::Image.load_tiles(Processor.window, BLAST_IMG_PATH + "dynamite.png", @t_size, @t_size, false)
     @time_counter = 80
     @sprite_index = 0
     @solid        = false

data/lib/explosion.rb

@@ -5,7 +5,7 @@ class Explosion
   def initialize(x,y)
     register!(x, y)
     @t_size       = Processor::TileSize
-    @sprites      = Gosu::Image.load_tiles(Processor.game_window, BLAST_IMG_PATH + "explosion.png", @t_size, @t_size, false)
+    @sprites      = Gosu::Image.load_tiles(Processor.window, BLAST_IMG_PATH + "explosion.png", @t_size, @t_size, false)
     @time_counter = 20
     @sprite_index = 0
   end

data/lib/{game_window.rb → game.rb}

@@ -1,18 +1,13 @@
-class GameWindow < Gosu::Window
-  def initialize
-    super(*Processor::Screen)
-    self.caption = Processor::Caption
+class Game
+  def initialize(window, opts={})
+    @window      = window
     @players_hit = {:player_0 => [], :player_1 => []}
     @finish_game = false
-    @song        = Gosu::Song.new(self, BLAST_SND_PATH + 'battle.mp3')
+    @song        = Gosu::Song.new(@window, BLAST_SND_PATH + 'battle.mp3')
     @song.volume = 0.3
     @song.play(true)
   end
 
-  def map
-    @map ||= Map.new(BLAST_MAP_PATH + 'basic.txt')
-  end
-
   def draw
     map.draw(0, 0)
     Processor.players.each do |player|
@@ -36,17 +31,20 @@ class GameWindow < Gosu::Window
     if @finish_game && Processor.players.map(&:explosions).flatten.empty?
       @song.stop
       Processor.game_over(@players_hit)
-      close
     end
   end
 
-private
+  def map
+    @map ||= Map.new(BLAST_MAP_PATH + 'basic.txt')
+  end
+
   def button_down(id)
-    close               if id == Gosu::KbEscape
+    Processor.close     if id == Gosu::KbEscape
     @song.volume -= 0.1 if id == Gosu::KbNumpadSubtract
     @song.volume += 0.1 if id == Gosu::KbNumpadAdd
   end
 
+private
   def players_hit?(explosion, index)
     Processor.players.each do |player|
       if explosion.at?(player.x, player.y)

data/lib/{game_over_window.rb → game_over.rb}

@@ -1,10 +1,8 @@
-class GameOverWindow < Gosu::Window
-
-  def initialize(death_toll)
-    super(*Processor::Screen)
-    self.caption = Processor::Caption
-    @font        = Gosu::Font.new(self, Gosu::default_font_name, 20)
-    @death_toll  = death_toll
+class GameOver
+  def initialize(window, death_toll)
+    @window = window
+    @font = Gosu::Font.new(@window, Gosu::default_font_name, 20)
+    @death_toll = death_toll
   end
 
   def draw
@@ -13,6 +11,14 @@ class GameOverWindow < Gosu::Window
     @font.draw("Player 1 won. Player 2 was blown up by #{killer(:player_1)}", 200, 200, 1) if player_1_hit?
   end
 
+  def button_down(id)
+    Processor.close if id == Gosu::KbEscape
+  end
+
+  def update
+    # do nothing
+  end
+private
   def draw?
     player_0_hit? && player_1_hit?
   end
@@ -28,8 +34,4 @@ class GameOverWindow < Gosu::Window
   def killer(player)
     "Player #{@death_toll[player].first.to_s[-1..-1].to_i + 1}"
   end
-
-  def button_down(id)
-    close if id == Gosu::KbEscape
-  end
 end

data/lib/map.rb

@@ -5,7 +5,7 @@ class Map
   def initialize(path)
     @path   = path
     @t_size = Processor::TileSize
-    @set    = Gosu::Image.load_tiles(Processor.game_window, BLAST_IMG_PATH + 'tileset.png', @t_size, @t_size, true)
+    @set    = Gosu::Image.load_tiles(Processor.window, BLAST_IMG_PATH + 'tileset.png', @t_size, @t_size, true)
     register_solid_tiles
   end
 

data/lib/menu.rb

@@ -0,0 +1,68 @@
+class Menu
+  def initialize(window, opts={})
+    @window     = window
+    @pointer    = Gosu::Image.new(@window,BLAST_IMG_PATH + "cursor.png",true)
+    @background = Gosu::Image.load_tiles(@window, BLAST_IMG_PATH + 'menu.png', 1024, 768, true).first
+    @title      = Gosu::Image.load_tiles(@window, BLAST_IMG_PATH + 'title.png', 350, 80, true)
+    @new_game   = Gosu::Image.load_tiles(@window, BLAST_IMG_PATH + 'newgame.png', 150, 40, true)
+    @options    = Gosu::Image.load_tiles(@window, BLAST_IMG_PATH + 'options.png', 150, 40, true)
+    @exit_game  = Gosu::Image.load_tiles(@window, BLAST_IMG_PATH + 'exitgame.png', 150, 40, true)
+    @song       = Gosu::Song.new(@window, BLAST_SND_PATH + 'menu.wav')
+    @new_game_index = @options_index = @exit_game_index = 1
+    @song.play(true)
+    @song.volume = 0.3
+    @px = @py = 0
+  end
+
+  def update
+    @px, @py = @window.mouse_x, @window.mouse_y
+    update_hovers
+  end
+
+  def draw
+    @background.draw(0,0,0)
+    @title.first.draw(340, 190, 1)
+    @new_game[@new_game_index].draw(450, 280, 1)
+    @options[@options_index].draw(450, 330, 1)
+    @exit_game[@exit_game_index].draw(450, 380, 1)
+    @pointer.draw(@px,@py,2)
+  end
+
+  def button_down(id)
+     Processor.close         if id == Gosu::KbEscape
+     start_game              if id == Gosu::KbReturn
+     mouse_clicked(@px, @py) if id == Gosu::MsLeft
+     @song.volume -= 0.1     if id == Gosu::KbNumpadSubtract
+     @song.volume += 0.1     if id == Gosu::KbNumpadAdd
+   end
+
+private
+
+  def mouse_clicked(x, y)
+    start_game if at_new_game?(x,y)
+    Processor.close if at_exit_game?(x,y)
+  end
+
+  def update_hovers
+     @new_game_index = at_new_game?(@px, @py) ? 0 : 1
+     @options_index = at_options?(@px, @py) ? 0 : 1
+     @exit_game_index = at_exit_game?(@px, @py) ? 0 : 1
+   end
+
+   def at_new_game?(x,y)
+     (450..600).include?(x) && (280..320).include?(y)
+   end
+
+   def at_options?(x,y)
+     (450..600).include?(x) && (330..370).include?(y)
+   end
+
+   def at_exit_game?(x,y)
+     (450..600).include?(x) && (380..420).include?(y)
+   end
+
+   def start_game
+     @song.stop
+     Processor.start_game
+   end
+end

data/lib/player.rb

@@ -6,10 +6,10 @@ class Player
     @t_size       = Processor::TileSize
     #more animation to come
     @facing       = :down
-    @animation_sprites = {:left  => Gosu::Image.load_tiles(Processor.game_window, BLAST_IMG_PATH + "player_left#{@index}.png", @t_size, @t_size, false),
-                          :down  => Gosu::Image.load_tiles(Processor.game_window, BLAST_IMG_PATH + "player_down#{@index}.png", @t_size, @t_size, false),
-                          :up    => Gosu::Image.load_tiles(Processor.game_window, BLAST_IMG_PATH + "player_up#{@index}.png", @t_size, @t_size, false),
-                          :right => Gosu::Image.load_tiles(Processor.game_window, BLAST_IMG_PATH + "player_right#{@index}.png", @t_size, @t_size, false)}
+    @animation_sprites = {:left  => Gosu::Image.load_tiles(Processor.window, BLAST_IMG_PATH + "player_left#{@index}.png", @t_size, @t_size, false),
+                          :down  => Gosu::Image.load_tiles(Processor.window, BLAST_IMG_PATH + "player_down#{@index}.png", @t_size, @t_size, false),
+                          :up    => Gosu::Image.load_tiles(Processor.window, BLAST_IMG_PATH + "player_up#{@index}.png", @t_size, @t_size, false),
+                          :right => Gosu::Image.load_tiles(Processor.window, BLAST_IMG_PATH + "player_right#{@index}.png", @t_size, @t_size, false)}
     @bombs        = []
     @explosions   = []
     @move_control = {[Gosu::Button::KbA,       Gosu::Button::KbLeft] => [:left, [-1, 0],[0, 0, 0, 40]],
@@ -95,7 +95,7 @@ private
   end
 
   def solid_at?(x, y)
-    Processor.game_window.map.solid_at?(x, y)
+    Processor.solid_at?(x, y)
   end
 
   def explode_direction(x,y, direction)
@@ -119,11 +119,11 @@ private
   end
 
   def input_move_instructions
-    move = @move_control.detect {|keys, movement| Processor.game_window.button_down?(keys[@index]) }
+    move = @move_control.detect {|keys, movement| Processor.window.button_down?(keys[@index]) }
     move.last if move
   end
 
   def placing_bomb?
-    @brain ? @brain.placing_bomb? : Processor.game_window.button_down?(@bomb_control[@index])
+    Processor.window.button_down?(@bomb_control[@index])
   end
 end

data/lib/processor.rb

@@ -1,26 +1,27 @@
 require 'tileable'
 require 'solid_tile'
-require 'menu_window'
-require 'game_window'
 require 'map'
 require 'explosion'
 require 'bomb'
 require 'player'
-require 'basic_brain'
-require 'game_over_window'
+require 'menu'
+require 'game_over'
+require 'game'
+require 'window'
 # Processor is responsible to keep overall configuration knowledge, state
 # transitions and keeping track of windows
 class Processor
   Screen = [1024, 768, false]
   TileSize = 48
-  Caption = "Blast Mavens: Multiplayer Beta v0.1.3"
+  Caption = "Blast Mavens: Multiplayer Beta v0.1.4"
   class << self
-    attr_reader :game_window
+    attr_reader :window
     attr_accessor :players
 
     def new
       @players = []
-      MenuWindow.new.show
+      @window = Window.new("Menu")
+      @window.show
     end
 
     def has_at_least_one_player?
@@ -48,13 +49,20 @@ class Processor
     end
 
     def start_game
-      @game_window = GameWindow.new
       2.times { @players << Player.new }
-      @game_window.show
+      @window.set_delegate("Game")
     end
 
     def game_over(death_toll)
-      GameOverWindow.new(death_toll).show
+      @window.set_delegate("GameOver", death_toll)
+    end
+
+    def close
+      @window.close
+    end
+
+    def solid_at?(x,y)
+      @window.map ? @window.map.solid_at?(x,y) : false
     end
 
   private

data/lib/window.rb

@@ -0,0 +1,27 @@
+class Window < Gosu::Window
+  def initialize(name)
+    super(*Processor::Screen)
+    self.caption = "Blast Mavens: Multiplayer Beta v0.1.0"
+    set_delegate(name)
+  end
+
+  def draw
+    @delegate.draw
+  end
+
+  def update
+    @delegate.update
+  end
+
+  def button_down(id)
+    @delegate.button_down(id)
+  end
+
+  def set_delegate(name, opts={})
+    @delegate = Object.const_get(name).new(self, opts)
+  end
+
+  def method_missing(sym, *args, &block)
+    @delegate.send(sym, *args, &block)
+  end
+end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: blast_mavens_multiplayer
 version: !ruby/object:Gem::Version 
-  hash: 29
+  hash: 19
   prerelease: 
   segments: 
   - 0
   - 1
-  - 3
-  version: 0.1.3
+  - 4
+  version: 0.1.4
 platform: ruby
 authors: 
 - tjbladez
@@ -42,17 +42,17 @@ extra_rdoc_files: []
 
 files: 
 - bin/blast_mavens
-- lib/basic_brain.rb
 - lib/bomb.rb
 - lib/explosion.rb
-- lib/game_over_window.rb
-- lib/game_window.rb
+- lib/game.rb
+- lib/game_over.rb
 - lib/map.rb
-- lib/menu_window.rb
+- lib/menu.rb
 - lib/player.rb
 - lib/processor.rb
 - lib/solid_tile.rb
 - lib/tileable.rb
+- lib/window.rb
 - resources/images/cursor.png
 - resources/images/dynamite.png
 - resources/images/exitgame.png

data/lib/basic_brain.rb

@@ -1,25 +0,0 @@
-class BasicBrain
-  def initialize(brainholder, enemy)
-    @me  = brainholder
-    @you = enemy
-    @move_control = {:left  => [:left, [-1, 0],[0, 0, 0, 40]],
-                     :right => [:right, [1, 0], [40, 0, 40, 40]],
-                     :up    => [:up, [0, -1],[40, 0, 0, 0]],
-                     :down  => [:down, [0, 1],[40, 40, 0, 40 ]]}
-  end
-
-  def move_instructions
-    x_diff = @me.x - @you.x
-    y_diff = @me.y - @you.y
-
-    return @move_control[:left] if x_diff > 24
-    return @move_control[:right] if x_diff < -24
-    return @move_control[:up] if y_diff > 24
-    return @move_control[:down] if y_diff < -24
-    return nil
-  end
-
-  def placing_bomb?
-    return false
-  end
-end

data/lib/menu_window.rb

@@ -1,69 +0,0 @@
-class MenuWindow < Gosu::Window
-  def initialize
-    super(*Processor::Screen)
-    self.caption = Processor::Caption
-    @pointer     = Gosu::Image.new(self, BLAST_IMG_PATH + "cursor.png",true)
-    @background  = Gosu::Image.load_tiles(self, BLAST_IMG_PATH + 'menu.png', 1024, 768, true).first
-    @title       = Gosu::Image.load_tiles(self, BLAST_IMG_PATH + 'title.png', 350, 80, true)
-    @new_game    = Gosu::Image.load_tiles(self, BLAST_IMG_PATH + 'newgame.png', 150, 40, true)
-    @options     = Gosu::Image.load_tiles(self, BLAST_IMG_PATH + 'options.png', 150, 40, true)
-    @exit_game   = Gosu::Image.load_tiles(self, BLAST_IMG_PATH + 'exitgame.png', 150, 40, true)
-    @song        = Gosu::Song.new(self, BLAST_SND_PATH + 'menu.wav')
-    @new_game_index = @options_index = @exit_game_index = 1
-    @song.play(true)
-    @song.volume = 0.3
-    @px = @py = 0
-  end
-
-  def update
-    @px, @py = mouse_x, mouse_y
-    update_hovers
-  end
-
-  def draw
-    @background.draw(0,0,0)
-    @title.first.draw(340, 190, 1)
-    @new_game[@new_game_index].draw(450, 280, 1)
-    @options[@options_index].draw(450, 330, 1)
-    @exit_game[@exit_game_index].draw(450, 380, 1)
-    @pointer.draw(@px,@py,2)
-  end
-
-  def mouse_clicked(x, y)
-    start_game if at_new_game?(x,y)
-    close if at_exit_game?(x,y)
-  end
-
-  def button_down(id)
-    close                   if id == Gosu::KbEscape
-    start_game              if id == Gosu::KbReturn
-    mouse_clicked(@px, @py) if id == Gosu::MsLeft
-    @song.volume -= 0.1     if id == Gosu::KbNumpadSubtract
-    @song.volume += 0.1     if id == Gosu::KbNumpadAdd
-  end
-
-private
-  def update_hovers
-    @new_game_index = at_new_game?(@px, @py) ? 0 : 1
-    @options_index = at_options?(@px, @py) ? 0 : 1
-    @exit_game_index = at_exit_game?(@px, @py) ? 0 : 1
-  end
-
-  def at_new_game?(x,y)
-    (450..600).include?(x) && (280..320).include?(y)
-  end
-
-  def at_options?(x,y)
-    (450..600).include?(x) && (330..370).include?(y)
-  end
-
-  def at_exit_game?(x,y)
-    (450..600).include?(x) && (380..420).include?(y)
-  end
-
-  def start_game
-    close
-    @song.stop
-    Processor.start_game
-  end
-end