zyps 0.7.5 → 0.7.6

data/lib/zyps/actions.rb

@@ -175,18 +175,19 @@ class TagAction < Action
 end
 
 
-#Blend the target's color with another color.
-class BlendAction < Action
-	#Color to apply to targets.
+#Blend the actor's color with another color.
+class BlendAction < TimedAction
+	#Color to apply to actor.
 	attr_accessor :color
-	def initialize(color)
-		self.color = color
+	def initialize(rate, color)
+		super
+		@color = color
 	end
-	#Blend the targets' color with the assigned color.
+	#Blend the actor's color with the assigned color.
 	def do(actor, targets)
-		targets.each do |target|
-			target.color += @color
-		end
+		actor.color.red += (@color.red - actor.color.red) * delta
+		actor.color.green += (@color.green - actor.color.green) * delta
+		actor.color.blue += (@color.blue - actor.color.blue) * delta
 	end
 end
 
@@ -269,4 +270,92 @@ class BreedAction < Action
 end
 
 
+#Copies the given GameObject prototypes into the environment.
+class SpawnAction < Action
+	#Environment to place children into.
+	attr_accessor :environment
+	#Array of GameObjects to copy into environment.
+	attr_accessor :prototypes
+	def initialize(environment, prototypes = [])
+		self.environment = environment
+		self.prototypes = prototypes
+	end
+	#Add children to environment.
+	def do(actor, targets)
+		prototypes.each do |prototype|
+			environment.objects << generate_child(actor, prototype)
+		end
+	end
+	#Copy prototype to actor's location.
+	def generate_child(actor, prototype)
+		#Copy prototype so it can be spawned repeatedly if need be.
+		child = prototype.copy
+		child.location = actor.location.copy
+		child
+	end
+end
+
+
+#Copies the given GameObject prototypes into the environment and destroys actor.
+#Shrapnel's original vector will be added to actor's vector.
+#Shrapnel's size will be actor's size divided by number of shrapnel pieces.
+class ExplodeAction < SpawnAction
+	#Calls super method.
+	#Also removes actor from environment.
+	def do(actor, targets)
+		super
+		environment.objects.delete(actor)
+	end
+	#Calls super method.
+	#Also adds actor's vector to child's.
+	#Finally, reduces child's size to actor's size divided by number of shrapnel pieces.
+	def generate_child(actor, prototype)
+		child = super
+		child.vector += actor.vector
+		child.size = actor.size / prototypes.length
+		child
+	end
+end
+
+
+
+#Copies the given GameObject prototypes into the environment.
+#Bullet's vector angle will be added to angle to target.
+class ShootAction < SpawnAction
+	#Collection of GameObjects to copy into environment.
+	#First element will be copied on first call, subsequent elements on subsequent calls, wrapping back to start once end is reached.
+	#If an element is a collection, all its members will be copied in at once.
+	attr_accessor :prototypes
+	def initialize(*arguments)
+		super
+		@prototype_index = 0
+		@target_index = 0
+	end
+	#Copies next prototype into environment.
+	def do(actor, targets)
+		return if targets.empty?
+		#If next item is a collection of prototypes, copy them all in at once.
+		if prototypes[@prototype_index].respond_to?(:each)
+			prototypes[@prototype_index].each do |prototype|
+				environment.objects << generate_child(actor, prototype, targets[@target_index])
+			end
+		#Otherwise copy the single prototype.
+		else
+			environment.objects << generate_child(actor, prototypes[@prototype_index], targets[@target_index])
+		end
+		#Move to next target and prototype group, wrapping to start of array if need be.
+		@target_index = (@target_index + 1) % targets.length
+		@prototype_index = (@prototype_index + 1) % prototypes.length
+	end
+	#Calls super method.
+	#Also adds angle to target to child's vector angle.
+	def generate_child(actor, prototype, target)
+		child = super(actor, prototype)
+		child.vector.pitch = Utility.find_angle(actor.location, target.location) + child.vector.pitch
+		child
+	end
+end
+
+
+
 end #module Zyps

data/lib/zyps/conditions.rb

@@ -105,4 +105,26 @@ class ClassCondition < Condition
 end
 
 
