zyps 0.6.2 → 0.6.3

data/bin/zyps

@@ -20,10 +20,12 @@
 
 gems_loaded = false
 begin
+	require 'optparse'
 	require 'zyps'
 	require 'zyps/actions'
 	require 'zyps/conditions'
 	require 'zyps/environmental_factors'
+	require 'zyps/remote'
 	require 'zyps/views/trails'
 rescue LoadError
 	if gems_loaded == false
@@ -39,14 +41,36 @@ end
 include Zyps
 
 
+DEFAULT_VIEW_WIDTH = 800
+DEFAULT_VIEW_HEIGHT = 600
+DEFAULT_MAX_SPEED = 200
+DEFAULT_MAX_POPULATION = 100
+DEFAULT_FPS = 60
+
+
 class Application
 
+	#Port to open service on.
+	attr_accessor :uri
+	#Maximum allowed number of objects.
+	attr_accessor :max_population
+	#View dimensions.
+	attr_accessor :view_width, :view_height
+	
 	#Create app window, game environment, and view.
-	def initialize(width, height)
+	#Set up default values.
+	def initialize(
+		uri = nil,
+		view_width = DEFAULT_VIEW_WIDTH,
+		view_height = DEFAULT_VIEW_HEIGHT,
+		fps = DEFAULT_FPS,
+		max_population = DEFAULT_MAX_POPULATION,
+		max_speed = DEFAULT_MAX_SPEED,
+		enclosure = true
+	)
 		
-		@width, @height = width, height
-		@birth_rate = 1
-		@fps = 30.0
+		@uri, @view_width, @view_height, @fps, @max_population, @max_speed, @enclosure =
+		uri, view_width, view_height, fps, max_population, max_speed, enclosure
 		
 		#Create a window, and set GTK up to quit when it is closed.
 		window = Gtk::Window.new
@@ -54,15 +78,16 @@ class Application
 		window.signal_connect("delete_event") {false}
 		window.signal_connect("destroy") {Gtk.main_quit}
 		
+		#Create environment.
+		@environment = Environment.new
+		
 		#Set up controls.
+		#Also initializes @view.
 		window.add(create_controls)
 	
 		#Show all widgets.
 		window.show_all
-		
-		#Create environment.
-		@environment = Environment.new
-		
+			
 		#Point view at environment.
 		@environment.add_observer(@view)
 		
@@ -71,20 +96,21 @@ class Application
 	
 	def main
 	
-	
-		#Keep all objects within a boundary.
-		enclosure = Enclosure.new
-		enclosure.left = 0
-		enclosure.bottom = 0
-		enclosure.top = @height
-		enclosure.right = @width
-		@environment.environmental_factors << enclosure
+		#Keep objects on screen.
+		if @enclosure
+			enclosure = Enclosure.new()
+			enclosure.left = 0
+			enclosure.bottom = 0
+			enclosure.top = @view_height
+			enclosure.right = @view_width
+			@environment.environmental_factors << enclosure
+		end
 		
 		#Keep all objects under a certain speed.
-		@environment.environmental_factors << SpeedLimit.new(100)
+		@environment.environmental_factors << SpeedLimit.new(@max_speed) if @max_speed
 		
 		#Limit population.
-		@environment.environmental_factors << PopulationLimit.new(@environment, 25)
+		@environment.environmental_factors << PopulationLimit.new(@environment, @max_population) if @max_population
 		
 		#Set up a creature generator.
 		@generator = CreatureGenerator.new(@environment)
@@ -98,7 +124,7 @@ class Application
 				time_per_frame = 1.0 / @fps
 				
 				loop do
-				
+
 					@environment.interact
 					
 					#Determine how much time is left in this frame.
@@ -119,6 +145,16 @@ class Application
 			
 		end
 		
+		
+		#Start a network service.
+		if @uri
+			server = EnvironmentServer.new(@environment, @uri)
+			server.start
+			#Disable file system access.
+			$SAFE = 2
+		end
+
+		
 		#Activate the GUI.
 		Gtk.main
 		
@@ -126,13 +162,13 @@ class Application
 	
 	
 	#Create a view and controls.
-	def create_controls(width = @width, height = @height, homogeneous = false, spacing = 0, expand = false, fill = false, padding = 0)
+	def create_controls(view_width = @view_width, view_height = @view_height, homogeneous = false, spacing = 0, expand = false, fill = false, padding = 0)
 	
 		#Create a container for the view and controls.
 		interface = Gtk::HBox.new(homogeneous, spacing)
 		
 		#Add view to interface.
-		@view = TrailsView.new(width, height)
+		@view = TrailsView.new(view_width, view_height)
 		interface.pack_start(@view.canvas, expand, fill, padding)
 		
 		#When mouse button pressed, record location for use in release event handler.
@@ -156,6 +192,7 @@ class Application
 				:flee => @flee_flag.active?,
 				:push => @push_flag.active?,
 				:pull => @pull_flag.active?,
+				:breed => @breed_flag.active?,
 				:eat => @eat_flag.active?
 			)
 		end
@@ -178,18 +215,88 @@ class Application
 		action_controls.pack_start(@push_flag, expand, fill, padding)
 		@pull_flag = Gtk::CheckButton.new("Pull")
 		action_controls.pack_start(@pull_flag, expand, fill, padding)
+		@breed_flag = Gtk::CheckButton.new("Breed")
+		action_controls.pack_start(@breed_flag, expand, fill, padding)
 		@eat_flag = Gtk::CheckButton.new("Eat")
 		action_controls.pack_start(@eat_flag, expand, fill, padding)
 		#Add the action controls to the panel.
 		control_panel.pack_start(action_controls, expand, fill, padding)
 		
+		#Create a group for environment controls.
+		environment_controls = Gtk::VBox.new(homogeneous, spacing)
+		environment_controls.pack_start(Gtk::Label.new("Environment"), expand, fill, padding)
+		@clear_button = Gtk::Button.new("Clear")
+		@clear_button.signal_connect("clicked") {
+			@environment.objects = []
+		}
+		environment_controls.pack_start(@clear_button, expand, fill, padding)
+		#Add the environment controls to the panel.
+		control_panel.pack_start(environment_controls, expand, fill, padding)
+		
 		#Add the control panel to the interface.
 		interface.pack_start(control_panel, expand, fill, padding)
 		
 		interface
 		
 	end
+
+
+	#Set attributes according to command-line arguments.
+	def process_options(arguments)
 	
+		#Set up option parser.
+		options = OptionParser.new
+		
+		#Define valid options.
+		options.on("-h", "--help", TrueClass, "Display program help.") {
+			puts options.help
+			exit
+		}
+		options.on(
+			"-m",
+			"--max-population [number]",
+			Integer,
+			"The maximum number of allowed game objects.  #{DEFAULT_MAX_POPULATION} by default."
+		) {|value| @max_population = value}
+		options.on(
+			"-s",
+			"--max-speed [number]",
+			Integer,
+			"The fastest an object can go.  #{DEFAULT_MAX_SPEED ? DEFAULT_MAX_SPEED : 'No limit'} by default."
+		) {|value| @max_speed = value}
+		options.on(
+			"-n",
+			"--no-enclosure",
+			"Disables the barrier that normally keeps objects on the screen."
+		) {|value| @enclosure = false}
+		options.on(
+			"-u",
+			"--uri [uri]",
+			String,
+			"dRuby URI to run the server on.  If not defined, one will be selected and printed to STDOUT."
+		) {|value| @uri = value}
+		options.on(
+			"-f",
+			"--fps [frames]",
+			Integer,
+			"Number of frames to draw per second.  #{DEFAULT_FPS} by default."
+		) {|value| @fps = value}
+		options.on(
+			"--view-width [pixels]",
+			Integer,
+			"Window width.  #{DEFAULT_VIEW_WIDTH} by default."
+		) {|value| @view_width = value}
+		options.on(
+			"--view-height [pixels]",
+			Integer,
+			"Window height.  #{DEFAULT_VIEW_HEIGHT} by default."
+		) {|value| @view_height = value}
+		
+		#Parse the options, printing usage if parsing fails.
+		options.parse(arguments) rescue puts "#{$!}\nType '#{$0} --help' for valid options."
+		
+	end
+
 
 end
 
@@ -224,8 +331,9 @@ class CreatureGenerator
 		@turn_rate = 90
 		@approach_turn_rate = 720
 		@flee_turn_rate = @approach_turn_rate
-		@pull_strength = 1000
+		@pull_strength = 100
 		@push_strength = @pull_strength
+		@breed_rate = 10
 		
 	end
 
@@ -233,7 +341,7 @@ class CreatureGenerator
 	#Create a creature and add it to the environment.
 	def create_creature(options = {})
 	
