missile-command-ruby 0.0.7 → 0.0.8

data/VERSION

@@ -1 +1 @@
-0.0.7
+0.0.8

data/lib/cross_hair.rb

@@ -3,26 +3,14 @@ class CrossHair < Cursor
   def initialize(opts={})
     super
     set_image 'crosshair-1.png', opts
-    @bajando = true
-    @z = 10
+    @z = ZOrder::CrossHair
+    interpolate(self, :angle, :init => 0, :end => 359, :duration => 2, :loop => true)
+    interpolate(self, :factor, :init => 10, :end => 0.5, :duration => 3)
+    #interpolate(self, :factor_y, :init => 1, :end => 0.5, :duration => 0.6, :loop => true, :bounce => true)
   end
 
   def update
     super
-    @angle += 10 * dt
-    return
-    if @bajando && @factor_y > 0.5
-      @factor_y -= dt
-      @factor_y = 0.5 if @factor_y < 0.5
-    else
-      @bajando = false
-    end
-    if !@bajando && @factor_y < 1.0
-      @factor_y += dt
-      @factor_y = 1.0 if @factor_y > 1.0
-    else
-      @bajando = true
-    end
   end
 
 end

data/lib/enemy_command.rb

@@ -0,0 +1,66 @@
+class EnemyCommand < Actor
+
+  attr_accessor :attack_every
+
+  def initialize opts={}
+    super
+    @defeated = false
+    @stock = opts[:stock] || 10
+    @attack_every = opts[:attack_every] || 1
+
+    # Missiles configuration
+    @missile_conf = {
+      :width => opts[:missile_width] || 14,
+      :max_force => opts[:missile_max_force] || 10,
+      :max_speed => opts[:missile_max_speed] || 50,
+      :mass => opts[:missile_mass] || 1,
+      :color => opts[:missile_color] || 0xffccbcff
+    }
+
+    on :extra! do
+      unless Gosu::Song.current_song
+        $lotu.song('Amenoske-Overtura_Ce_en_Re_menor.mp3').play
+      end
+    end
+  end
+
+  def attack! opts={}
+    unless @defeated
+      if @stock > 0
+        surprise = rand(5.0/@stock)
+        surprise *= 2 if opts[:extra]
+        @extra ||= {}
+        @extra[:max_speed] = 0
+        @extra[:color] = nil
+        if opts[:extra] == :speed
+          @extra[:max_speed] = @missile_conf[:max_speed] * 4
+          @extra[:color] = Gosu::Color.new(0xff000000)
+          @extra[:color].saturation = 0
+        end
+        missile = EnemyMissile.new(:mass => @missile_conf[:mass] + surprise,
+                                   :max_force => @missile_conf[:max_force] + surprise*10,
+                                   :max_speed => @missile_conf[:max_speed] + surprise*10 + @extra[:max_speed],
+                                   :color => @extra[:color] || @missile_conf[:color],
+                                   :x => rand($lotu.width),
+                                   :y => 0,
+                                   :angle => 180)
+        missile.save_init_pos
+        missile.target = Vector2d.new(rand($lotu.width), $lotu.height)
+        missile.play_animation('missile.png', :width => @missile_conf[:width] + surprise * 10)
+        if opts[:extra] == :speed
+          missile.interpolate_saturation( :init => 0.2, :end => 1, :duration => 1 )
+          missile.interpolate_value( :init => 1, :end => 0.2, :duration => 1, :bounce => true )
+          missile.interpolate_hue( :init => missile.color.hue, :end => missile.color.hue, :duration => 1, :loop => true)
+        end
+        @stock -= 1
+      else
+        @defeated = true
+      end
+    end
+  end
+
+  def to_s
+    "Stock: #{@stock}"
+  end
+
+end

data/lib/enemy_explosion.rb

@@ -0,0 +1,7 @@
+class EnemyExplosion < Explosion
+  collides_as :enemy_explosion
+
+  def initialize opts
+    super
+  end
+end

data/lib/enemy_missile.rb

@@ -0,0 +1,17 @@
+class EnemyMissile < Missile
+  collides_as :enemy_missile
+
+  def initialize opts
+    super
+    @color.alpha = 0
+    interpolate_alpha(:init => 0, :end => 255, :duration => 2.5)
+  end
+
+  def die
+    super
+    EnemyExplosion.new(:x => @x, :y => @y, :color => @color, :mode => :additive,
+                       :final_radius => @width*2.5,
+                       :duration => @width/20,
+                       :fade_after => (@width/20)*0.65)
+  end
+end

data/lib/experimental.rb

@@ -0,0 +1,26 @@
+module Shape
+  class << self
+    attr_accessor :points
+  end
+
+  @points = { :missile => { :points => [[-1,0],[0,-2],[1,0]], :close => false },
+    :silo => { :points => [], :close => true } }
+end
+
+module Wireframe
+  def build_wireframe opts
+    scale = 5
+    @wireframe = opts[:points].cycle.each_cons(2).take(opts[:points].length)
+    @wireframe.map!{ |p1, p2| [Vector2d.new( p1[0] * scale, p1[1] * scale ), Vector2d.new( p2[0] * scale, p2[1] * scale )] }
+    @wireframe.pop unless opts[:close]
+  end
+
+  def draw
+    super
+    return
+    @wireframe.each do |v1, v2|
+      radians = @angle.degrees_to_radians
+      $lotu.draw_line(v1.rotate(radians).x + x, v1.rotate(radians).y + y, @color, v2.rotate(radians).x + x, v2.rotate(radians).y + y, @color)
+    end if @wireframe
+  end
+end

data/lib/explosion.rb

@@ -1,16 +1,16 @@
 class Explosion < Actor
-  use InterpolationSystem
+  use_systems :interpolation
   collides_as :explosion
 
   def initialize(opts={})
     super
     set_image('explosion.png', opts)
-    @initial_radius = 10.0
-    @end_radius = 100.0
-    @explosion_time = 3.0
-    @fade_after = 0.5
+    @initial_radius = opts[:initial_radius] || 10.0
+    @final_radius = opts[:final_radius] || 100.0
+    @duration = opts[:duration] || 3.0
+    @fade_after = opts[:fade_after] || 2.5
 
-    interpolate_alpha(:init => 255, :end => 0, :duration => @explosion_time - @fade_after, :start_in => @fade_after)
+    interpolate_alpha(:init => 255, :end => 0, :duration => @duration - @fade_after, :start_in => @fade_after)
     interpolate_saturation(:init => 0.0, :end => 1.0, :duration => 0.1, :loop => true)
     # Don't know why gosu changes my hue when only transforming
     # saturation so we keep it fixed, or give it a little space for
@@ -19,16 +19,16 @@ class Explosion < Actor
 
     self.radius = @initial_radius
     # Expand or shrink the explosion
-    interpolate(self, :radius, :init => @initial_radius, :end => @end_radius, :duration => @explosion_time)
+    interpolate_my( :radius, :init => @initial_radius, :end => @final_radius, :duration => @duration )
 
-    @z = 7
+    @z = ZOrder::Explosion
     @elapsed_time = 0.0
   end
 
   def update
     # Note to self: It's important to call super!
     super
-    if @elapsed_time > @explosion_time
+    if @elapsed_time > @duration
       die
     end
     @elapsed_time += dt

data/lib/missile-command-ruby.rb

@@ -3,25 +3,86 @@ begin
 rescue LoadError
 end
 
+module ZOrder
+  Background, Missile, Silo, Explosion, CrossHair = *0..4
+end
+
 require 'lotu'
 include Lotu
 
 require 'silo'
 require 'explosion'
+require 'enemy_explosion'
+require 'player_explosion'
 require 'missile'
+require 'enemy_missile'
+require 'player_missile'
 require 'cross_hair'
+# TODO: autorequire from ./actors?
+require 'enemy_command'
+
+class Background < Actor
+  use_systems :interpolation
+
+  attr_accessor :x1, :y1, :x2, :y2, :x3, :y3, :x4, :y4
+
+  def initialize opts
+    super
+    @z = ZOrder::Background
+
+    @y1 = opts[:init_y] || 0
+    @y2 = opts[:init_y] || 0
+    @y3 = opts[:end_y] || $lotu.height
+    @y4 = opts[:end_y] || $lotu.height
+
+    @x1 = opts[:init_x] || 0
+    @x2 = opts[:end_x] || $lotu.width
+    @x3 = opts[:end_x] || $lotu.width
+    @x4 = opts[:init_x] || 0
+
+    @c1 = opts[:init_color] || 0xff000000
+    @c2 = opts[:init_color] || 0xff000000
+    @c3 = opts[:end_color] || 0xff000000
+    @c4 = opts[:end_color] || 0xff000000
+
+    interpolate_my :y1, :init => @y1, :end => 700, :duration => 50, :loop => true, :bounce => true
+    interpolate_my :y2, :init => @y2, :end => 700, :duration => 50, :loop => true, :bounce => true
+  end
+
+  def draw
+    super
+    $lotu.draw_quad( @x1, @y1, @c1,
+                     @x2, @y2, @c2,
+                     @x3, @y3, @c3,
+                     @x4, @y4, @c4,
+                     ZOrder::Background, @mode)
+  end
+
+end
 
 class MissileCommand < Game
