+ 3 players

floere · May 10, 2009 · c69af77 · c69af77
1 parent a58d10f
commit c69af77
Show file tree

Hide file tree

Showing 5 changed files with 66 additions and 43 deletions.
diff --git a/lib/bullet.rb b/lib/bullet.rb
@@ -16,11 +16,13 @@ def initialize window
                                    CP::Vec2.new(0.0, 0.0))
     @shape.collision_type = :bullet
 
+    self.friction = 0.1
     self.velocity = 100
+    self.lifetime = 2
   end
 
   def validate_position
-    closer
+    closer * 0.05
   end
 
   def draw

diff --git a/lib/game_window.rb b/lib/game_window.rb
@@ -31,32 +31,23 @@ def setup_space
     @space.damping = 0.8
   end
 
+  def randomly_add type
+    thing = type.new self
+    thing.warp_to rand*SCREEN_WIDTH, SCREEN_HEIGHT - 150
+    thing.put_on_surface
+    register thing
+  end
+
   def setup_objects
     register Earth.new(self)
 
-    city = City.new self
-    city.warp_to SCREEN_WIDTH / 2, SCREEN_HEIGHT / 2
-    city.put_on_surface
-    register city
-
-    launcher = NukeLauncher.new self
-    launcher.warp_to SCREEN_WIDTH - 100, 100
-    launcher.put_on_surface -5
-    launcher.shoots Nuke
-    register launcher
-
-    gun = Gun.new self
-    gun.warp_to 100, 50
-    gun.put_on_surface -5
-    gun.shoots Bullet
-    register gun
-
-    explosion = Puff.new self
-    explosion.warp_to 200, 200
-    register explosion
+    10.times { randomly_add City }
+    3.times { randomly_add NukeLauncher }
+    5.times { randomly_add Gun }
 
     add_player1
     add_player2
+    add_player3
   end
 
   def small_explosion shape
@@ -77,9 +68,6 @@ def setup_collisions
     end
 
     @space.add_collision_func :city, :earth, &nil
-    @space.add_collision_func :ship, :bullet do |ship_shape, bullet_shape|
-      small_explosion bullet_shape
-    end
 
     # @space.add_collision_func :bullet, :bullet do |bullet_shape1, bullet_shape2|
     #   remove bullet_shape1
@@ -90,13 +78,24 @@ def setup_collisions
     @space.add_collision_func :ship, :nuke do |ship_shape, nuke_shape|
       small_explosion nuke_shape
     end
+
     @space.add_collision_func :bullet, :nuke do |bullet_shape, nuke_shape|
       small_explosion bullet_shape
       remove nuke_shape
     end
+    @space.add_collision_func :bullet, :ship do |bullet_shape, ship_shape|
+      small_explosion bullet_shape
+    end
+    @space.add_collision_func :bullet, :city do |bullet_shape, ship_shape|
+      small_explosion bullet_shape
+    end
     @space.add_collision_func :bullet, :earth do |bullet_shape, earth_shape|
       remove bullet_shape
     end
+
+    @space.add_collision_func :city, :explosion do |city_shape, explosion_shape|
+      remove city_shape
+    end
   end
 
   # Moveables register themselves here.
@@ -134,15 +133,15 @@ def remove shape
   #
   def add_player1
     @player1 = Player.new self
-    @player1.warp_to SCREEN_WIDTH - 100, SCREEN_HEIGHT / 2 # move to the center of the window
+    @player1.warp_to 30, 50 # move to the center of the window
     # @player1.colorize 255, 0, 0
 
     @controls << Controls.new(self, @player1,
-      Gosu::Button::KbLeft =>       :left,
-      Gosu::Button::KbRight =>      :right,
-      Gosu::Button::KbUp =>         :away,
-      Gosu::Button::KbDown =>       :closer,
-      Gosu::Button::KbSpace =>      :shoot
+      Gosu::Button::KbA =>           :left,
+      Gosu::Button::KbD =>           :right,
+      Gosu::Button::KbW =>           :away,
+      Gosu::Button::KbS =>           :closer,
+      Gosu::Button::KbLeftShift =>   :shoot
     )
 
     register @player1
@@ -152,20 +151,38 @@ def add_player1
   #
   def add_player2
     @player2 = Player.new self
