gamefic 0.1.1 → 0.2.0

data/lib/gamefic/import/{basics/room_modes.rb → room_modes.rb}

@@ -7,11 +7,11 @@ module RoomModes
     if value.kind_of?(Array)
       @description_seen = value
     else
-      raise "Character#visited must be an Array"
+      raise "Character#description_seen must be an Array"
     end
   end
   def description_mode
-    @description_mode ||= "brief"
+    @description_mode ||= "verbose"
   end
 end
 
@@ -19,13 +19,13 @@ class Character
   include RoomModes
 end
 
-respond :go, Query.new(:siblings, Portal) do |actor, portal|
+respond :go, Query::Siblings.new(Portal) do |actor, portal|
   actor.tell "You go #{portal.name}."
   actor.parent = portal.destination
   if actor.description_mode == "superbrief" or (actor.description_mode == "brief" and actor.description_seen.include?(actor.parent))
-    actor.perform "itemize room"
+    actor.tell actor.parent.name.cap_first
   else
-    actor.perform "itemize room full"
+    actor.perform "look"
   end
   if actor.description_seen.include?(actor.parent) == false
     actor.description_seen.push actor.parent
@@ -44,5 +44,5 @@ end
 
 respond :superbrief do |actor|
   actor.description_mode = "superbrief"
-  actor.tell "You are now in VERBOSE mode. Detailed room descriptions will never be displayed unless you LOOK AROUND. Other options are BRIEF and VERBOSE."
+  actor.tell "You are now in SUPERBRIEF mode. Detailed room descriptions will never be displayed unless you LOOK AROUND. Other options are BRIEF and VERBOSE."
 end

data/lib/gamefic/import/standard.rb

@@ -0,0 +1 @@
+import 'basics'

data/lib/gamefic/meta.rb

@@ -0,0 +1,12 @@
+module Gamefic
+
+  class Meta < Action
+    def initialize *args
+      super
+      @plot.before @command, *@queries do |*args|
+        @plot.pass :everything
+      end
+    end
+  end
+  
+end

data/lib/gamefic/optionset.rb

@@ -0,0 +1,114 @@
+class OptionSet
+  attr_accessor :options
+  attr_reader :default
+  def initialize *args
+    @options = args
+    if @options.length == 0
+      raise "No options defined"
+    end
+    if @options.length == 1
+      raise "Option sets require at least 2 options"
+    end
+    @default = @options[0]
+  end
+  def default=(val)
+    if @options.include?(val) == false
+      raise "Option #{val} not available"
+    end
+    @default = val
+  end
+end
+
+module OptionMap
+  def option_map
+    @option_map ||= Hash.new
+  end
+  def options cls, *args
+    os = OptionSet.new *args
+    option_map[cls] ||= {}
+    os.options.each { |o|
+      if option_map[cls][o] != nil
+        raise "Option #{o} already exists"
+      end
+      option_map[cls][o] = os
+    }
+    os
+  end
+  def get_default_for(cls, opt)
+    os = get_option_set_for(cls, opt)
+    if os == nil
+      raise "Option does not exist"
+    end
+    return os.default
+  end
+  def set_default_for(cls, opt)
+    os = get_option_set_for(cls, opt)
+    os.default = opt
+  end
+  def get_all_option_sets_for(cls)
+    all = []
+    option_map.each_value { |s|
+      s.each_key { |o|
+        set = get_option_set_for(cls, o, false)
+        if set != nil
+          all.push set
+        end
+      }
+    }
+    all.uniq
+  end
+  def get_option_set_for(cls, opt, create_if_inherited = true)
+    if option_map[cls] and option_map[cls][opt]
+      return option_map[cls][opt]
+    elsif cls.superclass
+      os = get_option_set_for(cls.superclass, opt, false)
+      if os != nil and create_if_inherited == true
+        os = options(cls, *os.options)
+      end
+      return os
+    end
+    return nil
+  end
+end
+
+module OptionSettings
+  attr_reader :option_mapper
+  def option_array
+    @option_array ||= []
+  end
+  def option_select(opt)
+    if option_array.include?(opt) == false
+      set = option_mapper.get_option_set_for(self.class, opt)
+      if set == nil
+        raise "Invalid option #{opt}"
+      end
+      (set.options - [opt]).each { |o|
+        option_array.delete o
+      }
+      option_array.push opt
+    end
+  end
+  def option_unselect(opt)
+    set = option_mapper.get_option_set_for(self.class, opt)
+    if set == nil
+      raise "Invalid option #{opt}"
+    end
+    option_array.delete opt
+  end
+  def option_selected?(opt)
+    set = option_mapper.get_option_set_for(self.class, opt)
+    return false if set.nil?
+    return true if option_array.include?(opt)
+    other = set.options & option_array
+    if other.length == 0 and set.default == opt
+      return true
+    end
+    return false
+  end
+  def is(opt)
+    option_select opt
+  end
+  def is?(opt)
+    option_selected?(opt)
+  end
+end

data/lib/gamefic/plot.rb

@@ -11,6 +11,8 @@ module Gamefic
       def self.method_missing(name, *args, &block)
         if @@plot.respond_to?(name)
           @@plot.send name, *args, &block
+        elsif Gamefic.respond_to?(name)
+          Gamefic.send name, *args, &block
         end
       end
     end
@@ -18,13 +20,19 @@ module Gamefic
     mod.get_binding
   end
   
+  def self.safe_level
+    @@safe_level ||= (RUBY_VERSION.split('.')[0].to_i < 2 ? 2 : 3)
+  end
+  
 	class Plot
-		attr_reader :scenes, :commands, :conclusions, :imported_scripts
+		attr_reader :scenes, :commands, :conclusions, :imported_scripts, :rules
 		attr_accessor :story
+    include OptionMap
 		def commandwords
 			words = Array.new
 			@syntaxes.each { |s|
-				words.push(s.template.split_words[0])
+        word = s.template[0]
+				words.push(word) if !word.kind_of?(Symbol)
 			}
 			words.uniq
 		end
@@ -37,17 +45,27 @@ module Gamefic
       @available_scripts = Hash.new
 			@imported_scripts = Array.new
 			@entities = Array.new
+      @rules = Hash.new
 			post_initialize
 		end
+    def assert name, &block
+      @rules[name] = Requirement.new self, name, &block
+    end
 		def post_initialize
       # TODO: Should this method be required by extended classes?
 		end
+		def meta(command, *queries, &proc)
+			act = Meta.new(self, command, *queries, &proc)
+		end
 		def action(command, *queries, &proc)
 			act = Action.new(self, command, *queries, &proc)
 		end
 		def respond(command, *queries, &proc)
 			self.action(command, *queries, &proc)
 		end
+		def before(command, *queries, &proc)
+			bef = Before.new(self, command, *queries, &proc)
+		end
 		def make(cls, args = {})
 			ent = cls.new(self, args)
 			if ent.kind_of?(Entity) == false
@@ -56,6 +74,7 @@ module Gamefic
 			ent
 		end
 		def syntax(*args)
+      xlate *args
 		end
 		def xlate(*args)
 			syn = Syntax.new(self, *args)
@@ -97,6 +116,12 @@ module Gamefic
 		def passthru
 			Director::Delegate.passthru
 		end
+    def pass requirement
+      Director::Delegate.pass requirement
+    end
+    def deny requirement
+      Director::Delegate.deny requirement
+    end
 		def update
 			@update_procs.each { |p|
 				p.call
@@ -123,7 +148,7 @@ module Gamefic
       end
       get_scripts @source_directory + '/import'
       proc {
-        $SAFE = 3
+        $SAFE = Gamefic.safe_level
         eval code, ::Gamefic.bind(self), script, 1
       }.call
     end
@@ -149,7 +174,7 @@ module Gamefic
             script_object = @available_scripts[resolved]
             @available_scripts[resolved] = nil
             proc {
-              $SAFE = 3
+              $SAFE = Gamefic.safe_level
               @imported_scripts.push script_object
               eval script_object.code, Gamefic.bind(self), script_object.filename, 1
             }.call
@@ -186,8 +211,14 @@ module Gamefic
 			end
 			@syntaxes.unshift syntax
 			@syntaxes.sort! { |a, b|
-				al = a.template.split_words.length
-				bl = b.template.split_words.length
+				al = a.template.length
+        if (a.command.nil?)
+          al -= 1
+        end
+				bl = b.template.length
+        if (b.command.nil?)
+          bl -= 1
+        end
 				if al == bl
 					# For syntaxes of the same length, creation order takes precedence
 					0
@@ -210,21 +241,23 @@ module Gamefic
           b.specificity <=> a.specificity
         end
 			}
-			user_friendly = action.command.to_s.sub(/_/, ' ')
-			args = Array.new
-			used_names = Array.new
-			action.queries.each { |c|
-				num = 1
-				new_name = "var"
-				while used_names.include? new_name
-					num = num + 1
-					new_name = "var#{num}"
-				end
-				used_names.push new_name
-				user_friendly += " :#{new_name}"
-				args.push new_name.to_sym
-			}
-			Syntax.new self, *[user_friendly, action.command] + args
+      #if action.command != nil
+        user_friendly = action.command.to_s.sub(/_/, ' ')
+        args = Array.new
+        used_names = Array.new
+        action.queries.each { |c|
+          num = 1
+          new_name = "var"
+          while used_names.include? new_name
+            num = num + 1
+            new_name = "var#{num}"
+          end
+          used_names.push new_name
+          user_friendly += " :#{new_name}"
+          args.push new_name.to_sym
+        }
+        Syntax.new self, *[user_friendly.strip, action.command] + args
+      #end
 		end
     def rem_action(action)
       @commands[action.command].delete(action)