-  use CollisionSystem
-  #use StalkerSystem, :stalk => [Actor, Silo, Missile, Explosion, TextBox]
+  use_systems :collision#, :stalker => {:stalk => [Actor, Silo, Missile, Explosion, TextBox]}
 
   def initialize
     super
-    @info = TextBox.new(:size => 15)
-    @info.text("Press F1 to hide this text | F2 debug info | F3 toggle pause", :size => 24)
-    @info.watch(lambda{ fps }, :size => 20)
-    @info.watch(@systems[StalkerSystem], :color => 0xff33ccff)
-    @info.text("Click on screen to launch some missiles!")
+    @acc_dt = 0
+  end
+
+  def update
+    super
+    @acc_dt += $lotu.dt
+    if @acc_dt > @enemy_command.attack_every
+      @enemy_command.attack!
+      @acc_dt = 0
+      if rand > 0.5
+        @enemy_command.attack!
+      end
+      if rand > 0.96
+        (rand(4)+2).times do
+          @enemy_command.attack! :extra => :speed
+        end
+      end
+    end
   end
 
   def load_resources
@@ -29,6 +90,7 @@ class MissileCommand < Game
       load_images 'media/images'
       load_sounds 'media/sounds'
       load_animations 'media/animations'
+      load_songs 'media/songs'
     end
   end
 
@@ -40,23 +102,30 @@ class MissileCommand < Game
   end
 
   def setup_actors
+    @background = Background.new( :init_y => 500, :end_color => 0xff800080 )
+    @enemy_command = EnemyCommand.new( :stock => 50, :attack_every => 3 )
     @player = Silo.new(:x => width/2,
                        :width => 100,
                        :stock => 10000,
-                       :platform_capacity => 4,
-                       :load_time => 0.1,
+                       :platform_capacity => 5,
+                       :load_time => 0.2,
                        :speed => 100,
                        :missile_speed => 1000,
                        :missile_force => 1000,
                        :missile_mass => 0.5)
-    @player.set_keys(Gosu::KbA => :move_left,
-                     Gosu::KbD => :move_right)
 
     @cross_hair = CrossHair.new(:keys => {Gosu::MsLeft => [:click, false], Gosu::MsRight => :click},
                                 :rand_color => true,
                                 :mode => :additive,
                                 :width => 100)
 
+    @info = TextBox.new(:size => 15)
+    @info.text("Press F1 to hide this text | F2 debug info | F3 toggle pause", :size => 24)
+    @info.watch(lambda{ fps }, :size => 20)
+    @info.watch(@enemy_command)
+    #@info.watch(@systems[StalkerSystem], :color => 0xff33ccff)
+    @info.text("Click on screen to launch some missiles!")
+
     @silo_info = TextBox.new(:attach_to => @player, :size => 14)
     @silo_info.watch(@player)
   end
@@ -66,9 +135,13 @@ class MissileCommand < Game
       @player.launch_missile(x, y)
     end
 
-    when_colliding(:explosion, :missile) do |e, m|
+    when_colliding(:explosion, :enemy_missile) do |e, m|
       m.die
     end
+
+    when_colliding(:enemy_explosion, :silo) do |ex, s|
+      #s.die
+    end
   end
 
   def toggle_info

data/lib/missile.rb

@@ -1,8 +1,8 @@
 # -*- coding: utf-8 -*-
-class Missile < Actor
-  use SteeringSystem
-  use AnimationSystem
 
+class Missile < Actor
+  #include Wireframe
+  use_systems :steering, :animation, :interpolation
   collides_as :missile
 
   def initialize(opts={})
@@ -11,6 +11,18 @@ class Missile < Actor
     @last_distance_to_target = nil
     @target = nil
     set_image('missile-med.png', opts)
+    @z = ZOrder::Missile
+    #build_wireframe Shape.points[:missile]
+  end
+
+  def save_init_pos
+    @init_x = x
+    @init_y = y
+  end
+
+  def align_to target
+    to_target = target - pos
+    self.heading = to_target.normalize!
   end
 
   def update
@@ -20,29 +32,14 @@ class Missile < Actor
     if @target && (distance_to_target < 10 || !facing_target?)
       die
     end
