inform-runtime 1.3.1 → 1.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1a9737a28a03ce80dd3698d1fc2824b22cb3090d4f0db6c3b52c84134e17a04c
-  data.tar.gz: 30ea465986dd84a628280ffa63c83228e04689db657d26c1bf449a15a779165a
+  metadata.gz: ff0b544812291d9f9c2a5169ada547843704aa26f0a5ad0fdd82b1e914acba15
+  data.tar.gz: e3d011e11b4e3531054d3b4a83d199343541e44d57a770708d219a73ca40f668
 SHA512:
-  metadata.gz: f0f82b48842ed1cb74515abf3e26d2aeadc1c29004177a556e819ff814c3ce7ee63cf8b4225f5a53a3bfa8102c6bfa2ad0a21ad4b2654518269535c9fc3eca0f
-  data.tar.gz: e6122d69fc1a5fbbe2640709f567889a7d70d303740796883bec8ffb3001abd243b91597c02f12a7d31e9aac61de7e08b288cd648c9f784140e935279a2fb085
+  metadata.gz: 0c92163b72057f043cadce2abbcf7e79a20be080a51e9384289f44f62f5528738bc3c947e66758312b637c2042e480b092a342c2176bfbc0706389d49be636c2
+  data.tar.gz: 0e4355ed014b0e499e8e730d70ecf9b22ebaac3af317a5d6fc900ef528f819004526ee3004478e112e5c82221329fb4cb426b681e77c7b62aa1bb345269af17a

data/lib/story_teller/engine.rb

@@ -43,7 +43,6 @@ module StoryTeller
         environment: 'default',
         inform6lib_gem_code_prefix: 'inform',
         language: 'English',
-        persist_player_location: false,
         properties: 'player actor action action_to_be ' \
           'results parameters pattern ' \
           'noun second inp1 inp2 ' \
@@ -60,16 +59,6 @@ module StoryTeller
       @libraries ||= {}
     end
 
-    def persist_player_location?
-      return @persist_player_location unless @persist_player_location.nil?
-
-      default_config.fetch(:persist_player_location, false)
-    end
-
-    def persist_player_location=(value)
-      @persist_player_location = value
-    end
-
     def player_object
       @player_object || parser_selfobj
     end
@@ -107,26 +96,21 @@ module StoryTeller
       libraries[selfobj] = inform_library
       selfobj.inflib = inform_library if selfobj.respond_to?(:inflib=)
 
-      ensure_player_location(inform_library) if persist_player_location?
+      seed_library_location(inform_library) if location_unset?(inform_library)
 
       inform_library
     end
 
-    # rubocop: disable Metrics/CyclomaticComplexity
-    def ensure_player_location(inflib)
-      return unless persist_player_location?
-      return if inflib.nil?
-
-      existing_location = inflib.instance_variable_get(:@location)
-      return unless existing_location.nil?
-
-      player = inflib.selfobj
-      location = player.location if player.respond_to?(:location)
-      location ||= player.spawn_point if player.respond_to?(:spawn_point)
+    def seed_library_location(inflib)
+      player_obj = inflib.selfobj
+      location = player_obj.location if player_obj.respond_to?(:location)
 
       inflib.instance_variable_set(:@location, location) unless location.nil?
     end
-    # rubocop: enable Metrics/CyclomaticComplexity
+
+    def location_unset?(inflib)
+      inflib&.instance_variable_get(:@location).nil?
+    end
 
     def parser_selfobj
       return nil unless defined?(Inform::Parser::SelfObj)

data/lib/story_teller/grammar_parser.rb

@@ -362,6 +362,10 @@ module Inform
             !StoryTeller::Privileges.privileged?(obj, :builder))
       end
 
+      def visible_to?(verb, actor)
+        verb.grammars.any? { |grammar| !guarded?(grammar, actor) }
+      end
+
       def role(obj)
         return :admin if StoryTeller::Privileges.privileged?(obj, :admin)
         return :builder if StoryTeller::Privileges.privileged?(obj, :builder)

data/lib/story_teller/library/bootstrap.rb

@@ -38,7 +38,6 @@ module StoryTeller
         inflib = InformLibrary.new
         bind_inform_library(inflib, player)
         inflib.subscribe(inflib.selfobj)
-        ensure_player_location(inflib) if StoryTeller::Engine.persist_player_location?
         inflib
       end
     end

data/lib/story_teller/library/location.rb

@@ -26,17 +26,11 @@ module StoryTeller
     # module Location
     module Location
       def location
-        return @location unless StoryTeller::Engine.persist_player_location?
-
         @player&.location || @location
       end
 
       def location=(obj)
-        if StoryTeller::Engine.persist_player_location?
-          @player.location = obj
-        else
-          @location = obj
-        end
+        @player.location = @location = obj
       end
     end
 

data/lib/story_teller/stdlib.rb

@@ -764,6 +764,10 @@ module Rules
     page_index: 0, limit: 10, help: nil, done: :playing
   }.freeze
 
+  MORE_HELP_STRING = "Press Enter to show the next page.\n" +
+    "Type q or quit to stop paging and return to the command prompt.\n" +
+    "Type ? to show this help."
+
   # This method supports the MoreSub verb implementation.
   # rubocop: disable Metrics/AbcSize
   # rubocop: disable Metrics/CyclomaticComplexity
@@ -788,7 +792,7 @@ module Rules
 
     case input
     when /\?/
-      println params[:help] || "<Help for More goes here>"
+      println params[:help] || MORE_HELP_STRING
     when /^(q|quit)$/
       @more = nil
       @prompt = nil
@@ -816,7 +820,6 @@ module Rules
       session.state = :more
     else
       new_line
-      prompt nil
       session.state = params[:done]
     end
   end

data/lib/story_teller/version.rb

@@ -23,7 +23,7 @@
 module StoryTeller
   # module Engine
   module Engine
-    VERSION = '1.3.1'.freeze
+    VERSION = '1.3.2'.freeze
   end
 end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: inform-runtime
 version: !ruby/object:Gem::Version
-  version: 1.3.1
+  version: 1.3.2
 platform: ruby
 authors:
 - Nels Nelson