gamefic 0.1.1 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0ebda04fc06a182081d6516d328bd23501586ecd
-  data.tar.gz: 1e8aa7db0b490b0f864071fb74317a7a2f1b330d
+  metadata.gz: cdcd6a0fe04e0a8bbe946261ff8284fb4667e2f7
+  data.tar.gz: 98bafd885d73b32653194ca36ad50285e2656d45
 SHA512:
-  metadata.gz: 74a8a6dc8951a30802fb5bb8e6ee764525885572fc0fa18018ea4cd9890f48674830dc94274528ca4e1f0b58de2043d547f1f8e60f14d6e8cb1a41ce30f53d1c
-  data.tar.gz: 3181204289bc694587d60ffebf14f660a6c85d7f5140927f27f5e3c13fff60684f63c7fd59cf89d1acc8ac0ccaf85f5566f09f5d626a2a9d588518036acacc73
+  metadata.gz: 5cef4896f4506c22cbc82dff02846805b64b8062ccc90ead1e9aeeac1df9e9cc50a2a79bffd0159da33896f497bb2ce4bdeec68a45c7bef715384846e2c9a842
+  data.tar.gz: 2d2f4b0df8f65e54d1da9826e4e4ca1febf3b9a5858f200f81c4163afbbfd75502c8ceb187a4f7db102135683843bfe0dc3f2d6fd5bca258988f60e85a8e69ee

data/lib/gamefic/action.rb

@@ -5,9 +5,10 @@ module Gamefic
 		@@defaults = Array.new
     @@order_key_seed = 0
 		def initialize(story, command, *queries, &proc)
+      @plot = story
       @order_key = @@order_key_seed
       @@order_key_seed += 1
-			if (command.kind_of?(Symbol) == false)
+			if (command.kind_of?(Symbol) == false and !command.nil?)
 				raise "Action commands must be symbols"
 			end
 			if (queries.length + 1 != proc.arity) and (queries.length == 0 and proc.arity != -1)
@@ -29,12 +30,12 @@ module Gamefic
 			spec = 0
 			magnitude = 1
 			@queries.each { |q|
-				if q.kind_of?(Query)
+				if q.kind_of?(Query::Base)
 					spec += (q.specificity * magnitude)
 				else
 					spec += magnitude
 				end
-				magnitude = magnitude * 10
+				#magnitude = magnitude * 10
 			}
 			return spec
 		end
@@ -44,9 +45,9 @@ module Gamefic
 		def queries
 			@queries
 		end
-		def proc
-			@proc
-		end
+    def execute *args
+      @proc.call *args
+    end
 		private
 			def self.explode(entity)
 				arr = Array.new

data/lib/gamefic/before.rb

@@ -0,0 +1,12 @@
+# Before Actions are processed before Rules. Their primary use is to determine
+# whether or not a particular Action (or thread of Actions) should be allowed
+# to happen. A Before Action's proc can use the pass and deny methods to
+# override the results of rule assertions.
+
+module Gamefic
+
+  class Before < Action
+
+  end
+
+end

data/lib/gamefic/character.rb

@@ -1,6 +1,6 @@
 module Gamefic
 
-	class Character < Entity
+	class Character < Thing
 		attr_reader :state, :queue, :user, :last_command
     attr_accessor :object_of_pronoun
 		def initialize(plot, args = {})

data/lib/gamefic/core_ext/array.rb

@@ -2,6 +2,8 @@ class Array
 	def that_are(cls)
 		if (cls.kind_of?(Class) or cls.kind_of?(Module))
 			return self.clone.delete_if { |i| i.kind_of?(cls) == false }
+    elsif cls.kind_of?(Symbol)
+      return self.clone.delete_if { |i| i.option_selected?(cls) == false }
 		else
 			if self.include?(cls)
 				return [cls]
@@ -12,6 +14,8 @@ class Array
 	def that_are_not(cls)
 		if (cls.kind_of?(Class) or cls.kind_of?(Module))
 			return self.clone.delete_if { |i| i.kind_of?(cls) == true }
+    elsif cls.kind_of?(Symbol)
+      return self.clone.delete_if { |i| i.option_selected?(cls) == true }
 		else
 			return self.clone - [cls]
 		end

data/lib/gamefic/core_ext/string.rb

@@ -5,37 +5,6 @@ class String
 	def cap_first
 		self.capitalize_first
 	end
-  def specify
-    if self[0,2] == 'a ' or self[0,3] == 'an '
-      return "the #{self.split(' ')[1..-1].join(' ')}"
-    end
-    if self[0,2] == 'A ' or self[0,3] == 'An '
-      return "The #{self.split(' ')[1..-1].join(' ')}"
-    end
-    return self
-  end
-	def terminalize
-		output = ''
-		lines = self.split("\n")
-		lines.each { |line|
-			if line.size > 79
-				while (line.size > 79)
-					offset = line.rindex(/[\s\-]/, 79)
-					if (offset == 0 or offset == nil)
-						output = output + line + "\n"
-						line = ''
-					else
-						output = output + line[0,offset + 1] + "\n"
-						line = line[offset + 1, line.size - offset]
-					end
-				end
-				output = output + line + "\n"
-			else
-				output = output + line + "\n"
-			end
-		}
-		return output
-	end
 	def split_words
 		self.gsub(/ +/, ' ').strip.split
 	end

data/lib/gamefic/describable.rb

@@ -3,25 +3,85 @@ require "gamefic/keywords"
 module Gamefic
 
 	module Describable
-		attr_accessor :name, :longname, :synonyms
+    attr_reader :name
+		attr_accessor :synonyms, :indefinite_article
+    attr_writer :definite_article
 		def keywords
-			Keywords.new "#{name} #{longname} #{synonyms}"
+			Keywords.new "#{name} #{synonyms}"
 		end
 		def keywords=(value)
 			@keywords = value
 		end
-		def longname
-			@longname.to_s != '' ? @longname : name
-		end
-		def longname=(value)
-			@longname = value
-		end
+    def indefinitely
+      (proper_named? ? '' : "#{indefinite_article} ") + name
+    end
+    def definitely
+      (proper_named? ? '' : "#{definite_article} ") + name
+    end
+    def definite_article
+      @definite_article || "the"
+    end
+    def proper_named?
+      (@proper_named == true)
+    end
+    def proper_named=(value)
+      if value == true
+        if @definite_article != nil
+          @name = "#{@definite_article} #{@name}"
+          @definite_article = nil
+        end
+      end
+      @proper_named = value
+    end
+    def name=(value)
+      # TODO: Split article from name
+      words = value.split_words
+      if ['a','an'].include?(words[0].downcase)
+        @indefinite_article = words[0].downcase
+        @definite_article = 'the'
+        value = value[words[0].length+1..-1].strip
+      else
+        if words[0].downcase == 'the'
+          @definite_article = 'the'
+          value = value[4..-1].strip
+        end
+        # Try to guess the indefinite article
+        if ['a','e','i','o','u'].include?(value[0,1].downcase)
+          @indefinite_article = 'an'
+        else
+          @indefinite_article = 'a'
+        end
+      end
+      @name = value
+    end
 		def description
 			@description.to_s != '' ? @description : "Nothing special."
 		end
 		def description=(value)
 			@description = value
 		end
+		def to_s
+			indefinitely
+		end
 	end
 
+  def self.a(entity)
+    entity.indefinitely
+  end
+  def self.an(entity)
+    entity.indefinitely
+  end
+  def self.the(entity)
+    entity.definitely
+  end
+  def self.A(entity)
+    entity.indefinitely.cap_first
+  end
+  def self.An(entity)
+    entity.indefinitely.cap_first
+  end
+  def self.The(entity)
+    entity.definitely.cap_first
+  end
+
 end

data/lib/gamefic/director.rb

@@ -3,32 +3,24 @@ module Gamefic
 	class Director
 		def self.dispatch(actor, command)
 			command.strip!
-      verbs = actor.plot.commandwords
-      first = command.split(' ')[0].downcase
-      if verbs.include?(first) == false
-        possibles = []
-        verbs.each { |v|
-          if v.start_with?(first)
-            possibles.push v
-          end
-        }
-        if possibles.length == 1
-          command = possibles[0] + command[first.length..-1]
-        else
-          if possibles.length > 1
-            actor.tell "'#{first.cap_first}' is ambiguous."
-          else
-            actor.tell "I don't understand '#{first}' as a command."
-          end
-          return
-        end
+      if command.to_s == ''
+        return
       end
-			handlers = Syntax.match(command, actor.plot.syntaxes)
+      begin
+        handlers = Syntax.match(command, actor.plot)
+      rescue Exception => e
+        puts "#{e}"
+        return
+      end
+      befores = Array.new
 			options = Array.new
 			handlers.each { |handler|
 				actions = actor.plot.commands[handler.command]
 				if actions != nil
 					actions.each { |action|
+            if action.queries.length == 0 and handler.arguments.length > 0
+              next
+            end
 						orders = bind_contexts_in_result(actor, handler, action)
 						orders.each { |order|
 							args = Array.new
@@ -37,38 +29,42 @@ module Gamefic
 								if a.length > 1
 									longnames = Array.new
 									a.each { |b|
-										longnames.push b.longname
+										longnames.push "#{b.definitely}"
 									}
-									actor.tell "I don't know which you mean: #{longnames.join(', ')}"
+									actor.tell "I don't know which you mean: #{longnames.join_and(', ', ' or ')}."
 									return
 								end
 								args.push a[0]
 							}
-							options.push [order.action.proc, args]
+              if order.action.kind_of?(Before)
+                befores.push [order.action, args]
+              else
+                options.push [order.action, args]
+              end
 						}
 					}
 				end
 			}
-			options.push([
-				Proc.new { |actor|
-          first = command.split(' ')[0].downcase
-          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)
+			del = Delegate.new(actor, befores, options)
 			del.execute
 		end
 		private
 		def self.bind_contexts_in_result(actor, handler, action)
+      queries = action.queries.clone
+      objects = self.execute_query(actor, handler.arguments.clone, queries, action)
+      num_nil = 0
+      while objects.length == 0 and queries.last.optional?
+        num_nil +=1
+        queries.pop
+        objects = self.execute_query(actor, handler.arguments.clone, queries, action, num_nil)
+      end
+      return objects
+		end
+    def self.execute_query(actor, arguments, queries, action, num_nil = 0)
+			prepared = Array.new
 			objects = Array.new
 			valid = true
-			prepared = Array.new
-			arguments = handler.arguments.clone
-			action.queries.each { |context|
+			queries.clone.each { |context|
 				arg = arguments.shift
 				if arg == nil or arg == ''
 					valid = false
@@ -76,25 +72,12 @@ module Gamefic
 				end
 				if context == String
 					prepared.push [arg]
-				elsif context.kind_of?(Query)
-					if context.kind_of?(Subquery)
-						last = prepared.last
-						if last == nil or last.length > 1
-							valid = false
-							next
-						end
-            if arg == 'it' and actor.object_of_pronoun != nil
-              result = context.execute(last[0], "#{actor.object_of_pronoun.longname}")
-            else
-              result = context.execute(last[0], arg)
-            end
-					else
-            if arg == 'it' and actor.object_of_pronoun != nil
-              result = context.execute(actor, "#{actor.object_of_pronoun.longname}")
-            else
-              result = context.execute(actor, arg)
-            end
-					end
+				elsif context.kind_of?(Query::Base)
+          if arg == 'it' and actor.object_of_pronoun != nil
+            result = context.execute(actor, "#{actor.object_of_pronoun.name}")
+          else
+            result = context.execute(actor, arg)
+          end
 					if result.objects.length == 0
 						valid = false
 						next
@@ -113,43 +96,97 @@ module Gamefic
 				prepared.each { |p|
 					p.uniq!
 				}
+        num_nil.times do
+          prepared.push [nil]
+        end
 				objects.push Order.new(action, prepared)
 			end
-			return objects
-		end
+      objects
+    end
 	end
 	
 	class Director
 		class Delegate
+      @@assertion_stack = Array.new
 			@@delegation_stack = Array.new
-			def initialize(options)
-				@options = options
+			def initialize(actor, befores, actions)
+        @actor = actor
+        @befores = befores
+				@actions = actions
 			end
 			def execute
-				@@delegation_stack.push @options
-				if @options.length > 0
-					opt = @options.shift
+        @@assertion_stack.push Hash.new
+        @@delegation_stack.push @befores
+        handle @befores
+        @@delegation_stack.pop
+        if @@assertion_stack.last[:everything] == false
+          @@assertion_stack.pop
+          return
+        end
+        result = true
+        @@delegation_stack.push @actions
+        # Nil commands pass assertions to facilitate error messages.
+        if @@assertion_stack.last[:everything] != true and Director::Delegate.next_command != nil
+          @actor.plot.rules.each { |k, v|
+            if @@assertion_stack.last[k] == true
+              next
+            elsif @@assertion_stack.last[k] == false
+              result = false
+              break
+            end
+            result = v.test(@actor)
+            if result == false
+              break
+            end
+            result = true
+          }
+        end
+        @@assertion_stack.pop
+        if result == true
+          handle @actions
+        end
+        @@delegation_stack.pop
+			end
+      def handle options
+				if options.length > 0
+					opt = options.shift
 					if opt[1].length == 1
-						opt[0].call(opt[1][0])
+						opt[0].execute(opt[1][0])
+            opt[1][0].object_of_pronoun = nil
 					else
-            if opt[1].length == 2 and opt[1][1].kind_of?(Entity)
+            if opt[1].length == 2 and opt[1][1].kind_of?(Entity) and opt[1][0].parent != opt[1][1]
               opt[1][0].object_of_pronoun = opt[1][1]
-            else
+            elsif opt[1][0].parent == opt[1][1]
               opt[1][0].object_of_pronoun = nil
             end
-						opt[0].call(opt[1])
+						opt[0].execute(opt[1])
 					end
 				end
-				@@delegation_stack.pop
-			end
+      end
+      def self.pass requirement
+        @@assertion_stack.last[requirement] = true
+      end
+      def self.deny requirement
+        @@assertion_stack.last[requirement] = false
+      end
+      def self.next_command
+        return nil if @@delegation_stack.last.nil? or @@delegation_stack.last[0].length == 0
+        return @@delegation_stack.last[0][0].command
+      end
 			def self.passthru
 				if @@delegation_stack.last != nil
 					if @@delegation_stack.last.length > 0
 						opt = @@delegation_stack.last.shift
 						if opt[1].length == 1
-							opt[0].call(opt[1][0])
+							opt[0].execute(opt[1][0])
+              opt[1][0].object_of_pronoun = nil
 						else
-							opt[0].call(opt[1])
+              if opt[1].length == 2 and opt[1][1].kind_of?(Entity) and opt[1][0].parent != opt[1][1]
+                opt[1][0].object_of_pronoun = opt[1][1]
+              elsif opt[1][0].parent == opt[1][1]
+                opt[1][0].object_of_pronoun = nil
+              end
+							opt[0].execute(opt[1])
 						end
 					end
 				end
@@ -164,8 +201,4 @@ module Gamefic
 		end
 	end
 
-	def self.passthru
-		Director::Delegate.passthru
-	end
-
 end

data/lib/gamefic/engine.rb

@@ -3,18 +3,82 @@ module Gamefic
 	class Engine
 		def initialize(plot)
 			@plot = plot
+      post_initialize
 		end
+    def post_initialize
+      @user = User.new @plot
+    end
 		def run
-			user = User.new @plot
-      @plot.introduce user.character
-			while user.character.state.kind_of?(GameOverState) == false
-        proc {
-          $SAFE = 3
-          user.stream.select user.character.state.prompt
-          print "\n"
-          user.state.update
-          @plot.update
-        }.call
+      @plot.introduce @user.character
+			while @user.character.state.kind_of?(GameOverState) == false
+        tick
+			end
+		end
+    def tick
+      proc {
+        $SAFE = Gamefic.safe_level
+        @user.stream.select @user.character.state.prompt
+        @user.state.update
+        @plot.update
+      }.call    
+    end
+	end
+
+	class User
+		attr_reader :state, :character, :story
+		def initialize(plot)
+			@plot = plot
+      @character = Character.new @plot, :name => 'yourself', :synonyms => 'self myself you me'
+      @character.connect self
+      post_initialize
+		end
+    def post_initialize
+			@stream = UserStream.new
+			@state = UserState.new self
+    end
+		def stream
+			@stream ||= UserStream.new
+		end
+    def state
+      @state ||= UserState.new(self)
+    end
+		def state=(state_class)
+			@state = state_class.new self
+		end
+		def refresh
+			# Nothing to do
+		end
+		def quit
+			#exit
+		end
+	end
+	
+	class UserStream
+		def initialize
+			@queue = Array.new
+		end
+		def send(data)
+      puts data
+		end
+		def select(prompt)
+			print prompt
+			line = STDIN.gets
+      @queue.push line.strip
+		end
+		def recv
+			@queue.shift
+		end
+	end
+	
+	class UserState
+		attr_reader :user
+		def initialize(user)
+			@user = user
+		end
+		def update
+			line = @user.stream.recv
+			if line != nil
+        @user.character.queue.push line
 			end
 		end
 	end

data/lib/gamefic/entity.rb

@@ -8,6 +8,8 @@ module Gamefic
 	class Entity
 		include Branch
 		include Describable
+    include OptionSettings
+    attr_writer :option_array
 		attr_reader :session, :plot
 		def initialize(plot, args = {})
 			if (plot.kind_of?(Plot) == false)
@@ -17,6 +19,7 @@ module Gamefic
 			#self.state = State
 			#@story = Subplot.current
 			@plot = plot
+      @option_mapper = @plot
 			@plot.send :add_entity, self
 			#@story.add_entity self
 			args.each { |key, value|
@@ -49,9 +52,6 @@ module Gamefic
 			#TODO: Should this even be here? In all likelihood, only Characters receive tells, right?
 			#TODO: On second thought, it might be interesting to see logs from an npc point of view.
 		end
-		def to_s
-			name
-		end
 		def update
 			@update_procs.each { |p|
 				p.call self

data/lib/gamefic/import/basics/actions/close.rb

@@ -0,0 +1,16 @@
+respond :close, Query::Text.new() do |actor, string|
+  actor.tell "You don't see any \"#{string}\" here."
+end
+
+respond :close, Query::Reachable.new(Entity) do |actor, thing|
+  actor.tell "You can't close #{the thing}."
+end
+
+respond :close, Query::Reachable.new(Container, :openable) do |actor, container|
+  if container.is? :closed
+    actor.tell "It's already closed."
+  else
+    actor.tell "You close #{the container}."
+    container.is :closed
+  end
+end

data/lib/gamefic/import/basics/actions/commands.rb

@@ -0,0 +1,3 @@
+meta :commands do |actor|
+  actor.tell actor.plot.commandwords.sort.join(", ")
+end

data/lib/gamefic/import/basics/actions/drop-in.rb

@@ -0,0 +1,17 @@
+respond :drop_in, Query::Children.new(), Query::Reachable.new() do |actor, thing, target|
+  puts "You can't put #{the thing} inside #{the target}."
+end
+
+respond :drop_in, Query::Children.new(), Query::Reachable.new(Container) do |actor, thing, container|
+  if container.is? :closed
+    actor.tell "#{The container} is closed."
+  else
+    thing.parent = container
+    thing.is :contained
+    actor.tell "You put #{the thing} in #{the container}."
+  end
+end
+
+xlate "drop :item in :container", :drop_in, :item, :container
+xlate "put :item in :container", :drop_in, :item, :container
+xlate "place :item in :container", :drop_in, :item, :container

data/lib/gamefic/import/basics/actions/drop-on.rb

@@ -0,0 +1,16 @@
+respond :drop_on, Query::Children.new(), Query::Reachable.new() do |actor, thing, supporter|
+  actor.tell "You can't put #{the thing} on #{the supporter}."
+end
+
+respond :drop_on, Query::Children.new(), Query::Reachable.new(Supporter) do |actor, thing, supporter|
+  thing.parent = supporter
+  thing.is :supported
+  actor.tell "You put #{the thing} on #{the supporter}."
+end
+
+xlate "put :thing on :supporter", :drop_on, :thing, :supporter
+xlate "put :thing down on :supporter", :drop_on, :thing, :supporter
+xlate "set :thing on :supporter", :drop_on, :thing, :supporter
+xlate "set :thing down on :supporter", :drop_on, :thing, :supporter
+xlate "drop :thing on :supporter", :drop_on, :thing, :supporter
+xlate "place :thing on :supporter", :drop_on, :thing, :supporter