chingu 0.5.9.4 → 0.6

data/History.txt

@@ -1,24 +1,28 @@
-=== 0.5.7 / 2009-10-15
-alot,alot of stuffz :].. see github commithistory.
-
-=== 0.5 / 2009-10-7
-Big refactor of GameObject. Now has BasicGameObject as base.
-A first basic "trait"-system where GameObject "has_traits :visual, :velocity" etc.
-Tons of enhancements and fixes. Speed optimization. More examples.
-
-=== 0.4.5 / 2009-08-27
-Tons of small fixes across the board. 
-Started on GFX Helpers (fill, fill_rect, fill_gradient so far).
-A basic particle system (see example7.rb)
-
-=== 0.4.0 / 2009-08-19
-Alot of game state love. Now also works stand alone with pure gosu.
-
-=== 0.3.0 / 2009-08-14
+=== 0.6 / 2009-11-21
+More traits, better input, fixes
+See github commithistory. 
+
+=== 0.5.7 / 2009-10-15
+See github commithistory.
+
+=== 0.5 / 2009-10-7
+Big refactor of GameObject. Now has BasicGameObject as base.
+A first basic "trait"-system where GameObject "has_traits :visual, :velocity" etc.
+Tons of enhancements and fixes. Speed optimization. More examples.
+
+=== 0.4.5 / 2009-08-27
+Tons of small fixes across the board. 
+Started on GFX Helpers (fill, fill_rect, fill_gradient so far).
+A basic particle system (see example7.rb)
+
+=== 0.4.0 / 2009-08-19
+Alot of game state love. Now also works stand alone with pure gosu.
+
+=== 0.3.0 / 2009-08-14
 Too much to list. remade inputsystem. gamestates are better. window.rb is cleaner. lots of small bugfixes. Bigger readme.
 
-=== 0.2.0 / 2009-08-10
-tons of new stuff and fixes. complete keymap. gamestate system. moreexamples/docs. better game_object.
-
-=== 0.0.1 / 2009-08-05
+=== 0.2.0 / 2009-08-10
+tons of new stuff and fixes. complete keymap. gamestate system. moreexamples/docs. better game_object.
+
+=== 0.0.1 / 2009-08-05
 first release

data/Manifest.txt

@@ -17,6 +17,7 @@ examples/example10.rb
 examples/example11.rb
 examples/example12.rb
 examples/example13.rb
+examples/example14.rb
 examples/example2.rb
 examples/example3.rb
 examples/example4.rb
@@ -83,8 +84,10 @@ lib/chingu/particle.rb
 lib/chingu/rect.rb
 lib/chingu/require_all.rb
 lib/chingu/text.rb
+lib/chingu/traits/bounding_box.rb
 lib/chingu/traits/collision_detection.rb
 lib/chingu/traits/effect.rb
+lib/chingu/traits/radius.rb
 lib/chingu/traits/retrofy.rb
 lib/chingu/traits/timer.rb
 lib/chingu/traits/velocity.rb

data/README.rdoc

@@ -66,7 +66,7 @@ For example, inside game state Menu you call push_game_state(Level). When Level
 Traits are extensions (or plugins if you so will) to BasicGameObjects. 
 The aim is so encapsulate common behaivor into modules for easy inclusion in your game classes.
 Making a trait is easy, just an ordinary module with the methods setup_trait(), update_trait() and/or draw_trait().
-It currently has to be namespaced to Chingu::Traits for "has_trait" to work inside GameObject-classes.
+It currently has to be namespaced to Chingu::Traits for "has_traits" to work inside GameObject-classes.
 
 == OTHER CLASSES / HELPERS
 
@@ -454,7 +454,7 @@ Each of those 3 methods must call "super" to continue the trait-chain.
 Example:
 
   class Ogre < Chingu::GameObject
-    has_trait :velocity, :timer
+    has_traits :velocity, :timer
     
     def initialize(options)
       super
@@ -481,7 +481,10 @@ Example:
   
 The flow for a game object then becomes:
 
