gosu_extensions 0.3.5 → 0.3.6

data/VERSION

@@ -1 +1 @@
-0.3.5
+0.3.6

data/lib/core/initializer_hooks.rb

@@ -7,10 +7,18 @@ module InitializerHooks
   mattr_accessor :hooks # { class => [blocks] }
   self.hooks = {}
   
-  # Calls the hooks in order of registration.
+  # Runs the hooks for this instance for
+  # each class and superclass up to Sprite.
   #
   def after_initialize
-    hooks = InitializerHooks.hooks[self.class]
+    self.class.ancestors.each do |klass|
+      run_hooks_for klass
+      break if klass == Sprite
+    end
+  end
+  
+  def run_hooks_for klass
+    hooks = InitializerHooks.hooks[klass]
     hooks && hooks.each do |hook|
       self.instance_eval &hook
     end

data/lib/traits/damaging.rb

@@ -46,18 +46,16 @@ module Damaging extend Trait
     klass.extend ClassMethods
   end
   
-  def initialize window
+  def initialize *args
     raise DamageMissingError.new unless respond_to?(:damage)
-    super window
+    super *args
   end
   
   module ClassMethods
-    
     def damage damage = nil, &block
-      block = lambda { damage } unless block_given?
+      block ||= lambda { damage }
       define_method :damage, &block
     end
-    
   end
   
 end

data/lib/traits/hitpoints.rb

@@ -6,14 +6,16 @@ module Hitpoints extend Trait
   #
   manual <<-MANUAL
     Defines:
-      hitpoints <some trait>
-    
+      hitpoints <some number>
+      hitpoints { <some dynamically generated number> }
+      
     Example:
       hitpoints 10_000
+      hitpoints { rand(100) + 50 }
     
     Call hit!(damage = 1) to remove hitpoints. This will call
     * callback hit if hitpoints are still higher than 0.
-    * kill!, and if not available, destroy! if hitpoints are lower than 0.
+    * kill!, and if not available, destroy! if hitpoints are equal or lower than 0.
   MANUAL
   
   def self.included target_class
@@ -24,13 +26,15 @@ module Hitpoints extend Trait
     
     # Define the amount of hitpoints of the thing.
     #
-    def hitpoints amount
+    def hitpoints amount = nil, &block
       include InstanceMethods
       class_inheritable_accessor :prototype_hitpoints
       self.prototype_hitpoints = amount
       
-      hook = lambda { self.hitpoints = self.class.prototype_hitpoints }
-      InitializerHooks.register self, &hook
+      InitializerHooks.register self do
+        self.hitpoints = amount || block.call
+      end
+      
     end
     
   end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 3
-  - 5
-  version: 0.3.5
+  - 6
+  version: 0.3.6
 platform: ruby
 authors: 
 - Florian Hanke
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-04-21 00:00:00 +02:00
+date: 2010-05-11 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency