line-em-up 0.3.6 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a780d246a95abf5113ec05675e5f371d98c607e6
-  data.tar.gz: fbe35beb2057b0bb4585006729cb10cbd9e02d06
+  metadata.gz: 8342c51e3321fb4fece0302657a4ca034a4d78a6
+  data.tar.gz: 87f084f07f94bc47e837d0527cf54d3111528dcf
 SHA512:
-  metadata.gz: 3023953f7bfbe84799d35a5525d588964c237700c63ae5521df82359e28a383146adca85a83bad6154020641ae03912bd1e311d9c6dc74a2328d32c0fe79d3c9
-  data.tar.gz: d1dad27f58937b300038036482dd4b630100bcebef585db019870454bf3092bcd36bd8b2b2f9490e36c72e96c4c8e3bc30ddd5a31b9c84bd01335dd25457dc44
+  metadata.gz: 868ba45bb2b797f9af0b9e9fcb8377d556dc32172f6a59c3cb2bca296134573b9b62c62c55c43813599aea07e582f34e7aec2f7c6eb28542e2625597f5294f2c
+  data.tar.gz: 8a8b90012fae38067138062d0ab5444c45e24de6fef95a91c7ab4d4de7ceadf8df4ca7494de63ef9fdbef20e912f096604d71b8184fda52cfd379c7016eb5209

data/line-em-up/game_window.rb

@@ -109,7 +109,6 @@ class GameWindow < Gosu::Window
     
     @gl_background = GLBackground.new
     
-    @player = Player.new(@scale, @width / 2, @height / 2, @width, @height)
     @grappling_hook = nil
     
     @buildings = Array.new
@@ -137,15 +136,19 @@ class GameWindow < Gosu::Window
 
     # @boss_active_at_enemies_killed = 500
     if @difficulty == 'easy'
-      @boss_active_at_enemies_killed = 100
-      @boss_active_at_level          = 1
+      @boss_active_at_enemies_killed = 300
+      @boss_active_at_level          = 2
+      @handicap = 0.3
     elsif @difficulty == "medium"
       @boss_active_at_level          = 3
-      @boss_active_at_enemies_killed = 350
+      @boss_active_at_enemies_killed = 450
+      @handicap = 0.6
     else
       @boss_active_at_level          = 4
       @boss_active_at_enemies_killed = 700
+      @handicap = 1
     end
+    @player = Player.new(@scale, @width / 2, @height / 2, @width, @height, {handicap: @handicap, max_movable_height: @height - @footer_bar.height})
 
     @boss_active = false
     @boss = nil
@@ -154,12 +157,22 @@ class GameWindow < Gosu::Window
 
 
   # Switch button downs to this method
+  # This only triggers once during press. Use the other section for when we want it contunually triggered
   def button_down(id)
     # puts "HERE: #{id.inspect}"
     # super(id)
     if id == Gosu::MsLeft && @menu_open && @menu
       @menu.clicked
     end
+
+    if @player.is_alive && !@game_pause && !@menu_open
+              # KB_LEFT_CONTROL    = 224,
+      if id == Gosu::KB_LEFT_CONTROL && @player.ready_for_special?
+        puts "Gosu::KB_LEFT_CONTROL CLICKED!!"
+        @player.special_attack
+      end
+    end
+
   end
 
   def self.reset(window, options = {})
@@ -283,8 +296,9 @@ class GameWindow < Gosu::Window
         @menu_open = true
         @can_open_menu = false
         @menu = Menu.new(self)
-        @menu.add_item(Gosu::Image.new(self, "#{MEDIA_DIRECTORY}/exit.png", false), get_center_font_ui_x, get_center_font_ui_y, ZOrder::UI, lambda { self.close }, Gosu::Image.new(self, "#{MEDIA_DIRECTORY}/exit_hover.png", false))
         @menu.add_item(Gosu::Image.new(self, "#{MEDIA_DIRECTORY}/resume.png", false), get_center_font_ui_x, get_center_font_ui_y, ZOrder::UI, lambda { @menu_open = false; @menu = nil; @can_open_menu = true; }, Gosu::Image.new(self, "#{MEDIA_DIRECTORY}/resume.png", false))
