gamefic 0.0.4 → 0.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 19a80c1e4f84828c7b2bf27709fbb2c37c90100b
-  data.tar.gz: 63e7a3a0062cb167a9b363083bf34700783240b8
+  metadata.gz: 20c3e34c3d13071e770eda8495d563a655dcbeb1
+  data.tar.gz: e426f447d23f070f3e8ba86e53869dfd1a1bbbaf
 SHA512:
-  metadata.gz: e570aa3a5de2f2e321593e2eeb9fc239d12e30fecf2f9a235fe02fca947c084cf99c152c6f7ece6bf10dcc8bc1c9f0879aa0ddf82185b4cadd2d397d129278d1
-  data.tar.gz: 43ea2d63958bd7570b3c955dc5b364da94c8a3cb1314e32730e0252ca9508205cd450884b1d2dda0cb756df67e97d539277f0f78379baf47c4db42a5354f6602
+  metadata.gz: e3021ba57098702d8432f469a5df40a69b18560cb51680bec94a5eae0dd55291432c1191faec2456554e42a53027f4a8e6439e5b7a5b509827181e34469228ca
+  data.tar.gz: 83877a6aef2eb5150087840fdd4f8349bf489e21b3b0516484f6a25a3d07ecadf2861ddedc6192afdad9ebfe67ba5c0713e5dc711074c410b654dba12b9fa215

data/lib/gamefic/action_ext/container.rb

@@ -1,36 +1,114 @@
 module Gamefic
 
+	Action.new nil, :look, Query.new(:family, Container) do |actor, thing|
+    passthru
+    if thing.closeable?
+      actor.tell "#{thing.longname.specify.cap_first} is #{thing.closed? ? 'closed' : 'open'}."
+    end
+	end
+
 	Action.new nil, :look_inside, Query.new(:family, Container) do |actor, container|
-		if container.children.length == 0
-			actor.tell "You don't find anything."
-		else
-			actor.tell "#{container.longname} contains: #{container.children.join(', ')}"
-		end
+    if container.closed?
+      actor.tell "#{container.longname.cap_first.specify} is closed."
+    else
+      if container.children.length == 0
+        actor.tell "You don't find anything."
+      else
+        if container.children.length == 1
+          actor.tell "#{container.longname.specify.cap_first} contains #{container.children[0].longname}."
+        else
+          actor.tell "#{container.longname.specify.cap_first} contains: #{container.children.join_and(', ')}."
+        end
+      end
+    end
 	end
 	Syntax.new nil, "look inside :container", :look_inside, :container
 	Syntax.new nil, "search :container", :look_inside, :container
 	Syntax.new nil, "look in :container", :look_inside, :container
 
 	Action.new nil, :look_in_at, Query.new(:family, Container), Subquery.new(:children, Entity) do |actor, container, item|
-		actor.tell item.description
+    if container.closed?
+      actor.tell "#{container.longname.cap_first.specify} is closed."
+    else
+      actor.tell item.description
+    end
 	end
+  
+  Action.new nil, :look_in_at, Query.new(:family, Container), Query.new(:string) do |actor, container, item|
+    if container.closed?
+      actor.tell "#{container.longname.cap_first.specify} is closed."
+    else
+      passthru
+    end
+  end
+  
 	Syntax.new nil, "look at :item in :container", :look_in_at, :container, :item
 	Syntax.new nil, "look :item in :container", :look_in_at, :container, :item
 
-	Action.new nil, :take_from, Query.new(:family, Container), Subquery.new(:children, Item) do |actor, container, item|
-		item.parent = actor
-		actor.tell "You take #{item.longname} from #{container.longname}."
+	Action.new nil, :take_from, Query.new(:family, Container), Subquery.new(:children, Portable) do |actor, container, item|
+    if container.closed?
+      actor.tell "#{container.longname.cap_first.specify} is closed."
+    else
+      item.parent = actor
+      actor.tell "You take #{item.longname} from #{container.longname.specify}."
+    end
 	end
 	Syntax.new nil, "take :item from :container", :take_from, :container, :item
 	Syntax.new nil, "get :item from :container", :take_from, :container, :item
 	Syntax.new nil, "remove :item from :container", :take_from, :container, :item
 
 	Action.new nil, :drop_in, Query.new(:family, Container), Query.new(:children) do |actor, container, item|
