line-em-up 0.4.0 → 2.0.0

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

@@ -0,0 +1,149 @@
+require_relative 'dumb_projectile.rb'
+require_relative 'laser_particle.rb'
+require 'opengl'
+require 'glu'
+require 'glut'
+
+class Launcher < DumbProjectile
+  attr_accessor :x, :y, :active, :projectiles, :image_path, :test, :inited, :cooldown_wait
+  # DAMAGE = 0.001
+  COOLDOWN_DELAY = 15
+  # Friendly projects are + speeds
+  MAX_SPEED      = 15
+
+  def init_projectile
+    raise "Override me"
+  end
+
+
+  def initialize(scale, screen_width, screen_height, object, options = {})
+    options[:relative_y_padding] = -(object.image_height_half)
+    super(scale, screen_width, screen_height, object, options)
+    @active = true
+    @projectiles = []
+    @image_optional = self.class.get_image#Gosu::Image.new("#{MEDIA_DIRECTORY}/laser-start-overlay.png")
+
+    @inited = true
+    @cooldown_wait = 0
+    # @image_angle = options[:image_angle] || 0
+    # puts "IMAGE ANGLE: #{@image_angle}"
+    # raise "STOP "
+  end
+
+  def get_cooldown
+    COOLDOWN_DELAY
+  end
+
+  # Used via hardpoint
+  def self.get_hardpoint_image
+    # raise "Override me"
+    # default
+    Gosu::Image.new("#{MEDIA_DIRECTORY}/laser_beam_hardpoint.png")
+  end
+
+  def attack pointer
+    if @cooldown_wait <= 0
+      options = {damage_increase: @damage_increase}
+      projectile = init_projectile(options)
+      @projectiles << projectile
+      @cooldown_wait = get_cooldown
+      return projectile
+    end
+  end
+
+  # Get image is called before the initialization is complete
+  def self.get_image
+    # optional image
+    # Gosu::Image.new("#{MEDIA_DIRECTORY}/laser-start-overlay.png")
+  end
+  # In generalobject
+  # def get_image
+  #   self.class.get_image
+  # end
+
+  def get_hardpoint_image
+    # default
+    Gosu::Image.new("#{MEDIA_DIRECTORY}/hardpoint_empty.png")
+  end
+
+  def deactivate
+    @active = false
+    # @projectiles.each do |particle|
+    #   particle.active = false
+    # end
+  end
+
+  def update mouse_x = nil, mouse_y = nil, object = nil, scroll_factor = 1
+    if @inited && @active
+      @x = object.x
+      @y = object.y
+    end
+    @cooldown_wait -= 1.0 if @cooldown_wait > 0.0
+    if !@active && @projectiles.count == 0
+      return false
+    else
+      # @projectiles.reject! do |particle|
+      #   !particle.parental_update(nil, nil, nil)
+      # end
+
+      return true
+    end
+  end
+
+  def get_draw_ordering
+    ZOrder::Launcher
+  end
+
+  # Furthest active particle in active beam
+  # def get_furthest_active_particle
+  #   last_active_particle = nil
+  #   if @active
+  #     @projectiles.reverse.each do |lp|
+  #       if lp.active && lp.y_is_on_screen
+  #         last_active_particle = lp
+  #       else
+  #         break
+  #       end
+
+  #     end
+  #   end
+  #   return last_active_particle
+  # end
+
+  def draw
+    if @inited
+      if @active
+        if @image_optional
+          # if @image_angle != nil
+          #   @image_optional.draw_rot(@x - @image_width_half, @y - @image_height_half, get_draw_ordering, @image_angle, 0.5, 0.5, @scale, @scale)
+          # else
+            @image_optional.draw(@x - @image_width_half, @y - @image_height_half, get_draw_ordering, @scale, @scale)
+          # end
+        end
+      end
+
+      return true
+    else
+      return false
+    end
+  end
+
+  def draw_gl
+    # if @inited
+    #   z = ZOrder::Projectile
+    #   new_width1, new_height1, increment_x, increment_y = LaserBeam.convert_x_and_y_to_opengl_coords(@x - @image_width_half/2, @y - @image_height_half/2, @screen_width         , @screen_height)
+    #   new_width2, new_height2, increment_x, increment_y = LaserBeam.convert_x_and_y_to_opengl_coords(@x, @y + @image_height_half/2, @screen_width         , @screen_height)
+    #   new_width3, new_height3, increment_x, increment_y = LaserBeam.convert_x_and_y_to_opengl_coords(@x + @image_width_half/2, @y - @image_height_half/2, @screen_width         , @screen_height)
+
+    #   glEnable(GL_BLEND)
+    #   glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA)
+
+    #   glBegin(GL_TRIANGLES)
+    #     glColor4f(0, 1, 0, 0.2)
+    #     glVertex3f(new_width1, new_height1, 0.0)
+    #     glVertex3f(new_width2, new_height2, 0.0)
+    #     glVertex3f(new_width3, new_height3, 0.0)
+    #   glEnd
+    # end
+  end
+end

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

@@ -1,6 +1,38 @@
+
 class Main < Gosu::Window
-  def initialize
-    @width, @height = ResolutionSetting::RESOLUTIONS[0].split('x').collect{|s| s.to_i}
+  CURRENT_DIRECTORY = File.expand_path('../', __FILE__)
+  CONFIG_FILE = "#{CURRENT_DIRECTORY}/../../config.txt"
+  require "#{CURRENT_DIRECTORY}/../game_window.rb"
+  require "#{CURRENT_DIRECTORY}/../loadout_window.rb"
+
+
+  def initialize config_path = nil
+    config_path = CONFIG_FILE if config_path.nil?
+
+
+    # @width, @height = ResolutionSetting::SELECTION[0].split('x').collect{|s| s.to_i}
+    value = ConfigSetting.get_setting(config_path, 'resolution', ResolutionSetting::SELECTION[0])
+    raise "DID NOT GET A RESOLUTION FROM CONFIG" if value.nil?
+    width, height = value.split('x')
+    @width, @height = [width.to_i, height.to_i]
+
+    default_width, default_height = ResolutionSetting::SELECTION[0].split('x')
+    # default_width, default_height = default_value.split('x')
+    default_width, default_height = [default_width.to_i, default_height.to_i]
+
+
+    # Need to just pull from config file.. and then do scaling.
+    # index = GameWindow.find_index_of_current_resolution(self.width, self.height)
+    if @width == default_width && @height == @default_height
+      @scale = 1
+    else
+      # original_width, original_height = RESOLUTIONS[0]
+      width_scale = @width / default_width.to_f
+      height_scale = @height / default_height.to_f
+      @scale = (width_scale + height_scale) / 2
+    end
+
+
     super(@width, @height, false)
     @cursor = Gosu::Image.new(self, "#{MEDIA_DIRECTORY}/cursor.png", false)
     @gl_background = GLBackground.new
@@ -17,26 +49,78 @@ class Main < Gosu::Window
     #   @menu.add_item(Gosu::Image.new(self, "#{MEDIA_DIRECTORY}/item.png", false), x, y, 1, lambda { })
     #   y += lineHeight
     # }, lambda {}]
-    @menu = Menu.new(self)
-    # for i in (0..items.size - 1)
-    #   @menu.add_item(Gosu::Image.new(self, "#{MEDIA_DIRECTORY}/#{items[i]}.png", false), x, y, 1, actions[i], Gosu::Image.new(self, "#{MEDIA_DIRECTORY}/#{items[i]}_hover.png", false))
-    #   y += lineHeight
-    # end
-    exit_image = Gosu::Image.new("#{MEDIA_DIRECTORY}/exit.png")
-    # puts "WIDTH HERE: #{exit_image.width}"
-    # 8
-    @menu.add_item(exit_image, ((@width / 2) - (exit_image.width / 2)), get_center_font_ui_y, 1, lambda { self.close }, exit_image)
+
+    # exit_image = Gosu::Image.new("#{MEDIA_DIRECTORY}/exit.png")
+
+
+    # @menu.add_item(exit_image, @, @menu.y_offset, 1, lambda { self.close }, exit_image)
+
+
     window_height = Gosu.screen_height
-    @resolution_menu = ResolutionSetting.new(window_height, @width, @height, get_center_font_ui_y, CONFIG_FILE)
+    @window = self
+    @resolution_menu = ResolutionSetting.new(@window, window_height, @width, @height, get_center_font_ui_y, config_path)
 
     @difficulty = nil
-    @difficulty_menu = DifficultySetting.new(@width, @height, get_center_font_ui_y, CONFIG_FILE)
+    @difficulty_menu = DifficultySetting.new(@window, window_height, @width, @height, get_center_font_ui_y, config_path)
+    @menu = Menu.new(self, @width / 2, get_center_font_ui_y, ZOrder::UI, @scale)
+    # Just move everything else above the menu
+    # increase_center_font_ui_y(@menu.current_height)
+
+    # start_image = Gosu::Image.new("#{MEDIA_DIRECTORY}/menu/start.png")
+    # @game_window_width, @game_window_height, @full_screen = [nil, nil, nil]
+    # @menu.add_item(start_image, (@width / 2) - (start_image.width / 2), get_center_font_ui_y, 1, lambda {self.close; GameWindow.start(@game_window_width, @game_window_height, dynamic_get_resolution_fs, {block_controls_until_button_up: true, difficulty: @difficulty}) }, start_image)
+
+    button_key = :start_game
+    @menu.add_item(
+      LUIT::Button.new(@menu.local_window, button_key, @menu.x, @menu.y + @menu.current_height, "Start", 0, 1),
+      0,
+      0,
+      lambda {|window, id| self.close; GameWindow.start(@game_window_width, @game_window_height, dynamic_get_resolution_fs, {block_controls_until_button_up: true, difficulty: @difficulty}) },
+      # lambda {|window, id| self.close },
+      nil,
+      {is_button: true, key: button_key}
+    )
+
+
+
+
+    # loadout_image = Gosu::Image.new("#{MEDIA_DIRECTORY}/menu/loadout.png")
+    # @menu.add_item(loadout_image, (@width / 2) - (loadout_image.width / 2), get_center_font_ui_y, 1, lambda {self.close; LoadoutWindow.start(@game_window_width, @game_window_height, dynamic_get_resolution_fs, {block_controls_until_button_up: true}) }, loadout_image)
+    button_key = :loadout
+    @menu.add_item(
+      LUIT::Button.new(@menu.local_window, button_key, @menu.x, @menu.y + @menu.current_height, "Loadout", 0, 1),
+      0,
+      0,
+      lambda {|window, id| self.close; LoadoutWindow.start(@game_window_width, @game_window_height, dynamic_get_resolution_fs, {block_controls_until_button_up: true}) },
+      nil,
+      {is_button: true, key: button_key}
+    )
+
+    # debug_start_image = Gosu::Image.new("#{MEDIA_DIRECTORY}/debug_start.png")
+    # @menu.add_item(debug_start_image, (@width / 2) - (debug_start_image.width / 2), get_center_font_ui_y, 1, lambda {self.close; GameWindow.start(@game_window_width, @game_window_height, dynamic_get_resolution_fs, {block_controls_until_button_up: true, debug: true, difficulty: @difficulty}) }, debug_start_image)
+
+    button_key = :debug_start
+    @menu.add_item(
+      LUIT::Button.new(@menu.local_window, button_key, @menu.x, @menu.y + @menu.current_height, "Debug Start", 0, 1),
+      0,
+      0,
+      lambda {|window, id| self.close; GameWindow.start(@game_window_width, @game_window_height, dynamic_get_resolution_fs, {block_controls_until_button_up: true, debug: true, difficulty: @difficulty}) },
+      nil,
+      {is_button: true, key: button_key}
+    )
+    button_key = :exit
+    @menu.add_item(
+      LUIT::Button.new(@menu.local_window, button_key, @menu.x, @menu.y + @menu.current_height, "Exit", 0, 1),
+      0,
+      0,
+      lambda {|window, id| self.close },
+      nil,
+      {is_button: true, key: button_key}
+    )
+
+
+
 
-    start_image = Gosu::Image.new("#{MEDIA_DIRECTORY}/start.png")
-    @game_window_width, @game_window_height, @full_screen = [nil, nil, nil]
-    @menu.add_item(start_image, (@width / 2) - (start_image.width / 2), get_center_font_ui_y, 1, lambda {self.close; GameWindow.start(@game_window_width, @game_window_height, dynamic_get_resolution_fs, {block_controls_until_button_up: true, difficulty: @difficulty}) }, start_image)
-    debug_start_image = Gosu::Image.new("#{MEDIA_DIRECTORY}/debug_start.png")
-    @menu.add_item(debug_start_image, (@width / 2) - (debug_start_image.width / 2), get_center_font_ui_y, 1, lambda {self.close; GameWindow.start(@game_window_width, @game_window_height, dynamic_get_resolution_fs, {block_controls_until_button_up: true, debug: true, difficulty: @difficulty}) }, debug_start_image)
     # @font.draw("<", width + 15, get_center_font_ui_y, 1, 1.0, 1.0, 0xff_ffff00)
     # @font.draw("Resolution", width / 2, get_center_font_ui_y, 1, 1.0, 1.0, 0xff_ffff00)
     # @font.draw(">", width - 15, get_center_font_ui_y, 1, 1.0, 1.0, 0xff_ffff00)
@@ -52,13 +136,13 @@ class Main < Gosu::Window
     @resolution_menu.update(self.mouse_x, self.mouse_y)
     @difficulty_menu.update(self.mouse_x, self.mouse_y)
     
-    @game_window_width, @game_window_height, @fullscreen = @resolution_menu.get_resolution
-    @difficulty = @difficulty_menu.get_difficulty
+    @game_window_width, @game_window_height, @fullscreen = @resolution_menu.get_values
+    @difficulty = @difficulty_menu.get_values
     @gl_background.scroll
   end
 
   def draw
-    @cursor.draw(self.mouse_x, self.mouse_y, 2)
+    @cursor.draw(self.mouse_x, self.mouse_y, ZOrder::Cursor)
     # @back.draw(0,0,0)
     reset_center_font_ui_y
     @menu.draw
@@ -75,18 +159,27 @@ class Main < Gosu::Window
     end
   end
 
+  def increase_center_font_ui_y amount
+    @center_ui_y += amount 
+  end
+
   def get_center_font_ui_y
-    return_value = @center_ui_y
-    @center_ui_y += 50 
-    return return_value
+    increase_center_font_ui_y(50)
   end
 
+
+  # def get_center_font_ui_y
+  #   return_value = @center_ui_y
+  #   @center_ui_y += 50 
+  #   return return_value
+  # end
+
   def get_center_font_ui_x
     return @center_ui_x
   end
 
   def reset_center_font_ui_y
-    @center_ui_y = self.height  / 2 - 100
-    @center_ui_x = self.width / 2 - 100
+    @center_ui_y = -(self.height  / 2) + self.height  / 1.5
+    @center_ui_x = self.width / 2
   end
 end

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

@@ -1,12 +1,40 @@
 require_relative 'menu_item.rb'
 class Menu
-    def initialize (window)
+    attr_accessor :local_window, :current_height, :x, :y
+    def initialize(window, x, y, z = ZOrder::UI, scale = 1)
+        @scale = scale
         @window = window
+        @x = x
+        @y = y
+        @z = z
+        @cell_padding = 10 * @scale
+        # @offset_y = 0
+        @local_window = self
+        LUIT.config({window: @window, z: z})
         @items = Array.new
+        @current_height = 0
+        # Add to it while the buttons are being added, in add_item
+        @button_id_mapping = {}
     end
 
-    def add_item (object, x, y, z, callback, hover_image = nil, options = {})
-        item = MenuItem.new(@window, object, x, y, z, callback, hover_image, options)
+    # For external use
+    def increase_y_offset amount
+        @current_height = @current_height + amount
+    end
+
+    def add_item(object, x, y, callback, hover_image = nil, options = {})
+        if options[:key]
+          @button_id_mapping[options[:key]] = callback
+        end
+        if options[:is_button]
+
+        end
+        item = MenuItem.new(@window, object, x, y, @z, callback, hover_image, options)
+        if options[:is_button]
+          @current_height = @current_height + object.h + @cell_padding
+        else
+          @current_height = @current_height + object.height + @cell_padding
+        end
         @items << item
         self
     end
@@ -28,4 +56,16 @@ class Menu
             i.clicked
         end
     end
+
+    def onClick element_id
+      # puts "LOADOUT WINDOW ONCLICK"
+      button_clicked_exists = @button_id_mapping.key?(element_id)
+      if button_clicked_exists
+        @button_id_mapping[element_id].call(@local_window, element_id)
+      else
+        puts "Clicked button that is not mapped: #{element_id}"
+      end
+    end
+
+
 end

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

@@ -10,6 +10,8 @@ class MenuItem
         @callback = callback
         # Can also be a font object!
         @active_image = @main_image
+        @is_button = options[:is_button]
+        @y_offset = options[:y_offset] || 0
         # @text = options[:text]
         # @value = options[:value]
         # @settings_name = options[:settings_name]
@@ -18,26 +20,33 @@ class MenuItem
     end
 
     def draw
-      if @text
+      if @text && !@is_button
         @active_image.draw(@text, @x, @y, 1, 1.0, 1.0, 0xff_ffff00)
-      else
+      elsif !@is_button
         @active_image.draw(@x, @y, @z)
+      elsif @is_button
+        @main_image.draw(-(@main_image.w / 2), -(@y_offset - @main_image.h / 2))
+        # @main_image.draw(0, 0)
       end
     end
 
     def update
         # @text = @get_value_callback.call(@config_file, @settings_name) if @get_value_callback && @config_file && @settings_name
-        if is_mouse_hovering
-            if !@hover_image.nil? then
-                @active_image = @hover_image
-            end
+        if !@is_button
+          if is_mouse_hovering
+              if !@hover_image.nil? then
+                  @active_image = @hover_image
+              end
 
-            @x = @original_x + HOVER_OFFSET
-            @y = @original_y + HOVER_OFFSET
-        else 
-            @active_image = @main_image
-            @x = @original_x
-            @y = @original_y
+              @x = @original_x + HOVER_OFFSET
+              @y = @original_y + HOVER_OFFSET
+          else 
+              @active_image = @main_image
+              @x = @original_x
+              @y = @original_y
+          end
+        else
+          @main_image.update(-(@main_image.w / 2), -(@y_offset - @main_image.h / 2))
         end
     end
 
@@ -60,8 +69,10 @@ class MenuItem
       # if is_mouse_hovering && @callback && @value && @config_file && @settings_name
       #   return_value = @callback.call(@config_file, @settings_name, @value)
       # end
-      if is_mouse_hovering && @callback
-        @callback.call
+      if !@is_button
+        if is_mouse_hovering && @callback
+          @callback.call
+        end
       end
       # if return_value
       #   @text = return_value

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

@@ -24,6 +24,7 @@ class MissileBoat < GeneralObject
     @health = 10
     @armor = 0
     @current_speed = (rand(5) * @scale).round + 1
+    @damage_factor = options[:damage_increase] || 0.5
   end
 
   def get_points
@@ -44,9 +45,9 @@ class MissileBoat < GeneralObject
     x_padding_2 = -(5 * @scale)
     return {
       projectiles: [
-        SemiGuidedMissile.new(@scale, @screen_width, @screen_height, self, player, MISSILE_LAUNCHER_MIN_ANGLE, MISSILE_LAUNCHER_MAX_ANGLE, MISSILE_LAUNCHER_INIT_ANGLE, {custom_initial_delay: 2}),
-        SemiGuidedMissile.new(@scale, @screen_width, @screen_height, self, player, MISSILE_LAUNCHER_MIN_ANGLE, MISSILE_LAUNCHER_MAX_ANGLE, MISSILE_LAUNCHER_INIT_ANGLE, {custom_initial_delay: 12, x_homing_padding: x_padding_1}),
-        SemiGuidedMissile.new(@scale, @screen_width, @screen_height, self, player, MISSILE_LAUNCHER_MIN_ANGLE, MISSILE_LAUNCHER_MAX_ANGLE, MISSILE_LAUNCHER_INIT_ANGLE, {custom_initial_delay: 18, x_homing_padding: x_padding_2})
+        SemiGuidedMissile.new(@scale, @screen_width, @screen_height, self, player, MISSILE_LAUNCHER_MIN_ANGLE, MISSILE_LAUNCHER_MAX_ANGLE, MISSILE_LAUNCHER_INIT_ANGLE, {custom_initial_delay: 2, damage_increase: @damage_factor}),
+        SemiGuidedMissile.new(@scale, @screen_width, @screen_height, self, player, MISSILE_LAUNCHER_MIN_ANGLE, MISSILE_LAUNCHER_MAX_ANGLE, MISSILE_LAUNCHER_INIT_ANGLE, {custom_initial_delay: 12, x_homing_padding: x_padding_1, damage_increase: @damage_factor}),
+        SemiGuidedMissile.new(@scale, @screen_width, @screen_height, self, player, MISSILE_LAUNCHER_MIN_ANGLE, MISSILE_LAUNCHER_MAX_ANGLE, MISSILE_LAUNCHER_INIT_ANGLE, {custom_initial_delay: 18, x_homing_padding: x_padding_2, damage_increase: @damage_factor})
       ],
       cooldown: SemiGuidedMissile::COOLDOWN_DELAY
     }
@@ -69,7 +70,7 @@ class MissileBoat < GeneralObject
     
   # end
 
-  def update mouse_x = nil, mouse_y = nil, player = nil
+  def update mouse_x = nil, mouse_y = nil, player = nil, scroll_factor = 1
     @cooldown_wait -= 1 if @cooldown_wait > 0
     if is_alive
       # Stay above the player

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

@@ -28,6 +28,7 @@ class Mite < GeneralObject
     @current_speed = self.class.get_max_speed * @scale
     @x_direction = x_direction
     @switched_directions = false
+    @damage_factor = options[:damage_increase] || 0.3
   end
 
   def get_points
@@ -46,7 +47,7 @@ class Mite < GeneralObject
   def attack player
     return {
       projectiles: [
-        SemiGuidedMissile.new(@scale, @screen_width, @screen_height, self, player)
+        SemiGuidedMissile.new(@scale, @screen_width, @screen_height, self, player, nil, nil, nil, {damage_increase: @damage_factor})
       ],
       cooldown: SemiGuidedMissile::COOLDOWN_DELAY * MAX_ATTACK_SPEED
     }
@@ -67,7 +68,7 @@ class Mite < GeneralObject
   #   raise "HERE"
   # end
 
-  def update mouse_x = nil, mouse_y = nil, player = nil
+  def update mouse_x = nil, mouse_y = nil, player = nil, scroll_factor = 1
     @cooldown_wait -= 1 if @cooldown_wait > 0
     @time_alive += 1
     if is_alive

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

@@ -0,0 +1,61 @@
+require_relative 'general_object.rb'
+require_relative 'rocket_launcher_pickup.rb'
+require_relative 'pilotable_ship.rb'
+require 'gosu'
+
+require 'opengl'
+require 'glut'
+
+
+include OpenGL
+include GLUT
+
+class MiteShip < PilotableShip
+  SHIP_MEDIA_DIRECTORY = "#{MEDIA_DIRECTORY}/pilotable_ships/mite_ship"
+  SPEED = 8
+  MAX_ATTACK_SPEED = 3.0
+  attr_accessor :cooldown_wait, :secondary_cooldown_wait, :attack_speed, :health, :armor, :x, :y, :rockets, :score, :time_alive
+
+  attr_accessor :bombs, :secondary_weapon, :grapple_hook_cooldown_wait, :damage_reduction, :boost_increase, :damage_increase, :kill_count
+  attr_accessor :special_attack, :main_weapon, :drawable_items_near_self, :broadside_mode, :front_hard_points, :broadside_hard_points
+  MAX_HEALTH = 100
+
+  # SECONDARY_WEAPONS = [RocketLauncherPickup::NAME] + %w[bomb]
+  # Range goes clockwise around the 0-360 angle
+  # MISSILE_LAUNCHER_MIN_ANGLE = 75
+  # MISSILE_LAUNCHER_MAX_ANGLE = 105
+  # MISSILE_LAUNCHER_INIT_ANGLE = 90
+
+  # SPECIAL_POWER = 'laser'
+  # SPECIAL_POWER_KILL_MAX = 50
+
+  # FRONT_HARDPOINT_LOCATIONS = [{x_offset: 0, y_offset: -get_image.height}]
+  # RIGHT_BROADSIDE_HARDPOINT_LOCATIONS = [{x_offset: get_image.width / 2, y_offset: -(get_image.height * 0.9)}, {x_offset: get_image.width, y_offset: -(get_image.height * 0.8)}, {x_offset: -(get_image.width / 2), y_offset: -(get_image.height * 0.8)}]
+  FRONT_HARDPOINT_LOCATIONS = [{x_offset: lambda { |image, scale| 0 }, y_offset: lambda { |image, scale| -(image.height * scale / 2) } }]
+  RIGHT_BROADSIDE_HARDPOINT_LOCATIONS = [
+    {x_offset: lambda { |image, scale| image.width * scale / 2 },     y_offset: lambda { |image, scale| -(image.height * scale / 2)} },
+    {x_offset: lambda { |image, scale| -(image.width * scale / 2) } , y_offset: lambda { |image, scale| -(image.height * scale / 2)} }
+  ]
+  LEFT_BROADSIDE_HARDPOINT_LOCATIONS = []
+
+
+  # Rocket Launcher, Rocket launcher, yannon, Cannon, Bomb Launcher
+  # FRONT_HARD_POINTS_MAX = 1
+  # BROADSIDE_HARD_POINTS = 2
+
+  # def self.get_broadside_image
+  #   Gosu::Image.new("#{MEDIA_DIRECTORY}/mite.png")
+  # end
+
+  # def self.get_image
+  #   Gosu::Image.new("#{MEDIA_DIRECTORY}/mite.png")
+  # end
+
+  
+  # def get_image_path
+  #   "#{MEDIA_DIRECTORY}/spaceship.png"
+  # end
+
+
+
+end

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

@@ -99,7 +99,7 @@ class Mothership < GeneralObject
     
   # end
 
-  def update mouse_x = nil, mouse_y = nil, player = nil
+  def update mouse_x = nil, mouse_y = nil, player = nil, scroll_factor = 1
     @cooldown_wait -= 1 if @cooldown_wait > 0
     @secondary_cooldown_wait -= 1 if @secondary_cooldown_wait > 0
     @tertiary_cooldown_wait -= 1 if @tertiary_cooldown_wait > 0

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

@@ -19,8 +19,8 @@ class Pickup < GeneralObject
   end
 
 
-  def update mouse_x = nil, mouse_y = nil, player = nil
-    @y += @current_speed
+  def update mouse_x = nil, mouse_y = nil, player = nil, scroll_factor = 1
+    @y += @current_speed * scroll_factor
 
     super(mouse_x, mouse_y)
   end