-    return
-    if @bajando && @factor_y > 0.5
-      @factor_y -= dt
-    else
-      @bajando = false
-    end
-    if !@bajando && @factor_y < 1.0
-      @factor_y += dt
-    else
-      @bajando = true
-    end
   end
 
   def draw
     super
     color = @color.dup
     color.saturation = color.value = 0.3
-    $lotu.draw_line(@pos.x, @pos.y, color, @target.x, @target.y, color) if @target
-  end
-
-  def die
-    super
-    Explosion.new(:x => @x, :y => @y, :color => @color, :mode => :additive)
+    #$lotu.draw_line(@pos.x, @pos.y, color, @target.x, @target.y, color) if @target
+    $lotu.draw_line(@pos.x, @pos.y, color, @init_x, @init_y, color) if @target
   end
 
   def collision_radius

data/lib/player_explosion.rb

@@ -0,0 +1,3 @@
+class PlayerExplosion < Explosion
+  collides_as :player_explosion
+end

data/lib/player_missile.rb

@@ -0,0 +1,13 @@
+class PlayerMissile < Missile
+  collides_as :player_missile
+
+  def initialize opts
+    super
+    interpolate_alpha(:init => 0, :end => 255, :duration => 1, :on_stop => :complete)
+  end
+
+  def die
+    super
+    PlayerExplosion.new(:x => @x, :y => @y, :color => @color, :mode => :additive)
+  end
+end

data/lib/silo.rb

@@ -1,13 +1,13 @@
 class Silo < Actor
+  collides_as :silo
   attr_accessor :stock
 
   def initialize(opts={})
     super
-    set_image 'silo2.png', opts
+    set_image 'silo-b.png', opts
     @factor = @width / @image.width
     @y = $lotu.height - @height/2
-    @z = 5
-    @speed = opts[:speed]
+    @z = ZOrder::Silo
 
     @platform = []
     # How many missiles in stock?
@@ -28,18 +28,22 @@ class Silo < Actor
     @elapsed_time = -2
 
     # Platform configuration in pixels
-    @head_width = 75 * @factor
-    @tail_width = 35 * @factor
-    @platform_height = 70 * @factor
+    @left_padding = 13 * @factor
+    @right_padding = 24 * @factor
+    @bottom_padding = 18 * @factor
 
-    @missile_image_width = 22.0
+    @missile_image_width = 26
     @missile_animation_width = @missile_image_width * 20 / 15
 
     @slot_width = platform_width/@platform_capacity
   end
 
+  def collision_radius
+    50
+  end
+
   def platform_width
-    @width - @head_width - @tail_width
+    @width - @left_padding - @right_padding
   end
 
   def update
@@ -60,18 +64,18 @@ class Silo < Actor
   end
 
   def new_missile
