line-em-up 0.3.5 → 0.3.6

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

@@ -1,7 +1,7 @@
 require_relative 'general_object.rb'
 
 class Projectile < GeneralObject
-  attr_accessor :x, :y, :time_alive, :mouse_start_x, :mouse_start_y, :vector_x, :vector_y, :angle, :radian
+  attr_accessor :x, :y, :time_alive, :vector_x, :vector_y, :angle, :radian
   # WARNING THESE CONSTANTS DON'T GET OVERRIDDEN BY SUBCLASSES. NEED GETTER METHODS
   COOLDOWN_DELAY = 50
   STARTING_SPEED = 3.0
@@ -13,47 +13,114 @@ class Projectile < GeneralObject
   ADVANCED_HIT_BOX_DETECTION = false
 
 
-  def initialize(scale, width, height, object, mouse_x = nil, mouse_y = nil, options = {})
-    @scale = scale
-    @image = get_image
-    @time_alive = 0
-    @mouse_start_x = mouse_x
-    @mouse_start_y = mouse_y
+  def get_image
+    puts "override get_image!"
+    Gosu::Image.new("#{MEDIA_DIRECTORY}/question.png")
+  end
 
-    if LEFT == options[:side]
-      @x = object.x - (object.get_width / 2)
-      @y = object.y
-    elsif RIGHT == options[:side]
-      @x = (object.x + object.get_width / 2) - 4
-      @y = object.y
-    else
-      @x = object.x
-      @y = object.y
-    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 = {})
+    options[:relative_object] = object
+    super(scale, nil, nil, screen_width, screen_height, options)
 
-    start_point = OpenStruct.new(:x => @x - width / 2, :y => @y - height / 2)
+    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 => @mouse_start_x - width / 2, :y => @mouse_start_y - height / 2)
+    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
     end
-    @image_width  = @image.width  * @scale
-    @image_height = @image.height * @scale
-    @image_size   = @image_width  * @image_height / 2
-    @image_radius = (@image_width  + @image_height) / 4
-    # puts "INIT NEW ANGLE: #{@angle}"
+
+    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 get_image
-  #   puts "override get_image!"
-  #   Gosu::Image.new("#{MEDIA_DIRECTORY}/question.png")
-  # end
+  def update mouse_x = nil, mouse_y = nil
+    if @end_image_angle && @time_alive > 10
+      incrementing_amount = 0.5
+      angle_difference = (@current_image_angle - @end_image_angle)
+      if incrementing_amount > angle_difference.abs
+        # puts "ENDING IMAGE HERE!!!!!!"
+        @current_image_angle = @end_image_angle
+        @end_image_angle = nil
+      elsif angle_difference > 0
+        @current_image_angle -= incrementing_amount
+      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
+    end
+
+
+
+    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
+  end
+
+    @x = @x + vx
+    @y = @y + vy
+
+    super(mouse_x, mouse_y)
+  end
+
+  def draw
+    # limiting angle extreme by 2
+    @image.draw_rot(@x, @y, ZOrder::Projectile, @current_image_angle, 0.5, 0.5, @scale, @scale)
+  end
 
   def get_draw_ordering
     ZOrder::Projectile
@@ -69,7 +136,7 @@ class Projectile < GeneralObject
     # return test
   end
 
-  require 'benchmark'
+  # require 'benchmark'
 
   def hit_objects(object_groups)
     drops = []
@@ -95,14 +162,9 @@ class Projectile < GeneralObject
           hit_object = Gosu.distance(@x, @y, object.x, object.y) < self.get_radius + object.get_radius
         end
         if hit_object
-          # puts "HIT OBJECT"
           # hit_object = true
           if self.class.get_aoe <= 0
-            # puts "shout be here"
-            # puts "1: #{object.respond_to?(:health)}"
-            # puts "2: #{object.respond_to?(:take_damage)}"
             if object.respond_to?(:health) && object.respond_to?(:take_damage)
-              # puts "OBJECT TALING DAMAGE: #{self.class.get_damage}"
               object.take_damage(self.class.get_damage)
             end
 
@@ -144,7 +206,7 @@ class Projectile < GeneralObject
         end
       end
     end
-    @y = -HEIGHT if hit_object
+    @y = @off_screen if hit_object
     return {drops: drops, point_value: points, killed: killed}
   end
 
@@ -161,9 +223,6 @@ class Projectile < GeneralObject
   def self.get_starting_speed
     self::STARTING_SPEED
   end
-  def self.get_starting_speed
-    self::STARTING_SPEED
-  end
   def self.get_initial_delay
     self::INITIAL_DELAY
   end

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

@@ -4,7 +4,7 @@ class SmallExplosion < GeneralObject
   attr_reader :x, :y, :living_time
   TIME_TO_LIVE = 50
 
-  def initialize(scale, x = nil, y = nil, image = nil)
+  def initialize(scale, screen_width, screen_height, x = nil, y = nil, image = nil, options = {})
     @scale = scale
     @smoke_scale = @scale * 1.2
     @smoke = Gosu::Image.new("#{MEDIA_DIRECTORY}/smoke.png")
@@ -18,6 +18,10 @@ class SmallExplosion < GeneralObject
     @image_size   = @image_width  * @image_height / 2
     @image_radius = (@image_width  + @image_height) / 4
     @current_speed = (SCROLLING_SPEED - 1) * @scale
+    
+    @screen_width  = screen_width
+    @screen_height = screen_height
+    @off_screen = screen_height + screen_height
   end
 
   def draw
@@ -33,12 +37,12 @@ class SmallExplosion < GeneralObject
   end
 
 
-  def update width, height, mouse_x = nil, mouse_y = nil, player = nil
+  def update mouse_x = nil, mouse_y = nil, player = nil
     # Remove even if hasn't gone offscreen
     if @time_alive <= TIME_TO_LIVE
       @time_alive += 1
       @y += @current_speed
-      super(width, height, mouse_x, mouse_y)
+      super(mouse_x, mouse_y)
     else
       false
     end

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

@@ -5,20 +5,17 @@ require_relative 'pickup.rb'
 class Star < Pickup
   POINT_VALUE_BASE = 2
   
-  def initialize(scale, x = nil, y = nil)
-    @scale = scale
-    @image = get_image
-    @time_alive = 0
+  def initialize(scale, screen_width, screen_height, x = nil, y = nil, options = {})
+    # @scale = scale
+    # @image = get_image
+    # @time_alive = 0
+    @x = x || rand * 800
+    @y = y || 0
+    super(scale, screen_width, screen_height, @x, @y, options)
     @color = Gosu::Color.new(0xff_000000)
     @color.red = rand(255 - 40) + 40
     @color.green = rand(255 - 40) + 40
     @color.blue = rand(255 - 40) + 40
-    @x = x || rand * 800
-    @y = y || 0
-    @image_width  = 25 * @scale
-    @image_height = 25 * @scale
-    @image_radius = 13 * @scale
-    @current_speed = SCROLLING_SPEED * @scale
   end
 
   def get_image

data/menu_launcher.rb

@@ -49,11 +49,14 @@ class Main < Gosu::Window
     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}) }, start_image)
+    @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}) }, start_image)
+    @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)
@@ -67,8 +70,10 @@ class Main < Gosu::Window
   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
 
@@ -78,6 +83,7 @@ class Main < Gosu::Window
     reset_center_font_ui_y
     @menu.draw
     @resolution_menu.draw
+    @difficulty_menu.draw
     @gl_background.draw(ZOrder::Background)
   end
 
@@ -85,6 +91,7 @@ class Main < Gosu::Window
     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
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: line-em-up
 version: !ruby/object:Gem::Version
-  version: 0.3.5
+  version: 0.3.6
 platform: ruby
 authors:
 - Ben Dana
@@ -63,6 +63,7 @@ files:
 - line-em-up/game_window.rb
 - line-em-up/irb_requirements.rb
 - line-em-up/lib/config_setting.rb
+- line-em-up/lib/difficulty_setting.rb
 - line-em-up/lib/resolution_setting.rb
 - line-em-up/lib/setting.rb
 - line-em-up/lib/z_order.rb
@@ -160,6 +161,7 @@ files:
 - line-em-up/media/item_hover.png
 - line-em-up/media/landscape.svg
 - line-em-up/media/large_star.png
+- line-em-up/media/mini_missile.png
 - line-em-up/media/mini_missile_reverse.png
 - line-em-up/media/missile.png
 - line-em-up/media/missile_boat.png
@@ -196,6 +198,7 @@ files:
 - line-em-up/models/building.rb
 - line-em-up/models/bullet.rb
 - line-em-up/models/cursor.rb
+- line-em-up/models/dumb_projectile.rb
 - line-em-up/models/enemy_bomb.rb
 - line-em-up/models/enemy_bullet.rb
 - line-em-up/models/enemy_homing_missile.rb