-		{
+		options = {
 			:x => 0,
 			:y => 0,
 			:speed => 1,
@@ -245,77 +353,96 @@ class CreatureGenerator
 			:flee => false,
 			:push => false,
 			:pull => false,
+			:breed => false,
 			:eat => false,
-		}.merge!(options)
+		}.merge(options)
 		
-		#Set up the creature's vector.
-		vector = Vector.new(options[:speed], options[:pitch])
+		#Create a creature.
+		creature = Creature.new(
+			'',
+			Location.new(options[:x], options[:y]),
+			Color.new,
+			Vector.new(options[:speed], options[:pitch]),
+			0,
+			5
+		)
 		
 		#Set up actions and merge colors according to selected behaviors.
-		behavior = Behavior.new
-		behavior.conditions << ProximityCondition.new(@action_proximity)
 		color = Color.new(0.25, 0.25, 0.25)
 		if options[:accelerate]
 			color.red += 0.25
 			color.green += 0.25
 			color.blue += 0.25
-			behavior.actions << AccelerateAction.new(@acceleration_rate)
+			creature.behaviors << create_behavior(:actions => [AccelerateAction.new(@acceleration_rate)])
 		end
 		if options[:turn]
 			color.blue += 1
-			behavior.actions << TurnAction.new(@turn_rate)
+			creature.behaviors << create_behavior(:actions => [TurnAction.new(@turn_rate)])
 		end
 		if options[:approach]
 			color.red += 1
-			behavior.actions << ApproachAction.new(vector, @approach_turn_rate)
+			creature.behaviors << create_behavior(:actions => [ApproachAction.new(@approach_turn_rate, creature.vector)])
 		end
 		if options[:flee]
 			color.red += 0.5; color.green += 0.5 #Yellow.
-			behavior.actions << FleeAction.new(vector, @flee_turn_rate)
+			creature.behaviors << create_behavior(:actions => [FleeAction.new(@flee_turn_rate, creature.vector)])
 		end
 		if options[:push]
 			color.red += 0.5; color.blue += 0.5 #Purple.
-			behavior.actions << PushAction.new(@push_strength)
+			creature.behaviors << create_behavior(:actions => [PushAction.new(@push_strength)])
 		end
 		if options[:pull]
 			color.blue += 0.75; color.green += 0.75 #Aqua.
-			behavior.actions << PullAction.new(@pull_strength)
+			creature.behaviors << create_behavior(:actions => [PullAction.new(@pull_strength)])
+		end
+		if options[:breed]
+			color.green -= 0.1 #Make a bit redder.
+			color.blue -= 0.1
+			creature.behaviors << create_behavior(
+				:actions => [BreedAction.new(@environment, @breed_rate)],
+				:conditions => [CollisionCondition.new] #The default ProximityCondition won't do.
+			)
 		end
-		
-		#Create a creature.
-		creature = Creature.new(
-			'',
-			Location.new(options[:x], options[:y]),
-			color,
-			vector,
-			0,
-			5
-		)
-		creature.behaviors << behavior
-		
-		#Special handling for eat action, which needs a CollisionCondition.
 		if options[:eat]
-			creature.color.green += 1
-			behavior = Behavior.new
-			behavior.actions << EatAction.new(@environment)
-			behavior.conditions << CollisionCondition.new
-			creature.behaviors << behavior
+			color.green += 1
+			creature.behaviors << create_behavior(
+				:actions => [EatAction.new(@environment)],
+				:conditions => [CollisionCondition.new] #The default ProximityCondition won't do.
+			)
 		end
 		
+		creature.color = color
+		
 		@environment.objects << creature
 		
 	end
+	
+	
+	def create_behavior(options = {})
+	
+		options = {
+			:actions => [],
+			:conditions => [ProximityCondition.new(@action_proximity)],
+		}.merge(options)
+		
+		behavior = Behavior.new
+		behavior.actions = options[:actions]
+		behavior.conditions = options[:conditions]
+		behavior
+		
+	end
+	
+	
 end
 
 
 
 begin
-	#The view width.
-	WIDTH = 500
-	#The view height.
-	HEIGHT = 600
-	#Run the application.
-	application = Application.new(WIDTH, HEIGHT)
+	#Create a server.
+	application = Application.new
+	#Parse the command line.
+	application.process_options(ARGV)
+	#Start the server.
 	application.main
 rescue => exception
 	#Print error to STDERR and exit with an abnormal status.

