line-em-up 0.3.5 → 0.3.6

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

@@ -2,7 +2,7 @@ require_relative 'projectile.rb'
 class Missile < Projectile
   attr_reader :x, :y, :time_alive, :mouse_start_x, :mouse_start_y
   COOLDOWN_DELAY = 30
-  MAX_SPEED      = 25
+  MAX_SPEED      = 20
   STARTING_SPEED = 0.0
   INITIAL_DELAY  = 2
   SPEED_INCREASE_FACTOR = 0.5
@@ -17,6 +17,11 @@ class Missile < Projectile
   #   super(object_groups)
   # end
 
+  # def initialize(scale, screen_width, screen_height, object, end_point_x, end_point_y, angle_min, angle_max, angle_init, options)
+  #   super(scale, screen_width, screen_height, object, end_point_x, end_point_y, angle_min, angle_max, angle_init, options)
+  #   # puts "MYYYY MISSILE ANGLE: #{@angle}"
+  # end
+
   def get_image
     Gosu::Image.new("#{MEDIA_DIRECTORY}/missile.png")
   end
@@ -39,28 +44,28 @@ class Missile < Projectile
   #   @mouse_start_y = mouse_y
   # end
   
-  def update width, height, mouse_x = nil, mouse_y = nil, player = nil
-    new_speed = 0
-    if @time_alive > 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
+  # def update mouse_x = nil, mouse_y = nil, player = nil
+  #   new_speed = 0
+  #   if @time_alive > 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)
 
-      vy = ((new_speed / 3) * 1) * Math.sin(@angle * Math::PI / 180)
-      vy = vy * -1
-      # Because our y is inverted
-      vy = vy - ((new_speed / 3) * 2)
-    end
 
-    @x = @x + vx
-    @y = @y + vy
+  #   vx = 0
+  #   vy = 0
+  # if new_speed != 0
+  #   vx = ((new_speed / 3) * 1) * Math.cos(@angle * Math::PI / 180)
 
-    super(width, height, mouse_x, mouse_y)
-  end
+  #   vy = ((new_speed / 3) * 1) * Math.sin(@angle * Math::PI / 180)
+  #   vy = vy * -1
+  # end
+
+  #   @x = @x + vx
+  #   @y = @y + vy
+
+  #   super(mouse_x, mouse_y)
+  # end
 end

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

@@ -5,28 +5,24 @@ require_relative 'small_explosion.rb'
 require_relative 'star.rb'
 
 class MissileBoat < GeneralObject
-  Speed = 5
+  SPEED = 5
   MAX_ATTACK_SPEED = 3.0
   POINT_VALUE_BASE = 50
+  MISSILE_LAUNCHER_MIN_ANGLE = 255
+  MISSILE_LAUNCHER_MAX_ANGLE = 285
+  MISSILE_LAUNCHER_INIT_ANGLE = 270
   attr_accessor :cooldown_wait, :attack_speed, :health, :armor, :x, :y
 
-  def initialize(scale, width, height, x = nil, y = nil)
-    @scale = scale
-    # image = Magick::Image::read("#{MEDIA_DIRECTORY}/starfighterv4.png").first
-    # @image = Gosu::Image.new(image, :tileable => true)
-    # @image = Gosu::Image.new("#{MEDIA_DIRECTORY}/starfighterv4.png")
-    @image = Gosu::Image.new("#{MEDIA_DIRECTORY}/missile_boat_reverse.png")
-    # @beep = Gosu::Sample.new("#{MEDIA_DIRECTORY}/beep.wav")
-    @x = x || rand(width)
-    @y = y || 0
+  def get_image
+    Gosu::Image.new("#{MEDIA_DIRECTORY}/missile_boat_reverse.png")
+  end
+
+  def initialize(scale, screen_width, screen_height, x = nil, y = nil, options = {})
+    super(scale, x || rand(screen_width), y || 0, screen_width, screen_height, options)
     @cooldown_wait = 0
     @attack_speed = 0.5
     @health = 10
     @armor = 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
     @current_speed = (rand(5) * @scale).round + 1
   end
 