+        @menu.add_item(Gosu::Image.new(self, "#{MEDIA_DIRECTORY}/back_to_menu.png", false), get_center_font_ui_x, get_center_font_ui_y, ZOrder::UI, lambda { self.close; Main.new.show }, Gosu::Image.new(self, "#{MEDIA_DIRECTORY}/back_to_menu.png", false))
+        @menu.add_item(Gosu::Image.new(self, "#{MEDIA_DIRECTORY}/exit.png", false), get_center_font_ui_x, get_center_font_ui_y, ZOrder::UI, lambda { self.close }, Gosu::Image.new(self, "#{MEDIA_DIRECTORY}/exit.png", false))
         # close!
       end
       if Gosu.button_down?(Gosu::KB_M)
@@ -358,10 +372,12 @@ class GameWindow < Gosu::Window
         @player.collect_pickups(@pickups)
 
         @enemy_projectiles.each do |projectile|
-          projectile.hit_object(@player)
+          results = projectile.hit_object(@player)
+          @pickups = @pickups + results[:drops]
         end
         @enemy_destructable_projectiles.each do |projectile|
-          projectile.hit_object(@player)
+          results = projectile.hit_object(@player)
+          @pickups = @pickups + results[:drops]
         end
 
 
@@ -376,6 +392,7 @@ class GameWindow < Gosu::Window
           @pickups = @pickups + results[:drops]
           @player.score += results[:point_value]
           @enemies_killed += results[:killed]
+          @player.add_kill_count(results[:killed])
         end
 
 
@@ -418,10 +435,19 @@ class GameWindow < Gosu::Window
         # @enemies.push(MissileBoat.new(@scale, @width, @height)) if rand(10) == 0
         if !@boss_active && !@boss && !@boss_killed
 
+          if @player.is_alive && (@player.time_alive % 1000 == 0) # && @enemies.count <= @max_enemies
+              # @enemies.push(EnemyPlayer.new(@scale, @width, @height)) if @enemies.count <= @max_enemy_count
+              @pickups << RocketLauncherPickup.new(@scale, @width, @height)
+          end
+          if @player.is_alive && (@player.time_alive % 1300 == 0) # && @enemies.count <= @max_enemies
+              # @enemies.push(EnemyPlayer.new(@scale, @width, @height)) if @enemies.count <= @max_enemy_count
+              swarm = HorizontalSwarm.trigger_swarm(@scale, @width, @height)
+              @enemies = @enemies + swarm
+          end
+
           if @player.is_alive && rand(@enemies_random_spawn_timer) == 0 && @enemies.count <= @max_enemies
             (0..(@enemies_spawner_counter / 2).round).each do |count|
               @enemies.push(EnemyPlayer.new(@scale, @width, @height)) if @enemies.count <= @max_enemy_count
-              # @enemies.push(MissileBoat.new(@scale, @width, @height)) if @enemies.count == 0
             end
           end
           if @player.time_alive % 500 == 0
@@ -445,7 +471,6 @@ class GameWindow < Gosu::Window
           end
         end
         if @boss_active_at_enemies_killed <= @enemies_killed || @boss_active_at_level <= @enemies_spawner_counter
-          # puts "HEREaagL #{@boss_active_at_enemies_killed} amd #{@enemies_killed} and #{@boss_active_at_level} and #{ @enemies_spawner_counter}"
           @boss_active = true
         end
 
@@ -554,7 +579,7 @@ class GameWindow < Gosu::Window
     @font.draw("Score: #{@player.score}", 10, get_font_ui_y, ZOrder::UI, 1.0, 1.0, 0xff_ffff00)
     @font.draw("Level: #{@enemies_spawner_counter + 1}", 10, get_font_ui_y, ZOrder::UI, 1.0, 1.0, 0xff_ffff00)
     @font.draw("Enemies Killed: #{@enemies_killed}", 10, get_font_ui_y, ZOrder::UI, 1.0, 1.0, 0xff_ffff00)