-    missile = Missile.new(:mass => @missile_conf[:mass],
+    missile = PlayerMissile.new(:mass => @missile_conf[:mass],
                           :max_force => @missile_conf[:force],
                           :max_speed => @missile_conf[:speed],
-                          :rand_color => true,
                           :width => @missile_image_width*@factor)
-    missile.pos.x = initial_place(missile)
-    missile.pos.y = @y + @height/2 - missile.height/2 - @platform_height
+    missile.x = initial_place(missile)
+    missile.y = @y + @height/2 - missile.height/2 - @bottom_padding
+    missile.interpolate(missile, :y, :init => missile.y+20, :end => missile.y, :duration => 0.5)
     missile
   end
 
   def initial_place(missile)
-    res = @x - @width/2 + @head_width + missile.width/2 + (@platform_capacity - 1) * @slot_width
+    res = @x - @width/2 + @left_padding + missile.width/2 + (@platform_capacity - 1) * @slot_width
     res += (@slot_width - missile.width)
     res -= @elapsed_time / @load_time * @slot_width
     res
@@ -79,35 +83,31 @@ class Silo < Actor
 
   def place_missiles
     @platform.each_with_index do |missile, i|
-      place_to_be = @x - @width/2 + @head_width + missile.width/2 + i * @slot_width
+      place_to_be = @x - @width/2 + @left_padding + missile.width/2 + i * @slot_width
       place_to_be += i/(@platform_capacity-1) * (@slot_width - missile.width)
-      if missile.pos.x > initial_place(missile)
-        missile.pos.x = initial_place(missile)
+      if missile.x > initial_place(missile)
+        missile.x = initial_place(missile)
       end
-      if missile.pos.x > place_to_be
-        missile.pos.x -= @slot_width * dt / @load_time
+      if missile.x > place_to_be
+        missile.x -= @slot_width * dt / @load_time
       end
-      if missile.pos.x <= place_to_be
-        missile.pos.x = place_to_be
+      if missile.x <= place_to_be
+        missile.x = place_to_be
       end
     end
   end
 
   def launch_missile(x, y)
     if m = @platform.shift
-      m.target = Vector2d.new(x,y)
+      m.save_init_pos
+      m.stop_interpolations
+      target = Vector2d.new(x,y)
+      m.align_to target
+      m.target = target
       m.play_animation('missile.png', :width => @missile_animation_width*@factor)
     end
   end
 
-  def move_left
-    @x -= @speed * dt
-  end
-
-  def move_right
-    @x += @speed * dt
-  end
-
   def to_s
     ["@platform.length: #{@platform.length}",
      "Missiles in stock: #{@stock}",

data/missile-command-ruby.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{missile-command-ruby}
-  s.version = "0.0.7"
+  s.version = "0.0.8"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["lobo_tuerto"]
-  s.date = %q{2011-02-25}
+  s.date = %q{2011-02-27}
   s.default_executable = %q{missile-command-ruby}
   s.description = %q{Protect your cities, destroy the incoming enemy missiles!}
   s.email = %q{dev@lobotuerto.com}
@@ -26,6 +26,10 @@ Gem::Specification.new do |s|
     "VERSION",
     "bin/missile-command-ruby",
     "lib/cross_hair.rb",
+    "lib/enemy_command.rb",
+    "lib/enemy_explosion.rb",
+    "lib/enemy_missile.rb",
+    "lib/experimental.rb",
     "lib/explosion.rb",
     "lib/media/animations/missile.png",
     "lib/media/animations/missile.txt",
@@ -45,11 +49,17 @@ Gem::Specification.new do |s|
     "lib/media/images/explosion6.png",
     "lib/media/images/lobo_tuerto.png",
     "lib/media/images/missile-med.png",
+    "lib/media/images/missile.png",
+    "lib/media/images/silo-b.png",
     "lib/media/images/silo.png",
     "lib/media/images/silo2.png",
+    "lib/media/images/silo3.png",
+    "lib/media/songs/Amenoske-Overtura_Ce_en_Re_menor.mp3",
     "lib/media/sounds/Explosion.wav",
     "lib/missile-command-ruby.rb",
     "lib/missile.rb",
+    "lib/player_explosion.rb",
+    "lib/player_missile.rb",
     "lib/silo.rb",
     "missile-command-ruby.gemspec"
   ]

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: missile-command-ruby
 version: !ruby/object:Gem::Version
-  version: 0.0.7
+  version: 0.0.8
   prerelease: 
 platform: ruby
 authors:
@@ -9,12 +9,12 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-02-25 00:00:00.000000000 -06:00
+date: 2011-02-27 00:00:00.000000000 -06:00
 default_executable: missile-command-ruby
 dependencies:
 - !ruby/object:Gem::Dependency
   name: lotu
-  requirement: &7821320 !ruby/object:Gem::Requirement
+  requirement: &10065400 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -22,7 +22,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *7821320
+  version_requirements: *10065400
 description: Protect your cities, destroy the incoming enemy missiles!
 email: dev@lobotuerto.com
 executables:
@@ -39,6 +39,10 @@ files:
 - VERSION
 - bin/missile-command-ruby
 - lib/cross_hair.rb
+- lib/enemy_command.rb
+- lib/enemy_explosion.rb
+- lib/enemy_missile.rb
+- lib/experimental.rb
 - lib/explosion.rb
 - lib/media/animations/missile.png
 - lib/media/animations/missile.txt
@@ -58,11 +62,17 @@ files:
 - lib/media/images/explosion6.png
 - lib/media/images/lobo_tuerto.png
 - lib/media/images/missile-med.png
+- lib/media/images/missile.png
+- lib/media/images/silo-b.png
 - lib/media/images/silo.png
 - lib/media/images/silo2.png
+- lib/media/images/silo3.png
+- lib/media/songs/Amenoske-Overtura_Ce_en_Re_menor.mp3
 - lib/media/sounds/Explosion.wav
 - lib/missile-command-ruby.rb
 - lib/missile.rb
+- lib/player_explosion.rb
+- lib/player_missile.rb
 - lib/silo.rb
 - missile-command-ruby.gemspec
 has_rdoc: true