@@ -43,9 +39,9 @@ class MissileBoat < GeneralObject
     @health -= damage
   end
 
-  def attack width, height, player
+  def attack player
     return {
-      projectiles: [EnemyHomingMissile.new(@scale, width, height, self, nil, nil, player)],
+      projectiles: [EnemyHomingMissile.new(@scale, @screen_width, @screen_height, self, player, MISSILE_LAUNCHER_MIN_ANGLE, MISSILE_LAUNCHER_MAX_ANGLE, MISSILE_LAUNCHER_INIT_ANGLE)],
       cooldown: EnemyHomingMissile::COOLDOWN_DELAY
     }
   end
@@ -53,8 +49,8 @@ class MissileBoat < GeneralObject
 
   def drops
     [
-      SmallExplosion.new(@scale, @x, @y, @image),
-      Star.new(@scale, @x, @y)
+      SmallExplosion.new(@scale, @screen_width, @screen_height, @x, @y, @image),
+      Star.new(@scale, @screen_width, @screen_height, @x, @y)
     ]
   end
 
@@ -67,7 +63,7 @@ class MissileBoat < GeneralObject
     
   # end
 
-  def update width, height, mouse_x = nil, mouse_y = nil, player = nil
+  def update mouse_x = nil, mouse_y = nil, player = nil
     @cooldown_wait -= 1 if @cooldown_wait > 0
     if is_alive
       # Stay above the player
@@ -77,7 +73,7 @@ class MissileBoat < GeneralObject
         if rand(2).even?
           @y += @current_speed
 
-          @y = height / 2 if @y > height / 2
+          @y = @screen_height / 2 if @y > @screen_height / 2
         else
           @y -= @current_speed
 
@@ -86,13 +82,13 @@ class MissileBoat < GeneralObject
       end
       if rand(2).even?
         @x += @current_speed
-        @x = width if @x > width
+        @x = @screen_width if @x > @screen_width
       else
         @x -= @current_speed
         @x = 0 + (get_width / 2) if @x < 0 + (get_width / 2)
       end
 
-      @y < height + (get_height / 2)
+      @y < @screen_height + (get_height / 2)
     else
       false
     end

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

@@ -1,4 +1,4 @@
-require_relative 'player.rb'
+# require_relative 'player.rb'
 require_relative 'enemy_bullet.rb'
 require_relative 'enemy_homing_missile.rb'
 require_relative 'small_explosion.rb'
@@ -6,39 +6,37 @@ require_relative 'star.rb'
 require_relative 'enemy_bomb.rb'
 
 class Mothership < GeneralObject
-  Speed = 5
+  SPEED = 5
   MAX_ATTACK_SPEED = 3.0
   POINT_VALUE_BASE = 1000
+
+  MISSILE_LAUNCHER_MIN_ANGLE = nil
+  MISSILE_LAUNCHER_MAX_ANGLE = nil
+  MISSILE_LAUNCHER_INIT_ANGLE = nil
+
   attr_accessor :cooldown_wait, :attack_speed, :health, :armor, :x, :y, :secondary_cooldown_wait, :tertiary_cooldown_wait
 
-  def initialize(scale, width, height, x = nil, y = nil)
-    @scale = scale
-    # image = Magick::Image::read("#{MEDIA_DIRECTORY}/starfighterv4.png").first
-    # @image = Gosu::Image.new(image, :tileable => true)
-    # @image = Gosu::Image.new("#{MEDIA_DIRECTORY}/starfighterv4.png")
-    @image = Gosu::Image.new("#{MEDIA_DIRECTORY}/mothership.png")
-    # @image = Gosu::Image.new("#{MEDIA_DIRECTORY}/missile_boat_reverse.png")
-    # @beep = Gosu::Sample.new("#{MEDIA_DIRECTORY}/beep.wav")
-    @x = width / 2
-    @y = 0 + @image.height
+  def get_image
+    Gosu::Image.new("#{MEDIA_DIRECTORY}/mothership.png")
+  end
+
+  def initialize(scale, screen_width, screen_height, options = {})
+    super(scale, screen_width / 2, get_image.height, screen_width, screen_height, options)
+
     @cooldown_wait = 0
     @secondary_cooldown_wait = 0
     @tertiary_cooldown_wait = 0
     @attack_speed = 0.5
-    @health = 5000
+    @health = 2500
     @armor = 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
-    @current_speed = (rand(5) * @scale).round + 1
+    @current_speed = (SPEED * @scale).round + 1
   end
 
-  def draw
-    # Will generate error if class name is not listed on ZOrder
-    @image.draw(@x - get_width / 2, @y - get_height / 2, get_draw_ordering, @scale, @scale)
-    # @image.draw(@xΩ - @image.width / 2, @y - @image.height / 2, get_draw_ordering)
-  end
+  # def draw
+  #   # Will generate error if class name is not listed on ZOrder
+  #   @image.draw(@x - get_width / 2, @y - get_height / 2, get_draw_ordering, @scale, @scale)
+  #   # @image.draw(@xΩ - @image.width / 2, @y - @image.height / 2, get_draw_ordering)
+  # end
 
   def get_points
     return POINT_VALUE_BASE
@@ -54,31 +52,32 @@ class Mothership < GeneralObject
   end
 
 
-  def attack width, height, player
+  def attack player
     return {
       projectiles: [
-        EnemyBullet.new(@scale, width, height, self, nil, nil, {side: 'left'}),
-        EnemyBullet.new(@scale, width, height, self, nil, nil, {side: 'right'}),
-        EnemyBullet.new(@scale, width, height, self, nil, nil)
+        EnemyBullet.new(@scale, @screen_width, @screen_height, self, {side: 'left',  relative_object: self }),
+        EnemyBullet.new(@scale, @screen_width, @screen_height, self, {side: 'right', relative_object: self }),
+        EnemyBullet.new(@scale, @screen_width, @screen_height, self)
       ],
       cooldown: EnemyBullet::COOLDOWN_DELAY
     }
   end
 
-  def secondary_attack width, height, player
+  def secondary_attack player
     return {
       projectiles: [
-        EnemyHomingMissile.new(@scale, width, height, self, nil, nil, player, {side: 'left'}),
-        EnemyHomingMissile.new(@scale, width, height, self, nil, nil, player, {side: 'right'})
+        # relative_object not required yet for these
+        EnemyHomingMissile.new(@scale, @screen_width, @screen_height, self, player, MISSILE_LAUNCHER_MIN_ANGLE, MISSILE_LAUNCHER_MAX_ANGLE, MISSILE_LAUNCHER_INIT_ANGLE, {side: 'left',  relative_object: self }),
+        EnemyHomingMissile.new(@scale, @screen_width, @screen_height, self, player, MISSILE_LAUNCHER_MIN_ANGLE, MISSILE_LAUNCHER_MAX_ANGLE, MISSILE_LAUNCHER_INIT_ANGLE, {side: 'right', relative_object: self })
       ],
       cooldown: EnemyHomingMissile::COOLDOWN_DELAY
     }
   end
 
 
-  def tertiary_attack width, height, player
+  def tertiary_attack player
     return {
-      projectiles: [EnemyBomb.new(@scale, width, height, self, player.x, player.y)],
+      projectiles: [EnemyBomb.new(@scale, @screen_width, @screen_height, self, player.x, player.y)],
       cooldown: EnemyBomb::COOLDOWN_DELAY
     }
   end
@@ -86,7 +85,7 @@ class Mothership < GeneralObject
 
   def drops
     [
-      SmallExplosion.new(@scale, @x, @y, @image)
+      SmallExplosion.new(@scale, @screen_width, @screen_height, @x, @y, @image)
       # Star.new(@scale, @x, @y)
     ]
   end
@@ -100,7 +99,7 @@ class Mothership < GeneralObject
     
   # end
 
-  def update width, height, mouse_x = nil, mouse_y = nil, player = nil
+  def update mouse_x = nil, mouse_y = nil, player = nil
     @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
@@ -112,7 +111,7 @@ class Mothership < GeneralObject
         if rand(2).even?
           @y += @current_speed
 
-          @y = height / 2 if @y > height / 2
+          @y = @screen_height / 2 if @y > @screen_height / 2
         else
           @y -= @current_speed
 
@@ -121,13 +120,13 @@ class Mothership < GeneralObject
       end
       if rand(2).even?
         @x += @current_speed
-        @x = width if @x > width
+        @x = @screen_width if @x > @screen_width
       else
         @x -= @current_speed
         @x = 0 + (get_width / 2) if @x < 0 + (get_width / 2)
       end
 
-      @y < height + (get_height / 2)
+      @y < @screen_height + (get_height / 2)
     else
       false
     end

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

@@ -4,16 +4,8 @@ class Pickup < GeneralObject
   POINT_VALUE_BASE = 0
   attr_reader :x, :y
 
-  def initialize(scale, x = nil, y = nil)
-    @scale = scale
-    @image = get_image
-    @x = x
-    @y = y
-    @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
+  def initialize(scale, screen_width, screen_height, x = nil, y = nil, options = {})
+    super(scale, x, y, screen_width, screen_height, options = {})
     @current_speed = SCROLLING_SPEED * @scale
   end
 
@@ -21,16 +13,16 @@ class Pickup < GeneralObject
     ZOrder::Pickups
   end
 
-  # def draw
-  #   # @image.draw_rot(@x, @y, ZOrder::Pickups, @y, 0.5, 0.5, 1, 1)
-  #   raise "override me!"
-  # end
+  # Most classes will want to just override this
+  def draw
+    @image.draw_rot(@x, @y, ZOrder::Pickups, @y, 0.5, 0.5, 1, 1)
+  end
 
 
-  def update width, height, mouse_x = nil, mouse_y = nil, player = nil
+  def update mouse_x = nil, mouse_y = nil, player = nil
     @y += @current_speed
 
-    super(width, height, mouse_x, mouse_y)
+    super(mouse_x, mouse_y)
   end
 
   def collected_by_player player

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

@@ -7,44 +7,32 @@ class Player < GeneralObject
   MAX_HEALTH = 200
 
   SECONDARY_WEAPONS = %w[missile bomb]
+  # Range goes clockwise around the 0-360 angle
+  MISSILE_LAUNCHER_MIN_ANGLE = 75
+  MISSILE_LAUNCHER_MAX_ANGLE = 105
+  MISSILE_LAUNCHER_INIT_ANGLE = 90
 
-  # def draw
-  #   # Will generate error if class name is not listed on ZOrder
-  #   @image.draw(@x - get_width / 2, @y - get_height / 2, get_draw_ordering || Module.const_get("ZOrder::#{self.class.name}"))
-  #   # @image.draw(@x - get_width / 2, @y - get_height / 2, get_draw_ordering)
-  # end
-  def initialize(scale, x, y)
-    @scale = scale
-    # image = Magick::Image::read("#{MEDIA_DIRECTORY}/spaceship.png").first.resize(0.3)
-    # @image = Gosu::Image.new(image, :tileable => true)
-    @image = Gosu::Image.new("#{MEDIA_DIRECTORY}/spaceship.png")
+  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)
     @right_image = Gosu::Image.new("#{MEDIA_DIRECTORY}/spaceship_right.png")
     @left_image = Gosu::Image.new("#{MEDIA_DIRECTORY}/spaceship_left.png")
-    # @beep = Gosu::Sample.new("#{MEDIA_DIRECTORY}/beep.wav")
-    @x, @y = x, y
     @score = 0
     @cooldown_wait = 0
     @secondary_cooldown_wait = 0
     @grapple_hook_cooldown_wait = 0
     @attack_speed = 1
-    # @attack_speed = 3
-    # temp
     @health = 100
-    # @health = 100000
     @armor = 0
     @rockets = 25
-    # @rockets = 25000
-    # @rocket_launcher = {}
+    # @rockets = 250
     @bombs = 3
-    # @bombs = 300
-    @time_alive = 0
     @secondary_weapon = "missile"
     @turn_right = false
     @turn_left = false
-    @image_width  = @image.width  * @scale
-    @image_height = @image.height * @scale
-    @image_size   = @image_width  * @image_height / 2
-    @image_radius = (@image_width  + @image_height) / 4
   end
 
 
@@ -104,36 +92,39 @@ class Player < GeneralObject
     (SPEED * @scale).round
   end
 
-  def move_left width
+  def move_left
     @turn_left = true
     @x = [@x - get_speed, (get_width/3)].max
   end
   
-  def move_right width
+  def move_right
     @turn_right = true
-    @x = [@x + get_speed, (width - (get_width/3))].min
+    @x = [@x + get_speed, (@screen_width - (get_width/3))].min
   end
   
-  def accelerate height
+  def accelerate
     @y = [@y - get_speed, (get_height/2)].max
   end
   
-  def brake height
-    @y = [@y + get_speed, height].min
+  def brake
+    @y = [@y + get_speed, @screen_height].min
   end
 
 
-  def attack width, height, mouse_x = nil, mouse_y = nil
+  def attack pointer
     return {
-      projectiles: [Bullet.new(@scale, width, height, self, mouse_x, mouse_y, {side: 'left'}), Bullet.new(@scale, width, height, self, mouse_x, mouse_y, {side: 'right'})],
+      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})
+      ],
       cooldown: Bullet::COOLDOWN_DELAY
     }
   end
 
-  def trigger_secondary_attack width, height, mouse_x, mouse_y
+  def trigger_secondary_attack pointer
     return_projectiles = []
     if self.secondary_cooldown_wait <= 0 && self.get_secondary_ammo_count > 0
-      results = self.secondary_attack(width, height, mouse_x, mouse_y)
+      results = self.secondary_attack(pointer)
       projectiles = results[:projectiles]
       cooldown = results[:cooldown]
       self.secondary_cooldown_wait = cooldown.to_f.fdiv(self.attack_speed)
@@ -154,22 +145,31 @@ class Player < GeneralObject
   #   return second_weapon
   # end
 
-  def secondary_attack width, height, mouse_x = nil, mouse_y = nil
+  def secondary_attack pointer
     second_weapon = case @secondary_weapon
     when 'bomb'
       {
-        projectiles: [Bomb.new(@scale, width, height, self, mouse_x, mouse_y)],
+        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, width, height, self, mouse_x, mouse_y, {side: 'left'}), Missile.new(@scale, width, height, self, mouse_x, mouse_y, {side: 'right'})],
+          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, width, height, self, mouse_x, mouse_y)],
+          projectiles: [Missile.new(@scale, @screen_width, @screen_height, self, pointer.x, pointer.y, {relative_object: self})],
           cooldown: Missile::COOLDOWN_DELAY
         }
       end
@@ -195,31 +195,13 @@ class Player < GeneralObject
     @turn_left = false
   end
   
-  def update width, height, mouse_x = nil, mouse_y = nil, player = nil
-    # puts "TEST HERE: width: #{get_width} and height: #{get_height}"
+  def update mouse_x = nil, mouse_y = nil, player = nil
     @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
     @time_alive += 1 if self.is_alive
   end
 
-  # def collect_stars(stars)
-  #   stars.reject! do |star|
-  #     if Gosu.distance(@x, @y, star.x, star.y) < 35
-  #       @score += 10
-  #       @attack_speed = @attack_speed + 0.1
-  #       @attack_speed = MAX_ATTACK_SPEED if @attack_speed > MAX_ATTACK_SPEED
-
-  #       # stop that!
-  #       # @beep.play
-  #       true
-  #     else
-  #       false
-  #     end
-  #   end
-  # 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)
@@ -237,5 +219,4 @@ class Player < GeneralObject
   end
 
 
-
 end