+#True if the given interval has elapsed.
+class ElapsedTimeCondition < Condition
+	#The number of seconds that must elapse before the condition is true.
+	attr_accessor :interval
+	def initialize(interval = 1.0)
+		self.interval = interval
+		@clock = Clock.new
+		@elapsed_time = 0
+	end
+	#Returns the array of targets if the interval has elapsed.
+	def select(actor, targets)
+		@elapsed_time += @clock.elapsed_time
+		if @elapsed_time >= interval
+			@elapsed_time = 0
+			return targets
+		else
+			return []
+		end
+	end
+end
+
+
 end #module Zyps

data/test/test_zyps.rb

@@ -595,5 +595,56 @@ class TestBehavior < Test::Unit::TestCase
 		assert_equal(1, action.stop_count, "stop() should NOT have been called.")
 	end
 	
+end
+
+
+class TestAdditions < Test::Unit::TestCase
+
+	#Add a new behavior to a creature with the given action.
+	def add_action(action, creature)
+		behavior = Behavior.new
+		behavior.actions << action
+		creature.behaviors << behavior
+	end
+	
+	def setup
+		@environment = Environment.new
+		@actor = Creature.new(:name => 'target1', :location => Location.new(1, 1))
+		@env_fact = gravity = Gravity.new(200)
+	end
+	
+	def test_environment_double_arrow_objects
+		assert_equal(0, @environment.objects.size)
+		@environment << @actor
+		assert_equal(1, @environment.objects.size)
+		assert_equal(0, @environment.environmental_factors.size)
+	end
+	
+	def test_environment_double_arrow_factors
+		assert_equal(0, @environment.environmental_factors.size)
+		@environment << @env_fact
+		assert_equal(1, @environment.environmental_factors.size)
+		assert_equal(0, @environment.objects.size)
+	end
+
+	def test_game_object_double_arrow
+		#test color
+		@actor << Color.new(1,1,1)
+		assert_equal(Color.new(1,1,1), @actor.color)
+		#test vector
+		vect =Vector.new(23,13)
+		@actor << vect
+		assert_equal(vect, @actor.vector)
+		#test location
+		@actor << Location.new(13,13)
+		assert_equal(13, @actor.location.x)
+		assert_equal(13, @actor.location.y)
+		#test behavior
+		behavior = Behavior.new
+		behavior.actions << TagAction.new("1")
+		@actor << behavior
+		assert_equal(1, @actor.behaviors.size)
+		assert_equal("1", @actor.behaviors.first.actions.first.tag)
+	end
 	
 end

data/test/zyps/test_actions.rb

@@ -154,32 +154,32 @@ class TestActions < Test::Unit::TestCase
 	end
 	
 	
-	#A BlendAction shifts the target's color toward the given color.
+	#A BlendAction shifts the actor's color toward the given color.
 	def test_blend_action_black
 		#Create a BlendAction that blends to black.
-		add_action(BlendAction.new(Color.new(0, 0, 0)), @actor)
-		#Set the target's color.
-		@target1.color = Color.new(0.5, 0.5, 0.5)
-		#Act.
+		add_action(BlendAction.new(1, Color.new(0, 0, 0)), @actor)
+		#Set the actor's color.
+		@actor.color = Color.new(0.5, 0.5, 0.5)
+		#Act (time difference is 0.1 seconds).
 		@environment.interact
-		#Verify the target's new color.
-		assert_in_delta(0.25, @target1.color.red, REQUIRED_ACCURACY)
-		assert_in_delta(0.25, @target1.color.green, REQUIRED_ACCURACY)
-		assert_in_delta(0.25, @target1.color.blue, REQUIRED_ACCURACY)
+		#Verify the actor's new color.
+		assert_in_delta(0.45, @actor.color.red, REQUIRED_ACCURACY)
+		assert_in_delta(0.45, @actor.color.green, REQUIRED_ACCURACY)
+		assert_in_delta(0.45, @actor.color.blue, REQUIRED_ACCURACY)
 	end
 		
 	#Test shifting colors toward white.
 	def test_blend_action_white
 		#Create a BlendAction that blends to white.
