gamefic 0.1.1 → 0.2.0

data/lib/gamefic/query.rb

@@ -1,188 +1,214 @@
-require "gamefic/keywords"
-
-module Gamefic
-
-	class Query
-    FAMILY   = :family
-    CHILDREN = :children
-    SIBLINGS = :siblings
-    PARENT   = :parent
-    SELF     = :self
-    PLOT     = :plot
-    STRING   = :string
-		def initialize(context, *arguments)
-			if context != :family and context != :children and context != :siblings and context != :parent and context != :self and context != :plot and context != :string
-      #if self.class.constants.include?(context.to_sym) == false
-				raise "Invalid Query context '#{context.to_sym}'"
-			end
-			#if context == :string and arguments.length > 0
-			#	raise "Query with :string context cannot take additional arguments."
-			#end
-			@context = context
-			@arguments = arguments
-		end
-		def execute(subject, description)
-			case context
-				when :self
-					array = [subject]
-				when :parent
-					array = [subject.parent]
-				when :plot
-					array = subject.plot.entities
-				when :children
-					array = subject.children
-				when :siblings
-					array = subject.parent.children
-				when :family
-					array = subject.children + subject.parent.children
-				when :string
-          if @arguments.length == 0
-            return Matches.new([description], description, '')
-          end
-          keywords = Keywords.new(description)
-          args = Keywords.new(@arguments)
-          found = Array.new
-          remainder = Array.new
-          keywords.each { |key|
-            if args.include?(key)
-              found.push key
-            else
-              remainder.push key
-            end
-          }
-          if found.length > 0
-            return Matches.new([description], found.join(' '), remainder.join(' '))
-          else
-            return Matches.new([], '', description)
-          end
-				else
-					raise "Unrecognized: #{context}"
-			end
-			@arguments.each { |arg|
-				if arg.kind_of?(Class) or arg.kind_of?(Module)
-					array.delete_if { |entity| entity.kind_of?(arg) == false }
-				else
-					if array.include?(arg)
-						array = Array.new
-						array.push(arg)
-					else
-						array.clear
-					end
-				end
-			}
-			return Query.match(description, array)
-		end
-		def context
-			@context
-		end
-		def Query.match(description, array)
-			array.each {|e|
-				if e.uid == description
-					return Matches.new([e], description, '')
-				end
-			}
-			keywords = description.split_words
-			results = array
-			used = Array.new
-			if results.length > 0
-				previous_match = false
-				while keywords.length > 0
-					used.push keywords.shift
-					new_results = Array.new
-					mostMatches = 0.0
-					results.each { |r|
-						words = Keywords.new(used.join(' '))
-						if words.length > 0
-							matches = words.found_in r.keywords
-							if matches >= mostMatches and matches > 0
-								if matches - mostMatches > 0.5
-									new_results = Array.new
-								end
-								new_results.push r
-								mostMatches = matches
-							end
-						end
-					}
-					if new_results.length == 0
-						if previous_match == true
-							keywords.unshift used.pop
-							if used.length == 0
-								results = new_results
-							end
-							break
-						end
-					else
-						previous_match = true
-						results = new_results
-						if results.length == 1
-							break
-						end
-					end
-				end
-				if previous_match == false
-					# Scrolled through every word and not a single thing matched
-					results = Array.new
-				end
-			end
-			return Matches.new(results, used.join(' '), keywords.join(' '))
-		end
-		def Query.match_one(description, array)
-			result = self.match(description, array)
-			if result.objects.length == 1
-				return result.objects[0]
-			end
-			return nil
-		end
-		def specificity
-			if @specificity == nil
-				@specificity = 0
-				case @context
-					when :children
-						@specificity += 50
-					when :siblings
-						@specificity += 40
-					when :family
-						@specificity += 30
-					when :parent
-						@specificity += 20
-					when :self
-						@specificity += 10
-					when :string
-						@specificity = 1
-						#return @specificity
-				end
-				magnitude = 1
-				@arguments.each { |item|
-					if item.kind_of?(Entity)
-						@specificity += (magnitude * 10)
-						item = item.class
-					end
-					if item.kind_of?(Class)
-						s = item
-						while s != nil
-							@specificity += magnitude
-							s = s.superclass
-						end
-					else
-						@specificity += magnitude
-					end
-					magnitude = magnitude * 10
-				}
-			end
-			@specificity
-		end
-		class Matches
-			attr_reader :objects, :matching_text, :remainder
-			def initialize(objects, matching_text, remainder)
-				@objects = objects
-				@matching_text = matching_text
-				@remainder = remainder
-			end
-		end
-	end
-
-	class Subquery < Query
-	
-	end
-	
-end
+require "gamefic/keywords"
+
+module Gamefic
+
+  module Query
+
+    class Base
+      attr_accessor :arguments
+      def initialize *arguments
+        @optional = false
+        if arguments.include?(:optional)
+          @optional = true
+          arguments.delete :optional
+        end
+        @arguments = arguments
+      end
+      def optional?
+        @optional
+      end
+      def context_from(subject)
+        subject
+      end
+      def execute(subject, description)
+        array = context_from(subject)
+        @arguments.each { |arg|
+          array = array.that_are(arg)
+        }
+        return Query.match(description, array)
+      end
+      def base_specificity
+        0
+      end
+      def specificity
+        if @specificity == nil
+          @specificity = base_specificity
+          magnitude = 1
+          @arguments.each { |item|
+            if item.kind_of?(Entity)
+              @specificity += (magnitude * 10)
+              item = item.class
+            end
+            if item.kind_of?(Class)
+              s = item
+              while s != nil
+                @specificity += magnitude
+                s = s.superclass
+              end
+            else
+              @specificity += magnitude
+            end
+            #magnitude = magnitude * 10
+          }
+        end
+        @specificity
+      end
+    end
+    
+    class Text < Base
+      def base_specificity
+        10
+      end
+      def execute(subject, description)
+        if @arguments.length == 0
+          return Matches.new([description], description, '')
+        end
+        keywords = Keywords.new(description)
+        args = Keywords.new(@arguments)
+        found = Array.new
+        remainder = Array.new
+        keywords.each { |key|
+          if args.include?(key)
+            found.push key
+          else
+            remainder.push key
+          end
+        }
+        if found.length > 0
+          return Matches.new([description], found.join(' '), remainder.join(' '))
+        else
+          return Matches.new([], '', description)
+        end
+      end
+    end
+
+    class Self < Base
+      def base_specificity
+        30
+      end
+      def context_from(subject)
+        [subject]
+      end
+    end
+
+    class Parent < Base
+      def base_specificity
+        30
+      end
+      def context_from(subject)
+        [subject.parent]
+      end
+    end
+    
+    class Children < Base
+      def base_specificity
+        50
+      end
+      def context_from(subject)
+        subject.children
+      end
+    end
+    
+    class Siblings < Base
+      def base_specificity
+        40
+      end
+      def context_from(subject)
+        (subject.parent.children - [subject])
+      end
+    end
+    
+    class Family < Base
+      def base_specificity
+        40
+      end
+      def context_from(subject)
+        subject.children + subject.parent.children #+ [subject.parent]
+      end
+    end
+    
+    def self.match(description, array)
+			array.each {|e|
+				if e.uid == description
+					return Matches.new([e], description, '')
+				end
+			}
+			keywords = description.split_words
+			results = array
+			used = Array.new
+			if results.length > 0
+				previous_match = false
+				while keywords.length > 0
+					used.push keywords.shift
+					new_results = Array.new
+					mostMatches = 0.0
+					results.each { |r|
+						words = Keywords.new(used.join(' '))
+						if words.length > 0
+							matches = words.found_in r.keywords
+							if matches >= mostMatches and matches > 0
+								if matches - mostMatches > 0.5
+									new_results = Array.new
+								end
+								new_results.push r
+								mostMatches = matches
+							end
+						end
+					}
+					if new_results.length == 0
+						if previous_match == true
+							keywords.unshift used.pop
+							if used.length == 0
+								results = new_results
+							end
+							break
+						end
+					else
+						previous_match = true
+						results = new_results
+            # TODO: Uncommenting this code results in "lazy" word matching
+						#if results.length == 1
+						#	break
+						#end
+					end
+				end
+				if previous_match == false
+					# Scrolled through every word and not a single thing matched
+					results = Array.new
+				end
+			end
+			return Matches.new(results, used.join(' '), keywords.join(' '))
+    end
+
+    class Subquery < Base
+      def base_specificity
+        40
+      end
+      def context_from(subject)
+        last = Matches.last_match
+        return [] if last.nil?
+        last.children
+      end
+    end
+
+		class Matches
+      @@last_match = nil
+			attr_reader :objects, :matching_text, :remainder
+			def initialize(objects, matching_text, remainder)
+				@objects = objects
+				@matching_text = matching_text
+				@remainder = remainder
+        @@last_match = self
+			end
+      def self.last_match
+        return nil if @@last_match.nil?
+        if @@last_match.objects.length == 1
+          return @@last_match.objects[0]
+        end
+        return nil
+      end
+		end
+
+  end
+
+end

