gosu_extensions 0.2.5 → 0.2.6

data/Rakefile

@@ -6,7 +6,7 @@ begin
     gemspec.email = "florian.hanke@gmail.com"
     gemspec.homepage = "http://www.github.com/floere/gosu_extensions"
     gemspec.description = ""
-    gemspec.authors = ["Florian Hanke"]
+    gemspec.authors = ["Florian Hanke", "Severin Schoepke (various improvements)"]
     gemspec.rdoc_options = ["--inline-source", "--charset=UTF-8"]
     gemspec.files = FileList["[A-Z]*", "{generator,lib}/**/*"]
     gemspec.test_files = FileList["spec/**/*_spec.rb"]
@@ -26,4 +26,6 @@ require 'spec/rake/spectask'
 desc "Run all specs in spec directory"
 Spec::Rake::SpecTask.new(:spec) do |t|
   t.spec_files = FileList['spec/**/*_spec.rb']
-end
+end
+
+task :default => :spec

data/VERSION

@@ -1 +1 @@
-0.2.5
+0.2.6

data/lib/core/collision.rb

@@ -35,11 +35,10 @@ class Collision
   #
   def simple_package definition
     lambda do |this_shape, _|
-      # TODO break if found.
-      #
-      window.moveables.each do |movable|
-        if movable.shape == this_shape
-          movable.instance_eval &definition
+      window.moveables.each do |moveable|
+        if moveable.shape == this_shape
+          moveable.instance_eval &definition
+          break
         end
       end
     end
@@ -50,15 +49,14 @@ class Collision
   def complex_package definition
     lambda do |this_shape, that_shape|
       this_that = Array.new(2)
-      # TODO break if found
-      #
-      window.moveables.each do |movable|
-        if movable.shape == this_shape
-          this_that[0] = movable
+      window.moveables.each do |moveable|
+        if moveable.shape == this_shape
+          this_that[0] = moveable
         end
-        if movable.shape == that_shape
-          this_that[1] = movable
+        if moveable.shape == that_shape
+          this_that[1] = moveable
         end
+        break if this_that.all?
       end
       definition.call *this_that
     end

data/lib/core/control.rb

@@ -13,7 +13,7 @@ class Control
   #
   #
   def mapping?
-    @mapping && !@mapping.empty?
+    @mapping.present?
   end
   
   # 

data/lib/core/game_window.rb

@@ -247,7 +247,7 @@ class GameWindow < Gosu::Window
     @environment.window = self
     @environment.damping = -self.damping + 1 # recalculate the damping such that 0.0 has no damping.
   end
-  # Callbacks:
+  # Callbacks.
   #
   def setup_players; end
   def setup_enemies; end

data/lib/core/scheduling.rb

@@ -24,8 +24,6 @@ class Scheduling
   # 1. Move one step in time.
   # 2. Execute all blocks with time 0.
   #
-  # TODO Rewrite to be faster.
-  #
   # FIXME - threads added while threads are handled!
   #
   def step

data/lib/traits/generator.rb

@@ -39,14 +39,20 @@ end
   
   module InstanceMethods
     
+    #
+    #
     def destroyed!
       stop_generating!
     end
     
+    #
+    #
     def stop_generating!
       @stop_generating = true
     end
     
+    #
+    #
     def generation klass, every_rate, til
       return lambda {} if @stop_generating
       lambda do
@@ -56,12 +62,17 @@ end
       end
     end
     
-    def generate klass
-      generated = klass.new self.window
-      generated.warp self.position
-      self.window.register generated
-    end
-    
+  end
+  
+  # Returns the generated thing.
+  #
+  # TODO generate klass, times = 1, &after_generation ?
+  #
+  def generate klass
+    generated = klass.new self.window
+    generated.warp self.position
+    self.window.register generated
+    generated
   end
   
 end

data/lib/traits/hitpoints.rb

@@ -47,6 +47,7 @@ module Hitpoints extend Trait
     def hit!
       
     end
+    
     # Hit the thing with that much damage.
     #
     # hit!-s if hitpoints higher than 0
@@ -55,15 +56,8 @@ module Hitpoints extend Trait
     #
     def hit damage = 1
       self.hitpoints -= damage
-      if self.hitpoints > 0
-        hit!
-      else
-        if respond_to?(:kill!)
-          kill!
-        else
-          destroy!
-        end
-      end
+      hit! if hitpoints > 0
+      respond_to?(:kill!) ? kill! : destroy! if hitpoints == 0
     end
     
   end

data/lib/traits/lives.rb

@@ -43,14 +43,17 @@ module Lives extend Trait
       3
     end
     
+    # Override to handle killed!
+    #
+    def killed!
+      
+    end
+    
     # Does three things:
     # * Deduct 1 live.
     # * Check to see if the amount is 0.
     # * Calls #destroy! if yes.
     #
-    def killed!
-      
-    end
     def kill!
       self.lives -= 1
       killed! if self.lives > 0

data/lib/traits/targeting/closest.rb

@@ -9,17 +9,7 @@ module Targeting
     # TODO fire arc
     #
     def acquire *targets
-      closest = nil
-      lowest_distance = nil
-      
-      targets.each do |target|
-        distance = (target.position - self.position).length
-        next if lowest_distance && distance > lowest_distance
-        lowest_distance = distance
-        closest = target
-      end
-      
-      closest
+      targets.sort_by {|target| distance = (target.position - self.position).length }.first
     end
   end
   

data/lib/units/sprite.rb

@@ -46,7 +46,7 @@ class Sprite
     def rotation amount = nil, &block
       # Override default.
       #
-      to_execute = block_given? ? block : lambda { amount }
+      to_execute = block || lambda { amount }
       InitializerHooks.append self do
         self.rotation = to_execute[]
       end

metadata

@@ -5,11 +5,12 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 2
-  - 5
-  version: 0.2.5
+  - 6
+  version: 0.2.6
 platform: ruby
 authors: 
 - Florian Hanke
+- Severin Schoepke (various improvements)
 autorequire: 
 bindir: bin
 cert_chain: []