gamefic 1.2.0 → 1.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6840c99f360ddbe9171237724e2462369b6e9436
-  data.tar.gz: dae8127b46901506eaf847fbb1c56db6591d69af
+  metadata.gz: c9653029c10eea5877023b0f33166f04097390a0
+  data.tar.gz: 7fc2ed5e68a3e308524abb5f2d273fbc69ea18bd
 SHA512:
-  metadata.gz: 7276ad50d8871721e1999184e3e37ae6fafd8523a816d35708a2c0ac3766c1453cbe3449a73c2205481266cf2200c14309f53accc8ad15573ae1db4cdfc85f33
-  data.tar.gz: d5ce49c27cff38d30024bd418b2b979e20b3acd78f2c14e2b16ff82662086084965fa767a4d8bbe6e6b6bc4ff88cb48952cdb7f5bf349d64577a922005d9bd3e
+  metadata.gz: 55f967f633d6054a4b9f3700938a0f0eb81a877957f3aa11c09119d102ddaac71fdb566ac9ffa5a9daddceec22aa523228c0271707d8a60ce71629618d666517
+  data.tar.gz: 857869d33e31abb8ca303b070210e626e7d4e0572416a71a70d2411e8878960100a2543d4c3887bad2cdd21cf4fe7bdf5135bebb363652551f1736ed69d387bd

data/lib/gamefic/core_ext/array.rb

@@ -47,7 +47,7 @@ class Array
     if self.length < 3
       self.join(andSep)
     else
-      start = self - [self.last]
+      start = self[0..-2]
       start.join(sep) + "#{serial ? sep.strip : ''}#{andSep}#{self.last}"
     end
   end

data/lib/gamefic/plot/scene_mount.rb

@@ -66,12 +66,12 @@ module Gamefic
       scenes[key] = Scene::Passive.new &block
     end
     
-    # Branch to a new scene based on a list of options.
+    # Choose a new scene based on a list of options.
     # This is a specialized type of multiple-choice scene that determines
     # which scene to cue based on a Hash of choices and scene keys.
     #
     # @example Select a scene
-    #   branch :select_one_or_two, { "one" => :scene_one, "two" => :scene_two }
+    #   multiple_scene :select_one_or_two, { "one" => :scene_one, "two" => :scene_two }
     #   scene :scene_one do |actor|
     #     actor.tell "You went to scene one"
     #   end
@@ -79,12 +79,12 @@ module Gamefic
     #     actor.tell "You went to scene two"
     #   end
     #   introduction do |actor|
-    #     actor.cue, :select_one_or_two # The actor will be prompted to select "one" or "two" and get sent to the corresponding scene
+    #     actor.cue :select_one_or_two # The actor will be prompted to select "one" or "two" and get sent to the corresponding scene
     #   end
     #
     # @param key [Symbol] A unique name for the scene.
     # @param map [Hash] A Hash of options and associated scene keys.
-    def branch key, map
+    def multiple_scene key, map
       scenes[key] = Scene::MultipleChoice.new(
         options: map.keys,
         finish: proc { |actor, input|

data/lib/gamefic/plot/snapshot.rb

@@ -4,41 +4,11 @@ module Gamefic
   module Plot::Snapshot
   
     # Take a snapshot of the plot's current state.
+    # The snapshot is a hash with two keys: entities and subplots.
     #
     # @return [Hash]
     def save
-      store = []
-      index = 0
-      entities.each { |e|
-        hash = {}
-        e.serialized_attributes.each {|m|
-          con = m.to_s
-          if con.end_with?("?")
-            con = con[0..-2]
-          end
-          if e.respond_to?(m) == true
-            begin
-              val = e.send(m)
-              if val == false
-                hash[con] = false
-              elsif val
-                hash[con] = serialize_obj(val)
-              else
-                hash[con] = nil
-              end
-            rescue Exception => error
-              hash[con] = nil
-            end
-          end
-        }
-        hash[:class] = e.class.to_s
-        hash[:session] = {}
-        e.session.each_pair { |k, v|
-          hash[:session][k] = serialize_obj(v)
-        }
-        store.push hash
-        index += 1
-      }
+      store = get_entity_hash
       if @initial_state.nil?
         @initial_state = store
         store = []
@@ -75,6 +45,42 @@ module Gamefic
         internal_restore @initial_state
     end
     
+    def get_entity_hash
+      store = []
+      index = 0
+      entities.each { |e|
+        hash = {}
+        e.serialized_attributes.each {|m|
+          con = m.to_s
+          if con.end_with?("?")
+            con = con[0..-2]
+          end
+          if e.respond_to?(m) == true
+            begin
+              val = e.send(m)
+              if val == false
+                hash[con] = false
+              elsif val
+                hash[con] = serialize_obj(val)
+              else
+                hash[con] = nil
+              end
+            rescue Exception => error
+              hash[con] = nil
+            end
+          end
+        }
+        hash[:class] = e.class.to_s
+        hash[:session] = {}
+        e.session.each_pair { |k, v|
+          hash[:session][k] = serialize_obj(v)
+        }
+        store.push hash
+        index += 1
+      }
+      store
+    end
+    
     def internal_restore snapshot
       index = 0
       snapshot.each { |hash|

data/lib/gamefic/scene/multiple_choice.rb

@@ -45,7 +45,6 @@ module Gamefic
       else
         input_object = Input.new(input, index, choice)
         super actor, input_object
-        actor.cue :active if (actor.scene == this_scene and actor.next_scene.nil?)
       end
     end
 

data/lib/gamefic/shell.rb

@@ -21,9 +21,12 @@ module Gamefic
         decompress file, dir
         run_game(dir)
       end
-    rescue StandardError => e
+    rescue Zip::Error => e
       puts "'#{file}' does not appear to be a valid Gamefic file."
       show_exception(e) if options[:verbose]
+    rescue StandardError => e
+      puts "An error occurred: #{e.message}"
+      show_exception(e) if options[:verbose]
     end
 
     desc 'info FILE_NAME', 'Print information about a (.gfic) game'

data/lib/gamefic/subplot.rb

@@ -25,8 +25,8 @@ module Gamefic
       #
       # @param [Class] The class of the subplot to be created (Subplot by default)
       # @return [Subplot]
-      def branch subplot_class = Subplot, &block
-        subplot = subplot_class.new(self, &block)
+      def branch subplot_class, feature:nil, &block
+        subplot = subplot_class.new(self, feature: feature, &block)
         p_subplots.push subplot
         subplot
       end
@@ -39,13 +39,14 @@ module Gamefic
     
     attr_reader :plot, :entities, :players
     
-    def initialize plot
+    def initialize plot, feature:nil
       @plot = plot
       @entities = []
       @players = []
       @concluded = false
       post_initialize
       yield(self) if block_given?
+      introduce feature unless feature.nil?
     end
     def post_initialize
     end

data/lib/gamefic/version.rb

@@ -1,3 +1,3 @@
 module Gamefic
-  VERSION = '1.2.0'
+  VERSION = '1.3.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gamefic
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.3.0
 platform: ruby
 authors:
 - Fred Snyder
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-12-16 00:00:00.000000000 Z
+date: 2016-12-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor