gamefic 1.6.0 → 1.7.0

data/lib/gamefic/query.rb

@@ -6,6 +6,7 @@ module Gamefic
     autoload :Base, 'gamefic/query/base'
     autoload :Children, 'gamefic/query/children'
     autoload :Descendants, 'gamefic/query/descendants'
+    autoload :External, 'gamefic/query/external'
     autoload :Family, 'gamefic/query/family'
     autoload :Itself, 'gamefic/query/itself'
     autoload :Matches, 'gamefic/query/matches'

data/lib/gamefic/query/base.rb

@@ -21,9 +21,10 @@ module Gamefic
         []
       end
 
-      # Get an array of objects that exist in the subject's context and match
-      # the provided token.
+      # Get a collection of objects that exist in the subject's context and
+      # match the provided token. The result is provided as a Matches object.
       #
+      # @return [Gamefic::Query::Matches]
       def resolve(subject, token, continued: false)
         available = context_from(subject)
         return Matches.new([], '', token) if available.empty?
@@ -51,13 +52,18 @@ module Gamefic
         if @precision.nil?
           @precision = 1
           arguments.each { |a|
-            if a.kind_of?(Symbol) or a.kind_of?(Regexp)
-              @precision += 1
-            elsif a.kind_of?(Class)
-              @precision += (count_superclasses(a) * 100)
-            elsif a.kind_of?(Module)
-              @precision += 10
-            elsif a.kind_of?(Object)
+            #if a.kind_of?(Symbol) or a.kind_of?(Regexp)
+            #  @precision += 1
+            #elsif a.kind_of?(Class)
+            #  @precision += (count_superclasses(a) * 100)
+            #elsif a.kind_of?(Module)
+            #  @precision += 10
+            #elsif a.kind_of?(Object)
+            #  @precision += 1000
+            #end
+            if a.kind_of?(Class)
+              @precision += 100
+            elsif a.kind_of?(Gamefic::Entity)
               @precision += 1000
             end
           }
@@ -111,16 +117,6 @@ module Gamefic
 
       private
 
-      def count_superclasses cls
-        s = cls.superclass
-        c = 1
-        until s.nil? or s == Object or s == BasicObject
-          c += 1
-          s = s.superclass
-        end
-        c
-      end
-
       def nested?(token)
         !token.match(NEST_REGEXP).nil?
       end

data/lib/gamefic/query/external.rb

@@ -0,0 +1,14 @@
+module Gamefic
+  module Query
+    class External < Base
+      def initialize objects, *args
+        super(*args)
+        @objects = objects
+      end
+      
+      def context_from subject
+        @objects
+      end
+    end
+  end
+end

data/lib/gamefic/scene.rb

@@ -1,16 +1,14 @@
-#require 'gamefic/scene_data'
-
 module Gamefic
 
   module Scene
     autoload :Base, 'gamefic/scene/base'
     autoload :Custom, 'gamefic/scene/custom'
-    autoload :Active, 'gamefic/scene/active'
+    autoload :Activity, 'gamefic/scene/activity'
     autoload :Pause, 'gamefic/scene/pause'
     autoload :Conclusion, 'gamefic/scene/conclusion'
     autoload :MultipleChoice, 'gamefic/scene/multiple_choice'
     autoload :MultipleScene, 'gamefic/scene/multiple_scene'
     autoload :YesOrNo, 'gamefic/scene/yes_or_no'
   end
-  
+
 end

data/lib/gamefic/scene/{active.rb → activity.rb}

@@ -1,26 +1,26 @@
-module Gamefic
-
-  # Active Scenes handle the default command prompt, where input is parsed
-  # into an Action performed by the Character. This is the default scene in
-  # a Plot.
-  #
-  class Scene::Active < Scene::Base
-    def post_initialize
-      self.type = 'Active'
-    end
-
-    def finish
-      super
-      o = nil
-      o = actor.perform input.strip unless input.nil?
-      actor.performed o
-    end
-
-    class << self
-      def type
-        'Active'
-      end
-    end
-  end
-  
-end
+module Gamefic
+
+  # Active Scenes handle the default command prompt, where input is parsed
+  # into an Action performed by the Character. This is the default scene in
+  # a Plot.
+  #
+  class Scene::Activity < Scene::Base
+    def post_initialize
+      self.type = 'Activity'
+    end
+
+    def finish
+      super
+      o = nil
+      o = actor.perform input.strip unless input.to_s.strip.empty?
+      actor.performed o
+    end
+
+    class << self
+      def type
+        'Activity'
+      end
+    end
+  end
+  
+end

data/lib/gamefic/scene/base.rb

@@ -27,11 +27,16 @@ module Gamefic
     end
 
     def start
-      self.class.initialize_block.call @actor, self unless self.class.initialize_block.nil?
+      self.class.start_block.call @actor, self unless self.class.start_block.nil?
     end
 
     def finish
       @finish_block.call @actor, self unless @finish_block.nil?
+      @finished = true
+    end
+
+    def finished?
+      @finished ||= false
     end
 
     def flush
@@ -40,13 +45,13 @@ module Gamefic
 
     def state
       {
-        scene: type, prompt: prompt, input: input #, output: actor.messages, busy: !actor.queue.empty?
+        scene: type, prompt: prompt
       }
     end
 
     def self.subclass &block
       c = Class.new(self) do
-        on_initialize &block
+        on_start &block
       end
       c
     end
@@ -62,13 +67,13 @@ module Gamefic
       @type ||= 'Scene'
     end
 
-    def self.on_initialize &block
-      @initialize_block = block
+    def self.on_start &block
+      @start_block = block
     end
 
     class << self
-      def initialize_block
-        @initialize_block
+      def start_block
+        @start_block
       end
     end
   end

data/lib/gamefic/scene/multiple_choice.rb

@@ -18,20 +18,7 @@ module Gamefic
       self.prompt = 'Enter a choice:'
     end
 
-    #def start actor
-    #  data = start_data_for(actor)
-    #  data.clear
-    #  do_start_block actor, data
-    #  tell_options
-    #end
-    
-    def start
-      super
-      raise "MultipleChoice scene has zero options" if options.empty?
-    end
-
     def finish
-      #data = finish_data_for(actor, input)
       get_choice
       if selection.nil?
         actor.tell invalid_message

data/lib/gamefic/scene/multiple_scene.rb

@@ -13,7 +13,7 @@ module Gamefic
     def finish
       get_choice
       unless selection.nil?
-        actor.cue option_map[selection]
+        actor.prepare option_map[selection]
       end
     end
   end

data/lib/gamefic/subplot.rb

@@ -3,9 +3,6 @@ require 'gamefic/plot'
 module Gamefic
 
   class Subplot
-    attr_reader :plot
-    attr_writer :denied_message
-
     include Plot::Theater
     include Plot::Entities
     include Plot::Commands
@@ -13,6 +10,9 @@ module Gamefic
     include Plot::Scenes
     include Plot::Articles
 
+    # @return [Gamefic::Plot]
+    attr_reader :plot
+
     class << self
       attr_reader :start_proc
 
@@ -23,16 +23,19 @@ module Gamefic
       end
     end
 
-    def initialize plot, introduce: nil, next_cue: nil, busy_cue: nil
+    def initialize plot, introduce: nil, next_cue: nil
       @plot = plot
       @next_cue = next_cue
-      @busy_cue = busy_cue
       @concluded = false
       stage &self.class.start_proc unless self.class.start_proc.nil?
       playbook.freeze
       self.introduce introduce unless introduce.nil?
     end
 
+    def add_entity e
+      @p_entities.push e
+    end
+
     def subplot
       self
     end
@@ -46,7 +49,13 @@ module Gamefic
     end
 
     def playbook
-      @playbook ||= plot.playbook.dup
+      @playbook ||= Gamefic::Plot::Playbook.new
+    end
+
+    def cast cls, args = {}, &block
+      ent = super
+      ent.playbooks.push plot.playbook unless ent.playbooks.include?(plot.playbook)
+      ent
     end
 
     # HACK: Always assume subplots are running for the sake of entity destruction
@@ -54,24 +63,8 @@ module Gamefic
       true
     end
 
-    def denied_message
-      @denied_message ||= 'You are already involved in another subplot.'
-    end
-
-    def introduce player
-      if plot.in_subplot?(player)
-        if @busy_cue.nil?
-          player.tell denied_message
-        else
-          player.cue @busy_cue
-        end
-      else
-        super
-      end
-    end
-
     def exeunt player
-      player.playbook = plot.playbook
+      player.playbooks.delete playbook
       player.cue (@next_cue || default_scene)
       p_players.delete player
     end

data/lib/gamefic/user.rb

@@ -2,7 +2,6 @@ module Gamefic
 
   module User
     autoload :Base, 'gamefic/user/base'
-    autoload :Buffer, 'gamefic/user/buffer'
   end
 
 end

data/lib/gamefic/user/base.rb

@@ -1,5 +1,19 @@
 module Gamefic
-  class User::Base    
+  class User::Base
+    # @return [Gamefic::Active]
+    attr_reader :character
+
+    # @return [Gamefic::Engine::Base]
+    attr_reader :engine
+
+    def initialize engine
+      @engine = engine
+    end
+
+    def connect entity
+      @character = entity
+    end
+
     def update state
       raise 'Unimplemented'
     end

data/lib/gamefic/user/tty.rb

@@ -11,44 +11,28 @@ module Gamefic
   #   need them.
   #
   class User::Tty < User::Base
-    def update state
-      print Gamefic::Text::Html::Conversions.html_to_ansi(state[:output])
+    def update
+      unless character.state[:options].nil?
+        list = '<ol class="multiple_choice">'
+        character.state[:options].each { |o|
+          list += "<li><a href=\"#\" rel=\"gamefic\" data-command=\"#{o}\">#{o}</a></li>"
+        }
+        list += "</ol>"
+        character.tell list
+      end
+      print Gamefic::Text::Html::Conversions.html_to_ansi(character.state[:output])
     end
 
     def save filename, snapshot
-      json = JSON.generate snapshot
-      if json.nil?
-        @character.tell "Nothing to save."
-      end
-      if filename.nil?
-        stream.select "Enter the filename to save:"
-        filename = stream.queue.pop
-      end
-      if filename != ''
-        File.open(filename, 'w') do |f|
-          f.write json
-        end
+      File.open(filename, 'w') do |file|
+        file << snapshot.to_json
       end
     end
 
     def restore filename
-      if filename.nil?
-        stream.select "Enter the filename to restore:"
-        filename = stream.queue.pop
-      end
-      if filename != ''
-        if File.exists?(filename)
-          data = JSON.parse File.read(filename), symbolize_names: true
-          #if (data[:metadata] != @character.plot.metadata)
-          #  @character.tell "The save file is not compatible with this version of the game."
-          #else
-            return data
-          #end
-        else
-          @character.tell "File \"#{filename}\" not found."
-        end
-      end
-      nil
+      json = File.read(filename)
+      snapshot = JSON.parse(json, symbolize_names: true)
+      engine.plot.restore snapshot
     end
   end
 end

data/lib/gamefic/version.rb

@@ -1,3 +1,3 @@
 module Gamefic
-  VERSION = '1.6.0'
+  VERSION = '1.7.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gamefic
 version: !ruby/object:Gem::Version
-  version: 1.6.0
+  version: 1.7.0
 platform: ruby
 authors:
 - Fred Snyder
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-05-31 00:00:00.000000000 Z
+date: 2017-07-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -90,26 +90,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 11.3.0
-- !ruby/object:Gem::Dependency
-  name: codeclimate-test-reporter
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.0'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.0.0
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.0'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.0.0
 description: An adventure game and interactive fiction framework
 email: fsnyder@gamefic.com
 executables:
@@ -120,12 +100,13 @@ files:
 - bin/gamefic
 - lib/gamefic.rb
 - lib/gamefic/action.rb
-- lib/gamefic/character.rb
-- lib/gamefic/character/state.rb
+- lib/gamefic/active.rb
+- lib/gamefic/actor.rb
 - lib/gamefic/command.rb
 - lib/gamefic/core_ext/array.rb
 - lib/gamefic/core_ext/string.rb
 - lib/gamefic/describable.rb
+- lib/gamefic/element.rb
 - lib/gamefic/engine.rb
 - lib/gamefic/engine/base.rb
 - lib/gamefic/engine/tty.rb
@@ -147,6 +128,7 @@ files:
 - lib/gamefic/plot/articles.rb
 - lib/gamefic/plot/callbacks.rb
 - lib/gamefic/plot/commands.rb
+- lib/gamefic/plot/darkroom.rb
 - lib/gamefic/plot/entities.rb
 - lib/gamefic/plot/host.rb
 - lib/gamefic/plot/playbook.rb
@@ -159,6 +141,7 @@ files:
 - lib/gamefic/query/base.rb
 - lib/gamefic/query/children.rb
 - lib/gamefic/query/descendants.rb
+- lib/gamefic/query/external.rb
 - lib/gamefic/query/family.rb
 - lib/gamefic/query/itself.rb
 - lib/gamefic/query/matches.rb
@@ -166,7 +149,7 @@ files:
 - lib/gamefic/query/siblings.rb
 - lib/gamefic/query/text.rb
 - lib/gamefic/scene.rb
-- lib/gamefic/scene/active.rb
+- lib/gamefic/scene/activity.rb
 - lib/gamefic/scene/base.rb
 - lib/gamefic/scene/conclusion.rb
 - lib/gamefic/scene/custom.rb
@@ -194,7 +177,6 @@ files:
 - lib/gamefic/tty.rb
 - lib/gamefic/user.rb
 - lib/gamefic/user/base.rb
-- lib/gamefic/user/buffer.rb
 - lib/gamefic/user/tty.rb
 - lib/gamefic/version.rb
 homepage: http://gamefic.com