zyps 0.7.5 → 0.7.6

data/bin/zyps_demo

@@ -149,30 +149,35 @@ class Demo < Wx::App
 				test_behaviors_2
 				say "-" * 30
 			when 600:
-				@environment.objects = []
-				test_change_color
-				say "-" * 30
-			when 800:
 				@environment.objects = []
 				test_accelerate
 				say "-" * 30
-			when 1000:
+			when 700:
 				@environment.objects = []
 				test_turn
 				say "-" * 30
-			when 1200:
+			when 900:
 				@environment.objects = []
 				test_approach
 				say "-" * 30
-			when 1400:
+			when 1100:
 				@environment.objects = []
 				test_flee
 				say "-" * 30
-			when 1600:
+			when 1300:
 				@environment.objects = []
 				test_eat
 				say "-" * 30
-			when 1800:
+			when 1400:
+				@environment.objects = []
+				test_explode
+				say "-" * 30
+			when 1500:
+				@environment.objects = []
+				@environment.environmental_factors = []
+				test_shoot
+				say "-" * 30
+			when 1600:
 				finish
 		end
 		@update_count += 1
@@ -180,11 +185,12 @@ class Demo < Wx::App
 
 	
 	#Populate an environment with the given number of creatures.
-	def populate(environment, count = 50)
-		@log.debug "Add #{count} creatures to #{environment}."
+	def generate_creatures(count = 50)
+		@log.debug "Generating #{count} creatures."
+		objects = []
 		count.times do |i|
 			multiplier = i / count.to_f
-			environment.objects << Creature.new(
+			objects << Creature.new(
 				:name => i,
 				:location => Location.new(multiplier * WIDTH, multiplier * HEIGHT),
 				:color => Color.new(multiplier, 1 - multiplier, multiplier / 2 + 0.5),
@@ -192,6 +198,7 @@ class Demo < Wx::App
 				:size => DEFAULT_OBJECT_SIZE
 			)
 		end
+		objects
 	end
 	
 	
@@ -240,7 +247,7 @@ class Demo < Wx::App
 	#Demonstrates environmental factors by adding gravity to the environment.
 	def test_environmental_factors
 
-		populate(@environment)
+		@environment.objects = generate_creatures
 		
 		say("Without gravity, objects just travel on forever.")
 	
@@ -262,7 +269,7 @@ class Demo < Wx::App
 	#Demonstrates creature behaviors.
 	def test_behaviors
 
-		populate(@environment)
+		@environment.objects = generate_creatures
 		
 		say("Let's add a Behavior to our creatures.")
 		chase = Behavior.new
@@ -288,7 +295,7 @@ class Demo < Wx::App
 		@environment.objects << GameObject.new(
 			:name => "target",
 			:location => Location.new(WIDTH / 2, HEIGHT / 2),
-			:color => Color.new(1, 1, 1),
+			:color => Color.white,
 			:vector => Vector.new(30, 315),
 			:size => DEFAULT_OBJECT_SIZE * 2, #Size.
 			:tags => ["food"]
@@ -300,61 +307,11 @@ class Demo < Wx::App
 	end
 
 
-	#A Creature that changes the colors of other objects.
-	class Morpher < Creature
-		#Changes an object's color.
-		def initialize(*arguments)
-			super
-			morph = Behavior.new
-			#Shift the target's color to match the creature's.
-			morph.actions << BlendAction.new(self.color)
-			#Act only on nearby targets.
-			morph.conditions << ProximityCondition.new(50)
-			@behaviors << morph
-		end
-	end
-
-	#Demonstrates changing object colors.
-	def test_change_color
-
-		populate(@environment)
-		
-		say("Creatures can influence any attribute of their target, such as its color.")
-		say("This demo includes a Morpher class, which is a type of Creature.")
-		say("Morphers are created with a single behavior, which shifts the color of any nearby target to match the Morpher's color.")
-		
-		say("Let's place a red Morpher...")
-		@environment.objects << Morpher.new(
-			:location => Location.new(0, 100),
-			:color => Color.new(1, 0, 0),
-			:vector => Vector.new(100, 0),
-			:size => DEFAULT_OBJECT_SIZE
-		)
-		say("a green one...")
-		@environment.objects << Morpher.new(
-			:location => Location.new(0, 150),
-			:color => Color.new(0, 1, 0),
-			:vector => Vector.new(200, 0),
-			:size => DEFAULT_OBJECT_SIZE
-		)
-		say("and a blue one...")
-		@environment.objects << Morpher.new(
-			:location => Location.new(0, 200),
-			:color => Color.new(0, 0, 1),
-			:vector => Vector.new(300, 0),
-			:size => DEFAULT_OBJECT_SIZE
-		)
-		
-		say("...and see what they do.")
-		
-	end
-
-
 	#Demonstrates altering object speed.
 	def test_accelerate
 
 		say("Here are some Creatures, just plodding along.")
-		populate(@environment)
+		@environment.objects = generate_creatures
 		
 		say("We're going to have them pick up the pace.")
 		say("We add a Behavior with an AccelerateAction to all the creatures.")
@@ -371,7 +328,7 @@ class Demo < Wx::App
 	#Demonstrates altering object vectors.
 	def test_turn
 
-		populate(@environment)
+		@environment.objects = generate_creatures
 		
 		say("This time we'll use the TurnAction class.")
 		say("We tell each creature it should turn 90 degrees.")
@@ -387,7 +344,7 @@ class Demo < Wx::App
 	#Demonstrates adding vectors.
 	def test_approach
 
-		populate(@environment, 50)
+		@environment.objects = generate_creatures
 		
 		say("When your car skids on ice, you might steer in a different direction, but you're going to keep following your original vector for a while.")
 		say("Our ApproachAction adds the vector the creature WANTS to follow to the vector it's ACTUALLY following.")
@@ -418,12 +375,12 @@ class Demo < Wx::App
 	#Demonstrates adding vectors.
 	def test_flee
 
-		populate(@environment, 50)
+		@environment.objects = generate_creatures
 		
 		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(360, creature.vector)
+			flee.actions << FleeAction.new(300)
 			flee.conditions << TagCondition.new("predator")
 			creature.behaviors << flee
 		end
@@ -442,13 +399,13 @@ class Demo < Wx::App
 	#Demonstrates keeping a reference to an Environment so a Creature can alter it.
 	def test_eat
 	
-		populate(@environment)
+		@environment.objects = generate_creatures
 		
 		say("Most games are all about destruction, but there hasn't been much so far.")
 		say("Let's create a creature that causes some havoc.")
 		predator = Creature.new(
 			:location => Location.new(0, 150),
-			:color => Color.new(0, 1, 0),
+			:color => Color.green,
 			:vector => Vector.new(200, 0), 
 			:size => DEFAULT_OBJECT_SIZE * 5
 		)
@@ -473,6 +430,116 @@ class Demo < Wx::App
 		say("And - chomp!")
 		
 	end
+	
+	
+	#Demonstrates ElapsedTimeCondition.
+	def test_explode
+	
+		say("Let's have some fireworks.")
+		say("First we'll create 'stars' to load into the rocket.")
+		star = Creature.new(:color => Color.red)
+		say("A BlendAction will make them fade to black over time.")
+		star.behaviors << Behavior.new(:actions => [BlendAction.new(0.5, Color.black)])
+		say("An ExplodeAction copies prototype objects into the environment.")
+		action = ExplodeAction.new(@environment)
+		say("We'll make copies of our star with random vectors.")
+		say("We'll load these copies into our ExplodeAction.")
+		25.times do |i|
+			copy = star.copy
+			copy.vector = Vector.new(rand(50), rand(360))
+			action.prototypes << copy
+		end
+		
+		say("It's just not smart to build fireworks without a fuse.")
+		say("An ElapsedTimeCondition should do nicely.")
+		condition = ElapsedTimeCondition.new
+		say("This will be a short fuse, though, say 2 seconds.")
+		condition.interval = 2
+		
+		say("We set up a Behavior with the Action and Condition...")
+		explode = Behavior.new(:actions => [action], :conditions => [condition])
+		say("Add the behavior to rockets aimed at the sky...")
+		rocket = Creature.new(
+			:behaviors => [explode],
+			:vector => Vector.new(100, 260),
+			:location => Location.new(WIDTH / 2, HEIGHT),
+			:size => 50
+		)
+		rocket2 = rocket.copy
+		rocket2.vector = Vector.new(130, 275)
+		say("And light those suckers.")
+		@environment.objects << rocket << rocket2
+		@environment << Gravity.new(30)
+	
+	end
+
+
+	#Demonstrates ShootAction.
+	def test_shoot
+	
+		say("I'm a big fan of shoot-em-up games.")
+		say("The ability to make them easily is a major goal of Zyps.")
+		
+		say("Every shooter needs someone to play it, so let's make a player.")
+		say("We give him a 'player' tag so enemies can target him.")
+		player = Creature.new(
+			:location => Location.new(WIDTH / 2, HEIGHT / 2),
+			:behaviors => [
+				Behavior.new(
+					:actions => [FleeAction.new(100)],
+					:conditions => [ProximityCondition.new(30)]
+				)
+			],
+			:size => DEFAULT_OBJECT_SIZE,
+			:vector => Vector.new(10, 0),
+			:tags => ['player']
+		)
+		
+		say("Shooters need lots of bullets, of course.")
+		say("A bullet doesn't need to be smart, but it should destroy the player when he gets too close.")
+		bullet = Creature.new(
+			:behaviors => [
+				Behavior.new(
+					:actions => [DestroyAction.new(@environment)],
+					:conditions => [
+						ProximityCondition.new(7),
+						TagCondition.new('player')
+					]
+				)
+			],
+			:vector => Vector.new(100, 0)
+		)
+		
+		say("We're going to fire groups of 3 bullets at once.")
+		bullets = [bullet, bullet.copy, bullet.copy]
+		say("There's no point firing all 3 at the same spot...")
+		say("We'll vary their angles a bit.")
+		bullets.first.vector.pitch -= 10
+		bullets.last.vector.pitch += 10
+		
+		say("And lastly, we need an enemy to fire the bullets at the player.")
+		say("We'll give him a ShootAction, and assign it our group of bullets.")
+		say("The action copies the bullets into the Environment and aims them at its target.")
+		say("An ElapsedTimeCondition makes it fire every 0.5 seconds.")
+		enemy = Creature.new(
+			:vector => Vector.new(30, 45),
+			:behaviors => [
+				Behavior.new(
+					:actions => [ShootAction.new(@environment, [bullets])],
+					:conditions => [
+						ElapsedTimeCondition.new(0.5),
+						TagCondition.new('player'),
+					]
+				)
+			],
+			:color => Color.green,
+			:size => DEFAULT_OBJECT_SIZE
+		)
+		
+		say("Game on!")
+		@environment.objects << player << enemy
+	
+	end
 
 
 	#End the demos.

data/lib/zyps.rb

@@ -111,6 +111,19 @@ class Environment
 		
 	end
 	
+	#Overloads the << operator to put the new item into the correct list.
+	#This allows one to simply call env << <valid_object> instead of 
+	#having to choose a specific list, such as objects or environmental factors.
+	def <<(item)
+		if(item.kind_of? Zyps::GameObject)
+			self.objects << item
+		elsif(item.kind_of? Zyps::EnvironmentalFactor)
+			self.environmental_factors << item
+		else
+			raise "Invalid item: #{item.class}" 
+		end
+	end
+	
 end
 
 
@@ -164,7 +177,7 @@ class GameObject
 		copy.location = @location.copy
 		copy.tags = @tags.clone
 		copy.identifier = generate_identifier
-		copy.name = @name ? "Copy of " + @name : nil
+		copy.name = @name ? "Copy of " + @name.to_s : nil
 		copy
 	end
 	
@@ -187,6 +200,21 @@ class GameObject
 		@identifier = value
 	end
 	
+	#Overloads the << operator to put the new item into the correct
+	#list or assign it to the correct attribute.
+	#Assignment is done based on item's class or a parent class of item.
+	def <<(item)
+		if item.kind_of? Zyps::Location:
+			self.location = item
+		elsif item.kind_of? Zyps::Color:
+			self.color = item
+		elsif item.kind_of? Zyps::Vector:
+			self.vector = item
+		else
+			raise "Invalid item: #{item.class}"
+		end
+	end
+	
 	private
 	
 		#Make a unique GameObject identifier.
@@ -236,6 +264,20 @@ class Creature < GameObject
 		behaviors.each {|behavior| behavior.perform(self, targets)}
 	end
 	
+	#See GameObject#<<.
+	#Adds ability to stream in behaviors as well.
+	def <<(item)
+		begin
+			super
+		rescue 
+			if(item.kind_of? Zyps::Behavior)
+				self.behaviors << item
+			else
+				raise "invalid item: #{item.class}"
+			end
+		end
+	end
+	
 end
 
 
@@ -434,6 +476,19 @@ class Color
 		)
 	end
 	
+	#Pre-defined color value.
+	def self.red; Color.new(1, 0, 0); end
+	def self.orange; Color.new(1, 0.63, 0); end
+	def self.yellow; Color.new(1, 1, 0); end
+	def self.green; Color.new(0, 1, 0); end
+	def self.blue; Color.new(0, 0, 1); end
+	def self.indigo; Color.new(0.4, 0, 1); end
+	def self.violet; Color.new(0.9, 0.5, 0.9); end
+	def self.white; Color.new(1, 1, 1); end
+	def self.black; Color.new(0, 0, 0); end
+	def self.grey; Color.new(0.5, 0.5, 0.5); end
+
+		
 end
 
 
@@ -451,6 +506,9 @@ class Location
 	#Make a deep copy.
 	def copy; self.clone; end
 	
+	#True if x and y coordinates are the same.
+	def ==(other); self.x == other.x and self.y == other.y; end
+	
 end
 
 
@@ -478,7 +536,7 @@ class Vector
 		#Store as radians internally.
 		@pitch = Utility.to_radians(value)
 	end
-	
+ 	
 	#The X component.
 	def x; @speed.to_f * Math.cos(@pitch); end
 	def x=(value)
@@ -503,6 +561,9 @@ class Vector
 		Vector.new(new_length, new_angle)
 	end
 	
+	#True if x and y coordinates are the same.
+	def ==(other); self.speed == other.speed and self.pitch == other.pitch; end
+	
 end
 
 
@@ -522,13 +583,20 @@ class Clock
 		time = Time.new.to_f
 		elapsed_time = time - @last_check_time
 		@last_check_time = time
-		elapsed_time
+		elapsed_time * @@speed
 	end
 	
 	def reset_elapsed_time
 		@last_check_time = Time.new.to_f
 	end
 	
+	#Speed at which all Clocks are operating.
+	@@speed = 1.0
+	def Clock.speed; @@speed; end
+	#Set speed at which all Clocks will operate.
+	#1 is real-time, 2 is double speed, 0 is paused.
+	def Clock.speed=(value); @@speed = value; end
+
 end