line-em-up 0.3.6 → 0.4.0

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

@@ -1,23 +1,84 @@
 require_relative 'general_object.rb'
+require_relative 'rocket_launcher_pickup.rb'
 
 class Player < GeneralObject
   SPEED = 7
   MAX_ATTACK_SPEED = 3.0
-  attr_accessor :cooldown_wait, :secondary_cooldown_wait, :attack_speed, :health, :armor, :x, :y, :rockets, :score, :time_alive, :bombs, :secondary_weapon, :grapple_hook_cooldown_wait
+  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
   MAX_HEALTH = 200
 
-  SECONDARY_WEAPONS = %w[missile bomb]
+  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
+
+  def get_kill_count_max
+    self.class::SPECIAL_POWER_KILL_MAX
+  end
+
+  def ready_for_special?
+    @kill_count >= get_kill_count_max
+  end
+
+  def special_attack
+    # Fire special attack.
+    @kill_count = 0
+  end
+
+  # Rocket Launcher, Rocket launcher, Cannon, Cannon, Bomb Launcher
+  HARD_POINTS = 12
+
+  def add_kill_count kill_count
+    if @kill_count + kill_count > get_kill_count_max
+      @kill_count = get_kill_count_max
+    else
+      @kill_count += kill_count
+    end
+  end
+
+  def add_hard_point hard_point
+    @hard_point_items << hard_point
+    trigger_hard_point_load
+  end
+
+  def trigger_hard_point_load
+    @rocket_launchers, @bomb_launchers, @cannon_launchers = [0, 0, 0]
+    count = 0
+    # puts "RUNNING ON: #{@hard_point_items}"
+    @hard_point_items.each do |hard_point|
+      break if count == HARD_POINTS
+      case hard_point
+      when 'bomb_launcher'
+        @bomb_launchers += 1
+      when RocketLauncherPickup::NAME
+        # puts "INCREASTING ROCKET LAUNCHER: #{RocketLauncherPickup::NAME}"
+        @rocket_launchers += 1
+      when 'cannon_launcher'
+        @cannon_launchers += 1
+      else
+        "Raise should never get here. hard_point: #{hard_point}"
+      end
+      count += 1
+    end
+  end
+
   def get_image
     Gosu::Image.new("#{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
@@ -25,19 +86,31 @@ class Player < GeneralObject
     @secondary_cooldown_wait = 0
     @grapple_hook_cooldown_wait = 0
     @attack_speed = 1
-    @health = 100
+    # @attack_speed = 3
+    @health = 100.0
     @armor = 0
-    @rockets = 25
+    @rockets = 50
     # @rockets = 250
     @bombs = 3
-    @secondary_weapon = "missile"
+    @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
   end
 
 
   def take_damage damage
-    @health -= damage
+    @health -= damage * @damage_reduction
   end
 
   def toggle_secondary
@@ -59,12 +132,12 @@ class Player < GeneralObject
   end
 
 
-  def decrement_secondary_ammo_count
+  def decrement_secondary_ammo_count count = 1
     return case @secondary_weapon
     when 'bomb'
-      self.bombs -= 1
+      self.bombs -= count
     else
-      self.rockets -= 1
+      self.rockets -= count
     end
   end
 
@@ -103,19 +176,24 @@ class Player < GeneralObject
   end
   
   def accelerate
-    @y = [@y - get_speed, (get_height/2)].max
+    # # 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
   end
   
   def brake
-    @y = [@y + get_speed, @screen_height].min
+    @y = [@y + get_speed, @max_movable_height - (get_height/2)].min
   end
 
 
   def attack pointer
     return {
       projectiles: [
-        Bullet.new(@scale, @screen_width, @screen_height, self, {side: 'left',  relative_object: self}),
-        Bullet.new(@scale, @screen_width, @screen_height, self, {side: 'right', relative_object: self})
+        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
     }
@@ -130,7 +208,6 @@ class Player < GeneralObject
       self.secondary_cooldown_wait = cooldown.to_f.fdiv(self.attack_speed)
 
       projectiles.each do |projectile|
-        self.decrement_secondary_ammo_count
         return_projectiles.push(projectile)
       end
     end
@@ -146,35 +223,44 @@ class Player < GeneralObject
   # end
 
   def secondary_attack pointer
-    second_weapon = case @secondary_weapon
+    projectiles = []
+    cooldown = 0
+    case @secondary_weapon
     when 'bomb'
-      {
-        projectiles: [Bomb.new(@scale, @screen_width, @screen_height, self, pointer.x, pointer.y)],
-        cooldown: Bomb::COOLDOWN_DELAY
-      }
-    else
-      if get_secondary_ammo_count > 1
-        {
-          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',  relative_object: self}),
-            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', relative_object: self})
-            ],
-          cooldown: Missile::COOLDOWN_DELAY
-        }
-        # {
-        #   projectiles: [
-        #     Missile.new(@scale, @screen_width, @screen_height, self, mouse_x, mouse_y, MISSILE_LAUNCHER_MIN_ANGLE, MISSILE_LAUNCHER_MAX_ANGLE, MISSILE_LAUNCHER_INIT_ANGLE)
-        #     ],
-        #   cooldown: Missile::COOLDOWN_DELAY
-        # }
-      else get_secondary_ammo_count == 1
-        {
-          projectiles: [Missile.new(@scale, @screen_width, @screen_height, self, pointer.x, pointer.y, {relative_object: self})],
-          cooldown: Missile::COOLDOWN_DELAY
-        }
+      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
-    return second_weapon
+    decrement_secondary_ammo_count projectiles.count
+    return {projectiles: projectiles, cooldown: cooldown}
   end
 
   def get_draw_ordering

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

@@ -19,6 +19,11 @@ class Projectile < GeneralObject
   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]