-		item.parent = container
-		actor.tell "You put #{item.longname} in #{container.longname}."
+    if container.closed?
+      actor.tell "#{container.longname.cap_first.specify} is closed."
+    else
+      item.parent = container
+      actor.tell "You put #{item.longname} in #{container.longname}."
+    end
 	end
 	Syntax.new nil, "drop :item in :container", :drop_in, :container, :item
 	Syntax.new nil, "put :item in :container", :drop_in, :container, :item
 	Syntax.new nil, "place :item in :container", :drop_in, :container, :item
+  
+  Action.new nil, :open, Query.new(:string) do |actor, string|
+    actor.tell "You don't see any \"#{string}\" here."
+  end
+  
+  Action.new nil, :open, Query.new(:family, Entity) do |actor, thing|
+    actor.tell "You can't open #{thing.longname.specify}."
+  end
+  
+  Action.new nil, :open, Query.new(:family, Container) do |actor, container|
+    if container.closeable?
+      if container.closed?
+        actor.tell "You open #{container.longname.specify}."
+        container.closed = false
+      else
+        actor.tell "It's already open."
+      end
+    else
+      actor.tell "You can't open #{container.longname.specify}."
+    end
+  end
+
+  Action.new nil, :close, Query.new(:string) do |actor, string|
+    actor.tell "You don't see any \"#{string}\" here."
+  end
 
+  Action.new nil, :close, Query.new(:family, Entity) do |actor, thing|
+    actor.tell "You can't close #{thing.longname.specify}."
+  end
+  
+  Action.new nil, :close, Query.new(:family, Container) do |actor, container|
+    if container.closeable?
+      if container.closed?
+        actor.tell "It's already closed."
+      else
+        actor.tell "You close #{container.longname.specify}."
+        container.closed = true
+      end
+    else
+      actor.tell "You can't close #{container.longname.specify}."
+    end  
+  end
+  
 end

data/lib/gamefic/action_ext/inventory.rb

@@ -11,20 +11,36 @@ module Gamefic
 
 	Action.new nil, :take, Query.new(:siblings, Portable) do |actor, thing|
 		thing.parent = actor
-		actor.tell "You take #{thing.longname}.", true
+		actor.tell "You take #{thing.longname.specify}.", true
 	end
 
 	Action.new nil, :take, Query.new(:siblings) do |actor, thing|
-		actor.tell "You can't carry #{thing.longname}."
+		actor.tell "You can't carry #{thing.longname.specify}."
 	end
 
-	Action.new nil, :take, String do |actor, thing|
-		actor.tell "You don't see anything called \"#{thing}\" here."
+	Action.new nil, :take, Query.new(:string) do |actor, thing|
+    containers = actor.children.that_are(Container)
+    containers = containers + actor.parent.children.that_are(Container)
+    found = false
+    containers.each { |container|
+      if container.closed? == false
+        query = Query.new(:children, Portable)
+        result = query.execute(container, thing)
+        if result.objects.length == 1
+          found = true
+          actor.perform "take #{result.objects[0].longname} from #{container.longname}"
+          break
+        end
+      end
+    }
+    if found == false
+      actor.tell "You don't see anything called \"#{thing}\" here."
+    end
 	end
 
 	Action.new nil, :drop, Query.new(:children) do |actor, thing|
 		thing.parent = actor.parent
-		actor.tell "You drop #{thing.longname}.", true
+		actor.tell "You drop #{thing.longname.specify}.", true
 	end
 
 	Syntax.new nil, "get :thing", :take, :thing

data/lib/gamefic/action_ext/look.rb

@@ -9,7 +9,7 @@ module Gamefic
 	end
 
 	Action.new nil, :itemize_room, Query.new(:string) do |actor, option|
-		actor.tell "#{actor.parent.longname.cap_first}"
+		actor.tell "## #{actor.parent.longname.cap_first}"
 		if option == "full"
 			actor.tell actor.parent.description
 		end

data/lib/gamefic/character.rb

@@ -69,6 +69,13 @@ module Gamefic
 				end
 			end
 		end
+    def prompt
+      "> "
+    end
 	end
-
+  class GameOverState < CharacterState
+    def prompt
+      "GAME OVER"
+    end
+  end
 end

data/lib/gamefic/core_ext/string.rb

@@ -7,12 +7,12 @@ class String
 	end
   def specify
     if self[0,2] == 'a ' or self[0,3] == 'an '
-      "the #{self.split(' ').shift.join(' ')}"
+      return "the #{self.split(' ')[1..-1].join(' ')}"
     end
     if self[0,2] == 'A ' or self[0,3] == 'An '
-      "The #{self.split(' ').shift.join(' ')}"
+      return "The #{self.split(' ')[1..-1].join(' ')}"
     end
-    "#{self}"
+    return self
   end
 	def terminalize
 		output = ''

data/lib/gamefic/director.rb

@@ -31,7 +31,12 @@ module Gamefic
 			}
 			options.push([
 				Proc.new { |actor|
-					actor.tell "I don't know what you mean by '#{command}.'"
+          first = Keywords.new(command)[0]
+          if actor.plot.commandwords.include?(first)
+            actor.tell "I know the verb '#{first}' but couldn't understand the rest of your sentence."
+          else
+            actor.tell "I don't understand '#{first}' as a command."
+          end
 				}, [actor], -1
 			])
 			del = Delegate.new(options)

data/lib/gamefic/engine.rb

@@ -8,7 +8,7 @@ module Gamefic
 			user = User.new @plot
 			@plot.introduce user.character
 			while true
-				user.stream.select
+				user.stream.select user.character.state.prompt
 				user.state.update
 				@plot.update
 			end

data/lib/gamefic/entity_ext/container.rb

@@ -4,6 +4,25 @@ module Gamefic
 
 	class Container < Entity
 		include Itemized
+    def closeable=(bool)
+      @closeable = bool
+    end
+    def closeable?
+      @closeable ||= false
+      if (@closeable == true && @closed == nil)
+        @closed = false
+      end
+      @closeable
+    end
+    def closed?
+      (@closed == true)
+    end
+    def closed=(bool)
+      if bool == true
+        @closeable = true
+      end
+      @closed = bool
+    end
 	end
 
 end

data/lib/gamefic/plot.rb

@@ -69,6 +69,7 @@ module Gamefic
 		def conclude(player, key = nil)
 			if key != nil and @conclusions[key]
 				@conclusions[key].call(player)
+        player.state = GameOverState.new(player)
 			end
 		end
 		def cue scene

data/lib/gamefic/user.rb

@@ -35,9 +35,10 @@ module Gamefic
 		def send(data)
 			print data
 		end
-		def select
-			print "> "
-			@queue.push STDIN.gets
+		def select(prompt)
+			print prompt
+			line = STDIN.gets
+      @queue.push line.strip
 		end
 		def recv
 			@queue.shift
@@ -56,7 +57,8 @@ module Gamefic
 		def update
 			line = @user.stream.recv
 			if line != nil
-				@user.character.perform line
+				#@user.character.perform line
+        @user.character.queue.push line
 			end
 		end
 	end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gamefic
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
 platform: ruby
 authors:
 - Fred Snyder
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-27 00:00:00.000000000 Z
+date: 2014-03-14 00:00:00.000000000 Z
 dependencies: []
 description: An adventure game engine
 email: fsnyder@gamefic.com