-    @font.draw("Boss Health: #{@boss.health}", 10, get_font_ui_y, ZOrder::UI, 1.0, 1.0, 0xff_ffff00) if @boss
+    @font.draw("Boss Health: #{@boss.health.round(2)}", 10, get_font_ui_y, ZOrder::UI, 1.0, 1.0, 0xff_ffff00) if @boss
     if @debug
       # @font.draw("Attack Speed: #{@player.attack_speed.round(2)}", 10, get_font_ui_y, ZOrder::UI, 1.0, 1.0, 0xff_ffff00)
       @font.draw("Health: #{@player.health}", 10, get_font_ui_y, ZOrder::UI, 1.0, 1.0, 0xff_ffff00)
@@ -572,6 +597,9 @@ class GameWindow < Gosu::Window
       @font.draw("pickups count: #{@pickups.count}", 10, get_font_ui_y, ZOrder::UI, 1.0, 1.0, 0xff_ffff00)
       @font.draw("buildings count: #{@buildings.count}", 10, get_font_ui_y, ZOrder::UI, 1.0, 1.0, 0xff_ffff00)
       @font.draw("Object count: #{@enemies.count + @enemy_projectiles.count + @projectiles.count + @enemy_destructable_projectiles.count + @pickups.count + @buildings.count}", 10, get_font_ui_y, ZOrder::UI, 1.0, 1.0, 0xff_ffff00)
+      @font.draw("Damage Reduction: #{@player.damage_reduction.round(2)}", 10, get_font_ui_y, ZOrder::UI, 1.0, 1.0, 0xff_ffff00)
+      @font.draw("Boost Incease: #{@player.boost_increase.round(2)}", 10, get_font_ui_y, ZOrder::UI, 1.0, 1.0, 0xff_ffff00)
+      @font.draw("Attack Speed: #{@player.attack_speed.round(2)}", 10, get_font_ui_y, ZOrder::UI, 1.0, 1.0, 0xff_ffff00)
       @font.draw("FPS: #{Gosu.fps}", 10, get_font_ui_y, ZOrder::UI, 1.0, 1.0, 0xff_ffff00)
     end
     @gl_background.draw(ZOrder::Background)

data/line-em-up/lib/resolution_setting.rb

@@ -8,7 +8,6 @@ class ResolutionSetting < Setting
 
 
   def initialize fullscreen_height, max_width, max_height, height, config_file_path
-    # puts "INNITING #{config_file_path}"
     @font = Gosu::Font.new(20)
     # @x = width
     @y = height

data/line-em-up/lib/z_order.rb

@@ -1,3 +1,3 @@
 module ZOrder
-  Background, Building, Cursor, Projectile, SmallExplosions, BigExplosions, Pickups, Enemy, Player, UI = *0..10
+  Background, Building, Cursor, Projectile, BigExplosions, Pickups, Enemy, Player, SmallExplosions, UI = *0..10
 end

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

@@ -11,7 +11,8 @@ class BombPack < Pickup
   end
 
   def collected_by_player player
-    player.bombs += 3
+    value = 3
+    player.bombs += (value * player.boost_increase).round
   end
 
 end

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

@@ -1,12 +1,95 @@
 require_relative 'dumb_projectile.rb'
+require 'opengl'
+# require 'ruby-opengl'
+# require 'glu'
+# require 'glut'
 
 class Bullet < DumbProjectile
-  DAMAGE = 5
-  COOLDOWN_DELAY = 30
+  DAMAGE = 3
+  COOLDOWN_DELAY = 20
   # Friendly projects are + speeds
-  MAX_SPEED      = 5
+  MAX_SPEED      = 15
 
   def get_image
+    # Gosu::Image.new("#{MEDIA_DIRECTORY}/laserbolt.png")
     Gosu::Image.new("#{MEDIA_DIRECTORY}/bullet-mini.png")
   end
+
+  # include Gl
+  # include Glu 
+  # include Glut
+
+
+  def alt_draw
+    glClearColor(0.0, 0.2, 0.5, 1.0)
+    glClearDepth(0)
+    glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT)
+    # info = @image.gl_tex_info
+    glDepthFunc(GL_GEQUAL)
+    glEnable(GL_DEPTH_TEST)
+    glEnable(GL_BLEND)
+
+    glMatrixMode(GL_PROJECTION)
+    glLoadIdentity 
+    glTranslate(0, 0, -4)
+  
+    # glEnable(GL_TEXTURE_2D)
+    # glBindTexture(GL_TEXTURE_2D, info.tex_name)
+
+
+
+    middle_x = @screen_width / 2
+    puts "MIDDLE X: #{middle_x}"
+    middle_y = @screen_height / 2
+    puts "MIDDLE Y: #{middle_y}"
+    increment_x = 1.0 / middle_x
+    increment_y = 1.0 / middle_y
+    puts "INcREMENT X : #{increment_x}"
+    puts "INcREMENT Y : #{increment_y}"
+
+    puts "PRE X: #{@x}"
+    puts "PRE Y: #{@y}"
+    puts "MID X: #{(@x - middle_x)}"
+    puts "MID Y: #{(@y - middle_y)}"
+
+    new_pos_x = (@x - middle_x) * increment_x
+    new_pos_y = (@y - middle_y) * increment_y
+    # Inverted Y
+    new_pos_y = new_pos_y * -1
+
+    height = @image_height.to_f * increment_x
+
+    puts "NEW POS X: #{new_pos_x}"
+    puts "NEW POS Y: #{new_pos_y}"
+
+    z = ZOrder::Projectile
+    # @image.draw(@x - get_width / 2, @y - get_height / 2, get_draw_ordering, @scale, @scale)
+    # gl do
+    # points_x = 3
+    # pounts_y = 10
+    Gosu.gl(z) do
+      glLineWidth(5)
+      glBegin(GL_LINES)
+        glColor3f(1.0, 0.0, 0.0)
+        glVertex3d(new_pos_x, new_pos_y, z)
+        glVertex3d(new_pos_x, new_pos_y - height, z)
+        # glVertex3d(new_pos_x, new_pos_y - increment_y, z)
+        # glVertex3d(0, 0, z)
+        # glVertex3d(1, 0, z)
+      glEnd
+    end
+
+    # Gosu.gl(z) do
+    #   glLineWidth(50)
+    #   glColor3f(1.0, 0.0, 0.0)
+    #   glBegin(GL_TRIANGLE_STRIP)
+    #     glVertex3f(0, 0.0, z)
+    #     glVertex3f(0.5, 0, z)
+    #     glVertex3f(0.5, 0.5, z)
+    #   glEnd
+    # end
+
+    # end
+  end
+
 end

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