data/lib/gamefic/requirement.rb

@@ -0,0 +1,14 @@
+module Gamefic
+
+  class Requirement
+    def initialize plot, name, &proc
+      @plot = plot
+      @name = name
+      @proc = proc
+    end
+    def test actor
+      return @proc.call actor
+    end
+  end
+
+end

data/lib/gamefic/shell.rb

@@ -1,7 +1,9 @@
+require 'rubygems'
 require 'rubygems/package'
 require 'zlib'
 require 'tmpdir'
 require 'getoptlong'
+require 'gamefic/engine/tty'
 
 # Crazy hack to set file mtimes in tar file
 class Gem::Package::TarHeader
@@ -66,7 +68,7 @@ module Gamefic
             exit 1
           end
           story.load dir + '/main.rb'
-          engine = Engine.new story
+          engine = Tty::Engine.new story
           puts "\n"
           engine.run
         end
@@ -88,7 +90,8 @@ module Gamefic
         #  puts "#{e.inspect}"
         #  exit 1
         #end
-        engine = Engine.new story
+        engine = Tty::Engine.new story
+        puts "\n"
         engine.run
       end
       def init directory
@@ -112,7 +115,7 @@ module Gamefic
         Dir.mkdir(directory + '/import')
         main_rb = File.new(directory + '/main.rb', 'w')
         main_rb.write <<EOS
-import 'basics'
+import 'standard'
 
 room = make Room, :name => 'room'
 
@@ -122,7 +125,7 @@ introduction do |player|
 end
 EOS
         main_rb.close
-        fetch directory
+        #fetch directory
         puts "Game directory '#{directory}' initialized."
       end
       def fetch directory

data/lib/gamefic/syntax.rb

@@ -7,37 +7,54 @@ module Gamefic
 			if arguments.length < 2
 				raise "Syntax.new requires at least two arguments (template and command)"
 			end
-			@template = arguments.shift
-			@command = arguments.shift
-			@arguments = arguments
-			if story == nil
-				@@defaults.push self
-			else
-				story.send :add_syntax, self
-				@story = story
-			end
+      if arguments.length == 2 and arguments[0].kind_of?(Array) and arguments[1].kind_of?(Array)
+        @template = arguments[0]
+        @command = arguments[1].shift
+        @arguments = arguments[1]
+      else
+        @template = []
+        string = arguments.shift
+        string.split_words.each { |word|
+          if word[0,1] == ":"
+            @template.push word[1..-1].to_sym
+          else
+            @template.push word
+          end
+        }
+        #@template = arguments.shift
+        @command = arguments.shift
+        @arguments = arguments
+        if story == nil
+          #@@defaults.push self
+          raise "Default syntaxes are deprecated"
+        else
+          story.send :add_syntax, self
+          @story = story
+        end
+      end
 		end
 		def self.defaults
 			@@defaults.clone
 		end
-		def self.match(input, syntaxes)
+		def self.match(input, context)
 			# Given the input, return all the syntaxes that potentially match it.
+      syntaxes = (context.kind_of?(Plot) ? context.syntaxes : context)
 			matches = Array.new
 			words = input.split_words
 			syntaxes.each { |syntax|
 				input_words = words.clone
 				tokens = Hash.new
-				syntax_words = syntax.template.split_words
+				syntax_words = syntax.template.clone
 				while syntax_words.length > 0
 					if input_words.length == 0
 						# No more input. Break with an imbalance.
 						break
 					end
 					symbol = syntax_words.shift
-					if symbol[0, 1] == ":"
+					if symbol.kind_of?(Symbol)
 						if syntax_words.length == 0
 							# Last syntax word.
-							tokens[symbol[1..-1].to_sym] = input_words.join(' ')
+							tokens[symbol] = input_words.join(' ')
 							input_words.clear
 							break
 						elsif input_words.length == 0
@@ -45,11 +62,11 @@ module Gamefic
 							break
 						else
 							non_vars = syntax_words.clone.delete_if { |w|
-								w[0, 1] == ':'
+								w.kind_of?(Symbol)
 							}
 							if non_vars.length == 0
 								# All remaining words in the syntax are variables. Dump everything now.
-								tokens[symbol[1..-1].to_sym] = input_words.join(' ')
+								tokens[symbol] = input_words.join(' ')
 								syntax_words.clear
 								input_words.clear
 							else
@@ -58,7 +75,7 @@ module Gamefic
 								if syntax_words.length == 0
 									last_input_word = input_words.pop
 									if last_input_word == next_syntax_word
-										tokens[symbol[1..-1].to_sym] = input_words.join(' ')
+										tokens[symbol] = input_words.join(' ')
 										input_words.clear
 									end
 									break
@@ -71,7 +88,7 @@ module Gamefic
 								if input_words.length == 0 and syntax_words.length > 0
 									break
 								else
-									tokens[symbol[1..-1].to_sym] = token.strip
+									tokens[symbol] = token.strip
 								end
 							end
 						end
@@ -93,7 +110,7 @@ module Gamefic
 						else
 							if a != nil and a != ''
 								arguments.push(a)
-							end						
+							end
 						end
 					}
 					if syntax.arguments.length == arguments.length

data/lib/gamefic/thing.rb

@@ -0,0 +1,7 @@
+module Gamefic
+
+  class Thing < Entity
+  
+  end
+
+end

data/lib/gamefic.rb

@@ -1,13 +1,17 @@
 require "gamefic/core_ext/array"
 require "gamefic/core_ext/string"
+require "gamefic/optionset"
 require "gamefic/keywords"
 require "gamefic/entity"
+require "gamefic/thing"
 require "gamefic/character"
 require "gamefic/action"
+require "gamefic/before"
+require "gamefic/meta"
+require "gamefic/requirement"
 require "gamefic/syntax"
 require "gamefic/query"
 require "gamefic/director"
 require "gamefic/plot"
 require "gamefic/story"
 require "gamefic/engine"
-require "gamefic/user"