data/bin/zyps_demo

@@ -353,7 +353,7 @@ class Demo
 		say("We also add a condition that it should only target food.")
 		@environment.objects.each do |creature|
 			approach = Behavior.new
-			approach.actions << ApproachAction.new(creature.vector)
+			approach.actions << ApproachAction.new(360, creature.vector)
 			approach.conditions << TagCondition.new("food")
 			creature.behaviors << approach
 		end
@@ -384,7 +384,7 @@ class Demo
 		say("A FleeAction is just like an ApproachAction, but we head in the OPPOSITE direction.")
 		@environment.objects.each do |creature|
 			flee = Behavior.new
-			flee.actions << FleeAction.new(creature.vector)
+			flee.actions << FleeAction.new(360, creature.vector)
 			flee.conditions << TagCondition.new("predator")
 			creature.behaviors << flee
 		end

data/lib/zyps/actions.rb

@@ -21,6 +21,41 @@ require 'zyps'
 module Zyps
 
 
+#Superclass for actions that need to happen at a specific rate.
+class TimedAction < Action
+
+	#A Clock that tracks time between actions.
+	attr_accessor :clock
+	#Units per second for action.
+	attr_accessor :rate
+	
+	def initialize(rate, *arguments)
+		self.rate = rate
+		@clock = Clock.new
+	end
+	
+	#Make a deep copy.
+	def copy
+		copy = super
+		#Copies should have their own Clock.
+		copy.clock = Clock.new
+		copy
+	end
+	
+	#Units to add to the attribute being changed.
+	def delta
+		@clock.elapsed_time * rate
+	end
+	
+	#Begin tracking time between actions.
+	def start(actor, target)
+		super
+		@clock.reset_elapsed_time
+	end
+	
+end
+
+
 #Head toward a target.
 class FaceAction < Action
 	#Set the actor's heading to point directly at target.
@@ -31,61 +66,44 @@ end
 
 
 #Increase/decrease speed over time.
-class AccelerateAction < Action
+class AccelerateAction < TimedAction
 	#Units per second to accelerate.
 	#Can be negative to slow down or go in reverse.
 	attr_accessor :rate
-	def initialize(rate = 0)
-		self.rate = rate
-		@clock = Clock.new
-	end
-	#Begin tracking time between actions.
-	def start(actor, target)
-		super
-		@clock.reset_elapsed_time
-	end
 	#Increase or decrease speed according to elapsed time.
 	def do(actor, target)
-		actor.vector.speed += @clock.elapsed_time * rate
+		actor.vector.speed += delta
 	end
 end
 
 
 #Turn over time.
-class TurnAction < Action
+class TurnAction < TimedAction
 	#Degrees per second to turn.
 	#Positive turns clockwise, negative turns counter-clockwise.
 	attr_accessor :rate
-	def initialize(rate = 0)
-		self.rate = rate
-		@clock = Clock.new
-	end
-	#Begin tracking time between actions.
-	def start(actor, target)
-		super
-		@clock.reset_elapsed_time
-	end
 	#Turn according to elapsed time.
 	def do(actor, target)
-		actor.vector.pitch += @clock.elapsed_time * rate
+		actor.vector.pitch += delta
 	end
 end
 
 
 #Approaches the target, but obeys law of inertia.
-class ApproachAction < Action
+class ApproachAction < TimedAction
 	#Direction/speed actor is accelerating in.
 	attr_accessor :heading
 	#Degrees per second the direction of acceleration can change.
-	attr_accessor :turn_rate
-	def initialize(heading = Vector.new, turn_rate = 360)
-		self.heading, self.turn_rate = heading, turn_rate
-		@clock = Clock.new
-	end
-	#Begin tracking time between actions.
-	def start(actor, target)
+	attr_accessor :rate
+	def initialize(rate = 360, heading = Vector.new)
 		super
-		@clock.reset_elapsed_time
+		self.heading = heading
+	end
+	#Make a deep copy.
+	def copy
+		copy = super
+		copy.heading = @heading.copy
+		copy
 	end
 	#Accelerate toward the target, but limited by turn rate.
 	def do(actor, target)
@@ -98,7 +116,7 @@ class ApproachAction < Action
 			turn_angle += 360.0
 		end
 		#The creature can only turn as fast as the elapsed time, of course.
-		maximum_turn = turn_rate * @clock.elapsed_time
+		maximum_turn = delta
 		if turn_angle.abs > maximum_turn
 			if turn_angle > 0
 				turn_angle = maximum_turn
