lunar_lander 0.0.3 → 0.0.4

data/TODO

@@ -0,0 +1,2 @@
+
+- Isolate particles movement

data/lib/lunar_lander/game_objects/player.rb

@@ -5,16 +5,15 @@ module LunarLander
     
     attr_accessor :fuel
     
-    def initialize(options={})
-      super(options.merge(:image => Gosu::Image["player.png"]))
-    end
-    
     def setup
-      @engine_sound = Gosu::Sound["fierce_wind.wav"].play(1,1,true)
+      @x = $window.width / 2
+      @y = $window.height / 2
+      self.image = Gosu::Image["player.png"]
+      @engine_sound = Gosu::Sound["fierce_wind.wav"].play(1, 1, true)
       @engine_sound.pause
       self.acceleration_y = 0.01
       self.velocity_y = 1
-      @particle_animation = Chingu::Animation.new(:file => "particle.png", :size => [32,32])
+      @particle_animation = Chingu::Animation.new(:file => "particle.png", :size => [32, 32])
       @fuel = 100.0
     end
 
@@ -22,18 +21,18 @@ module LunarLander
       @angle -= 0.5
       
       Chingu::Particle.create( 
-        :x => @x + Gosu::offset_x(@angle + 60, 20),
-        :y => @y + Gosu::offset_y(@angle + 60, 20),
+        :x => @x + Gosu::offset_x(@angle + 60, 20 * @factor),
+        :y => @y + Gosu::offset_y(@angle + 60, 20 * @factor),
         :animation => @particle_animation,
         :scale_rate => -0.03, 
         :fade_rate => -35, 
         :rotation_rate => +1,
         :mode => :default,
-        :factor => 0.5
+        :factor => @factor / 2
       )
       Chingu::Particle.each { |particle| 
-        particle.y -= Gosu::offset_y(@angle-90, 2)
-        particle.x -= Gosu::offset_x(@angle-90, 2)
+        particle.x -= Gosu::offset_x(@angle-90, 2 * @factor)
+        particle.y -= Gosu::offset_y(@angle-90, 2 * @factor)
       }
     end
 
@@ -41,18 +40,18 @@ module LunarLander
       @angle += 0.5
       
       Chingu::Particle.create( 
-        :x => @x + Gosu::offset_x(@angle - 60, 20), 
-        :y => @y + Gosu::offset_y(@angle - 60, 20), 
+        :x => @x + Gosu::offset_x(@angle - 60, 20 * @factor), 
+        :y => @y + Gosu::offset_y(@angle - 60, 20 * @factor), 
         :animation => @particle_animation,
         :scale_rate => -0.03, 
         :fade_rate => -35, 
         :rotation_rate => +1,
         :mode => :default,
-        :factor => 0.5
+        :factor => @factor / 2
       )
       Chingu::Particle.each { |particle| 
-        particle.y -= Gosu::offset_y(@angle+90, 2)
-        particle.x -= Gosu::offset_x(@angle+90, 2)
+        particle.x -= Gosu::offset_x(@angle+90, 2 * @factor)
+        particle.y -= Gosu::offset_y(@angle+90, 2 * @factor)
       }
     end
     
@@ -62,17 +61,19 @@ module LunarLander
         self.velocity_y += Gosu::offset_y(@angle, 0.05)
 
         Chingu::Particle.create( 
-          :x => @x - Gosu::offset_x(@angle, 20), 
-          :y => @y - Gosu::offset_y(@angle, 20), 
+          :x => @x - Gosu::offset_x(@angle, 20 * @factor), 
+          :y => @y - Gosu::offset_y(@angle, 20 * @factor), 
           :animation => @particle_animation,
           :scale_rate => -0.03, 
           :fade_rate => -35, 
           :rotation_rate => +1,
-          :mode => :default
+          :mode => :default,
+          :factor => @factor
         )
+        
         Chingu::Particle.each { |particle| 
-          particle.y -= Gosu::offset_y(@angle, 10 + rand(4))
-          particle.x -= Gosu::offset_x(@angle, 10 + rand(4))
+          particle.x -= Gosu::offset_x(@angle, 10 * @factor + rand(4))
+          particle.y -= Gosu::offset_y(@angle, 10 * @factor + rand(4))
         }
         @engine_sound.resume unless @engine_sound.playing?
       
@@ -100,7 +101,6 @@ module LunarLander
     
     def update
       super
-      @x %= $window.width
       @engine_sound.stop if @fuel == 0
     end
   end

data/lib/lunar_lander/game_states/play.rb

@@ -1,30 +1,75 @@
 # -*- coding: utf-8 -*-
 module LunarLander
+  
   class Play < Chingu::GameState
+    trait :timer
+    
     def setup
-      self.input = { :p => LunarLander::Pause }
+      self.input = { :p => LunarLander::Pause, :holding_z => :zoom_in, :holding_x => :zoom_out, :c => :cinema_zoom, :holding_d => :camera_right, :holding_a => :camera_left }
       
-      @player = Player.create({ :x => $window.width/2, :y => $window.height/2})
+      @player = Player.new
       @player.input = {:holding_left => :rotate_left, :holding_right => :rotate_right, :holding_up => :thrust, :released_up => :stop_engine}
       
-      @background = Gosu::Image["moon.png"]
-      @surface = Chingu::Rect.new(0, $window.height-50, 800, 50)
+      @background = Gosu::Image["earth.png"]
+      
+      @moon = Gosu::Image["moon.png"]
+      @parallax = Chingu::Parallax.create(:x => 0, :y => $window.height - @moon.height, :rotation_center => :top_left, :zorder => 1)
+      @parallax << { :image => @moon, :repeat_x => true, :repeat_y => false}
+      
+      @surface = Chingu::Rect.new(0, $window.height-@moon.height + 60, $window.width, @moon.height - 60)
       
       setup_hud
+      @factor = 1
     end
     
-    def update
-      super
-      
-      game_objects.destroy_if { |object| 
+    def camera_left
+      @parallax.camera_x -= 2
+    end
+
+    def camera_right
+      @parallax.camera_x += 2
+    end
+    
+    def adjust_parallax_viewport	
+      @parallax.camera_x += @player.velocity_x if @player.x > $window.width * 0.8 or @player.x < $window.width * 0.2
+      @parallax.camera_y += @player.velocity_y if @player.y < $window.height * 0.2 or (@player.y > $window.height * 0.2 and @parallax.camera_y < -($window.height - @moon.height)) 
+    end
+    
+    def cinema_zoom
+      during(3000) do
+        zoom_in
+      end
+    end
+    
+    def zoom_in
+      @factor += 0.001
+      zoom_by_factor
+    end
+    
+    def zoom_out
+      @factor -= 0.001
+      zoom_by_factor
+    end
+    
+    def zoom_by_factor
+      game_objects.each do |game_object|
+        next if game_object.kind_of? Chingu::Text
+        game_object.factor = @factor
+        if game_object.kind_of? Chingu::Parallax
+          game_object.layers.each do |p| p.factor = @factor end
+          game_object.y = $window.height - (@moon.height * game_object.factor)
+        end
+      end
+      @player.factor = @factor
+      Chingu::Particle.all.each do |p| p.factor = @factor end
+    end
+    
+    def destroy_particles
+      game_objects.destroy_if do |object| 
         if object.kind_of? Chingu::Particle
           object.outside_window? || object.color.alpha == 0
         end
-      }
-      
-      test_colision
-      
-       update_hud
+      end
     end
     
     def setup_hud
@@ -59,11 +104,51 @@ module LunarLander
       end
     end
     
+    def restrict_player_movement
+      if @player.x > $window.width * 0.8
+        @player.x = $window.width * 0.8
+      elsif @player.x < $window.width * 0.2
+        @player.x = $window.width * 0.2
+      end
+      if @player.y > $window.height * 0.2 and @parallax.camera_y < -($window.height - @moon.height)
+        @player.y = $window.height * 0.2 
+      elsif @player.y < $window.height * 0.2
+        @player.y = $window.height * 0.2
+      end
+    end
     
+    def update
+      super
+      @player.update_trait
+      @player.update
+      destroy_particles
+      test_colision
+      update_hud
+      adjust_parallax_viewport
+      restrict_player_movement
+    end
+        
     def draw
       super
-      @background.draw(0,0,0)
+      @background.draw(($window.width / 2) - (@background.width * 0.5)/2, ($window.height / 2) - (@background.height * 0.5) / 2, 0, 0.5, 0.5)
+
+      offset_x = 0
+      if @player.x > $window.width * 0.8
+        offset_x = -(@player.x - $window.width * 0.8)
+      elsif @player.x < $window.width * 0.2
+        offset_x = -(@player.x - $window.width * 0.2)
+      end
+      
+      offset_y = 0
+      if @player.y > $window.height * 0.2 and @parallax.camera_y < -($window.height - @moon.height)
+        offset_y = -(@player.y - $window.height * 0.2)
+      elsif @player.y < $window.height * 0.2
+        offset_y = -(@player.y - $window.height * 0.2)
+      end
       
+      $window.translate(offset_x, offset_y) do
+        @player.draw
+      end
     end
   end
 end

data/lib/lunar_lander/version.rb

@@ -1,3 +1,3 @@
 module LunarLander
-  VERSION = "0.0.3"
+  VERSION = "0.0.4"
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: lunar_lander
 version: !ruby/object:Gem::Version 
-  hash: 25
+  hash: 23
   prerelease: 
   segments: 
   - 0
   - 0
-  - 3
-  version: 0.0.3
+  - 4
+  version: 0.0.4
 platform: ruby
 authors: 
 - Lucas Roxo Mundim
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-03-05 00:00:00 -03:00
+date: 2011-03-11 00:00:00 -03:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -51,6 +51,7 @@ files:
 - Gemfile
 - README.rdoc
 - Rakefile
+- TODO
 - bin/lunar_lander
 - lib/lunar_lander.rb
 - lib/lunar_lander/game.rb
@@ -60,6 +61,7 @@ files:
 - lib/lunar_lander/game_states/pause.rb
 - lib/lunar_lander/game_states/play.rb
 - lib/lunar_lander/version.rb
+- lib/media/earth.png
 - lib/media/explosion.wav
 - lib/media/fierce_wind.wav
 - lib/media/moon.png