+    end
+    @damage_increase = options[:damage_increase] || 1
+    @custom_initial_delay = options[:custom_initial_delay] if options[:custom_initial_delay]
     options[:relative_object] = object
     super(scale, nil, nil, screen_width, screen_height, options)
 
@@ -94,26 +99,26 @@ class Projectile < GeneralObject
 
 
     new_speed = 0
-    if @time_alive > self.class.get_initial_delay
+    if @time_alive > (@custom_initial_delay || self.class.get_initial_delay)
       new_speed = self.class.get_starting_speed + (self.class.get_speed_increase_factor > 0 ? @time_alive * self.class.get_speed_increase_factor : 0)
       new_speed = self.class.get_max_speed if new_speed > self.class.get_max_speed
       new_speed = new_speed * @scale
-    end
 
 
 
-    vx = 0
-    vy = 0
-  if new_speed != 0
-    vx = ((new_speed / 3) * 1) * Math.cos(@angle * Math::PI / 180)
+      vx = 0
+      vy = 0
+      if new_speed != 0
+        vx = ((new_speed / 3) * 1) * Math.cos(@angle * Math::PI / 180)
 
-    vy = ((new_speed / 3) * 1) * Math.sin(@angle * Math::PI / 180)
-    vy = vy * -1
-  end
+        vy = ((new_speed / 3) * 1) * Math.sin(@angle * Math::PI / 180)
+        vy = vy * -1
+      end
 
-    @x = @x + vx
-    @y = @y + vy
+      @x = @x + vx
+      @y = @y + vy
 
+    end
     super(mouse_x, mouse_y)
   end
 
@@ -165,7 +170,7 @@ class Projectile < GeneralObject
           # hit_object = true
           if self.class.get_aoe <= 0
             if object.respond_to?(:health) && object.respond_to?(:take_damage)
-              object.take_damage(self.class.get_damage)
+              object.take_damage(self.class.get_damage * @damage_increase)
             end
 
             if object.respond_to?(:is_alive) && !object.is_alive && object.respond_to?(:drops)
@@ -189,7 +194,7 @@ class Projectile < GeneralObject
           next if object.nil?
           if Gosu.distance(@x, @y, object.x, object.y) < self.class.get_aoe * @scale
             if object.respond_to?(:health) && object.respond_to?(:take_damage)
-              object.take_damage(self.class.get_damage)
+              object.take_damage(self.class.get_damage * @damage_increase)
             end
 
             if object.respond_to?(:is_alive) && !object.is_alive && object.respond_to?(:drops)
@@ -206,6 +211,16 @@ class Projectile < GeneralObject
         end
       end
     end
+
+    # Drop projectile explosions
+    if hit_object
+      if self.respond_to?(:drops)
+        self.drops.each do |drop|
+          drops << drop
+        end
+      end
+    end
+
     @y = @off_screen if hit_object
     return {drops: drops, point_value: points, killed: killed}
   end

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

