gamefic 1.5.1 → 1.6.0

data/lib/gamefic/scene/multiple_choice.rb

@@ -8,54 +8,76 @@ module Gamefic
   # instead of a String.
   #
   class Scene::MultipleChoice < Scene::Custom
-    def data_class
-      SceneData::MultipleChoice
-    end
+    attr_reader :index
+    attr_reader :number
+    attr_reader :selection
+    attr_writer :invalid_message
 
-    def start actor
-      data = start_data_for(actor)
-      data.options.clear
-      do_start_block actor, data
-      tell_options actor, data
+    def post_initialize
+      self.type = 'MultipleChoice'
+      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 finish actor, input
-      data = finish_data_for(actor, input)
-      get_choice data
-      if data.selection.nil?
-        actor.tell data.invalid_message
-        tell_options actor, data
+    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
+        tell_options
       else
-        do_finish_block actor, data
+        super
       end
-      data
+    end
+
+    def options
+      @options ||= []
+    end
+
+    def invalid_message
+      @invalid_message ||= 'That is not a valid choice.'
+    end
+
+    def state
+      super.merge options: options
     end
 
     private
-    
-    def get_choice data
-      if data.input.strip =~ /[0-9]+/ and data.input.to_i > 0
-        data.number = data.input.to_i
-        data.index = data.number - 1
-        data.selection = data.options[data.number - 1]
+
+    def get_choice
+      if input.strip =~ /^[0-9]+$/ and input.to_i > 0
+        @number = input.to_i
+        @index = number - 1
+        @selection = options[index]
       else
-        index = 0
-        data.options.each { |o|
-          if o.casecmp(data.input).zero?
-            data.selection = o
-            data.index = index
-            data.number = index + 1
+        i = 0
+        options.each { |o|
+          if o.casecmp(input).zero?
+            @selection = o
+            @index = i
+            @number = index + 1
             break
           end
-          index += 1
+          i += 1
         }
       end
     end
 
-    def tell_options actor, data
+    def tell_options
       list = '<ol class="multiple_choice">'
-      data.options.each { |o|
-        list += "<li>#{o}</li>"
+      options.each { |o|
+        list += "<li><a href=\"#\" rel=\"gamefic\" data-command=\"#{o}\">#{o}</a></li>"
       }
       list += "</ol>"
       actor.tell list

data/lib/gamefic/scene/multiple_scene.rb

@@ -1,14 +1,19 @@
 module Gamefic
 
   class Scene::MultipleScene < Scene::MultipleChoice
-    def data_class
-      SceneData::MultipleScene
+    def option_map
+      @option_map ||= {}
     end
 
-    def finish actor, input
-      data = super
-      unless data.selection.nil?
-        actor.cue data.scene_for(data.selection)
+    def map option, scene
+      options.push option
+      option_map[option] = scene
+    end
+
+    def finish
+      get_choice
+      unless selection.nil?
+        actor.cue option_map[selection]
       end
     end
   end

data/lib/gamefic/scene/pause.rb

@@ -3,10 +3,9 @@ module Gamefic
   # Pause for user input.
   #
   class Scene::Pause < Scene::Custom
-    def start actor
-      data = start_data_for(actor)
-      data.prompt = 'Press enter to continue...'
-      do_start_block actor, data
+    def post_initialize
+      self.type = 'Pause'
+      self.prompt = 'Press enter to continue...'
     end
   end
   

data/lib/gamefic/scene/yes_or_no.rb

@@ -6,18 +6,32 @@ module Gamefic
   # other scene has been prepared or cued.
   #
   class Scene::YesOrNo < Scene::Custom
-    def data_class
-      SceneData::YesOrNo
+    def post_initialize
+      self.type = 'YesOrNo'
+      self.prompt = 'Yes or No?'
     end
 
-    def finish actor, input
-      data = finish_data_for(actor, input)
-      if data.yes? or data.no?
-        this_scene = actor.scene
-        do_finish_block actor, data
-        #actor.cue :active if (actor.scene == this_scene and actor.next_scene.nil?)
+    def yes?
+      input.to_s[0,1].downcase == 'y'
+    end
+
+    def no?
+      input.to_s[0,1].downcase == 'n'
+    end
+
+    def invalid_message
+      @invalid_message ||= 'Please enter Yes or No.'
+    end
+
+    def prompt
+      @prompt ||= 'Yes or No?'
+    end
+
+    def finish
+      if yes? or no?
+        super
       else
-        actor.tell data.invalid_message
+        actor.tell invalid_message
       end
     end
   end

data/lib/gamefic/script/base.rb

@@ -4,6 +4,7 @@ module Gamefic
     def initialize
       raise "#initialize must be defined in subclasses"
     end
+
     # Get the script's text.
     # The text must be source code suitable for evaluation via Plot#stage.
     #
@@ -11,12 +12,14 @@ module Gamefic
     def read
       raise "#read must be defined in subclasses"
     end
+
     # Get the script's path.
     #
     # @return [String]
     def path
       raise "#path must be defined in subclasses"
     end
+
     # Get the absolute path of the script's original file, or its URL for
     # sources that are not file-based.
     #
@@ -24,6 +27,7 @@ module Gamefic
     def absolute_path
       raise "#absolute_path must be defined in subclasses"
     end
+
     # Script objects are equal if their relative paths are the same. Note that
     # they are still considered equal if their absolute paths are different,
     # or even if they come from different types of sources.

data/lib/gamefic/subplot.rb

@@ -3,42 +3,40 @@ require 'gamefic/plot'
 module Gamefic
 
   class Subplot
-    include Stage
-    
     attr_reader :plot
     attr_writer :denied_message
 
-    # @!parse include Plot::Entities
-    mount Plot::Entities
-    # @!parse include Plot::CommandMount
-    mount Plot::CommandMount
-    # @!parse include Plot::Callbacks
-    mount Plot::Callbacks
-    # @!parse include Plot::SceneMount
-    mount Plot::SceneMount
-    
-    expose :plot, :conclude
+    include Plot::Theater
+    include Plot::Entities
+    include Plot::Commands
+    include Plot::Callbacks
+    include Plot::Scenes
+    include Plot::Articles
 
     class << self
-      def start_proc
-        @start_proc
-      end
+      attr_reader :start_proc
 
-      private
+      protected
 
       def on_start &block
         @start_proc = block
       end
     end
 
-    def initialize plot, introduce: nil
+    def initialize plot, introduce: nil, next_cue: nil, busy_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 subplot
+      self
+    end
+
     def default_scene
       plot.default_scene
     end
@@ -62,7 +60,11 @@ module Gamefic
 
     def introduce player
       if plot.in_subplot?(player)
-        player.tell denied_message
+        if @busy_cue.nil?
+          player.tell denied_message
+        else
+          player.cue @busy_cue
+        end
       else
         super
       end
@@ -70,6 +72,7 @@ module Gamefic
 
     def exeunt player
       player.playbook = plot.playbook
+      player.cue (@next_cue || default_scene)
       p_players.delete player
     end
 
@@ -100,5 +103,5 @@ module Gamefic
       call_update
     end
   end
-  
+
 end

data/lib/gamefic/syntax.rb

@@ -6,8 +6,7 @@ module Gamefic
     attr_reader :token_count, :first_word, :verb, :template, :command
     @@phrase = '([\w\W\s\S]*?)'
     
-    def initialize template, *command
-      command = command.join(' ')
+    def initialize template, command
       words = template.split_words
       @token_count = words.length
       command_words = command.split_words
@@ -99,19 +98,12 @@ module Gamefic
         result = syntax.tokenize text
         matches.push(result) if !result.nil?
       }
-      # Sort matches having the most populated arguments first
-      matches.sort! { |a, b|
-        ca = 0
-        cb = 0
-        a.arguments.each { |t|
-          break if t.nil?
-          ca += 1
-        }
-        b.arguments.each { |t|
-          break if t.nil?
-          cb += 1
-        }
-        cb <=> ca
+      matches.sort! { |a,b|
+        if a.arguments.length == b.arguments.length
+          b.verb.to_s <=> a.verb.to_s
+        else
+          b.arguments.length <=> a.arguments.length
+        end
       }
       matches
     end

data/lib/gamefic/user/base.rb

@@ -1,21 +1,15 @@
 module Gamefic
-
-  # The base user provides methods for handling messages received from plots.
-  #
-  class User::Base
-    def send message
-      buffer.send message
+  class User::Base    
+    def update state
+      raise 'Unimplemented'
     end
 
-    def flush
-      buffer.flush
+    def save filename, snapshot
+      raise 'Unimplemented'
     end
 
-    private
-
-    def buffer
-      @buffer ||= User::Buffer.new
+    def restore filename
+      raise 'Unimplemented'
     end
   end
-
 end

data/lib/gamefic/user/buffer.rb

@@ -12,6 +12,13 @@ module Gamefic
       @data += message
     end
 
+    # Read the current buffer without clearing it.
+    #
+    # @return [String]
+    def peek
+      @data
+    end
+
     # Get the current data and clear the buffer.
     #
     # @return [String]

data/lib/gamefic/user/tty.rb

@@ -6,10 +6,17 @@ module Gamefic
 
   # Extend User::Base to convert HTML into ANSI text.
   #
+  # @note Due to their dependency on io/console, User::Tty and Engine::Tty are
+  #   not included in the core Gamefic library. `require gamefic/tty` if you
+  #   need them.
+  #
   class User::Tty < User::Base
+    def update state
+      print Gamefic::Text::Html::Conversions.html_to_ansi(state[:output])
+    end
+
     def save filename, snapshot
-      data = snapshot.merge(:metadata => @character.plot.metadata)
-      json = JSON.generate data
+      json = JSON.generate snapshot
       if json.nil?
         @character.tell "Nothing to save."
       end
@@ -21,7 +28,6 @@ module Gamefic
         File.open(filename, 'w') do |f|
           f.write json
         end
-        @character.tell "Game saved."
       end
     end
 
@@ -33,21 +39,16 @@ module Gamefic
       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
+          #if (data[:metadata] != @character.plot.metadata)
+          #  @character.tell "The save file is not compatible with this version of the game."
+          #else
             return data
-          end
+          #end
         else
           @character.tell "File \"#{filename}\" not found."
         end
       end
       nil
     end
-
-    def flush
-      Gamefic::Text::Html::Conversions.html_to_ansi(super)
-    end
   end
-
 end

data/lib/gamefic/version.rb

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