@@ -0,0 +1,69 @@
+# require_relative 'dumb_projectile.rb'
+# require 'opengl'
+# # require 'ruby-opengl'
+# require 'glu'
+# require 'glut'
+
+# class BackupBullet < DumbProjectile
+#   DAMAGE = 3
+#   COOLDOWN_DELAY = 20
+#   # Friendly projects are + speeds
+#   MAX_SPEED      = 15
+
+#   def get_image
+#     Gosu::Image.new("#{MEDIA_DIRECTORY}/bullet-mini.png")
+#   end
+
+#   include Gl
+#   include Glu 
+#   include Glut
+
+
+#   def draw
+#     glClearColor(0.0, 0.2, 0.5, 1.0)
+#     glClearDepth(0)
+#     glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT)
+#     glDepthFunc(GL_GEQUAL)
+#     glEnable(GL_DEPTH_TEST)
+#     glEnable(GL_BLEND)
+
+#     glMatrixMode(GL_PROJECTION)
+#     glLoadIdentity 
+#     glTranslate(0, 0, -4)
+  
+#     glEnable(GL_TEXTURE_2D)
+#     # glBindTexture(GL_TEXTURE_2D, info.tex_name)
+    
+#     z = ZOrder::Projectile
+#     # @image.draw(@x - get_width / 2, @y - get_height / 2, get_draw_ordering, @scale, @scale)
+#     # gl do
+#     # points_x = 3
+#     # pounts_y = 10
+#     # Gosu.gl(z) {
+#     #   # glColor3f(r,g,b);
+#     #   0.upto(pounts_y) do |y|
+#     #     0.upto(points_x) do |x|
+#     #       # glColor3f(1.0, 1.0, 0.0)
+#     #       glColor4d(1, 0, 0, z)
+#     #       glBegin(GL_LINES)
+#     #         glColor3f(1.0, 0.0, 0.0)
+#     #         glVertex3d(@x + x, @y + y, z)
+#     #         # glVertex3d(@x - 5, @y , z)
+#     #       glEnd
+#     #     end
+#     #   end
+#     # }
+
+#     Gosu.gl(z) do
+#       glLineWidth(50)
+#       glColor3f(1.0, 0.0, 0.0)
+#       glBegin(GL_LINES)
+#         glVertex3f(0.0, 0.0, z)
+#         glVertex3f(15, 0, z)
+#       glEnd
+#     end
+
+#     # end
+#   end
+
+# end

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

@@ -20,6 +20,7 @@ class DumbProjectile < GeneralObject
 
   def initialize(scale, screen_width, screen_height, object, options = {})
     options[:relative_object] = object
+    @damage_increase = options[:damage_increase] || 1
     super(scale, object.x, object.y, screen_width, screen_height, options)
     @current_speed = self.class.get_max_speed * @scale
   end
@@ -58,7 +59,7 @@ class DumbProjectile < GeneralObject
         hit_object = Gosu.distance(@x, @y, object.x, object.y) < self.get_radius + object.get_radius
         if hit_object
           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)

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

@@ -1,10 +1,11 @@
 require_relative 'dumb_projectile.rb'
 
 class EnemyBullet < DumbProjectile
-  DAMAGE = 5
-  COOLDOWN_DELAY = 30
+  DAMAGE = 3
+  COOLDOWN_DELAY = 18
   # Enemy y speeds are negative
-  MAX_SPEED      = -5
+  MAX_SPEED      = -10
+
 
   def get_image
     Gosu::Image.new("#{MEDIA_DIRECTORY}/bullet-mini-reverse.png")

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

@@ -17,7 +17,7 @@ class EnemyPlayer < GeneralObject
     super(scale, x || rand(screen_width), y || 0, screen_width, screen_height, options)
     @cooldown_wait = 0
     @attack_speed = 0.5
-    @health = 15
+    @health = 25
     @armor = 0
     @current_speed = (rand(5) * @scale).round + 1
   end

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

@@ -1,7 +1,7 @@
 require_relative 'general_object.rb'
 
 class FooterBar < GeneralObject
-  attr_reader :x, :y, :living_time
+  attr_reader :x, :y, :living_time, :height
 
   def initialize(scale, screen_width = nil, screen_height = nil, image = nil)
     @scale = scale * 0.7
@@ -19,6 +19,7 @@ class FooterBar < GeneralObject
     @health_00 = Gosu::Image.new("#{MEDIA_DIRECTORY}/health_bar_10.png")
 
 
+
     @green_health_100 = Gosu::Image.new("#{MEDIA_DIRECTORY}/green_health_bar_0.png")
     @green_health_90 = Gosu::Image.new("#{MEDIA_DIRECTORY}/green_health_bar_1.png")
     @green_health_80 = Gosu::Image.new("#{MEDIA_DIRECTORY}/green_health_bar_2.png")
@@ -30,6 +31,20 @@ class FooterBar < GeneralObject
     @green_health_20 = Gosu::Image.new("#{MEDIA_DIRECTORY}/green_health_bar_8.png")
     @green_health_10 = Gosu::Image.new("#{MEDIA_DIRECTORY}/green_health_bar_9.png")
 
+    @progress_bar = []
+    @progress_bar_increments = 20
+    (0..20).each do |i|
+      @progress_bar << Gosu::Image.new("#{MEDIA_DIRECTORY}/progress_bar_#{i}.png")
+    end
+    @progress_bar_width  = (@progress_bar.first.width  * @scale)
+    @progress_bar_height = (@progress_bar.first.height * @scale)
+
+    # Right in the middle of the screen
+    @progress_bar_x = (screen_width / 2) - @progress_bar_width / 2
+    # Lets see how it looks without padding
+    @progress_bar_y = screen_height - @progress_bar_height # - padding
+
+
     @bomb_hud = Gosu::Image.new("#{MEDIA_DIRECTORY}/bomb_pack_hud.png")
     @missile_hud = Gosu::Image.new("#{MEDIA_DIRECTORY}/missile_pack_hud.png")
 
@@ -78,6 +93,8 @@ class FooterBar < GeneralObject
     @current_color.red = 51
     @current_color.green = 204
     @current_color.blue = 51
+
+    @height = [@missile_hud_height, @bomb_hud_height, @health_bar_height].max
     # rgb(51, 204, 51)
   end
 
@@ -133,6 +150,22 @@ class FooterBar < GeneralObject
 
     health_image.draw(@health_bar_x, @health_bar_y, get_draw_ordering, @scale, @scale)
 
+
+
+    # progress_bar = []
+    # progress_bar_increments = 20
+    # (0..20).each do |i|
+    #   progress_bar << Gosu::Image.new("#{MEDIA_DIRECTORY}/progress_bar_#{i}.png")
+    # end
+    # @progress_bar_width  = (progress_bar.first.width  * @scale)
+    # @progress_bar_height = (progress_bar.first.height * @scale)
+    index = player.kill_count * @progress_bar_increments / player.get_kill_count_max
+    current_progress_bar = @progress_bar[index]
+    current_progress_bar.draw(@progress_bar_x, @progress_bar_y, get_draw_ordering, @scale, @scale)
+
+
+
+
     @bomb_hud.draw(@bomb_hud_x, @bomb_hud_y, get_draw_ordering, @scale, @scale)
     # @bomb_hud_width_half  = @bomb_hud_width / 2
     # @bomb_hud_height_half = @bomb_hud_height /2

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

@@ -25,6 +25,7 @@ class GeneralObject
         @x = options[:relative_object].x
         @y = options[:relative_object].y
       end
+      @x = @x + options[:relative_x_padding] if options[:relative_x_padding]
     else
       @x = x
       @y = y
@@ -140,6 +141,7 @@ class GeneralObject
   end
 
   def self.is_angle_between_two_angles?(angle, min_angle, max_angle)
+    return angle if min_angle.nil? || max_angle.nil?
     value = false
     if angle == min_angle
       value = true

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

@@ -16,16 +16,18 @@ class HealthPack < Pickup
     end 
     image_rot = 12 if image_rot == 13
     @image = Gosu::Image.new("#{MEDIA_DIRECTORY}/health_pack_#{image_rot}.png", :tileable => true)
-    @image.draw(@x - get_width / 2, @y - get_height / 2, ZOrder::Pickups)
+    @image.draw(@x - get_width / 2, @y - get_height / 2, ZOrder::Pickups, @scale, @scale)
     # super
   end
 
 
   def collected_by_player player
-    if player.health + HEALTH_BOOST > player.class::MAX_HEALTH 
+    value = player.boost_increase * HEALTH_BOOST
+    if player.health + value > player.class::MAX_HEALTH 
       player.health = player.class::MAX_HEALTH
     else
-      player.health += HEALTH_BOOST
+
+      player.health += value
     end
   end