-    @player2.warp_to 100, SCREEN_HEIGHT / 2 # move to the center of the window
+    @player2.warp_to SCREEN_WIDTH/2, 50
     # @player2.colorize 0, 255, 0
 
     @controls << Controls.new(self, @player2,
-      Gosu::Button::KbA =>           :left,
-      Gosu::Button::KbD =>           :right,
-      Gosu::Button::KbW =>           :away,
-      Gosu::Button::KbS =>           :closer,
-      Gosu::Button::KbLeftShift =>   :shoot
+      Gosu::Button::KbH =>     :left,
+      Gosu::Button::KbK =>     :right,
+      Gosu::Button::KbU =>     :away,
+      Gosu::Button::KbJ =>     :closer,
+      Gosu::Button::KbSpace => :shoot
     )
 
     register @player2
   end
 
+  # Adds the second player.
+  #
+  def add_player3
+    @player3 = Player.new self
+    @player3.warp_to SCREEN_WIDTH - 30, 50 # move to the center of the window
+    # @player2.colorize 0, 255, 0
+
+    @controls << Controls.new(self, @player3,
+      Gosu::Button::KbLeft =>       :left,
+      Gosu::Button::KbRight =>      :right,
+      Gosu::Button::KbUp =>         :away,
+      Gosu::Button::KbDown =>       :closer,
+      Gosu::Button::KbRightAlt =>   :shoot
+    )
+
+    register @player3
+  end
+
   def remove_collided
     # This iterator makes an assumption of one Shape per Star making it safe to remove
     # each Shape's Body as it comes up
@@ -195,6 +212,7 @@ def reset_forces
     #
     @player1.shape.body.reset_forces
     @player2.shape.body.reset_forces
+    @player3.shape.body.reset_forces
   end
 
   # Checks whether
@@ -211,7 +229,7 @@ def step_once
 
   def targeting
     @moveables.select { |m| m.respond_to? :target }.each do |moveable|
-      moveable.target @player1, @player2
+      moveable.target @player1, @player2, @player3
     end
   end
 
@@ -239,8 +257,9 @@ def draw_moveables
   end
 
   def draw_ui
-    # @font.draw "P1 Score: #{@player1.score}", 10, SCREEN_HEIGHT-30, ZOrder::UI, 1.0, 1.0, 0xffff0000
-    # @font.draw "P2 Score: #{@player2.score}", SCREEN_WIDTH-110, 10, ZOrder::UI, 1.0, 1.0, 0xff00ff00
+    @font.draw "P1 Score: #{@player1.score}", 10, 10, ZOrder::UI, 1.0, 1.0, 0xffff0000
+    @font.draw "P2 Score: #{@player2.score}", SCREEN_WIDTH/2-50, 10, ZOrder::UI, 1.0, 1.0, 0xff00ff00
+    @font.draw "P3 Score: #{@player3.score}", SCREEN_WIDTH-110, 10, ZOrder::UI, 1.0, 1.0, 0xff0000ff
   end
 
   def draw

diff --git a/lib/gun.rb b/lib/gun.rb
@@ -20,11 +20,11 @@ def initialize window
     skill = 0.05
 
     self.shoots Bullet
-    self.muzzle_position_func { self.position }
+    self.muzzle_position_func { self.position + self.direction_from_earth*10 }
     self.muzzle_velocity_func { |target| (target.position - self.muzzle_position[] + self.random_vector(1/skill)).normalize }
     self.muzzle_rotation_func { self.rotation }
-    self.range = 360
-    self.frequency = 3
+    self.range = 300
+    self.frequency = 1.5
   end
 
   def random_vector strength

diff --git a/lib/nuke.rb b/lib/nuke.rb
@@ -24,7 +24,7 @@ def initialize window
 
     # up-/downgradeable
     self.turn_speed     = 0.5
-    self.acceleration   = 0.05
+    self.acceleration   = 0.5
 
     self.friction       = 50.0
 

diff --git a/lib/nuke_launcher.rb b/lib/nuke_launcher.rb
@@ -7,6 +7,8 @@ def initialize window
     self.range = 500
     self.muzzle_position_func { self.position }
     self.muzzle_velocity_func { |target| self.direction_from_earth }
+
+    self.shoots Nuke
   end
 
 end