gamefic 1.4.0 → 1.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c183cbc357d79a7ad5537c2dbd12b798e383d209
-  data.tar.gz: 91055b2773aa8d6ee095a8da1be6209c67e8d4bd
+  metadata.gz: 148fd56ec0966aee6fe9af25f63b450b64ecdcc3
+  data.tar.gz: f0bee28dabd8400c7c350c5c8a8005b67ce01ebf
 SHA512:
-  metadata.gz: aaea9c46d01e5f0683c9a96148c2695be6094133369acf9dd5f8eb7c09f78f6071cdf36059463f9d354af7ed3662505ab4c09c6c098f70b2b2b1c10d16fe13f5
-  data.tar.gz: dea0c09003fb3a1c06bbfadc9a19522287b72bca2fc3a3cf309e8af31119f1c98f42cc5ae121d853b7396f135e84840a6e33b40cfe7127e4a920272180f840e5
+  metadata.gz: 913706c95e0814ec1b4d9f39358d5afcb2a09b3a4f9d683684e64e404154e4c5d7735ea837c40dd4433525d3734ad2ba2a312fc23d9376dfb7d5886497a99238
+  data.tar.gz: 9ac42568ffb6fc3247dbf386fd42aca1ad0e97d18b195a8ca3154ac8ac634525df10a120d7f28eeb182d8d31a63a9dfb121665640623fc569771b2243a16b0cc

data/lib/gamefic/engine/base.rb

@@ -29,7 +29,6 @@ module Gamefic
     def run
       connect
       @plot.introduce @character
-      print @user.flush
       turn until @plot.concluded?(@character)
       print @user.flush
     end

data/lib/gamefic/keywords.rb

@@ -12,15 +12,14 @@ module Gamefic
         end
         self.concat statement.to_s.gsub(/[^a-z0-9]/i, ' ').strip.downcase.split(' ')
       end
-      # TODO: This routine is stubbed to allow any combination of letters and
-      # numbers as a keyword. Since we're doing this, there's a distinct
-      # possibility that the Keywords class can be deprecated.
-      #self.delete_if { |w|
-      #  w.length < 2 or w == 'an' or w == 'the'
-      #}
-      #self.uniq!
       self
     end
+
+    # Count the number of matching words in another Keywords array.
+    # The total includes partial matches; for example, "gre" is a 0.6 match
+    # for "green".
+    #
+    # @return [Float] The total number of matches
     def found_in(other, fuzzy = false)
       matches = 0.0
       self.each { |my_word|
@@ -33,14 +32,7 @@ module Gamefic
                 matches = matches + (my_word.length.to_f / other_word.length.to_f)
               end
             elsif fuzzy
-              fuzzy_word = my_word
-              if fuzzy_word.end_with?('ies')
-                fuzzy_word = fuzzy_word[0..-4]
-              elsif fuzzy_word.end_with?('ae')
-                fuzzy_word = fuzzy_word[0..-3]
-              elsif fuzzy_word.end_with?('s') or fuzzy_word.end_with?('i')
-                fuzzy_word = fuzzy_word[0..-2]
-              end
+              fuzzy_word = fuzzify my_word
               if other_word[0, fuzzy_word.length] == fuzzy_word and fuzzy_word.length > 2
                 matches = matches + (fuzzy_word.length.to_f / other_word.length.to_f)
               elsif fuzzy_word[0, other_word.length] == other_word and other_word.length > 2
@@ -50,11 +42,26 @@ module Gamefic
           }
         end
       }
-      return matches
+      matches
     end
+
     def to_s
       self.join(' ')
     end
+
+    private
+    
+    def fuzzify word
+      if word.end_with?('ies')
+        word[0..-4]
+      elsif word.end_with?('ae')
+        word[0..-3]
+      elsif word.end_with?('s') or word.end_with?('i')
+        word[0..-2]
+      else
+        word
+      end
+    end
   end
 
 end

data/lib/gamefic/plot.rb

@@ -28,7 +28,7 @@ module Gamefic
     #include Gamefic, Tester, SceneMount, CommandMount, EntityMount, QueryMount, ArticleMount, YouMount, Snapshot
     mount Gamefic, Tester, SceneMount, CommandMount, EntityMount, QueryMount,
       ArticleMount, YouMount, Snapshot, Subplot::Host
-    expose :script, :introduction, :assert_action, :before_player_update,
+    expose :script, :introduction, :assert_action,
       :on_update, :on_player_update, :entities, :on_ready, :on_player_ready,
       :players, :scenes, :metadata
     
@@ -38,7 +38,6 @@ module Gamefic
       @commands = {}
       @syntaxes = []
       @ready_procs = []
-      @before_player_update_procs = []
       @update_procs = []
       @player_ready = []
       @player_procs = []
@@ -171,28 +170,20 @@ module Gamefic
     # This method is typically called by the Engine that manages game execution.
     def introduce(player)
       player.extend Subplot::Feature
+      player.cue :active
       @players.push player
-      if @introduction != nil
-        @introduction.call(player)
-      end
-      # TODO: There should probably be a default state specified
-      # by the plot, which would be :active by default. We could
-      # get it like player.cue nil.
-      if player.scene.nil?
-        player.cue :active
-        ready
-        update
-      end
+      @introduction.call(player) unless @introduction.nil?
     end
     
     # Prepare the Plot for the next turn of gameplay.
     # This method is typically called by the Engine that manages game execution.
     def ready
-      @ready_procs.each { |p|
-        p.call
-      }
+      @ready_procs.each { |p| p.call }
       # Prepare player scenes for the update.
       @players.each { |player|
+        this_scene = player.next_scene || player.scene
+        player.prepare nil
+        player.cue this_scene unless player.scene == this_scene
         @player_ready.each { |block|
           block.call player
         }
@@ -202,17 +193,7 @@ module Gamefic
     # Update the Plot's current turn of gameplay.
     # This method is typically called by the Engine that manages game execution.
     def update
-      @players.each { |player|
-        @before_player_update_procs.each { |p| p.call player }
-        this_scene = player.next_scene || player.scene
-        player.prepare nil
-        if this_scene != player.scene
-          player.cue this_scene
-          player.queue.shift
-        else
-          process_input player
-        end
-      }
+      @players.each { |p| process_input p }
       @entities.each { |e| e.update }
       @players.each { |player| update_player player }
       @update_procs.each { |p| p.call }
@@ -262,36 +243,26 @@ module Gamefic
       @player_procs.push block
     end
 
-    # Add a block to  be executed for each player before the turn's update is
-    # performed.
-    #
-    # @yieldparam [Character]
-    def before_player_update &block
-      @before_player_update_procs.push block
-    end
-    
     private
+
     def process_input player
       line = player.queue.shift
       if !line.nil?
         scenes[player.scene].finish player, line
       end
     end
+
     def update_player player
       @player_procs.each { |proc|
         proc.call player
       }
     end
+
     def rem_entity(entity)
       @entities.delete(entity)
       @players.delete(entity)
     end
-    def recursive_update(entity)
-      entity.update
-      entity.children.each { |e|
-        recursive_update e
-      }
-    end
+
     def add_syntax syntax
       if @commands[syntax.verb] == nil
         raise "Action \"#{syntax.verb}\" does not exist."
@@ -310,6 +281,7 @@ module Gamefic
         end
       }
     end
+
     def add_action(action)
       @commands[action.verb] ||= []
       @commands[action.verb].unshift action
@@ -324,6 +296,7 @@ module Gamefic
       }
       generate_default_syntax action
     end
+
     def generate_default_syntax action
       user_friendly = action.verb.to_s.gsub(/_/, ' ')
       args = []
@@ -341,12 +314,15 @@ module Gamefic
       }
       add_syntax Syntax.new(user_friendly.strip, "#{action.verb} #{args.join(' ')}")
     end
+
     def rem_action(action)
       @commands[action.verb].delete(action)
     end
+
     def rem_syntax(syntax)
       @syntaxes.delete syntax
     end
+    
     def add_entity(entity)
       @entities.push entity
     end

data/lib/gamefic/plot/scene_mount.rb

@@ -14,10 +14,7 @@ module Gamefic
       scenes[key].on_start do |actor, data|
         data.options.push *choices
       end
-      scenes[key].on_finish do |actor, data|
-        block.call actor, data unless block.nil?
-        actor.cue :active if actor.scene == key and actor.next_scene.nil?
-      end
+      scenes[key].on_finish &block
     end
     
     # Create a yes-or-no scene.
@@ -40,10 +37,7 @@ module Gamefic
       scenes[key].on_start do |actor, data|
         data.prompt = prompt
       end
-      scenes[key].on_finish do |actor, data|
-        block.call actor, data unless block.nil?
-        actor.cue :active if actor.scene == key and actor.next_scene.nil?
-      end
+      scenes[key].on_finish &block
     end
 
     # Create a scene that pauses the game.
@@ -77,21 +71,6 @@ module Gamefic
       scenes[key].on_start &block
     end
     
-    # Create a passive scene.
-    # Passive scenes will cue the active scene if another scene
-    # has not been prepared or cued.
-    #
-    # @param [Symbol] A unique name for the scene.
-    # @yieldparam [Character]
-    # @yieldparam [Scene::Data::Base]
-    def passive key, &block
-      scenes[key] = Scene::Custom.new
-      scenes[key].on_start do |actor, data|
-        block.call actor, data
-        actor.cue :active if actor.scene == key and actor.next_scene.nil?
-      end
-    end
-
     # Create a custom scene.
     #
     # Custom scenes should always specify the next scene to be cued or
@@ -152,7 +131,7 @@ module Gamefic
     # @param key [Symbol] A unique name for the scene.
     # @param map [Hash] A Hash of options and associated scene keys.
     def multiple_scene key, map
-      scenes[key] = Scene::MultipleChoice.new
+      scenes[key] = Scene::MultipleScene.new
       scenes[key].on_start do |actor, data|
         map.each { |k, v|
           data.map k, v

data/lib/gamefic/query/base.rb

@@ -141,23 +141,7 @@ module Gamefic::Query
       }
     end
     def match(description, array)
-      if description.include?(',')
-        tmp = description.split(',', -1)
-        keywords = []
-        first = tmp.shift
-        if first.strip != ''
-          keywords.push first.strip
-        end
-        tmp.each { |t|
-          keywords.push ','
-          if t.strip != ''
-            keywords += t.strip.split_words
-          end
-        }
-        keywords = keywords.join(' ').split_words
-      else
-        keywords = description.split_words
-      end
+      keywords = get_keywords(description)
       array.each { |e|
         if e.uid == keywords[0]
           return Matches.new([e], keywords.shift, keywords.join(' '))
@@ -193,14 +177,12 @@ module Gamefic::Query
         end
         used.push next_word
         new_results = []
-        most_matches = 0.0
         possibilities.each { |p|
           words = Keywords.new(used.last)
           if words.length > 0
             matches = words.found_in(p.keywords, (allow_many? or allow_ambiguous?))
             if matches > 0
               new_results.push p
-              most_matches = matches
             end
           end
         }
@@ -263,5 +245,23 @@ module Gamefic::Query
         return Matches.new([], '', description)
       end
     end
+
+    private
+
+    def get_keywords text
+      if text.include?(',')
+        tmp = text.split(',', -1)
+        keywords = []
+        first = tmp.shift
+        keywords.push first.strip unless first.strip == ''
+        tmp.each { |t|
+          keywords.push ','
+          keywords += t.strip.split_words unless t.strip == ''
+        }
+        keywords.join(' ').split_words
+      else
+        text.split_words
+      end
+    end
   end
 end

data/lib/gamefic/scene/multiple_scene.rb

@@ -1,6 +1,6 @@
 module Gamefic
 
-  class Scene::MultipleScene < Scene::Custom
+  class Scene::MultipleScene < Scene::MultipleChoice
     def data_class
       SceneData::MultipleScene
     end
@@ -8,7 +8,7 @@ module Gamefic
     def finish actor, input
       data = super
       unless data.selection.nil?
-        actor.cue data.scene_for(selection)
+        actor.cue data.scene_for(data.selection)
       end
     end
   end

data/lib/gamefic/scene_data.rb

@@ -3,6 +3,7 @@ module Gamefic
   module SceneData
     autoload :Base, 'gamefic/scene_data/base'
     autoload :MultipleChoice, 'gamefic/scene_data/multiple_choice'
+    autoload :MultipleScene, 'gamefic/scene_data/multiple_scene'
     autoload :YesOrNo, 'gamefic/scene_data/yes_or_no'
   end
 

data/lib/gamefic/version.rb

@@ -1,3 +1,3 @@
 module Gamefic
-  VERSION = '1.4.0'
+  VERSION = '1.4.1'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gamefic
 version: !ruby/object:Gem::Version
-  version: 1.4.0
+  version: 1.4.1
 platform: ruby
 authors:
 - Fred Snyder
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-02-01 00:00:00.000000000 Z
+date: 2017-02-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor