line-em-up 0.4.0 → 2.0.0

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

@@ -1,13 +1,24 @@
 require_relative 'general_object.rb'
 require_relative 'rocket_launcher_pickup.rb'
+require_relative '../lib/config_setting.rb'
+require 'gosu'
+
+require 'opengl'
+require 'glut'
+
+
+include OpenGL
+include GLUT
 
 class Player < GeneralObject
+  CONFIG_FILE = "#{CURRENT_DIRECTORY}/../config.txt"
+  puts "CONFIG SHOULD BE HERE: #{CONFIG_FILE}"
   SPEED = 7
   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
+  attr_accessor :special_attack, :main_weapon, :drawable_items_near_self, :broadside_mode
   MAX_HEALTH = 200
 
   SECONDARY_WEAPONS = [RocketLauncherPickup::NAME] + %w[bomb]
@@ -19,6 +30,53 @@ class Player < GeneralObject
   SPECIAL_POWER = 'laser'
   SPECIAL_POWER_KILL_MAX = 50
 
+  def initialize(scale, x, y, screen_width, screen_height, options = {})
+    super(scale, x, y, screen_width, screen_height, options)
+    # Top of screen
+    @min_moveable_height = options[:min_moveable_height] || 0
+    # Bottom of the screen
+    @max_movable_height = options[:max_movable_height] || screen_height
+    # @right_image = Gosu::Image.new("#{MEDIA_DIRECTORY}/spaceship_right.png")
+    # @left_image = Gosu::Image.new("#{MEDIA_DIRECTORY}/spaceship_left.png")
+    # @broadside_image = Gosu::Image.new("#{MEDIA_DIRECTORY}/spaceship_broadside.png")
+    @score = 0
+    @cooldown_wait = 0
+    @secondary_cooldown_wait = 0
+    @grapple_hook_cooldown_wait = 0
+    @attack_speed = 3
+    # @attack_speed = 3
+    @health = 100.0
+    @armor = 0
+    @rockets = 50
+    # @rockets = 250
+    @bombs = 3
+    @secondary_weapon = RocketLauncherPickup::NAME
+    @turn_right = false
+    @turn_left = false
+
+    @hard_point_items = [RocketLauncherPickup::NAME, 'cannon_launcher', 'cannon_launcher', 'bomb_launcher']
+    @rocket_launchers = 0
+    @bomb_launchers   = 0
+    @cannon_launchers = 0
+    trigger_hard_point_load
+    @damage_reduction = options[:handicap] ? options[:handicap] : 1
+    invert_handicap = 1 - options[:handicap]
+    @boost_increase = invert_handicap > 0 ? 1 + (invert_handicap * 1.25) : 1
+    @damage_increase = invert_handicap > 0 ? 1 + (invert_handicap) : 1
+    @kill_count = 0
+    @main_weapon = nil
+    # @drawable_items_near_self = []
+    @broadside_mode = false
+    ship = ConfigSetting.get_setting(CONFIG_FILE, 'ship', BasicShip)
+    if ship
+      ship_class = eval(ship)
+      @ship = ship_class.new(scale, x, y, screen_width, screen_height, options)
+    else
+      @ship = BasicShip.new(scale, x, y, screen_width, screen_height, options)
+    end
+    @angle = 90
+  end
+
   def get_kill_count_max
     self.class::SPECIAL_POWER_KILL_MAX
   end
@@ -27,11 +85,54 @@ class Player < GeneralObject
     @kill_count >= get_kill_count_max
   end
 
-  def special_attack
+  def special_attack object_groups
     # Fire special attack.
     @kill_count = 0
+    projectiles = []
+    object_groups.each do |group|
+      group.each do |object|
+        next if object.nil?
+          projectiles << Missile.new(@scale, @screen_width, @screen_height, self, object.x, object.y, nil, nil, nil, {damage_increase: @damage_increase})
+      end
+    end
+    return projectiles
   end
 
+
+  def special_attack_2
+    # Fire special attack.
+    @kill_count = 0
+    projectiles = []
+    # object_groups.each do |group|
+    #   group.each do |object|
+    #     next if object.nil?
+    #       projectiles << Missile.new(@scale, @screen_width, @screen_height, self, object.x, object.y, nil, nil, nil, {damage_increase: @damage_increase})
+    #   end
+    # end
+
+    r = 10 * @scale
+    theta = 0
+    count_max = 360
+    max_passes = 3
+    pass_count = 0
+    theta = 0
+    # Need a projectile queue system?
+    while theta < count_max
+      x  =  @x + r * Math.cos(theta)
+      y  =  @y + r * Math.sin(theta)
+      if y < @y
+
+        projectiles << Missile.new(@scale, @screen_width, @screen_height, self, x, y, nil, nil, nil, {damage_increase: @damage_increase})
+
+      end
+      theta += 5
+    end
+    # where r is the radius of the circle, and h,k are the coordinates of the center.
+
+    return projectiles
+  end
+
+
   # Rocket Launcher, Rocket launcher, Cannon, Cannon, Bomb Launcher
   HARD_POINTS = 12
 
@@ -69,48 +170,55 @@ class Player < GeneralObject
     end
   end
 
-  def get_image
-    Gosu::Image.new("#{MEDIA_DIRECTORY}/spaceship.png")
-  end
+  # Issue with image.. probably shouldn't be using images to define sizes
+  # def get_image
+  #   # if @inited
+  #   #   @ship.get_image
+  #   # end
+  #   if @broadside_mode
+  #     Gosu::Image.new("#{MEDIA_DIRECTORY}/pilotable_ships/basic_ship/spaceship_broadside.png")
+  #   else
+  #     Gosu::Image.new("#{MEDIA_DIRECTORY}/pilotable_ships/basic_ship/spaceship.png")
+  #   end
+  # end
+  
+  # def get_image_path
+  #   "#{MEDIA_DIRECTORY}/spaceship.png"
+  # end
 
-  def initialize(scale, x, y, screen_width, screen_height, options = {})
-    super(scale, x, y, screen_width, screen_height, options)
-    # Top of screen
-    @min_moveable_height = options[:min_moveable_height] || 0
-    # Bottom of the screen
-    @max_movable_height = options[:max_movable_height] || screen_height
-    @right_image = Gosu::Image.new("#{MEDIA_DIRECTORY}/spaceship_right.png")
-    @left_image = Gosu::Image.new("#{MEDIA_DIRECTORY}/spaceship_left.png")
-    @score = 0
-    @cooldown_wait = 0
-    @secondary_cooldown_wait = 0
-    @grapple_hook_cooldown_wait = 0
-    @attack_speed = 1
-    # @attack_speed = 3
-    @health = 100.0
-    @armor = 0
-    @rockets = 50
-    # @rockets = 250
-    @bombs = 3
-    @secondary_weapon = RocketLauncherPickup::NAME
-    @turn_right = false
-    @turn_left = false
 
-    @hard_point_items = [RocketLauncherPickup::NAME, 'cannon_launcher', 'cannon_launcher', 'bomb_launcher']
-    @rocket_launchers = 0
-    @bomb_launchers   = 0
-    @cannon_launchers = 0
-    trigger_hard_point_load
-    @damage_reduction = options[:handicap] ? options[:handicap] : 1
-    invert_handicap = 1 - options[:handicap]
-    @boost_increase = invert_handicap > 0 ? 1 + (invert_handicap * 1.25) : 1
-    @damage_increase = invert_handicap > 0 ? 1 + (invert_handicap) : 1
-    @kill_count = 0
+  def rotate_counterclockwise
+    return @ship.rotate_counterclockwise
   end
 
+  def rotate_clockwise
+    return @ship.rotate_clockwise
+  end
+
+  # def laser_attack pointer
+  #   if @main_weapon.nil?
+  #     # options = {damage_increase: @damage_increase, relative_y_padding: @image_height_half}
+  #     options = {damage_increase: @damage_increase}
+  #     @main_weapon = LaserBeam.new(@scale, @screen_width, @screen_height, self, options)
+  #     @drawable_items_near_self << @main_weapon
+  #     return {
+  #       projectiles: [@main_weapon.attack],
+  #       cooldown: LaserBeam::COOLDOWN_DELAY
+  #     }
+  #   else
+  #     @main_weapon.active = true if @main_weapon.active == false
+  #     @drawable_items_near_self << @main_weapon
+  #     return {
+  #       projectiles: [@main_weapon.attack],
+  #       cooldown: LaserBeam::COOLDOWN_DELAY
+  #     }
+  #   end
+  # end
+
 
   def take_damage damage
-    @health -= damage * @damage_reduction
+    @ship.take_damage(damage)
+    # @health -= damage * @damage_reduction
   end
 
   def toggle_secondary
@@ -158,130 +266,92 @@ class Player < GeneralObject
   end
 
   def is_alive
-    health > 0
+    @ship.is_alive
+    # health > 0
   end
 
-  def get_speed
-    (SPEED * @scale).round
-  end
+  # CAP movement w/ Acceleration!!!!!!!!!!!!!!!!!!!
 
-  def move_left
-    @turn_left = true
-    @x = [@x - get_speed, (get_width/3)].max
+  def move_left movement_x = 0, movement_y = 0
+    # @x = @ship.move_left
+    return [movement_x - 1.0, movement_y]
   end
   
-  def move_right
-    @turn_right = true
-    @x = [@x + get_speed, (@screen_width - (get_width/3))].min
+  def move_right movement_x = 0, movement_y = 0
+    # @x = @ship.move_right
+    return [movement_x + 1.0, movement_y]
   end
   
-  def accelerate
-    # # Top of screen
-    # @min_moveable_height = options[:min_moveable_height] || 0
-    # # Bottom of the screen
-    # @max_movable_height = options[:max_movable_height] || screen_height
-
-    @y = [@y - get_speed, @min_moveable_height + (get_height/2)].max
+  def accelerate movement_x = 0, movement_y = 0
+    # @y = @ship.accelerate
+    puts "ACCELLERATE"
+    return [movement_x, movement_y + 1.0]
   end
   
-  def brake
-    @y = [@y + get_speed, @max_movable_height - (get_height/2)].min
+  def brake movement_x = 0, movement_y = 0
+    # @y = @ship.brake
+    return [movement_x, movement_y - 1.0]
   end
 
 
-  def attack pointer
-    return {
-      projectiles: [
-        Bullet.new(@scale, @screen_width, @screen_height, self, {side: 'left', damage_increase: @damage_increase}),
-        Bullet.new(@scale, @screen_width, @screen_height, self, {side: 'right', damage_increase: @damage_increase})
-      ],
-      cooldown: Bullet::COOLDOWN_DELAY
-    }
+  def attack_group_1 pointer
+    @ship.attack_group_1(pointer)
+  end
+ 
+  def deactivate_group_1
+    @ship.deactivate_group_1
   end
 
-  def trigger_secondary_attack pointer
-    return_projectiles = []
-    if self.secondary_cooldown_wait <= 0 && self.get_secondary_ammo_count > 0
-      results = self.secondary_attack(pointer)
-      projectiles = results[:projectiles]
-      cooldown = results[:cooldown]
-      self.secondary_cooldown_wait = cooldown.to_f.fdiv(self.attack_speed)
-
-      projectiles.each do |projectile|
-        return_projectiles.push(projectile)
-      end
-    end
-    return return_projectiles
+  def attack_group_2 pointer
+    @ship.attack_group_2(pointer)
+  end
+ 
+  def deactivate_group_2
+    @ship.deactivate_group_2
   end
 
-  # def toggle_state_secondary_attack
-  #   second_weapon = case @secondary_weapon
-  #   when 'bomb'
-  #   else
+
+  # def trigger_secondary_attack pointer
+  #   return_projectiles = []
+  #   if self.secondary_cooldown_wait <= 0 && self.get_secondary_ammo_count > 0
+  #     results = @ship.secondary_attack(pointer)
+  #     projectiles = results[:projectiles]
+  #     cooldown = results[:cooldown]
+  #     self.secondary_cooldown_wait = cooldown.to_f.fdiv(self.attack_speed)
+
+  #     projectiles.each do |projectile|
+  #       return_projectiles.push(projectile)
+  #     end
   #   end
-  #   return second_weapon
+  #   return return_projectiles
   # end
 
-  def secondary_attack pointer
-    projectiles = []
-    cooldown = 0
-    case @secondary_weapon
-    when 'bomb'
-      projectiles << Bomb.new(@scale, @screen_width, @screen_height, self, pointer.x, pointer.y, nil, nil, nil, {damage_increase: @damage_increase})
-      cooldown = Bomb::COOLDOWN_DELAY
-    when RocketLauncherPickup::NAME
-      # NEEED TO DECRETMENT AMMO BASED OFF OF LAUNCHERS!!!!!!!!!!!
-      # puts "ROCKET LAUNCHERS: #{@rocket_launchers}"
-      cooldown = Missile::COOLDOWN_DELAY
-      if get_secondary_ammo_count == 1 && @rocket_launchers > 0 || @rocket_launchers == 1
-        projectiles << Missile.new(@scale, @screen_width, @screen_height, self, pointer.x, pointer.y, MISSILE_LAUNCHER_MIN_ANGLE, MISSILE_LAUNCHER_MAX_ANGLE, MISSILE_LAUNCHER_INIT_ANGLE, {damage_increase: @damage_increase})
-      elsif get_secondary_ammo_count == 2 && @rocket_launchers >= 2 || @rocket_launchers == 2
-        projectiles << Missile.new(@scale, @screen_width, @screen_height, self, pointer.x - @image_width_half, pointer.y, MISSILE_LAUNCHER_MIN_ANGLE, MISSILE_LAUNCHER_MAX_ANGLE, MISSILE_LAUNCHER_INIT_ANGLE, {side: 'left', damage_increase: @damage_increase})
-        projectiles << Missile.new(@scale, @screen_width, @screen_height, self, pointer.x + @image_width_half, pointer.y, MISSILE_LAUNCHER_MIN_ANGLE, MISSILE_LAUNCHER_MAX_ANGLE, MISSILE_LAUNCHER_INIT_ANGLE, {side: 'right', damage_increase: @damage_increase})
-      elsif get_secondary_ammo_count == 3 && @rocket_launchers >= 3 || @rocket_launchers == 3
-        projectiles << Missile.new(@scale, @screen_width, @screen_height, self, pointer.x, pointer.y, MISSILE_LAUNCHER_MIN_ANGLE, MISSILE_LAUNCHER_MAX_ANGLE, MISSILE_LAUNCHER_INIT_ANGLE, {damage_increase: @damage_increase})
-        projectiles << Missile.new(@scale, @screen_width, @screen_height, self, pointer.x - @image_width_half, pointer.y, MISSILE_LAUNCHER_MIN_ANGLE, MISSILE_LAUNCHER_MAX_ANGLE, MISSILE_LAUNCHER_INIT_ANGLE, {side: 'left', damage_increase: @damage_increase})
-        projectiles << Missile.new(@scale, @screen_width, @screen_height, self, pointer.x + @image_width_half, pointer.y, MISSILE_LAUNCHER_MIN_ANGLE, MISSILE_LAUNCHER_MAX_ANGLE, MISSILE_LAUNCHER_INIT_ANGLE, {side: 'right', damage_increase: @damage_increase})
-      elsif get_secondary_ammo_count == 4 && @rocket_launchers >= 4 || @rocket_launchers == 4
-        projectiles << Missile.new(@scale, @screen_width, @screen_height, self, pointer.x - @image_width_half, pointer.y, MISSILE_LAUNCHER_MIN_ANGLE, MISSILE_LAUNCHER_MAX_ANGLE + 15, MISSILE_LAUNCHER_INIT_ANGLE, {side: 'left', damage_increase: @damage_increase})
-        projectiles << Missile.new(@scale, @screen_width, @screen_height, self, pointer.x + @image_width_half, pointer.y, MISSILE_LAUNCHER_MIN_ANGLE - 15, MISSILE_LAUNCHER_MAX_ANGLE, MISSILE_LAUNCHER_INIT_ANGLE, {side: 'right', damage_increase: @damage_increase})
-
-        projectiles << Missile.new(@scale, @screen_width, @screen_height, self, pointer.x - @image_width_half / 2, pointer.y, MISSILE_LAUNCHER_MIN_ANGLE, MISSILE_LAUNCHER_MAX_ANGLE + 5, MISSILE_LAUNCHER_INIT_ANGLE, {side: 'left', damage_increase: @damage_increase,  relative_x_padding:  (@image_width_half / 2) })
-        projectiles << Missile.new(@scale, @screen_width, @screen_height, self, pointer.x + @image_width_half / 2, pointer.y, MISSILE_LAUNCHER_MIN_ANGLE - 5, MISSILE_LAUNCHER_MAX_ANGLE, MISSILE_LAUNCHER_INIT_ANGLE, {side: 'right', damage_increase: @damage_increase, relative_x_padding: -(@image_width_half / 2) })
-      elsif get_secondary_ammo_count == 5 && @rocket_launchers >= 5 || @rocket_launchers >= 5
-        projectiles << Missile.new(@scale, @screen_width, @screen_height, self, pointer.x, pointer.y, MISSILE_LAUNCHER_MIN_ANGLE, MISSILE_LAUNCHER_MAX_ANGLE, MISSILE_LAUNCHER_INIT_ANGLE, {damage_increase: @damage_increase})
-        projectiles << Missile.new(@scale, @screen_width, @screen_height, self, pointer.x - @image_width_half, pointer.y, MISSILE_LAUNCHER_MIN_ANGLE, MISSILE_LAUNCHER_MAX_ANGLE + 15, MISSILE_LAUNCHER_INIT_ANGLE, {side: 'left', damage_increase: @damage_increase})
-        projectiles << Missile.new(@scale, @screen_width, @screen_height, self, pointer.x + @image_width_half, pointer.y, MISSILE_LAUNCHER_MIN_ANGLE - 15, MISSILE_LAUNCHER_MAX_ANGLE, MISSILE_LAUNCHER_INIT_ANGLE, {side: 'right', damage_increase: @damage_increase})
-
-        projectiles << Missile.new(@scale, @screen_width, @screen_height, self, pointer.x - @image_width_half / 2, pointer.y, MISSILE_LAUNCHER_MIN_ANGLE, MISSILE_LAUNCHER_MAX_ANGLE + 5, MISSILE_LAUNCHER_INIT_ANGLE, {side: 'left', damage_increase: @damage_increase,  relative_x_padding:  (@image_width_half / 2) })
-        projectiles << Missile.new(@scale, @screen_width, @screen_height, self, pointer.x + @image_width_half / 2, pointer.y, MISSILE_LAUNCHER_MIN_ANGLE - 5, MISSILE_LAUNCHER_MAX_ANGLE, MISSILE_LAUNCHER_INIT_ANGLE, {side: 'right', damage_increase: @damage_increase, relative_x_padding: -(@image_width_half / 2) })
-      else
-        raise "Should never get here: @secondary_weapon: #{@secondary_weapon} for @rocket_launchers: #{@rocket_launchers} and get_secondary_ammo_count: #{get_secondary_ammo_count}"
-      end
-    end
-    decrement_secondary_ammo_count projectiles.count
-    return {projectiles: projectiles, cooldown: cooldown}
-  end
-
   def get_draw_ordering
     ZOrder::Player
   end
 
   def draw
-    if @turn_right
-      image = @right_image
-    elsif @turn_left
-      image = @left_image
-    else
-      image = @image
-    end
-    # super
-    image.draw(@x - get_width / 2, @y - get_height / 2, get_draw_ordering, @scale, @scale)
-    @turn_right = false
-    @turn_left = false
+    # @drawable_items_near_self.reject! { |item| item.draw }
+    @ship.draw
+  end
+
+  POINTS_X = 7
+  POINTS_Y = 7
+
+  def draw_gl_list
+    # @drawable_items_near_self + [self]
+    @ship.draw_gl_list
+  end
+
+  def draw_gl
+    @ship.draw_gl
   end
   
-  def update mouse_x = nil, mouse_y = nil, player = nil
+  def update mouse_x = nil, mouse_y = nil, player = nil, scroll_factor = 1
+    @ship.update(mouse_x, mouse_y, player, scroll_factor)
+    # Update list of weapons for special cases like beans. Could iterate though an association in the future.
+    # @main_weapon.update(mouse_x, mouse_y, player) if @main_weapon
+
     @cooldown_wait -= 1              if @cooldown_wait > 0
     @secondary_cooldown_wait -= 1    if @secondary_cooldown_wait > 0
     @grapple_hook_cooldown_wait -= 1 if @grapple_hook_cooldown_wait > 0
@@ -289,20 +359,7 @@ class Player < GeneralObject
   end
 
   def collect_pickups(pickups)
-    pickups.reject! do |pickup|
-      if Gosu.distance(@x, @y, pickup.x, pickup.y) < ((self.get_radius) + (pickup.get_radius)) * 1.2 && pickup.respond_to?(:collected_by_player)
-        pickup.collected_by_player(self)
-        if pickup.respond_to?(:get_points)
-          self.score += pickup.get_points
-        end
-        # stop that!
-        # @beep.play
-        true
-      else
-        false
-      end
-    end
+    @ship.collect_pickups(pickups)
   end
 
-
 end

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

@@ -18,6 +18,8 @@ class Projectile < GeneralObject
     Gosu::Image.new("#{MEDIA_DIRECTORY}/question.png")
   end
 
+  def draw_gl
+  end
   def initialize(scale, screen_width, screen_height, object, end_point_x, end_point_y, angle_min = nil, angle_max = nil, angle_init = nil, options = {})
     if options[:x_homing_padding]
       end_point_x = end_point_x + options[:x_homing_padding]
@@ -28,15 +30,10 @@ class Projectile < GeneralObject
     super(scale, nil, nil, screen_width, screen_height, options)
 
     start_point = OpenStruct.new(:x => @x - screen_width / 2, :y => @y - screen_height / 2)
-    # start_point = GeoPoint.new(@x - WIDTH / 2, @y - HEIGHT / 2)
-    # end_point   =   OpenStruct.new(:x => @mouse_start_x, :y => @mouse_start_y)
     end_point   = OpenStruct.new(:x => end_point_x - screen_width / 2, :y => end_point_y - screen_height / 2)
-    # end_point = GeoPoint.new(@mouse_start_x - WIDTH / 2, @mouse_start_y - HEIGHT / 2)
     @angle = calc_angle(start_point, end_point)
     @radian = calc_radian(start_point, end_point)
 
-    # puts "PRE-ANGLE: #{@angle}"
-
     @image_angle = @angle
     if @angle < 0
       @angle = 360 - @angle.abs
@@ -45,39 +42,22 @@ class Projectile < GeneralObject
     if angle_min.nil? && angle_max.nil?
       # do nothing
     else
-      # if @angle < angle_min
-      #   @angle = angle_max
-      # # elsif @angle < angle_min && @angle > add_angles(@angle, 180)
-      #   # @angle = angle_max
       if is_angle_between_two_angles?(@angle, angle_min, angle_max)
         # Do nothing, we're good
-        # puts "ANGLE WAS BETWEEN TWO POINTS: #{@angle} was between #{angle_min} and #{angle_max}"
       else
-        # puts "ANGLE WAS CHOSEN TO BE NEAREST: #{@angle} with #{angle_min} and #{angle_max}"
         @angle = nearest_angle(@angle, angle_min, angle_max)
-        # puts "ANGLE WAS CHSOEN: #{@angle}"
       end
     end
 
-
     if angle_init
       @current_image_angle = (angle_init - 90) * -1
       @end_image_angle = (@angle - 90) * -1
     else
       @current_image_angle = (@angle - 90) * -1
     end
-
-    # puts "POST-ANGLE: #{@angle}"
-
-    # # Limit extreme angles 180 and 0 are the 
-    # image_angle = 0
-    # if @angle > 160 < 
-    # if @angle > 160 && @ange 
-
-
   end
 
-  def update mouse_x = nil, mouse_y = nil
+  def update mouse_x = nil, mouse_y = nil, player = nil, scroll_factor = 1
     if @end_image_angle && @time_alive > 10
       incrementing_amount = 0.5
       angle_difference = (@current_image_angle - @end_image_angle)
@@ -90,7 +70,6 @@ class Projectile < GeneralObject
       elsif angle_difference < 0
         @current_image_angle += incrementing_amount
       else
-        # puts "ENDING IMAGE HERE!!!!!!"
         @current_image_angle = @end_image_angle
         @end_image_angle = nil
       end

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

@@ -46,7 +46,7 @@ class SemiGuidedMissile < Projectile
   end
 
 
-  def update mouse_x = nil, mouse_y = nil
+  def update mouse_x = nil, mouse_y = nil, player = nil, scroll_factor = 1
     if is_alive
       super(mouse_x, mouse_y)
     else

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

@@ -49,11 +49,11 @@ class SmallExplosion < GeneralObject
   end
 
 
-  def update mouse_x = nil, mouse_y = nil, player = nil
+  def update mouse_x = nil, mouse_y = nil, player = nil, factor = 1
     # Remove even if hasn't gone offscreen
     if @time_alive <= @time_to_live
       @time_alive += 1
-      @y += @current_speed
+      @y += @current_speed * factor
       super(mouse_x, mouse_y)
     else
       false

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

@@ -46,7 +46,7 @@ class Star < Pickup
     @image.draw_rot(@x, @y, ZOrder::Pickups, @y, 0.5, 0.5, @scale, @scale, @color, :add)
   end
   
-  # def update mouse_x = nil, mouse_y = nil
+  # def update mouse_x = nil, mouse_y = nil, scroll_factor = 1
   #   # Move towards bottom of screen
   #   @y += 1
   #   super(mouse_x, mouse_y)
@@ -57,7 +57,12 @@ class Star < Pickup
     player.attack_speed += player.boost_increase * value
     if player.attack_speed > Player::MAX_ATTACK_SPEED
       player.attack_speed = Player::MAX_ATTACK_SPEED
-      player.health += 1
+      if player.health + value > player.class::MAX_HEALTH 
+        player.health = player.class::MAX_HEALTH
+      else
+
+        player.health += 1
+      end
     end
   end
 end

data/menu_launcher.rb

@@ -1,20 +1,24 @@
 require 'gosu'
 
-CURRENT_DIRECTORY = File.expand_path('../', __FILE__)
+current_directory = File.expand_path('../', __FILE__)
 MEDIA_DIRECTORY   = File.expand_path('../', __FILE__) + "/line-em-up/media"
-CONFIG_FILE = "#{CURRENT_DIRECTORY}/config.txt"
+config_file = "#{current_directory}/config.txt"
+vendor_directory   = File.expand_path('../', __FILE__) + "/vendors"
+require "#{vendor_directory}/lib/luit.rb"
 
-Dir["#{CURRENT_DIRECTORY}/line-em-up/lib/*.rb"].each { |f| require f }
+
+Dir["#{current_directory}/line-em-up/lib/*.rb"].each { |f| require f }
 # Shouldn't need models
 # Does need the GL BACKGROUND Model
-require "#{CURRENT_DIRECTORY}/line-em-up/models/gl_background.rb"
+require "#{current_directory}/line-em-up/models/gl_background.rb"
 # Dir["#{CURRENT_DIRECTORY}/line-em-up/models/*.rb"].each { |f| require f }
 
-require "#{CURRENT_DIRECTORY}/line-em-up/game_window.rb"
+require "#{current_directory}/line-em-up/game_window.rb"
+require "#{current_directory}/line-em-up/loadout_window.rb"
 
 # @menu = Menu.new(self) #instantiate the menu, passing the Window in the constructor
 
 # @menu.add_item(Gosu::Image.new("#{MEDIA_DIRECTORY}question.png"), 100, 200, 1, lambda { self.close }, Gosu::Image.new(self, "#{MEDIA_DIRECTORY}question.png", false))
 # @menu.add_item(Gosu::Image.new("#{MEDIA_DIRECTORY}question.png"), 100, 250, 1, lambda { puts "something" }, Gosu::Image.new(self, "#{MEDIA_DIRECTORY}question.png", false))
 
-Main.new.show
+Main.new(config_file).show