-		add_action(BlendAction.new(Color.new(1, 1, 1)), @actor)
-		#Set the target's color.
-		@target1.color = Color.new(0.5, 0.5, 0.5)
-		#Act.
+		add_action(BlendAction.new(1, Color.new(1, 1, 1)), @actor)
+		#Set the actor's color.
+		@actor.color = Color.new(0.5, 0.5, 0.5)
+		#Act (time difference is 0.1 seconds).
 		@environment.interact
-		#Verify the target's new color.
-		assert_in_delta(0.75, @target1.color.red, REQUIRED_ACCURACY)
-		assert_in_delta(0.75, @target1.color.green, REQUIRED_ACCURACY)
-		assert_in_delta(0.75, @target1.color.blue, REQUIRED_ACCURACY)
+		#Verify the actor's new color.
+		assert_in_delta(0.55, @actor.color.red, REQUIRED_ACCURACY)
+		assert_in_delta(0.55, @actor.color.green, REQUIRED_ACCURACY)
+		assert_in_delta(0.55, @actor.color.blue, REQUIRED_ACCURACY)
 	end
 	
 	
@@ -231,4 +231,65 @@ class TestActions < Test::Unit::TestCase
 		assert_equal(@actor.location.y, child.location.y)
 	end
 	
+	def test_spawn_action
+		#Set up prototypes.
+		prototypes = [Creature.new, GameObject.new]
+		prototypes[0].vector = Vector.new(1, 45)
+		#Add prototypes to new SpawnAction.
+		add_action(SpawnAction.new(@environment, prototypes), @actor)
+		#Interact.
+		@environment.interact
+		#All children should be spawned.
+		assert_equal(5, @environment.objects.length)
+		#Childrens' starting location should match actor's.
+		assert_equal(@environment.objects[-1].location, @actor.location)
+		#Spawned objects should be copy of originals.
+		assert_not_same(prototypes[0], @environment.objects[-2])
+		#Spawned objects' vectors should be same as originals'.
+		assert_equal(prototypes[0].vector, @environment.objects[-2].vector)
+	end
+	
+	def test_explode_action
+		#Set up prototypes.
+		prototypes = [Creature.new, GameObject.new]
+		prototypes[0].vector = Vector.new(1, 45)
+		#Add prototypes to new ExplodeAction.
+		add_action(ExplodeAction.new(@environment, prototypes), @actor)
+		#Interact.
+		@environment.interact
+		#Actor should be removed from environment.
+		assert(! @environment.objects.include?(@actor))
+		#All children should be spawned.
+		assert_equal(4, @environment.objects.length)
+		children = @environment.objects[-2, 2]
+		#Spawned objects' vectors should be sum of originals' plus actor's.
+		assert_equal(prototypes[0].vector + @actor.vector, children[0].vector)
+		assert_equal(prototypes[1].vector + @actor.vector, children[1].vector)
+	end
+	
+	def test_shoot_action
+		#Set up prototypes.
+		prototypes = [[Creature.new, GameObject.new], Creature.new(:name => '2')]
+		prototypes[0][0].vector.pitch = 5
+		#Add prototypes to new ShootAction.
+		add_action(ShootAction.new(@environment, prototypes), @actor)
+		#Interact with both targets.
+		@environment.interact
+		#Both objects in first group should have been spawned.
+		assert_equal(5, @environment.objects.length)
+		#First spawned object's vector should match angle to first target plus prototype's vector angle.
+		children = @environment.objects[-2, 2]
+		assert_equal(45 + 5, children[0].vector.pitch)
+		#Second spawned object's vector should match angle to first target.
+		assert_equal(45, children[1].vector.pitch)
+		#Fire second set of bullets.
+		@environment.interact
+		#Only second set should have been spawned.
+		assert_equal(6, @environment.objects.length)
+		children = @environment.objects[-1, 1]
+		assert_equal('Copy of 2', children[0].name)
+		#Spawned object should be aimed at second target.
+		assert_equal(225, children[0].vector.pitch)
+	end
+	
 end

data/test/zyps/test_conditions.rb

@@ -96,4 +96,16 @@ class TestConditions < Test::Unit::TestCase
 	end
 	
 	
