line-em-up 0.3.5 → 0.3.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d9421cc61562776406fdb6434aefa629abe793a3
-  data.tar.gz: 4958a21d527c866522676a7f346b6735fc33ae2e
+  metadata.gz: a780d246a95abf5113ec05675e5f371d98c607e6
+  data.tar.gz: fbe35beb2057b0bb4585006729cb10cbd9e02d06
 SHA512:
-  metadata.gz: ea9e7e14ff9596ed5000a2c1a0ed08c5a4b1c152a74f7c6c63ce408db376252f2289459a203265215de674ce6f807a919073f6910f7afefd0f100d3a8177fc2e
-  data.tar.gz: 708c5fd5be3f031830ec85d22bfc28761144b4228112313d9e9a8af6da39c347b99672e384ebc4251d5430aa60902c01f870ca99fb54c77a744947cc59ac2c00
+  metadata.gz: 3023953f7bfbe84799d35a5525d588964c237700c63ae5521df82359e28a383146adca85a83bad6154020641ae03912bd1e311d9c6dc74a2328d32c0fe79d3c9
+  data.tar.gz: d1dad27f58937b300038036482dd4b630100bcebef585db019870454bf3092bcd36bd8b2b2f9490e36c72e96c4c8e3bc30ddd5a31b9c84bd01335dd25457dc44

data/line-em-up/game_window.rb

@@ -60,7 +60,7 @@ Dir["#{CURRENT_DIRECTORY}/models/*.rb"].each { |f| require f }
 # exit if Object.const_defined?(:Ocra) #allow ocra to create an exe without executing the entire script
 
 
-WIDTH, HEIGHT = 640, 480
+DEFAULT_WIDTH, DEFAULT_HEIGHT = 640, 480
 
 RESOLUTIONS = [[640, 480], [800, 600], [960, 720], [1024, 768], [1280, 960], [1400, 1050], [1440, 1080], [1600, 1200], [1856, 1392], [1920, 1440], [2048, 1536]]
 # RESOLUTIONS = [[640, 480], [800, 600], [960, 720], [1024, 768]]
@@ -69,81 +69,8 @@ RESOLUTIONS = [[640, 480], [800, 600], [960, 720], [1024, 768], [1280, 960], [14
 class GameWindow < Gosu::Window
   attr_accessor :width, :height, :block_all_controls
 
-  # Switch button downs to this method
-  def button_down(id)
-    # puts "HERE: #{id.inspect}"
-    # super(id)
-    if id == Gosu::MsLeft && @menu_open && @menu
-      @menu.clicked
-    end
-  end
-
-  def self.reset(window, options = {})
-    window = GameWindow.new(window.width, window.height, window.fullscreen?, {block_controls_until_button_up: true, debug: options[:debug]}).show
-  end
-
-
-  def self.start width = nil, height = nil, fullscreen = false, options = {}
-    # window = GameWindow.new.show
-    GameWindow.new(width, height, fullscreen, options).show
-  end
-
-# When fullscreen, try to match window with screen resolution
-# .screen_height ⇒ Integer
-# The height (in pixels) of the user's primary screen.
-# .screen_width ⇒ Integer
-# The width (in pixels) of the user's primary screen.
-
-  def self.fullscreen(window)
-    window.fullscreen = !window.fullscreen?
-  end
-
-  def self.resize(window, width, height, fullscreen)
-    window = GameWindow.new(width, height).show
-    window.fullscreen = fullscreen
-  end
-
-  def self.find_index_of_current_resolution width, height
-    current_index = nil
-    counter = 0
-    RESOLUTIONS.each do |resolution|
-      break if current_index && current_index > 0
-      current_index = counter if resolution[0] == width && resolution[1] == height
-      counter += 1
-    end
-    return current_index
-  end
-
-  def self.up_resolution(window)
-    # puts "UP RESLUTION"
-    index = find_index_of_current_resolution(window.width, window.height)
-    # puts "FOUND INDEX: #{index}"
-    if index == RESOLUTIONS.count - 1
-      # Max resolution, do nothing
-    else
-      # window.width = RESOLUTIONS[index + 1][0]
-      # window.height = RESOLUTIONS[index + 1][1]
-      width = RESOLUTIONS[index + 1][0]
-      height = RESOLUTIONS[index + 1][1]
-      # puts "UPPING TO #{width} x #{height}"
-      window = GameWindow.new(width, height, {block_resize: true}).show
-    end
-  end
-
-  def self.down_resolution(window)
-    index = find_index_of_current_resolution(window.width, window.height)
-    if index == 0
-      # Min resolution, do nothing
-    else
-      # window.width = RESOLUTIONS[index - 1][0]
-      # window.height = RESOLUTIONS[index - 1][1]
-      width = RESOLUTIONS[index - 1][0]
-      height = RESOLUTIONS[index - 1][1]
-      window = GameWindow.new(width, height, {block_resize: true}).show
-    end
-  end
-
   def initialize width = nil, height = nil, fullscreen = false, options = {}
+    @difficulty = options[:difficulty]
     @block_all_controls = !options[:block_controls_until_button_up].nil? && options[:block_controls_until_button_up] == true ? true : false
     @debug = options[:debug]
     # GameWindow.fullscreen(self) if fullscreen
@@ -151,8 +78,8 @@ class GameWindow < Gosu::Window
     @center_ui_y = 0
     @center_ui_x = 0
 
-    @width  = width || WIDTH
-    @height = height || HEIGHT
+    @width  = width || DEFAULT_WIDTH
+    @height = height || DEFAULT_HEIGHT
 
     reset_center_font_ui_y
 
@@ -182,7 +109,7 @@ class GameWindow < Gosu::Window
     
     @gl_background = GLBackground.new
     
-    @player = Player.new(@scale, @width / 2, @height / 2)
+    @player = Player.new(@scale, @width / 2, @height / 2, @width, @height)
     @grappling_hook = nil
     
     @buildings = Array.new
@@ -209,13 +136,97 @@ class GameWindow < Gosu::Window
     reset_font_ui_y
 
     # @boss_active_at_enemies_killed = 500
-    @boss_active_at_enemies_killed = 750
-    @boss_active_at_level          = 4
+    if @difficulty == 'easy'
+      @boss_active_at_enemies_killed = 100
+      @boss_active_at_level          = 1
+    elsif @difficulty == "medium"
+      @boss_active_at_level          = 3
+      @boss_active_at_enemies_killed = 350
+    else
+      @boss_active_at_level          = 4
+      @boss_active_at_enemies_killed = 700
+    end
+
     @boss_active = false
     @boss = nil
     @boss_killed = false
   end
 
+
+  # Switch button downs to this method
+  def button_down(id)
+    # puts "HERE: #{id.inspect}"
+    # super(id)
+    if id == Gosu::MsLeft && @menu_open && @menu
+      @menu.clicked
+    end
+  end
+
+  def self.reset(window, options = {})
+    window = GameWindow.new(window.width, window.height, window.fullscreen?, options.merge({block_controls_until_button_up: true})).show
+  end
+
+
+  def self.start width = nil, height = nil, fullscreen = false, options = {}
+    # window = GameWindow.new.show
+    GameWindow.new(width, height, fullscreen, options).show
+  end
+
+# When fullscreen, try to match window with screen resolution
+# .screen_height ⇒ Integer
+# The height (in pixels) of the user's primary screen.
+# .screen_width ⇒ Integer
+# The width (in pixels) of the user's primary screen.
+
+  def self.fullscreen(window)
+    window.fullscreen = !window.fullscreen?
+  end
+
+  def self.resize(window, width, height, fullscreen)
+    window = GameWindow.new(width, height).show
+    window.fullscreen = fullscreen
+  end
+
+  def self.find_index_of_current_resolution width, height
+    current_index = nil
+    counter = 0
+    RESOLUTIONS.each do |resolution|
+      break if current_index && current_index > 0
+      current_index = counter if resolution[0] == width && resolution[1] == height
+      counter += 1
+    end
+    return current_index
+  end
+
+  def self.up_resolution(window)
+    # # puts "UP RESLUTION"
+    # index = find_index_of_current_resolution(window.width, window.height)
+    # # puts "FOUND INDEX: #{index}"
+    # if index == RESOLUTIONS.count - 1
+    #   # Max resolution, do nothing
+    # else
+    #   # window.width = RESOLUTIONS[index + 1][0]
+    #   # window.height = RESOLUTIONS[index + 1][1]
+    #   width = RESOLUTIONS[index + 1][0]
+    #   height = RESOLUTIONS[index + 1][1]
+    #   # puts "UPPING TO #{width} x #{height}"
+    #   window = GameWindow.new(width, height, {block_resize: true}).show
+    # end
+  end
+
+  def self.down_resolution(window)
+    # index = find_index_of_current_resolution(window.width, window.height)
+    # if index == 0
+    #   # Min resolution, do nothing
+    # else
+    #   # window.width = RESOLUTIONS[index - 1][0]
+    #   # window.height = RESOLUTIONS[index - 1][1]
+    #   width = RESOLUTIONS[index - 1][0]
+    #   height = RESOLUTIONS[index - 1][1]
+    #   window = GameWindow.new(width, height, {block_resize: true}).show
+    # end
+  end
+
   def button_up id
     @block_all_controls = false
     # Grappling hook always active
@@ -260,6 +271,7 @@ class GameWindow < Gosu::Window
   end
 
   def update
+    @pointer.update(self.mouse_x, self.mouse_y) if @pointer
     if @start_fullscreen
       @start_fullscreen = false
       GameWindow.fullscreen(self)
@@ -271,8 +283,8 @@ class GameWindow < Gosu::Window
         @menu_open = true
         @can_open_menu = false
         @menu = Menu.new(self)
-        @menu.add_item(Gosu::Image.new(self, "#{MEDIA_DIRECTORY}/exit.png", false), get_center_font_ui_x, get_center_font_ui_y, 1, lambda { self.close }, Gosu::Image.new(self, "#{MEDIA_DIRECTORY}/exit_hover.png", false))
-        @menu.add_item(Gosu::Image.new(self, "#{MEDIA_DIRECTORY}/resume.png", false), get_center_font_ui_x, get_center_font_ui_y, 1, lambda { @menu_open = false; @menu = nil; @can_open_menu = true; }, Gosu::Image.new(self, "#{MEDIA_DIRECTORY}/resume.png", false))
+        @menu.add_item(Gosu::Image.new(self, "#{MEDIA_DIRECTORY}/exit.png", false), get_center_font_ui_x, get_center_font_ui_y, ZOrder::UI, lambda { self.close }, Gosu::Image.new(self, "#{MEDIA_DIRECTORY}/exit_hover.png", false))
+        @menu.add_item(Gosu::Image.new(self, "#{MEDIA_DIRECTORY}/resume.png", false), get_center_font_ui_x, get_center_font_ui_y, ZOrder::UI, lambda { @menu_open = false; @menu = nil; @can_open_menu = true; }, Gosu::Image.new(self, "#{MEDIA_DIRECTORY}/resume.png", false))
         # close!
       end
       if Gosu.button_down?(Gosu::KB_M)
@@ -312,25 +324,26 @@ class GameWindow < Gosu::Window
       end
 
       if @player.is_alive && !@game_pause && !@menu_open
-        @player.update(@width, @height)
-        @player.move_left(@width)  if Gosu.button_down?(Gosu::KB_LEFT)  || Gosu.button_down?(Gosu::GP_LEFT)    || Gosu.button_down?(Gosu::KB_A)
-        @player.move_right(@width) if Gosu.button_down?(Gosu::KB_RIGHT) || Gosu.button_down?(Gosu::GP_RIGHT)   || Gosu.button_down?(Gosu::KB_D)
-        @player.accelerate(@height) if Gosu.button_down?(Gosu::KB_UP)    || Gosu.button_down?(Gosu::GP_UP)      || Gosu.button_down?(Gosu::KB_W)
-        @player.brake(@height)      if Gosu.button_down?(Gosu::KB_DOWN)  || Gosu.button_down?(Gosu::GP_DOWN)    || Gosu.button_down?(Gosu::KB_S)
+        @player.update()
+        @player.move_left()  if Gosu.button_down?(Gosu::KB_LEFT)  || Gosu.button_down?(Gosu::GP_LEFT)    || Gosu.button_down?(Gosu::KB_A)
+        @player.move_right() if Gosu.button_down?(Gosu::KB_RIGHT) || Gosu.button_down?(Gosu::GP_RIGHT)   || Gosu.button_down?(Gosu::KB_D)
+        @player.accelerate() if Gosu.button_down?(Gosu::KB_UP)    || Gosu.button_down?(Gosu::GP_UP)      || Gosu.button_down?(Gosu::KB_W)
+        @player.brake()      if Gosu.button_down?(Gosu::KB_DOWN)  || Gosu.button_down?(Gosu::GP_DOWN)    || Gosu.button_down?(Gosu::KB_S)
 
         if Gosu.button_down?(Gosu::MS_RIGHT)
           if @grappling_hook == nil && @player.grapple_hook_cooldown_wait <= 0
-            @grappling_hook = GrapplingHook.new(@scale, @player, self.mouse_x, self.mouse_y)
+            @grappling_hook = GrapplingHook.new(@scale, @width, @height, @player, self.mouse_x, self.mouse_y)
+            @player.grapple_hook_cooldown_wait = @grappling_hook.cooldown_delay
           end
         end
 
         if Gosu.button_down?(Gosu::MS_LEFT)
-          @projectiles = @projectiles + @player.trigger_secondary_attack(@width, @height, self.mouse_x, self.mouse_y)
+          @projectiles = @projectiles + @player.trigger_secondary_attack(@pointer)
         end
 
         if Gosu.button_down?(Gosu::KB_SPACE)
           if @player.cooldown_wait <= 0
-            results = @player.attack(@width, @height, self.mouse_x, self.mouse_y)
+            results = @player.attack(@pointer)
             projectiles = results[:projectiles]
             cooldown = results[:cooldown]
             @player.cooldown_wait = cooldown.to_f.fdiv(@player.attack_speed)
@@ -368,23 +381,23 @@ class GameWindow < Gosu::Window
 
         
         
-        @buildings.reject! { |building| !building.update(@width, @height) }
+        @buildings.reject! { |building| !building.update() }
 
         if @player.is_alive && @grappling_hook
-          grap_result = @grappling_hook.update(@width, @height, @player)
+          grap_result = @grappling_hook.update(@player)
           @grappling_hook = nil if !grap_result
         end
 
-        @pickups.reject! { |pickup| !pickup.update(@width, @height, self.mouse_x, self.mouse_y) }
+        @pickups.reject! { |pickup| !pickup.update(self.mouse_x, self.mouse_y) }
 
-        @projectiles.reject! { |projectile| !projectile.update(@width, @height, self.mouse_x, self.mouse_y) }
+        @projectiles.reject! { |projectile| !projectile.update(self.mouse_x, self.mouse_y) }
 
-        @enemy_projectiles.reject! { |projectile| !projectile.update(@width, @height, self.mouse_x, self.mouse_y) }
-        @enemy_destructable_projectiles.reject! { |projectile| !projectile.update(@width, @height, self.mouse_x, self.mouse_y) }
-        @enemies.reject! { |enemy| !enemy.update(@width, @height, nil, nil, @player) }
+        @enemy_projectiles.reject! { |projectile| !projectile.update(self.mouse_x, self.mouse_y) }
+        @enemy_destructable_projectiles.reject! { |projectile| !projectile.update(self.mouse_x, self.mouse_y) }
+        @enemies.reject! { |enemy| !enemy.update(nil, nil, @player) }
 
         if @boss
-          result = @boss.update(@width, @height, nil, nil, @player)
+          result = @boss.update(nil, nil, @player)
           if !result
             @boss_killed = true
             @boss = nil
@@ -398,7 +411,7 @@ class GameWindow < Gosu::Window
         
 
         if !@boss_killed && !@boss_active
-          @buildings.push(Building.new(@scale)) if rand(100) == 0
+          @buildings.push(Building.new(@scale, @width, @height)) if rand(100) == 0
         end
 
         # Temp
@@ -408,6 +421,7 @@ class GameWindow < Gosu::Window
           if @player.is_alive && rand(@enemies_random_spawn_timer) == 0 && @enemies.count <= @max_enemies
             (0..(@enemies_spawner_counter / 2).round).each do |count|
               @enemies.push(EnemyPlayer.new(@scale, @width, @height)) if @enemies.count <= @max_enemy_count
+              # @enemies.push(MissileBoat.new(@scale, @width, @height)) if @enemies.count == 0
             end
           end
           if @player.time_alive % 500 == 0
@@ -445,7 +459,7 @@ class GameWindow < Gosu::Window
         # Move to enemy mehtods
         @enemies.each do |enemy|
           if enemy.cooldown_wait <= 0
-            results = enemy.attack(@width, @height, @player)
+            results = enemy.attack(@player)
 
             projectiles = results[:projectiles]
             cooldown = results[:cooldown]
@@ -463,7 +477,7 @@ class GameWindow < Gosu::Window
 
         if @boss
           if @boss.cooldown_wait <= 0
-            results = @boss.attack(@width, @height, @player)
+            results = @boss.attack(@player)
             projectiles = results[:projectiles]
             cooldown = results[:cooldown]
             @boss.cooldown_wait = cooldown.to_f.fdiv(@boss.attack_speed)
@@ -476,7 +490,7 @@ class GameWindow < Gosu::Window
             end
           end
           if @boss.secondary_cooldown_wait <= 0
-            results = @boss.secondary_attack(@width, @height, @player)
+            results = @boss.secondary_attack(@player)
 
             projectiles = results[:projectiles]
             cooldown = results[:cooldown]
@@ -491,7 +505,7 @@ class GameWindow < Gosu::Window
           end
 
           if @boss.tertiary_cooldown_wait <= 0
-            results = @boss.tertiary_attack(@width, @height, @player)
+            results = @boss.tertiary_attack(@player)
 
             projectiles = results[:projectiles]
             cooldown = results[:cooldown]
@@ -517,7 +531,7 @@ class GameWindow < Gosu::Window
     @footer_bar.draw(@player)
     @boss.draw if @boss
     # @pointer.draw(self.mouse_x, self.mouse_y) if @grappling_hook.nil? || !@grappling_hook.active
-    @pointer.draw(self.mouse_x, self.mouse_y)# if @grappling_hook.nil? || !@grappling_hook.active
+    @pointer.draw# if @grappling_hook.nil? || !@grappling_hook.active
 
     @player.draw() if @player.is_alive
     @grappling_hook.draw(@player) if @player.is_alive && @grappling_hook

data/line-em-up/irb_requirements.rb

@@ -3,9 +3,8 @@
 require 'rubygems'
 require 'gosu'
 require 'gl'
-# require 'rmagick'
-# require 'geometry'
-# require_relative 'star.rb'
-# require_relative 'bullet.rb'
-# require_relative 'player.rb'
-# require_relative 'enemy_player.rb'
+CURRENT_DIRECTORY = File.expand_path('../', __FILE__)
+
+Dir["#{CURRENT_DIRECTORY}/models/*.rb"].each { |f| require f }
+Dir["#{CURRENT_DIRECTORY}/lib/*.rb"].each { |f| require f }
+

data/line-em-up/lib/config_setting.rb

@@ -5,25 +5,38 @@ module ConfigSetting
     # puts "HERE: #{file_location} and #{setting_name} and #{setting_value}"
     create_file_if_non_existent(file_location)
     if setting_value
+      # File.open('xxx.txt').each do |line|
+      #   print "#{line_num += 1} #{line}"
+      # end
       if File.readlines(file_location).grep(/#{setting_name}:/).size > 0
-        # puts "FOUND SETTING"
         text = File.read(file_location)
-        # puts "FOUDN IN FILE: #{text.inspect}"
-        replace = text.gsub(/^#{setting_name}: ([^$]*)$/, setting_value)
-        # replace = replace.gsub(/bbb/, "Replace bbb with 222")
-        File.open(file_location, "w") {|file| file.puts "#{setting_name}: #{replace}"}
+        puts "READ TEXT IN FILE: #{text}"
+        File.open(file_location, 'w+'){|f| f << text.sub(/^#{setting_name}: ([^;]*);$/, "#{setting_name}: #{setting_value};") }
       else
-        # puts "COULDNT FIND SETTING"
         File.open(file_location, 'a') do |f|
-          f << "#{setting_name}: #{setting_value}"
+          f << "\n#{setting_name}: #{setting_value};"
         end
       end
+
+      # if File.readlines(file_location).grep(/#{setting_name}:/).size > 0
+      #   # puts "FOUND SETTING"
+      #   text = File.read(file_location)
+      #   # puts "FOUDN IN FILE: #{text.inspect}"
+      #   replace = text.gsub(/^#{setting_name}: ([^$]*)$/, setting_value)
+      #   # replace = replace.gsub(/bbb/, "Replace bbb with 222")
+      #   File.open(file_location, "w") {|file| file.puts "#{setting_name}: #{replace}"}
+      # else
+      #   # puts "COULDNT FIND SETTING"
+      #   File.open(file_location, 'a') do |f|
+      #     f << "#{setting_name}: #{setting_value}"
+      #   end
+      # end
     end
   end
 
   def self.get_setting file_location, setting_name, default_value
     create_file_if_non_existent(file_location)
-    test = File.readlines(file_location).select { |line| line =~ /^#{setting_name}: ([^$]*)$/ }
+    test = File.readlines(file_location).select { |line| line =~ /^#{setting_name}: ([^;]*);$/ }
     if test && test.first
       # puts "BEFORE SCAN: #{test}"
       # So many firstsss
@@ -48,7 +61,7 @@ module ConfigSetting
     if test == [] || test.nil? || test == ''
       test = default_value
     end
-    return test
+    return test.gsub(';', '')
   end
 
   def self.create_file_if_non_existent file_location

data/line-em-up/lib/difficulty_setting.rb

@@ -0,0 +1,78 @@
+require_relative 'setting.rb'
+# require_relative "config_settings.rb"
+
+class DifficultySetting < Setting
+  DIFFICULTIES = ["easy", "medium", "hard"]
+  attr_accessor :x, :y, :font, :max_width, :max_height
+
+
+  def initialize max_width, max_height, height, config_file_path
+    # puts "INNITING #{config_file_path}"
+    @font = Gosu::Font.new(20)
+    # @x = width
+    @y = height
+    @max_width = max_width
+    @max_height = max_height
+    @next_x = 15
+    @prev_x = @max_width - 15 - @font.text_width('>')
+    @config_file_path = config_file_path
+    @name = 'difficulty'
+    @value = ConfigSetting.get_setting(@config_file_path, @name, DIFFICULTIES[0])
+  end
+
+  def get_difficulty
+    # puts "GETTING DIFFICULTY: #{@value}"
+    if @value
+      @value
+    end
+  end
+
+  def draw
+    @font.draw("<", @next_x, @y, 1, 1.0, 1.0, 0xff_ffff00)
+    @font.draw(@value, ((@max_width / 2) - @font.text_width(@value) / 2), @y, 1, 1.0, 1.0, 0xff_ffff00)
+    @font.draw(">", @prev_x, @y, 1, 1.0, 1.0, 0xff_ffff00)
+  end
+
+  def update mouse_x, mouse_y
+  end
+
+  def clicked mx, my
+    if is_mouse_hovering_next(mx, my)
+      puts "NEXT!!"
+      index = DIFFICULTIES.index(@value)
+      value = @value
+      if index == 0
+        value = DIFFICULTIES[DIFFICULTIES.count - 1]
+      else
+        value = DIFFICULTIES[index - 1]
+      end
+      ConfigSetting.set_setting(@config_file_path, @name, value)
+      @value = value
+    elsif is_mouse_hovering_prev(mx, my)
+      puts "PREVV!!!!"
+      index = DIFFICULTIES.index(@value)
+      value = @value
+      if index == DIFFICULTIES.count - 1
+        value = DIFFICULTIES[0]
+      else
+        value = DIFFICULTIES[index + 1]
+      end
+      ConfigSetting.set_setting(@config_file_path, @name, value)
+      @value = value
+    end
+  end
+  def is_mouse_hovering_next mx, my
+    local_width  = @font.text_width('>')
+    local_height = @font.height
+
+    (mx >= @next_x and my >= @y) and (mx <= @next_x + local_width) and (my <= @y + local_height)
+  end
+  def is_mouse_hovering_prev mx, my
+    local_width  = @font.text_width('<')
+    local_height = @font.height
+
+    (mx >= @prev_x and my >= @y) and (mx <= @prev_x + local_width) and (my <= @y + local_height)
+  end
+
+
+end

data/line-em-up/models/bomb.rb

@@ -25,7 +25,7 @@ class Bomb < Projectile
   end
   
 
-  def update width, height, mouse_x = nil, mouse_y = nil, player = nil
+  def update mouse_x = nil, mouse_y = nil, player = nil
     vx = (self.class.get_starting_speed * @scale) * Math.cos(@angle * Math::PI / 180)
 
     vy =  (self.class.get_starting_speed * @scale) * Math.sin(@angle * Math::PI / 180)
@@ -35,6 +35,6 @@ class Bomb < Projectile
     @x = @x + vx
     @y = @y + vy
 
-    super(width, height, mouse_x, mouse_y)
+    super(mouse_x, mouse_y)
   end
 end

data/line-em-up/models/building.rb

@@ -4,18 +4,24 @@ class Building < GeneralObject
   POINT_VALUE_BASE = 1
   attr_accessor :health, :armor, :x, :y
 
-  def initialize(scale, x = nil, y = nil)
-    @scale = scale
+
+  def get_image
+    Gosu::Image.new("#{MEDIA_DIRECTORY}/building.png")
+  end
+
+  def initialize(scale, screen_width, screen_height, x = nil, y = nil, options = {})
+    # @scale = scale
     # image = Magick::Image::read("#{MEDIA_DIRECTORY}/building.png").first.resize(0.3)
     # @image = Gosu::Image.new(image, :tileable => true)
-    @image = Gosu::Image.new("#{MEDIA_DIRECTORY}/building.png")
-    @image_width  = @image.width  * @scale
-    @image_height = @image.height * @scale
-    @image_size   = @image_width  * @image_height / 2
-    @image_radius = (@image_width  + @image_height) / 4
-    @x = rand * 800
-    @y = 0 - get_height
+    # @image = Gosu::Image.new("#{MEDIA_DIRECTORY}/building.png")
+    # @image_width  = @image.width  * @scale
+    # @image_height = @image.height * @scale
+    # @image_size   = @image_width  * @image_height / 2
+    # @image_radius = (@image_width  + @image_height) / 4
+    # @x = rand * 800
+    # @y = 0 - get_height
     # puts "NEW BUILDING: #{@x} and #{@y}"
+    super(scale, rand(screen_width), 0 - get_image.height, screen_width, screen_height, options)
     @health = 15
     @armor = 0
     @current_speed = (GLBackground::SCROLLING_SPEED * @scale)
@@ -36,11 +42,11 @@ class Building < GeneralObject
   def drops
     rand_num = rand(10)
     if rand(10) == 9
-      [HealthPack.new(@scale, @x, @y)]
+      [HealthPack.new(@scale, @screen_width, @screen_height, @x, @y)]
     elsif rand(10) == 8
-      [BombPack.new(@scale, @x, @y)]
+      [BombPack.new(@scale, @screen_width, @screen_height, @x, @y)]
     else
-      [MissilePack.new(@scale, @x, @y)]
+      [MissilePack.new(@scale, @screen_width, @screen_height, @x, @y)]
     end
   end
 
@@ -49,10 +55,10 @@ class Building < GeneralObject
   end
 
 
-  def update width, height, mouse_x = nil, mouse_y = nil, player = nil
+  def update mouse_x = nil, mouse_y = nil, player = nil
     if is_alive
       @y += @current_speed
-      @y < height + get_height
+      @y < @screen_height + get_height
     else
       false
     end

data/line-em-up/models/bullet.rb

@@ -1,43 +1,12 @@
-require_relative 'projectile.rb'
+require_relative 'dumb_projectile.rb'
 
-class Bullet < Projectile
+class Bullet < DumbProjectile
   DAMAGE = 5
   COOLDOWN_DELAY = 30
+  # Friendly projects are + speeds
   MAX_SPEED      = 5
 
   def get_image
     Gosu::Image.new("#{MEDIA_DIRECTORY}/bullet-mini.png")
   end
-
-  def initialize(scale, width, height, object, mouse_x = nil, mouse_y = nil, options = {})
-    @scale = scale
-    @time_alive = 0
-    @image = get_image
-    # @color = Gosu::Color.new(0xff_000000)
-    # @color.red = rand(255 - 40) + 40
-    # @color.green = rand(255 - 40) + 40
-    # @color.blue = rand(255 - 40) + 40
-    if LEFT == options[:side]
-      @x = object.x - (object.get_width / 2)
-      @y = object.y# - player.get_height
-    elsif RIGHT == options[:side]
-      @x = (object.x + object.get_width / 2) - 4
-      @y = object.y# - player.get_height
-    else
-      @x = object.x
-      @y = object.y
-    end
-    @image_width  = @image.width  * @scale
-    @image_height = @image.height * @scale
-    @image_size   = @image_width  * @image_height / 2
-    @image_radius = (@image_width  + @image_height) / 4
-    @current_speed = self.class.get_max_speed * @scale
-  end
-
-  def update width, height, mouse_x = nil, mouse_y = nil, player = nil
-    @y -= @current_speed
-    # Return false when out of screen (gets deleted then)
-    @y > 0 && @y < height
-    # super(mouse_x, mouse_y)
-  end
 end

data/line-em-up/models/cursor.rb

@@ -1,6 +1,6 @@
 require_relative 'general_object.rb'
 class Cursor < GeneralObject
-  # attr_reader :img, :visible, :imgObj
+  attr_accessor :x, :y, :image_width_half, :image_height_half
 
 
   def get_image
@@ -13,13 +13,20 @@ class Cursor < GeneralObject
     @image = get_image
     @image_width  = @image.width  * @scale
     @image_height = @image.height * @scale
-    @image_size   = @image_width  * @image_height / 2
-    @image_radius = (@image_width  + @image_height) / 4
+    @image_width_half  = @image_width  / 2
+    @image_height_half = @image_height / 2
+    @x = 0
+    @y = 0
   end
 
 
-  def draw mouse_x, mouse_y
-    @image.draw(mouse_x - get_width / 2, mouse_y - get_height / 2, ZOrder::Cursor, @scale, @scale)
+  def draw
+    @image.draw(@x - @image_width_half, @y - @image_height_half, ZOrder::Cursor, @scale, @scale)
+  end
+
+  def update mouse_x, mouse_y
+    @x = mouse_x
+    @y = mouse_y
   end
 
 end