-  -- creating the object
+  -- creating a GameObject class X  ( with a "has_trait :bounding_box, :scale => 0.80" )
+  1) trait gets merged into X, instance and class methods are added
+  2) GameObject.initialize_trait(:scale => 0.80)
+  -- creating an instance of X
   1) GameObject#initialize(options)
   2) GameObject#setup_trait(options)
   -- each game iteration
@@ -503,6 +506,20 @@ Adds timer functionality to your game object
 Adds accessors velocity_x, velocity_y, acceleration_x, acceleration_y, max_velocity to game object.
 They modify x, y as you would expect. *speed / angle will come*
 
+==== Trait "bounding_box"
+Adds accessor 'bounding_box', which returns a Rect based on current image size,x,y,factor_x,factor_y,center_x,center_y
+You can also scale the calculated rect with has_trait-options:
+
+  # This would return a rect slightly smaller then the image. 
+  # Make player think he's better @ dodging bullets then he really is ;)
+  has_trait :bounding_box, :scale => 0.80 
+
+==== Trait "radius"
+Adds accessor 'radius', which returns a Fixnum based on current image size,factor_x and factor_y
+You can also scale the calculated radius with has_trait-options:
+
+  # This would return a radius slightly bigger then what initialize was calculated
+  has_trait :radius, :scale => 1.10
 
 ==== Trait "effect"
 Adds accessors rotation_rate, fade_rate and scale_rate to game object.
@@ -651,3 +668,10 @@ As far as possible, use correct rubyfied english game_objects, not gameobjects.
 * gem 'texplay' for some bonus Image-pixel operations, not needed otherwise
 
 
+
+
+
+  "If you program and want any longevity to your work, make a game. 
+  All else recycles, but people rewrite architectures to keep games alive.", _why
+  
+  

data/chingu.gemspec

@@ -2,17 +2,17 @@
 
 Gem::Specification.new do |s|
   s.name = %q{chingu}
-  s.version = "0.5.9.4"
+  s.version = "0.6"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["ippa"]
-  s.date = %q{2009-11-16}
+  s.date = %q{2009-11-21}
   s.description = %q{OpenGL accelerated 2D game framework for Ruby.
 Builds on the awesome Gosu (Ruby/C++) which provides all the core functionality.
 It adds simple yet powerful game states, prettier input handling, deployment safe asset-handling, a basic re-usable game object and automation of common task.}
   s.email = ["ippa@rubylicio.us"]
   s.extra_rdoc_files = ["History.txt", "Manifest.txt", "benchmarks/README.txt"]
-  s.files = ["History.txt", "LICENSE", "Manifest.txt", "README.rdoc", "Rakefile", "benchmarks/README.txt", "benchmarks/benchmark.rb", "benchmarks/benchmark3.rb", "benchmarks/benchmark4.rb", "benchmarks/benchmark5.rb", "benchmarks/benchmark6.rb", "benchmarks/meta_benchmark.rb", "benchmarks/meta_benchmark2.rb", "chingu.gemspec", "examples/example1.rb", "examples/example10.rb", "examples/example11.rb", "examples/example12.rb", "examples/example13.rb", "examples/example2.rb", "examples/example3.rb", "examples/example4.rb", "examples/example5.rb", "examples/example6.rb", "examples/example7.rb", "examples/example8.rb", "examples/example9.rb", "examples/game1.rb", "examples/high_score_list.yml", "examples/media/Parallax-scroll-example-layer-0.png", "examples/media/Parallax-scroll-example-layer-1.png", "examples/media/Parallax-scroll-example-layer-2.png", "examples/media/Parallax-scroll-example-layer-3.png", "examples/media/background1.png", "examples/media/bullet.png", "examples/media/bullet_hit.wav", "examples/media/city1.csv", "examples/media/city1.png", "examples/media/city2.png", "examples/media/droid.bmp", "examples/media/enemy_bullet.png", "examples/media/explosion.wav", "examples/media/fire_bullet.png", "examples/media/fireball.png", "examples/media/laser.wav", "examples/media/particle.png", "examples/media/plane.csv", "examples/media/plane.png", "examples/media/ruby.png", "examples/media/saucer.csv", "examples/media/saucer.gal", "examples/media/saucer.png", "examples/media/spaceship.png", "examples/media/stickfigure.bmp", "examples/media/stickfigure.png", "examples/media/video_games.png", "lib/chingu.rb", "lib/chingu/animation.rb", "lib/chingu/assets.rb", "lib/chingu/basic_game_object.rb", "lib/chingu/core_extensions.rb", "lib/chingu/fpscounter.rb", "lib/chingu/game_object.rb", "lib/chingu/game_object_list.rb", "lib/chingu/game_state.rb", "lib/chingu/game_state_manager.rb", "lib/chingu/game_states/debug.rb", "lib/chingu/game_states/edit.rb", "lib/chingu/game_states/fade_to.rb", "lib/chingu/game_states/pause.rb", "lib/chingu/helpers/game_object.rb", "lib/chingu/helpers/game_state.rb", "lib/chingu/helpers/gfx.rb", "lib/chingu/helpers/input_client.rb", "lib/chingu/helpers/input_dispatcher.rb", "lib/chingu/helpers/rotation_center.rb", "lib/chingu/high_score_list.rb", "lib/chingu/inflector.rb", "lib/chingu/input.rb", "lib/chingu/named_resource.rb", "lib/chingu/parallax.rb", "lib/chingu/particle.rb", "lib/chingu/rect.rb", "lib/chingu/require_all.rb", "lib/chingu/text.rb", "lib/chingu/traits/collision_detection.rb", "lib/chingu/traits/effect.rb", "lib/chingu/traits/retrofy.rb", "lib/chingu/traits/timer.rb", "lib/chingu/traits/velocity.rb", "lib/chingu/window.rb"]
+  s.files = ["History.txt", "LICENSE", "Manifest.txt", "README.rdoc", "Rakefile", "benchmarks/README.txt", "benchmarks/benchmark.rb", "benchmarks/benchmark3.rb", "benchmarks/benchmark4.rb", "benchmarks/benchmark5.rb", "benchmarks/benchmark6.rb", "benchmarks/meta_benchmark.rb", "benchmarks/meta_benchmark2.rb", "chingu.gemspec", "examples/example1.rb", "examples/example10.rb", "examples/example11.rb", "examples/example12.rb", "examples/example13.rb", "examples/example14.rb", "examples/example2.rb", "examples/example3.rb", "examples/example4.rb", "examples/example5.rb", "examples/example6.rb", "examples/example7.rb", "examples/example8.rb", "examples/example9.rb", "examples/game1.rb", "examples/high_score_list.yml", "examples/media/Parallax-scroll-example-layer-0.png", "examples/media/Parallax-scroll-example-layer-1.png", "examples/media/Parallax-scroll-example-layer-2.png", "examples/media/Parallax-scroll-example-layer-3.png", "examples/media/background1.png", "examples/media/bullet.png", "examples/media/bullet_hit.wav", "examples/media/city1.csv", "examples/media/city1.png", "examples/media/city2.png", "examples/media/droid.bmp", "examples/media/enemy_bullet.png", "examples/media/explosion.wav", "examples/media/fire_bullet.png", "examples/media/fireball.png", "examples/media/laser.wav", "examples/media/particle.png", "examples/media/plane.csv", "examples/media/plane.png", "examples/media/ruby.png", "examples/media/saucer.csv", "examples/media/saucer.gal", "examples/media/saucer.png", "examples/media/spaceship.png", "examples/media/stickfigure.bmp", "examples/media/stickfigure.png", "examples/media/video_games.png", "lib/chingu.rb", "lib/chingu/animation.rb", "lib/chingu/assets.rb", "lib/chingu/basic_game_object.rb", "lib/chingu/core_extensions.rb", "lib/chingu/fpscounter.rb", "lib/chingu/game_object.rb", "lib/chingu/game_object_list.rb", "lib/chingu/game_state.rb", "lib/chingu/game_state_manager.rb", "lib/chingu/game_states/debug.rb", "lib/chingu/game_states/edit.rb", "lib/chingu/game_states/fade_to.rb", "lib/chingu/game_states/pause.rb", "lib/chingu/helpers/game_object.rb", "lib/chingu/helpers/game_state.rb", "lib/chingu/helpers/gfx.rb", "lib/chingu/helpers/input_client.rb", "lib/chingu/helpers/input_dispatcher.rb", "lib/chingu/helpers/rotation_center.rb", "lib/chingu/high_score_list.rb", "lib/chingu/inflector.rb", "lib/chingu/input.rb", "lib/chingu/named_resource.rb", "lib/chingu/parallax.rb", "lib/chingu/particle.rb", "lib/chingu/rect.rb", "lib/chingu/require_all.rb", "lib/chingu/text.rb", "lib/chingu/traits/bounding_box.rb", "lib/chingu/traits/collision_detection.rb", "lib/chingu/traits/effect.rb", "lib/chingu/traits/radius.rb", "lib/chingu/traits/retrofy.rb", "lib/chingu/traits/timer.rb", "lib/chingu/traits/velocity.rb", "lib/chingu/window.rb"]
   s.homepage = %q{http://github.com/ippa/chingu/tree/master}
   s.rdoc_options = ["--main", "README.rdoc"]
   s.require_paths = ["lib"]

data/examples/example11.rb

@@ -15,20 +15,21 @@ class Game < Chingu::Window
     @factor = 6
     self.input = { :escape => :exit }          
     self.caption = "Chingu::Animation / retrofy example. Move with arrows!"
-    Droid.create(:x => $window.width/@factor/2, :y => $window.height/@factor/2)
+    Droid.create(:x => $window.width/2, :y => $window.height/2)
   end
 end
 
 class Droid < Chingu::GameObject
-  has_trait :retrofy  # modifies draw(), 
+  has_traits :timer
   
   def initialize(options = {})
     super
     
-    self.input = {  :holding_left => :left,
-                    :holding_right => :right,
-                    :holding_up => :up,
-                    :holding_down => :down }
+    #
+    # This shows up the shorten versio of input-maps, where each key calls a method of the very same name.
+    # Use this by giving an array of symbols to self.input
+    #
+    self.input = [:holding_left, :holding_right, :holding_up, :holding_down]
     
     # Load the full animation from tile-file media/droid.bmp
     @full_animation = Chingu::Animation.new(:file => "droid.bmp", :size => [11,16]).retrofy
@@ -49,23 +50,23 @@ class Droid < Chingu::GameObject
     update
   end
     
-  def left
-    @x -= 1
+  def holding_left
+    @x -= 2
     @animation = @animations[:left]
   end
 
-  def right
-    @x += 1
+  def holding_right
+    @x += 2
     @animation = @animations[:right]
   end
 
-  def up
-    @y -= 1
+  def holding_up
+    @y -= 2
     @animation = @animations[:up]
   end
 
-  def down
-    @y += 1
+  def holding_down
+    @y += 2
     @animation = @animations[:down]
   end
 

data/examples/example13.rb

@@ -90,7 +90,7 @@ end
 # colorful pulsating text...
 #
 class PulsatingText < Text
-  has_trait :timer, :effect
+  has_traits :timer, :effect
   @@red = Color.new(0xFFFF0000)
   @@green = Color.new(0xFF00FF00)
   @@blue = Color.new(0xFF0000FF)

data/examples/example14.rb

@@ -0,0 +1,124 @@
+require 'rubygems'
+require File.join(File.dirname($0), "..", "lib", "chingu")
+include Gosu
+include Chingu
+
+#
+# Demonstrating Chingus HighScoreList-class
+# I couldn't keep myself from spicying it up some though  :P
+#
+class Game < Chingu::Window
+  def initialize
+    super(640,400)
+    self.input = {:esc => :exit, :space => :remote_high_score, :a => :add}
+    self.caption = "Example of Chingus HighScore class. Press Space to go to fetch high scores remotely!"
+    
+    @title = PulsatingText.create("HIGH SCORES", :x => $window.width/2, :y => 50, :size => 70)
+    
+    #
+    # Load a list from disk, defaults to "high_score_list.yml"
+    # Argument :size forces list to this size
+    #
+    @high_score_list = HighScoreList.load(:size => 10)
+
+    #
+    # Add some new high scores to the list. :name and :score are required but you can put whatever.
+    # They will mix with the old scores, automatic default sorting on :score
+    #
+    10.times do
+      data = {:name => "NEW", :score => rand(10000)}
+      
+      position = @high_score_list.add(data)
+      if position
+        puts "#{data[:name]} - #{data[:score]} got position #{position}"
+      else
+        puts "#{data[:name]} - #{data[:score]} didn't make it"
+      end
+    end
+    
+    create_text
+    
+    # @high_score_list.save_to_file  # Uncomment to save list to disk
+  end
+  
+  def remote_high_score
+    game_objects.destroy_all
+    
+    @title = PulsatingText.create("REMOTE WEBSERVICE HIGH SCORES", :x => $window.width/2, :y => 50, :size => 30)
+    
+    #
+    # :game_id is the unique ID the game has on www.gamercv.com
+    # :user is the login for that specific game (set by owner)
+    # :password is the password for that specific game (set by owner)
+    #
+    # To read a high score list only :game_id is required
+    # To write to a high score list :user and :password is required as well
+    #
+    @high_score_list = HighScoreList.load_remote(:game_id => 1, :user => "chingu", :password => "chingu", :size => 10)
+    create_text
+  end
+  
+  def add
+    data = {:name => "NEW", :score => 1600}
+    position = @high_score_list.add(data)
+    puts "Got position: #{position.to_s}"
+    create_text
+  end
+  
+  def create_text
+    @score_texts ||= []
+    @score_texts.each { |text| text.destroy }
+    
+    #
+    # Iterate through all high scores and create the visual represenation of it
+    #
+    @high_score_list.each_with_index do |high_score, index|
+      y = index * 25 + 100
+      @score_texts << Text.create(high_score[:name], :x => 200, :y => y, :size => 20)
+      @score_texts << Text.create(high_score[:score], :x => 400, :y => y, :size => 20)
+    end
+    
+    5.times do
+      score = rand(20000)
+      puts "position for possible score #{score}: #{@high_score_list.position_by_score(score)}"
+    end
+  end
+  
+end
+
+#
+# colorful pulsating text...
+#
+class PulsatingText < Text
+  has_traits :timer, :effect
+  @@red = Color.new(0xFFFF0000)
+  @@green = Color.new(0xFF00FF00)
+  @@blue = Color.new(0xFF0000FF)
+  
+  def initialize(text, options = {})
+    super(text, options)
+    
+    options = text  if text.is_a? Hash
+    @pulse = options[:pulse] || false
+    self.rotation_center(:center_center)
+    every(20) { create_pulse }   if @pulse == false
+  end
+  
+  def create_pulse
+    pulse = PulsatingText.create(@text, :x => @x, :y => @y, :height => @height, :pulse => true, :image => @image, :zorder => @zorder+1)
+    colors = [@@red, @@green, @@blue]
+    pulse.color = colors[rand(colors.size)].dup
+    pulse.mode = :additive
+    pulse.alpha -= 150
+    pulse.scale_rate = 0.002
+    pulse.fade_rate = -3 + rand(2)
+    pulse.rotation_rate = rand(2)==0 ? 0.05 : -0.05
+  end
+    
+  def update
+    destroy if self.alpha == 0
+  end
+  
+end
+
+Game.new.show

data/examples/example2.rb

@@ -60,13 +60,17 @@ class Play < Chingu::GameState
   def initialize
     super
     @player = Player.create(:x => 200, :y => 200)
-    @player.input = { :holding_left => :move_left, 
-                      :holding_right => :move_right, 
-                      :holding_up => :move_up, 
-                      :holding_down => :move_down, 
-                      :space => :fire
+    
+    #
+    # More advanced input-maps, showing of multiple keys leading to the same method
+    #
+    @player.input = { [:holding_a, :holding_left, :holding_pad_left] => :move_left, 
+                      [:holding_d, :holding_right, :holding_pad_right] => :move_right, 
+                      [:holding_w, :holding_up, :holding_pad_up] => :move_up, 
+                      [:holding_s, :holding_down, :holding_pad_down] => :move_down, 
+                      [:space, :return, :pad_button_2] => :fire
                     }
-    self.input = { :f1 => :debug, :escape => :exit }
+    self.input = { :f1 => :debug, [:q, :escape] => :exit }
   end
   
   def debug   

data/examples/example9.rb

@@ -18,14 +18,7 @@ class Game < Chingu::Window
 end
 
 class FireCube < Chingu::GameObject
-  has_trait :velocity
-  has_trait :collision_detection
-  #
-  # TODO:
-  # has_trait :collision_detection, :type => :bounding_box
-  # has_trait :collision_detection, :type => :radius
-  #
-  
+  has_traits :velocity, :collision_detection  
   attr_accessor :color, :radius
   
   def initialize(options)
@@ -36,7 +29,7 @@ class FireCube < Chingu::GameObject
     @velocity_x = options[:velocity_x] || 1 + rand(2)
     @velocity_y = options[:velocity_y] || 1 + rand(2)
     
-    @bounding_box = Rect.new([@x, @y, 10, 10])
+    @box = Rect.new([@x, @y, 10, 10])
     @radius = 6
     
     @blue = Color.new(255,100,255,255)
@@ -45,17 +38,14 @@ class FireCube < Chingu::GameObject
   end
   
   def draw
-    $window.fill_rect(@bounding_box, @color)
+    $window.fill_rect(@box, @color)
   end
   
   def update
+    @box.x, @box.y = @x, @y
     @color = @blue
   end
   
-  def collides?(object2)
-    radius_collision?(object2)
-  end
-    
   def die!
     @color = @red
   end

data/examples/game1.rb

@@ -9,7 +9,6 @@ require 'rubygems'
 require File.join(File.dirname($0), "..", "lib", "chingu")
 
 require 'texplay'     # adds Image#get_pixel
-#require 'devil/gosu'  # adds Gosu::Window#screenshot and better file support
 require 'opengl'      # adds raw gl stuff so Image#retrofy works (in some setups this seems to be 'gl')
 
 include Gosu
@@ -26,59 +25,22 @@ class Game < Chingu::Window
   end
 end
 
-#
-# GAME STATE: GAME OVER
-#
-class GameOver < Chingu::GameState  
-  def setup
-    @text = Text.create(:text => "GAME OVER (ESC to quit, RETURN to try again!)", :size => 40, :x => 30, :y => 100)
-    self.input = { :esc => :exit, :return => :try_again}
-    @layover = Color.new(0x99000000)
-  end
-  
-  def draw
-    super
-    previous_game_state.draw
-    fill(@layover)
-  end
-  
-  def try_again
-    pop_game_state  # pop back to our playing game state
-  end
-end
-
-#
-# GAME STATE: GAME OVER
-#
-class Done < Chingu::GameState
-  def initialize(options)
-    @score = options[:score]
-  end
-  
-  def setup
-    @text = Text.create(:text => "You made it! Score #{@score} (ESC to quit, RETURN to try again!)", :size => 40, :x => 30, :y => 100)
-    self.input = { :esc => :exit, :return => :try_again}
-  end  
-  
-  def try_again
-    pop_game_state  # pop back to our playing game state
-  end
-end
-
 
 #
 # GAME STATE: LEVEL
 #
 class Level < Chingu::GameState
+  has_trait :timer
+  
   def initialize(options = {})
     super
     
     @parallax = Parallax.create
-    ParallaxLayer.has_trait :retrofy
+    #ParallaxLayer.has_trait :retrofy
     #@parallax << ParallaxLayer.new(:image => Image["city3.png"].retrofy, :center => 0, :damping => 4, :factor => $window.factor)
     @parallax << ParallaxLayer.new(:image => Image["city2.png"].retrofy, :center => 0, :damping => 2, :factor => $window.factor)
     @parallax << ParallaxLayer.new(:image => Image["city1.png"].retrofy, :center => 0, :damping => 1, :factor => $window.factor)
-    @player = Player.create(:x => 10, :y => 100)
+    @player = Player.create(:x => 10, :y => 10)
     
     @bg1 = Color.new(0xFFCE28FF)
     @bg2 = Color.new(0xFF013E87)
@@ -88,7 +50,7 @@ class Level < Chingu::GameState
   # This is called each time this GameState is switched/pushed/poped to.
   #
   def setup
-    # Remove all lingering g
+    # Remove all lingering game objects
     Enemy.destroy_all
     Bullet.destroy_all
     
@@ -107,7 +69,11 @@ class Level < Chingu::GameState
   #
   def solid_pixel_at?(x, y)
     begin
-      @parallax.layers.last.get_pixel(x, y)[3] != 0
+      #pixel = @parallax.layers.last.get_pixel(x/$window.factor, y/$window.factor)
+      #return false  if  pixel.nil?
+      #return 
+      
+      @parallax.layers.last.get_pixel(x/$window.factor, y/$window.factor)[3] != 0
     rescue
       puts "Error in get_pixel(#{x}, #{y})"
     end
@@ -145,13 +111,13 @@ class Level < Chingu::GameState
     @timer = @timer * 0.9999
     @total_ticks += 1
     if @total_ticks > @timer
-      Enemy.create(:x => $window.width/2, :y => rand(300))
+      Enemy.create(:x => $window.width, :y => rand(300))
       @total_ticks = 0
     end
     
     #push_game_state(Done.new(:score => @player.score)) if @game_steps == 1
     
-    $window.caption = "City Battle! Score: #{@player.score} .... FPS: #{$window.fps} ... game objects: #{game_objects.size}"
+    $window.caption = "City Battle! Player x/y: #{@player.x}/#{@player.y} - Score: #{@player.score} - FPS: #{$window.fps} - game objects: #{game_objects.size}"
   end
   
   def draw
@@ -164,7 +130,9 @@ end
 # OUR PLAYER
 #
 class Player < GameObject
-  has_trait :velocity, :collision_detection, :retrofy, :timer
+  has_traits :velocity, :collision_detection, :timer
+  has_trait :radius, :scale => 0.50, :debug => true
+  
   attr_accessor :score
   
   def initialize(options = {})
@@ -179,40 +147,39 @@ class Player < GameObject
       :holding_down => :down, 
       :holding_space => :fire }
     
-    @max_velocity = 1
-    @radius = 10
+    @max_velocity = 2
     @score = 0
     @cooling_down = false
   end
   
   def up
-    @velocity_y += -@max_velocity
+    self.velocity_y = -@max_velocity
   end
   def down
-    @velocity_y += @max_velocity
+    self.velocity_y = @max_velocity
   end
   def right
-    @velocity_x += @max_velocity
+    self.velocity_x = @max_velocity
   end
   def left
-    @velocity_x -= @max_velocity
+    self.velocity_x = -@max_velocity
   end
   
   def fire
     return if @cooling_down
     @cooling_down = true
-    after(100) { @cooling_down = false}
+    after(100) { @cooling_down = false }
     
     Bullet.create(:x => self.x, :y => self.y)
     Sound["laser.wav"].play(0.1)
   end
   
   def update
-    @velocity_y *= 0.6
-    @velocity_x *= 0.6
+    self.velocity_y *= 0.6
+    self.velocity_x *= 0.6
     
-    @x = @last_x  if @x < 0 || @x > $window.width/$window.factor
-    @y = @last_y  if @y < 0 || @y > $window.height/$window.factor
+    @x = @last_x  if @x < 0 || @x > $window.width#/$window.factor
+    @y = @last_y  if @y < 0 || @y > $window.height#/$window.factor
     @last_x, @last_y = @x, @y
   end
   
@@ -222,14 +189,14 @@ end
 # OUR PLAYERS BULLETS
 #
 class Bullet < GameObject
-  has_trait :retrofy, :timer, :collision_detection
-  attr_reader :status
+  has_traits :timer, :collision_detection, :velocity
+  attr_reader :status, :radius
   
   def initialize(options)
     super
     @image = Image["bullet.png"].retrofy
     self.factor = $window.factor
-    @velocity_x = 10
+    self.velocity_x = 10
     @status = :default
     @radius = 3
   end
@@ -241,10 +208,10 @@ class Bullet < GameObject
     during(50) { @factor_x += 1; @factor_y += 1; @x -= 1; }.then { self.destroy }
   end
   
-  def update
-    return if @status == :dying
-    @x += @velocity_x
-  end
+  #def update
+    #return if @status == :dying
+    #@x += self.velocity_x
+  #end
 end
 
 #
@@ -254,12 +221,12 @@ class EnemyBullet < Bullet
   def initialize(options)
     super
     @image = Image["enemy_bullet.png"].retrofy
-    @velocity_x = -3
+    self.velocity_x = -3
   end
 end
 
 class Explosion < GameObject
-  has_trait :timer,:retrofy
+  has_traits :timer
   
   def initialize(options)
     super
@@ -271,8 +238,7 @@ class Explosion < GameObject
     
     @image = @@image.dup  if @image.nil?
     
-    
-    self.rotation_center(:center)
+    self.rotation_center = :center
     self.factor = options[:factor] ? options[:factor] : $window.factor
     during(100) { self.alpha -= 30}.then { destroy }
   end
@@ -287,7 +253,7 @@ class Explosion < GameObject
 end
 
 class Shrapnel < GameObject
-  has_trait :retrofy, :timer, :effect, :velocity
+  has_traits :timer, :effect, :velocity
   
   def initialize(options)
     super
@@ -296,8 +262,7 @@ class Shrapnel < GameObject
     self.velocity_x = 4 - rand(8)
     self.velocity_y = 4 - rand(10)
     self.acceleration_y = 0.2 # gravity = downards acceleration
-    
-    rotation_center(:center)
+    self.rotation_center = :center
     self.factor = $window.factor
     @status = :default
   end
@@ -325,15 +290,16 @@ end
 # OUR ENEMY SAUCER
 #
 class Enemy < GameObject
-  has_trait :collision_detection, :retrofy, :timer  
+  has_traits :collision_detection, :timer  
+  attr_reader :radius
   
   def initialize(options)
     super
     @velocity = options[:velocity] || 2
     @health = options[:health] || 100
     
-    @anim = Animation.new(:file => "media/saucer.png", :size => [32,13], :delay => 100)
-    @anim.retrofy
+    @anim = Animation.new(:file => "media/saucer.png", :size => [32,13], :delay => 100).retrofy
+    #  @anim.retrofy
     @image = @anim.first
       
     self.factor = $window.factor
@@ -403,4 +369,49 @@ class Enemy < GameObject
   end
 end
 
-Game.new.show
+
+#
+# GAME STATE: GAME OVER
+#
+class GameOver < Chingu::GameState  
+  def setup
+    @text = Text.create("GAME OVER (ESC to quit, RETURN to try again!)", :size => 40, :x => 30, :y => 100)
+    self.input = { :esc => :exit, :return => :try_again }
+    @layover = Color.new(0x99000000)
+  end
+  
+  def draw
+    super
+    previous_game_state.draw
+    fill(@layover)
+  end
+  
+  def try_again
+    pop_game_state  # pop back to our playing game state
+  end
+end
+
+#
+# GAME STATE: GAME OVER
+#
+class Done < Chingu::GameState
+  def initialize(options)
+    @score = options[:score]
+  end
+  
+  def setup
+    @text = Text.create("You made it! Score #{@score} (ESC to quit, RETURN to try again!)", :size => 40, :x => 30, :y => 100)
+    self.input = { :esc => :exit, :return => :try_again}
+  end  
+  
+  def try_again
+    pop_game_state  # pop back to our playing game state
+  end
+end
+
+
+Game.new.show
+
+
+
+