+	def test_elapsed_time_condition
+		condition = ElapsedTimeCondition.new
+		condition.interval = 0.2
+		#Test for falsehood.
+		#On first pass, its clock will only be at 0.1 seconds.
+		assert(! condition.select(@actor, [@target]).include?(@target))
+		#Test for truth.
+		#On first pass, its clock will be at 0.2 seconds, the assigned interval.
+		assert(condition.select(@actor, [@target]).include?(@target))
+	end
+	
+	
 end

metadata

@@ -1,93 +1,87 @@
 --- !ruby/object:Gem::Specification 
+rubygems_version: 0.9.2
+specification_version: 1
 name: zyps
 version: !ruby/object:Gem::Version 
-  version: 0.7.5
+  version: 0.7.6
+date: 2008-02-29 00:00:00 -07:00
+summary: A game library for Ruby
+require_paths: 
+- lib
+email: jay@mcgavren.com
+homepage: http://jay.mcgavren.com/zyps/
+rubyforge_project: zyps
+description: 
+autorequire: zyps
+default_executable: 
+bindir: bin
+has_rdoc: true
+required_ruby_version: !ruby/object:Gem::Version::Requirement 
+  requirements: 
+  - - ">"
+    - !ruby/object:Gem::Version 
+      version: 0.0.0
+  version: 
 platform: ruby
+signing_key: 
+cert_chain: 
+post_install_message: 
 authors: 
 - Jay McGavren
-autorequire: zyps
-bindir: bin
-cert_chain: []
-
-date: 2008-02-16 00:00:00 -07:00
-default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
-  name: wxruby
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: 1.9.2
-    version: 
-description: 
-email: jay@mcgavren.com
-executables: 
-- zyps
-extensions: []
-
-extra_rdoc_files: 
-- README.txt
-- COPYING.LESSER.txt
-- COPYING.txt
 files: 
 - COPYING.LESSER.txt
 - COPYING.txt
-- README_windows.txt
 - README.txt
-- bin/zyps_demo
+- README_windows.txt
 - bin/zyps
+- bin/zyps-175
+- bin/zyps_demo
 - lib/zyps
+- lib/zyps/actions.rb
+- lib/zyps/conditions.rb
+- lib/zyps/environmental_factors.rb
+- lib/zyps/remote.rb
 - lib/zyps/views
 - lib/zyps/views/canvas
 - lib/zyps/views/canvas/wx.rb
 - lib/zyps/views/trails.rb
-- lib/zyps/conditions.rb
-- lib/zyps/remote.rb
-- lib/zyps/actions.rb
-- lib/zyps/environmental_factors.rb
 - lib/zyps.rb
+- test/test_zyps.rb
 - test/zyps
-- test/zyps/test_behaviors.rb
 - test/zyps/test_actions.rb
+- test/zyps/test_behaviors.rb
 - test/zyps/test_conditions.rb
-- test/zyps/test_remote.rb
 - test/zyps/test_environmental_factors.rb
+- test/zyps/test_remote.rb
+test_files: 
 - test/test_zyps.rb
-has_rdoc: true
-homepage: http://jay.mcgavren.com/zyps/
-post_install_message: 
+- test/zyps/test_actions.rb
+- test/zyps/test_behaviors.rb
+- test/zyps/test_conditions.rb
+- test/zyps/test_environmental_factors.rb
+- test/zyps/test_remote.rb
 rdoc_options: 
 - --title
 - Zyps - A game library for Ruby
 - --main
 - README.txt
-require_paths: 
-- lib
-required_ruby_version: !ruby/object:Gem::Requirement 
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
-  version: 
-required_rubygems_version: !ruby/object:Gem::Requirement 
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
-  version: 
+extra_rdoc_files: 
+- README.txt
+- COPYING.LESSER.txt
+- COPYING.txt
+executables: 
+- zyps
+extensions: []
+
 requirements: []
 
-rubyforge_project: zyps
-rubygems_version: 1.0.1
-signing_key: 
-specification_version: 2
-summary: A game library for Ruby
-test_files: 
-- test/zyps/test_behaviors.rb
-- test/zyps/test_actions.rb
-- test/zyps/test_conditions.rb
-- test/zyps/test_remote.rb
-- test/zyps/test_environmental_factors.rb
-- test/test_zyps.rb
+dependencies: 
+- !ruby/object:Gem::Dependency 
+  name: wxruby
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Version::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: 1.9.2
+    version: