gamefic-standard 3.2.1 → 3.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5b0c82ed182ca48a25af31d675e7a661d2956403c56ffbe74a1f88ded22ab667
-  data.tar.gz: 7f7a7c1d1ef4eb12d1f41fa8e004e2ca92833ba2b4583bf0bcd9ac6d9df63ae4
+  metadata.gz: 934c9793a332bc51d87f3643530112bf53930955a012cbaaa8c20b9b652347f1
+  data.tar.gz: 5d7afbc7b668390a80ed5784921f872dacf5c51a741b0bf0b2a584b152e156d2
 SHA512:
-  metadata.gz: fc01bbb87e5631b207b152611eed41449279ee4f25f99e5897855aaf6ffd9e558bdbc056f68c7bd48f96ec8169b891480442f1b2f0e5a8115a4466efba9bdfc8
-  data.tar.gz: 3e090e4e91037020f9b3956f5d864be29ab0e97bebd8b813c684ca111f3234d24407c952ac324f801c1bedc79db56655018a9df905da5ab8ff5d46e9c18b0b92
+  metadata.gz: 19c479b2c1c2f6ca1deae46644056c3ee24e9a5b19f084b758e2caeaff3e13e149593deaf0d9b37af2c8b04b1fe42dfe51567b6712b3a2c2b18d3910eb416d32
+  data.tar.gz: 928429f5cb51bec69403e17797f9117368b9e847973a1c430b180b2d3567ac9b1d97948908c7f7ccf7221627452aaa160fd528a89a12346cde74dc9cc5737bce

data/.github/workflows/rspec.yml

@@ -22,7 +22,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        ruby-version: ['2.7', '3.0', '3.1']
+        ruby-version: ['2.7', '3.0', '3.1', '3.3']
 
     steps:
     - uses: actions/checkout@v3

data/CHANGELOG.md

@@ -1,3 +1,10 @@
+## 3.2.2 - September 1, 2024
+- Move help commands to their own extension
+- get inside -> enter
+- Use definite names in leave error
+- Report commands that do not accept arguments
+- Require gamefic ~> 3.3
+
 ## 3.2.1 - July 23, 2024
 - Help actions are meta
 - Ignore empty commands

data/gamefic-standard.gemspec

@@ -37,7 +37,7 @@ Gem::Specification.new do |spec|
 
   spec.required_ruby_version = '>= 2.7.0'
 
-  spec.add_dependency 'gamefic', '~> 3.1'
+  spec.add_dependency 'gamefic', '~> 3.3'
 
   spec.add_development_dependency 'opal', '~> 1.7'
   spec.add_development_dependency 'opal-rspec', '~> 1.0'

data/lib/gamefic-standard/actions/enter.rb

@@ -24,6 +24,7 @@ module Gamefic
 
       interpret "get on :thing", "enter :thing"
       interpret "get in :thing", "enter :thing"
+      interpret "get inside :thing", "enter :thing"
       interpret "sit on :thing", "enter :thing"
       interpret "sit in :thing", "enter :thing"
       interpret "lie on :thing", "enter :thing"

data/lib/gamefic-standard/actions/leave.rb

@@ -22,7 +22,7 @@ module Gamefic
         elsif portals.length == 1
           actor.execute :go, portals[0]
         else
-          actor.tell "I don't know which way you want to go: #{portals.join_or}."
+          actor.tell "I don't know which way you want to go: #{portals.map(&:definitely).join_or}."
         end
       end
 

data/lib/gamefic-standard/actions/nil.rb

@@ -6,21 +6,49 @@ Gamefic::Standard.script do
     list = actor.epic.synonyms
     if list.include?(words[0]&.to_sym)
       if words.length > 1
-        found = []
+        result = myself.query(actor, words[1..-1].join(' '))
+        found = [result.match].compact
         avail = available(ambiguous: true)
-        result = avail.query(actor, words[1..-1].join(' '))
+        result = avail.query(actor, result.remainder)
         until result.match.nil?
           found.concat result.match
           result = avail.query(actor, result.remainder)
         end
         if found.empty?
-          actor.tell %(I recognize "#{words[0]}" as a verb but don't know what you mean by "#{words[1..-1].join(' ')}.")
+          verbs = actor.epic
+                       .syntaxes
+                       .select { |syn| syn.synonym == words[0].to_sym }
+                       .map(&:verb)
+          resps = actor.epic.responses_for(*verbs)
+          if resps.any? { |resp| !resp.queries.empty? }
+            actor.tell %(I recognize "#{words[0]}" as a verb but don't know what you mean by "#{words[1..-1].join(' ')}.")
+          else
+            actor.tell %[I recognize "#{words[0]}" but not with the rest of your sentence. (Maybe it's a one-word command?)]
+          end
         elsif result.remainder != ''
           actor.tell %(I recognize "#{words[0]}" as a verb but was confused by "#{result.remainder}.")
         elsif found.one?
-          actor.tell %(I recognize "#{words[0]}" and "#{found.first.name}" but could not understand them together.)
+          verbs = actor.epic
+                       .syntaxes
+                       .select { |syn| syn.synonym == words[0].to_sym }
+                       .map(&:verb)
+          resps = actor.epic.responses_for(*verbs)
+          if resps.any? { |resp| !resp.queries.empty? }
+            actor.tell %(I recognize "#{words[0]}" and "#{found.first.name}" but could not understand them together.)
+          else
+            actor.tell %[I recognize "#{words[0]}" and "#{found.first.name}" but could not understand them together. (Maybe "#{words[0]}" is a one-word command?)]
+          end
         else
-          actor.tell %(I recognize "#{words[0]}" but I'm not sure if "#{words[1..-1].join(' ')}" means #{found.map(&:definitely).join_or}.)
+          verbs = actor.epic
+                       .syntaxes
+                       .select { |syn| syn.synonym == words[0].to_sym }
+                       .map(&:verb)
+          resps = actor.epic.responses_for(*verbs)
+          if resps.any? { |resp| !resp.queries.empty? }
+            actor.tell %(I recognize "#{words[0]}" but I'm not sure if "#{words[1..-1].join(' ')}" means #{found.map(&:definitely).join_or}.)
+          else
+            actor.tell %[I recognize "#{words[0]}" but not with the rest of your sentence. (Maybe it's a one-word command?)]
+          end
         end
       else
         actor.tell %(I recognize "#{words[0]}" as a verb but could not understand it in this context.)

data/lib/gamefic-standard/actions.rb

@@ -19,6 +19,5 @@ require 'gamefic-standard/actions/move'
 require 'gamefic-standard/actions/talk'
 require 'gamefic-standard/actions/wait'
 require 'gamefic-standard/actions/repeat'
-require 'gamefic-standard/actions/help'
 require 'gamefic-standard/actions/save-restore-undo'
 require 'gamefic-standard/actions/pronouns'

data/lib/gamefic-standard/version.rb

@@ -2,6 +2,6 @@
 
 module Gamefic
   module Standard
-    VERSION = '3.2.1'
+    VERSION = '3.2.2'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gamefic-standard
 version: !ruby/object:Gem::Version
-  version: 3.2.1
+  version: 3.2.2
 platform: ruby
 authors:
 - Fred Snyder
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2024-07-23 00:00:00.000000000 Z
+date: 2024-09-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: gamefic
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.1'
+        version: '3.3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.1'
+        version: '3.3'
 - !ruby/object:Gem::Dependency
   name: opal
   requirement: !ruby/object:Gem::Requirement
@@ -115,6 +115,7 @@ files:
 - Rakefile
 - bin/console
 - bin/setup
+- gamefic-standard-3.2.1.gem
 - gamefic-standard.gemspec
 - lib/gamefic-standard.rb
 - lib/gamefic-standard/actions.rb
@@ -123,7 +124,6 @@ files:
 - lib/gamefic-standard/actions/drop.rb
 - lib/gamefic-standard/actions/enter.rb
 - lib/gamefic-standard/actions/go.rb
-- lib/gamefic-standard/actions/help.rb
 - lib/gamefic-standard/actions/insert.rb
 - lib/gamefic-standard/actions/inventory.rb
 - lib/gamefic-standard/actions/leave.rb

data/lib/gamefic-standard/actions/help.rb

@@ -1,52 +0,0 @@
-# frozen_string_literal: true
-
-module Gamefic
-  module Standard
-    script do
-      meta :verbs do |actor|
-        list = rulebook.synonyms.reject { |syn| syn.to_s.start_with?('_') }
-                      .map { |syn| "<kbd>#{syn}</kbd>"}
-                      .join_and
-        actor.tell "I understand the following commands: #{list}."
-        actor.tell "Try using commands in plain sentences like <kbd>go north</kbd> or <kbd>take the coin</kbd>."
-        actor.tell "For more information about a specific command, try <kbd>help [command]</kbd>, e.g., <kbd>help go</kbd>."
-      end
-
-      interpret 'commands', 'verbs'
-      interpret 'help', 'verbs'
-
-      meta :help, plaintext do |actor, command|
-        if rulebook.synonyms.include?(command.to_sym) && !command.start_with?('_')
-          available = rulebook.syntaxes.select { |syntax| syntax.synonym == command.to_sym }
-                              .uniq(&:signature)
-          examples = available.map(&:template)
-                              .map do |tmpl|
-                                tmpl.text
-                                    .gsub(/:character/i, '[someone]')
-                                    .gsub(/:var[0-9]?/i, '[something]')
-                                    .gsub(/:([a-z0-9]+)/i, "[\\1]")
-                              end
-                              .reject { |tmpl| tmpl.include?('[something] [something]') }
-          actor.tell 'Examples:'
-          actor.stream '<ul>'
-          examples.each do |xmpl|
-            actor.stream "<li><kbd>#{xmpl}</kbd></li>"
-          end
-          actor.stream '</ul>'
-          related = available.map(&:verb)
-                              .uniq
-                              .that_are_not(command.to_sym)
-                              .sort
-                              .map { |sym| "<kbd>#{sym}</kbd>"}
-          next if related.empty?
-
-          actor.tell "Related: #{related.join(', ')}"
-        elsif command =~ /[^a-z]/i
-          actor.tell "Try asking for help with a specific command, e.g., <kbd>help go</kbd>"
-        else
-          actor.tell "\"#{command.cap_first}\" is not a verb I understand."
-        end
-      end
-    end
-  end
-end