@@ -115,19 +133,20 @@ end
 
 
 #Flees from the target, but obeys law of inertia.
-class FleeAction < Action
+class FleeAction < TimedAction
 	#Direction/speed actor is accelerating in.
 	attr_accessor :heading
 	#Degrees per second the direction of acceleration can change.
-	attr_accessor :turn_rate
-	def initialize(heading = Vector.new, turn_rate = 360)
-		self.heading, self.turn_rate = heading, turn_rate
-		@clock = Clock.new
-	end
-	#Begin tracking time between actions.
-	def start(actor, target)
+	attr_accessor :rate
+	def initialize(rate = 360, heading = Vector.new)
 		super
-		@clock.reset_elapsed_time
+		self.heading = heading
+	end
+	#Make a deep copy.
+	def copy
+		copy = super
+		copy.heading = @heading.copy
+		copy
 	end
 	#Accelerate away from the target, but limited by turn rate.
 	def do(actor, target)
@@ -140,7 +159,7 @@ class FleeAction < Action
 			turn_angle += 360.0
 		end
 		#The creature can only turn as fast as the elapsed time, of course.
-		maximum_turn = turn_rate * @clock.elapsed_time
+		maximum_turn = delta
 		if turn_angle.abs > maximum_turn
 			if turn_angle > 0
 				turn_angle = maximum_turn
@@ -166,8 +185,6 @@ class DestroyAction < Action
 	#Remove the target from the environment.
 	def do(actor, target)
 		@environment.objects.delete(target)
-		#Discontinue action.
-		return false
 	end
 end
 
@@ -213,24 +230,15 @@ end
 
 
 #Pushes target away.
-class PushAction < Action
+class PushAction < TimedAction
 	#Units/second to accelerate target by.
-	attr_accessor :force
-	def initialize(force = 1)
-		@force = force
-		@clock = Clock.new
-	end
-	#Begin tracking time between actions.
-	def start(actor, target)
-		super
-		@clock.reset_elapsed_time
-	end
+	attr_accessor :rate
 	#Accelerate the target away from the actor, but limited by elapsed time.
 	def do(actor, target)
 		#Angle to target is also angle of push force.
 		push_angle = Utility.find_angle(actor.location, target.location)
 		#Acceleration will be limited by elapsed time.
-		push_force = @force * @clock.elapsed_time
+		push_force = delta
 		#Apply the force to the creature's movement vector.
 		target.vector += Vector.new(push_force, push_angle)
 	end
@@ -238,28 +246,59 @@ end
 
 
 #Pulls target toward actor.
-class PullAction < Action
+class PullAction < TimedAction
 	#Units/second to accelerate target by.
-	attr_accessor :force
-	def initialize(force = 1)
-		@force = force
-		@clock = Clock.new
-	end
-	#Begin tracking time between actions.
-	def start(actor, target)
-		super
-		@clock.reset_elapsed_time
-	end
+	attr_accessor :rate
 	#Accelerate away from the target, but limited by turn rate.
 	def do(actor, target)
 		#Angle from target to actor is also angle of pull force (opposite of that for push).
 		pull_angle = Utility.find_angle(target.location, actor.location)
 		#Acceleration will be limited by elapsed time.
-		pull_force = @force * @clock.elapsed_time
+		pull_force = delta
 		#Apply the force to the creature's movement vector.
 		target.vector += Vector.new(pull_force, pull_angle)
 	end
 end
 
 
+class BreedAction < Action
+	DEFAULT_DELAY = 60
+	#Environment to place children into.
+	attr_accessor :environment
+	#Delay between actions.
+	attr_accessor :delay
+	def initialize(environment, delay = DEFAULT_DELAY)
+		self.environment, self.delay = environment, delay
+		@clock = Clock.new
+		@time_since_last_action = 0
+	end
+	def do(actor, target)
+		#Skip action if target is not a Creature.
+		return unless target.is_a?(Creature)
+		#Get time since last action, and skip if it hasn't been long enough.
+		@time_since_last_action += @clock.elapsed_time
+		return unless @time_since_last_action >= @delay
+		#Create a child.
+		child = Creature.new
+		#Combine colors.
+		child.color = actor.color + target.color
+		#Combine behaviors EXCEPT those with BreedActions.
+		behaviors = (actor.behaviors + target.behaviors).find_all do |behavior|
+			! behavior.actions.any?{|action| action.is_a?(BreedAction)}
+		end
+		behaviors.each {|behavior| child.behaviors << behavior.copy}
+		#Location should equal actor's.
+		child.location = actor.location.copy
+		#Add parents' vectors to get child's vector.
+		child.vector = actor.vector + target.vector
+		#Child's size should be half the average size of the parents'.
+		child.size = ((actor.size + target.size) / 2) / 2
+		#Add child to environment.
+		@environment.objects << child
+		#Reset elapsed time.
+		@time_since_last_action = 0
+	end
+end
+
+
 end #module Zyps

data/lib/zyps.rb

@@ -117,7 +117,19 @@ class GameObject
 	
 	def initialize (name = nil, location = Location.new, color = Color.new, vector = Vector.new, age = 0, size = 1, tags = [])
 		self.name, self.location, self.color, self.vector, self.age, self.size, self.tags = name, location, color, vector, age, size, tags
-		@identifier = rand(99999999) #TODO: Current setup won't necessarily be unique.
+		@identifier = generate_identifier
+	end
+	
+	#Make a deep copy.
+	def copy
+		copy = self.clone
+		copy.vector = @vector.copy
+		copy.color = @color.copy
+		copy.location = @location.copy
+		copy.tags = @tags.clone
+		copy.identifier = generate_identifier
+		copy.name = @name ? "Copy of " + @name : nil
+		copy
 	end
 	
 	#Size must be positive.
@@ -133,6 +145,19 @@ class GameObject
 	def age; Time.new.to_f - @birth_time; end
 	def age=(age); @birth_time = Time.new.to_f - age; end
 	
+	#Set identifier.
+	#Not part of API; copy() needs this to make copy's ID unique.
+	def identifier=(value) #:nodoc:
+		@identifier = value
+	end
+	
+	private
+	
+		#Make a unique GameObject identifier.
+		def generate_identifier
+			rand(99999999) #TODO: Current setup won't necessarily be unique.
+		end
+	
 end
 
 
@@ -149,6 +174,15 @@ class Creature < GameObject
 		self.behaviors = behaviors
 	end
 	
+	#Make a deep copy.
+	def copy
+		copy = super
+		#Make deep copy of each behavior.
+		copy.behaviors = []
+		@behaviors.each {|behavior| copy.behaviors << behavior.copy}
+		copy
+	end
+	
 	#Call Behavior.perform(self, environment) on each of the creature's assigned Behaviors.
 	def act(environment)
 		behaviors.each {|behavior| behavior.perform(self, environment)}
@@ -175,15 +209,18 @@ class Action
 		@started = false
 	end
 	
+	#Make a deep copy.
+	def copy; self.clone; end
+	
 	#Start the action.
 	#Overriding subclasses must either call "super" or set the @started attribute to true.
 	def start(actor, target)
 		@started = true
 	end
 	
-	#Perform the action.
-	#Subclasses should override this.
+	#Action subclasses must implement a do(actor, target) instance method.
 	def do(actor, target)
+		raise NotImplementedError.new("Action subclasses must implement a do(actor, target) instance method.")
 	end
 	
 	#Stop the action.
@@ -197,8 +234,16 @@ end
 
 
 #A condition for one Creature to act on another.
-#Conditions must implement a met?(actor, target) instance method.
 class Condition
+
+	#Make a deep copy.
+	def copy; self.clone; end
+	
+	#Condition subclasses must implement a met?(actor, target) instance method.
+	def met?(actor, target)
+		raise NotImplementedError.new("Condition subclasses must implement a met?(actor, target) instance method.")
+	end
+	
 end
 
 
@@ -220,6 +265,18 @@ class Behavior
 		@active_target = nil
 	end
 	
+	#Make a deep copy.
+	def copy
+		copy = self.clone #Currently, we overwrite everything anyway, but we may add some clonable attributes later.
+		#Make a deep copy of all actions.
+		copy.actions = []
+		@actions.each {|action| copy.actions << action.copy}
+		#Make a deep copy of all conditions.
+		copy.conditions = []
+		@conditions.each {|condition| copy.conditions << condition.copy}
+		copy
+	end
+	
 	#Test all conditions against each object in the evironment.
 	#For the first object that meets all of them, mark it active (and operate on it first next time).
 	#Then call start() (if applicable) and perform() for all actions against the active target.
@@ -294,6 +351,9 @@ class Color
 		self.red, self.green, self.blue = red, green, blue
 	end
 	
+	#Make a deep copy.
+	def copy; self.clone; end
+	
 	#Automatically constrains value to the range 0 - 1.
 	def red=(v); v = 0 if v < 0; v = 1 if v > 1; @red = v; end
 	#Automatically constrains value to the range 0 - 1.
@@ -329,6 +389,9 @@ class Location
 	def initialize (x = 0, y = 0)
 		self.x, self.y = x, y
 	end
+
+	#Make a deep copy.
+	def copy; self.clone; end
 	
 end
 
@@ -346,6 +409,9 @@ class Vector
 		self.pitch = pitch
 	end
 	
+	#Make a deep copy.
+	def copy; self.clone; end
+	
 	#The angle along the X/Y axes.
 	def pitch; Utility.to_degrees(@pitch); end
 	def pitch=(degrees)
@@ -390,6 +456,9 @@ class Clock
 		reset_elapsed_time
 	end
 	
+	#Make a deep copy.
+	def copy; self.clone; end
+	
 	#Returns the time in (fractional) seconds since this method was last called (or on the first call, time since the Clock was created).
 	def elapsed_time
 		time = Time.new.to_f

data/test/test_zyps.rb

@@ -61,6 +61,27 @@ class TestGameObject < Test::Unit::TestCase
 		assert_in_delta(1, object.location.x, 0.001)
 		assert_in_delta(1, object.location.y, 0.001)
 	end
+	
+	
+	def test_copy
+		object = GameObject.new
+		object.vector = Vector.new(1, 1)
+		object.color = Color.new(0.5, 0.5, 0.5)
+		object.location = Location.new(3, 3)
+		object.tags = ["1", "2"]
+		object.name = "name"
+		copy = object.copy
+		assert_not_same(object.vector, copy.vector, "Copy's vector should not be same object.")
+		assert_equal(object.vector.x, copy.vector.x, "Copy's vector should share attributes.")
+		assert_not_same(object.color, copy.color, "Copy's color should not be same object.")
+		assert_equal(object.color.red, copy.color.red, "Copy's color should share attributes.")
+		assert_not_same(object.location, copy.location, "Copy's location should not be same object.")
+		assert_equal(object.location.x, copy.location.x, "Copy's location should share attributes.")
+		assert_not_same(object.tags, copy.tags, "Copy's tag list should not be same object.")
+		assert_equal(object.tags[0], copy.tags[0], "Copy's tag list should share attributes.")
+		assert_not_equal(object.identifier, copy.identifier, "Copy's identifier should not be identical.")
+		assert_not_equal(object.name, copy.name, "Copy's name should not be identical.")
+	end
 
 
 end
@@ -115,6 +136,17 @@ class TestCreature < Test::Unit::TestCase
 	end
 	
 	
+	def test_copy
+		creature = Creature.new
+		behavior1 = Behavior.new
+		behavior2 = Behavior.new
+		creature.behaviors << behavior1 << behavior2
+		copy = creature.copy
+		assert_not_same(creature.behaviors, copy.behaviors, "Copy's behavior list should not be same object.")
+		assert_not_same(creature.behaviors[0], copy.behaviors[0], "Behaviors in list should not be same objects.")
+	end
+	
+	
 end
 
 
@@ -476,7 +508,7 @@ class TestUtility < Test::Unit::TestCase
 	
 end
 
-#TODO: Rewrite to pass environment.
+
 class TestBehavior < Test::Unit::TestCase
 
 	#Always true.
@@ -551,5 +583,18 @@ class TestBehavior < Test::Unit::TestCase
 				
 	end
 	
+	def test_copy
+		original = Behavior.new
+		action = TagAction.new("tag")
+		original.actions << action
+		condition = TagCondition.new("tag")
+		original.conditions << condition
+		copy = original.copy
+		assert_not_same(original.actions, copy.actions, "Copy's action list should not be same object.")
+		assert_not_same(original.actions[0], copy.actions[0], "Actions in list should not be same objects.")
+		assert_not_same(original.conditions, copy.conditions, "Copy's condition list should not be same object.")
+		assert_not_same(original.conditions[0], copy.conditions[0], "Conditions in list should not be same objects.")
+	end
+	
 	
 end

data/test/zyps/test_actions.rb

@@ -40,9 +40,9 @@ class TestActions < Test::Unit::TestCase
 
 	#Create and populate an environment.
 	def setup
-		@actor = Creature.new('name', Location.new(0, 0))
-		@target1 = GameObject.new('name', Location.new(1, 1))
-		@target2 = GameObject.new('name', Location.new(-2, -2))
+		@actor = Creature.new('actor', Location.new(0, 0))
+		@target1 = Creature.new('target1', Location.new(1, 1))
+		@target2 = Creature.new('target2', Location.new(-2, -2))
 		#Create an environment, and add the objects.
 		@environment = Environment.new
 		#Order is important - we want to act on target 1 first.
@@ -90,7 +90,7 @@ class TestActions < Test::Unit::TestCase
 	
 		#Create an ApproachAction with a 0-degree vector, turn rate of 40 degrees/sec.
 		@actor.vector = Vector.new(0, 0)
-		action = ApproachAction.new(Vector.new(1, 0), 40)
+		action = ApproachAction.new(40, Vector.new(1, 0))
 		add_action(action, @actor)
 		#Act.
 		@environment.interact
@@ -109,7 +109,7 @@ class TestActions < Test::Unit::TestCase
 		#Create an ApproachAction with a 0-degree vector, turn rate high enough to turn more than 45 degrees in 0.1 seconds.
 		#Action should only turn as far as target.
 		@actor.vector = Vector.new(0, 0)
-		action = ApproachAction.new(Vector.new(1, 0), 500)
+		action = ApproachAction.new(500, Vector.new(1, 0))
 		add_action(action, @actor)
 		#Act.
 		@environment.interact
@@ -129,7 +129,7 @@ class TestActions < Test::Unit::TestCase
 
 		#Create a FleeAction with a 0-degree vector, turn rate of 40 degrees/sec.
 		@actor.vector = Vector.new(0, 0)
-		action = FleeAction.new(Vector.new(1, 0), 40)
+		action = FleeAction.new(40, Vector.new(1, 0))
 		add_action(action, @actor)
 		#Act.
 		@environment.interact
@@ -147,7 +147,7 @@ class TestActions < Test::Unit::TestCase
 		#Create a FleeAction with a 0-degree vector, turn rate high enough to turn more than 135 degrees in 0.1 seconds.
 		#Action should turn directly away from target, but no farther.
 		@actor.vector = Vector.new(0, 0)
-		action = FleeAction.new(Vector.new(1, 0), 1400)
+		action = FleeAction.new(1400, Vector.new(1, 0))
 		add_action(action, @actor)
 		#Act.
 		@environment.interact
@@ -253,4 +253,31 @@ class TestActions < Test::Unit::TestCase
 		assert_in_delta(225.0, @target1.vector.pitch, REQUIRED_ACCURACY, "@target1's angle should be facing toward @actor.")
 	end
 	
+	
+	#A BreedAction creates a new Creature by combining the actor's color and behaviors with another creature.
+	def test_breed_action
+		#Create two creatures with different colors and behaviors.
+		@actor.color = Color.new(1, 1, 1)
+		@target1.color = Color.new(0, 0, 0)
+		add_action(TagAction.new("1"), @actor)
+		add_action(TagAction.new("2"), @target1)
+		#Set actor's location to a non-standard place.
+		@actor.location = Location.new(33, 33)
+		#Create a BreedAction using the Environment, and act.
+		add_action(BreedAction.new(@environment, 0.2), @actor) #0.1 delay ensures modified Clock will trigger action on second operation.
+		@environment.interact
+		@environment.interact #Act twice to trigger action on actor (and only actor).
+		#Find child.
+		child = @environment.objects.last
+		#Ensure child's color is a mix of parents'.
+		assert_equal(Color.new(0.5, 0.5, 0.5), child.color)
+		#Ensure child's behaviors combine the parents', but exclude those with BreedActions.
+		assert_equal("1", child.behaviors[0].actions.first.tag)
+		assert_equal("2", child.behaviors[1].actions.first.tag)
+		assert_equal(2, child.behaviors.length)
+		#Ensure child appears at actor's location.
+		assert_equal(@actor.location.x, child.location.x)
+		assert_equal(@actor.location.y, child.location.y)
+	end
+	
 end

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.9.2
 specification_version: 1
 name: zyps
 version: !ruby/object:Gem::Version 
-  version: 0.6.2
-date: 2007-11-01 00:00:00 -07:00
+  version: 0.6.3
+date: 2007-11-08 00:00:00 -07:00
 summary: A game library for Ruby
 require_paths: 
 - lib