@@ -0,0 +1,26 @@
+require_relative 'pickup.rb'
+
+class RocketLauncherPickup < Pickup
+
+  NAME = 'rocket_launcher'
+
+  def initialize(scale, screen_width, screen_height, x = nil, y = nil, options = {})
+    @x = x || rand(screen_width)
+    @y = y || 0
+    super(scale, screen_width, screen_height, @x, @y, options)
+  end
+
+  def get_image
+    Gosu::Image.new("#{MEDIA_DIRECTORY}/rocket_launcher.png")
+  end
+
+  # def draw
+  # end
+
+  # def update
+  # end
+
+  def collected_by_player player
+    player.add_hard_point(RocketLauncherPickup::NAME)
+  end
+end

data/line-em-up/models/{enemy_homing_missile.rb → semi_guided_missile.rb}

@@ -1,11 +1,12 @@
 require_relative 'projectile.rb'
-class EnemyHomingMissile < Projectile
+# Follows targets location only at time of launch. Will not follow target
+class SemiGuidedMissile < Projectile
   attr_reader :x, :y, :time_alive, :mouse_start_x, :mouse_start_y, :health
   COOLDOWN_DELAY = 75
-  MAX_SPEED      = 18
+  MAX_SPEED      = 30
   STARTING_SPEED = 0.0
   INITIAL_DELAY  = 2
-  SPEED_INCREASE_FACTOR = 0.5
+  SPEED_INCREASE_FACTOR = 2
   DAMAGE = 15
   AOE = 0
   
@@ -15,13 +16,14 @@ class EnemyHomingMissile < Projectile
 
   def get_image
     # Gosu::Image.new("#{MEDIA_DIRECTORY}/mini_missile_reverse.png")
-    Gosu::Image.new("#{MEDIA_DIRECTORY}/mini_missile.png")
+    Gosu::Image.new("#{MEDIA_DIRECTORY}/tiny_missile.png")
   end
 
-  def initialize(scale, screen_width, screen_height, object, homing_object, angle_min, angle_max, angle_init, options = {})
+  def initialize(scale, screen_width, screen_height, object, homing_object, angle_min = nil, angle_max = nil, angle_init = nil, options = {})
     options[:relative_object] = object
     super(scale, screen_width, screen_height, object, homing_object.x, homing_object.y, angle_min, angle_max, angle_init, options)
     @health = 5
+    # puts "CUSTOM DELAY: #{@custom_initial_delay}"
   end
 
   def destructable?
@@ -32,6 +34,12 @@ class EnemyHomingMissile < Projectile
     @health > 0
   end
 
+  def drops
+    [
+      SmallExplosion.new(@scale, @screen_width, @screen_height, @x, @y, nil, {ttl: 2, third_scale: true}),
+    ]
+  end
+
 
   def take_damage damage
     @health -= damage

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

@@ -6,6 +6,9 @@ class SmallExplosion < GeneralObject
 
   def initialize(scale, screen_width, screen_height, x = nil, y = nil, image = nil, options = {})
     @scale = scale
+    if options[:third_scale]
+      @scale = @scale / 3
+    end
     @smoke_scale = @scale * 1.2
     @smoke = Gosu::Image.new("#{MEDIA_DIRECTORY}/smoke.png")
     @image = image#Gosu::Image.new("#{MEDIA_DIRECTORY}/starfighterv4.png", :tileable => true)
@@ -13,15 +16,24 @@ class SmallExplosion < GeneralObject
     @x = x || 0
     @y = y || 0
     @time_alive = 0
-    @image_width  = @image.width  * @scale
-    @image_height = @image.height * @scale
-    @image_size   = @image_width  * @image_height / 2
-    @image_radius = (@image_width  + @image_height) / 4
+    if @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
+    else
+      @image_width  = @smoke.width  * @scale
+      @image_height = @smoke.height * @scale
+      @image_size   = @image_width  * @image_height / 2
+      @image_radius = (@image_width  + @image_height) / 4
+    end
     @current_speed = (SCROLLING_SPEED - 1) * @scale
     
     @screen_width  = screen_width
     @screen_height = screen_height
     @off_screen = screen_height + screen_height
+
+    @time_to_live = options[:ttl] || TIME_TO_LIVE
   end
 
   def draw
@@ -33,13 +45,13 @@ class SmallExplosion < GeneralObject
       spin_down = @time_alive * 10
     end
     @smoke.draw_rot(@x, @y, ZOrder::SmallExplosions, (360 - spin_down), 0.5, 0.5, @smoke_scale, @smoke_scale)
-    @image.draw_rot(@x, @y, ZOrder::SmallExplosions, (360 - spin_down), 0.5, 0.5, @scale, @scale)
+    @image.draw_rot(@x, @y, ZOrder::SmallExplosions, (360 - spin_down), 0.5, 0.5, @scale, @scale) if @image
   end
 
 
   def update mouse_x = nil, mouse_y = nil, player = nil
     # Remove even if hasn't gone offscreen
-    if @time_alive <= TIME_TO_LIVE
+    if @time_alive <= @time_to_live
       @time_alive += 1
       @y += @current_speed
       super(mouse_x, mouse_y)

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

@@ -9,7 +9,7 @@ class Star < Pickup
     # @scale = scale
     # @image = get_image
     # @time_alive = 0
-    @x = x || rand * 800
+    @x = x || rand(screen_width)
     @y = y || 0
     super(scale, screen_width, screen_height, @x, @y, options)
     @color = Gosu::Color.new(0xff_000000)
@@ -53,7 +53,11 @@ class Star < Pickup
   # end
 
   def collected_by_player player
-    player.attack_speed += 0.1
-    player.attack_speed = Player::MAX_ATTACK_SPEED if player.attack_speed > Player::MAX_ATTACK_SPEED
+    value = 0.02
+    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
+    end
   end
 end

data/menu_launcher.rb

@@ -1,7 +1,7 @@
 require 'gosu'
 
 CURRENT_DIRECTORY = File.expand_path('../', __FILE__)
-MEDIA_DIRECTORY   = File.expand_path('../', __FILE__) + "/media"
+MEDIA_DIRECTORY   = File.expand_path('../', __FILE__) + "/line-em-up/media"
 CONFIG_FILE = "#{CURRENT_DIRECTORY}/config.txt"
 
 Dir["#{CURRENT_DIRECTORY}/line-em-up/lib/*.rb"].each { |f| require f }
@@ -17,98 +17,4 @@ require "#{CURRENT_DIRECTORY}/line-em-up/game_window.rb"
 # @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))
 
-
-class Main < Gosu::Window
-  def initialize
-    @width, @height = ResolutionSetting::RESOLUTIONS[0].split('x').collect{|s| s.to_i}
-    super(@width, @height, false)
-    @cursor = Gosu::Image.new(self, "#{MEDIA_DIRECTORY}/cursor.png", false)
-    @gl_background = GLBackground.new
-    # x = self.width / 2 - 100
-    # y = self.height  / 2 - 100
-    @center_ui_y = 0
-    @center_ui_x = 0
-    reset_center_font_ui_y
-    lineHeight = 50
-    @font = Gosu::Font.new(20)
-    self.caption = "A menu with Gosu"
-    # items = Array["exit", "additem", "item"]
-    # actions = Array[lambda { self.close }, lambda {
-    #   @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)
-    window_height = Gosu.screen_height
-    @resolution_menu = ResolutionSetting.new(window_height, @width, @height, get_center_font_ui_y, CONFIG_FILE)
-
-    @difficulty = nil
-    @difficulty_menu = DifficultySetting.new(@width, @height, get_center_font_ui_y, CONFIG_FILE)
-
-    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}) }, 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)
-    # @menu.add_item(Gosu::Image.new(self, "#{MEDIA_DIRECTORY}/start.png", false), get_center_font_ui_x, get_center_font_ui_y, 1, lambda { self.close; GameWindow.start(nil, nil, {block_controls_until_button_up: true}) }, Gosu::Image.new(self, "#{MEDIA_DIRECTORY}/start.png", false))
-  end
-
-  def dynamic_get_resolution_fs
-    @fullscreen
-  end
-
-  def update
-    @menu.update
-    @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
-    @gl_background.scroll
-  end
-
-  def draw
-    @cursor.draw(self.mouse_x, self.mouse_y, 2)
-    # @back.draw(0,0,0)
-    reset_center_font_ui_y
-    @menu.draw
-    @resolution_menu.draw
-    @difficulty_menu.draw
-    @gl_background.draw(ZOrder::Background)
-  end
-
-  def button_down id
-    if id == Gosu::MsLeft then
-      @menu.clicked
-      @resolution_menu.clicked(self.mouse_x, self.mouse_y)
-      @difficulty_menu.clicked(self.mouse_x, self.mouse_y)
-    end
-  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
-  end
-end
-
 Main.new.show