gamefic-what 1.1.0 → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f40f2ea9dca315b67d9a59a7daa003655694a8f2bb0a218fb0779952c2e5f302
-  data.tar.gz: d5115b517c1f57c01b2c031f9f9e234814b376831bba9dd120ad585cb209957a
+  metadata.gz: f8f3c7e689ff251e6777f362bf424d493eb988cfccf47e95319fc0b216b2ddc5
+  data.tar.gz: 2cf0bfae41be0deb822d904f4745dd4270d4479fe782ee62052ae19e0c6d9fce
 SHA512:
-  metadata.gz: 98cce3c727eb1e3fdc062894addd61b5e8e0df068b4182c1900bf3deb28747ded743258dde999ddc67b6b7e4905ad717afdb5f6cf370e4b47cae2361c353b46b
-  data.tar.gz: a89ab4ed46ec39098d1ae0ea2263c6036c3ec99cfb6eafa55cce52fcb74677365bcfc31f548807a1a435c5c21ff65d60fc281fc90e9288717d0f2a548987ba1a
+  metadata.gz: 55f502bfbacb9b03c187b909f0197be357246810171fddc969499380c3c3472a7f9e68d27dd06c79476081723c841a59ddd2daa61379e3d9b57e590a88f320a2
+  data.tar.gz: 5cfa5f94b033640c715435fe39cbca5507e9bc656cf46a5656751c350a534ba254ccb654d40a32d552265a01094766eb698657fc9716fe8f62119da7aa0b72a6

data/CHANGELOG.md

@@ -1,3 +1,6 @@
+## 2.0.0
+- Use AskForWhat scene to process answers
+
 ## 1.1.0 - October 15, 2024
 - Allow gamefic-4.0
 

data/README.md

@@ -25,10 +25,6 @@ require 'gamefic-what'
 Example code:
 
 ```ruby
-class Gamefic::Actor
-  include Gamefic::What::Askable
-end
-
 class MyPlot < Gamefic::Plot
   include Gamefic::What
 
@@ -47,7 +43,7 @@ class MyPlot < Gamefic::Plot
 
   respond :take do |actor|
     actor.tell 'What do you want to take?'
-    actor.ask_for_what 'take', nil
+    actor.cue AskForWhat, template: 'take __what__'
   end
 end
 ```
@@ -57,7 +53,7 @@ Example gameplay:
     > take
     What do you want to take?
     > the thing
-    You take a thing.
+    You take the thing.
 
 ## Development
 

data/Rakefile

@@ -1,7 +1,8 @@
 # frozen_string_literal: true
 
-require "bundler/gem_tasks"
-require "rspec/core/rake_task"
+require 'bundler/setup'
+require 'bundler/gem_tasks'
+require 'rspec/core/rake_task'
 require 'opal/rspec/rake_task'
 
 RSpec::Core::RakeTask.new(:spec)

data/gamefic-what.gemspec

@@ -33,7 +33,7 @@ Gem::Specification.new do |spec|
 
   # Uncomment to register a new dependency of your gem
   # spec.add_dependency "example-gem", "~> 1.0"
-  spec.add_dependency 'gamefic', '>= 3.4'
+  spec.add_dependency 'gamefic', '~> 4.0'
 
   spec.add_development_dependency 'opal-rspec', '~> 1.0'
   spec.add_development_dependency 'opal-sprockets', '~> 1.0'

data/lib/gamefic/what/version.rb

@@ -2,6 +2,6 @@
 
 module Gamefic
   module What
-    VERSION = '1.1.0'
+    VERSION = '2.0.0'
   end
 end

data/lib/gamefic/what.rb

@@ -1,21 +1,59 @@
 # frozen_string_literal: true
 
-require 'gamefic/what/askable'
 require 'gamefic/what/version'
 
 module Gamefic
   # A Gamefic extension for expanding commands with an additional argument.
   #
   module What
-    extend Gamefic::Scriptable
+    # Perform a command based on the player's answer for what an object of the
+    # previous command should be.
+    #
+    # @example
+    #   class MyPlot < Gamefic::Plot
+    #     include Gamefic::What
+    #
+    #     construct :room, Gamefic::Entity, name: 'room'
+    #     construct :thing, Gamefic::Entity, name: 'thing', parent: room
+    #
+    #     introduction do |actor|
+    #       actor.parent = room
+    #     end
+    #
+    #     respond :take, Gamefic::Entity do |actor, thing|
+    #       thing.parent = actor
+    #       actor.tell "You take it."
+    #     end
+    #
+    #     respond :take do |actor|
+    #       actor.tell 'What do you want to take?'
+    #       actor.cue AskForWhat, template: 'take __what__'
+    #     end
+    #   end
+    #
+    class AskForWhat < Gamefic::Scene::Base
+      def finish
+        if command_with_answer_actions.empty? && actor.can?(props.input.keywords.first)
+          actor.perform(props.input)
+        else
+          actor.perform command_with_answer
+        end
+        super
+      end
+
+      private
 
-    on_player_update(&:answer_for_what)
+      def command_with_answer
+        return nil unless props.input
+
+        @command_with_answer ||= context[:template].to_s
+                                                   .gsub('__what__', props.input)
+      end
 
-    respond nil, plaintext do |actor, text|
-      if (command = actor.answer_for_what(text))
-        actor.perform command
-      else
-        actor.proceed
+      def command_with_answer_actions
+        Gamefic::Request.new(actor, command_with_answer)
+                        .to_actions
+                        .select(&:verb)
       end
     end
   end

metadata

@@ -1,29 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: gamefic-what
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 2.0.0
 platform: ruby
 authors:
 - Fred Snyder
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2024-10-16 00:00:00.000000000 Z
+date: 2025-01-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: gamefic
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.4'
+        version: '4.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.4'
+        version: '4.0'
 - !ruby/object:Gem::Dependency
   name: opal-rspec
   requirement: !ruby/object:Gem::Requirement
@@ -108,7 +108,6 @@ files:
 - gamefic-what.gemspec
 - lib/gamefic-what.rb
 - lib/gamefic/what.rb
-- lib/gamefic/what/askable.rb
 - lib/gamefic/what/version.rb
 - sig/gamefic/what.rbs
 homepage: https://gamefic.com

data/lib/gamefic/what/askable.rb

@@ -1,44 +0,0 @@
-# frozen_string_literal: true
-
-module Gamefic
-  module What
-    # A mixin for Active entities that enables
-    module Askable
-      # Set a template to be populated with the player's answer.
-      #
-      # The template's placeholder for the answer can take two forms:
-      # 1. An array with a nil element: `ask_for_what :use, nil`
-      # 2. A `__what__` placeholder in a string: `ask_for_what "use __what__"`
-      #
-      # @example
-      #   class Example::Plot < Gamefic::Plot
-      #     respond :use, available do |actor, thing|
-      #       actor.tell "You use #{the thing}."
-      #     end
-      #
-      #     respond :use do |actor|
-      #       actor.tell "What do you want to use?"
-      #       actor.ask_for_what :use, nil
-      #     end
-      #   end
-      #
-      # @param tokens [String, Array<String, nil>]
-      def ask_for_what(*tokens)
-        @asking_for_what = [tokens].flatten
-      end
-
-      attr_reader :asked_for_what
-
-      def answer_for_what(text = nil)
-        text = text&.gsub('__what__', 'what') # "Don't recurse" -- Heavy D.
-        command = text && asked_for_what&.map { |token| token || text }
-                                        &.join(' ')
-                                        &.gsub('__what__', text)
-        @asked_for_what = @asking_for_what
-        @asking_for_what = nil
-        command
-      end
-      alias set_asked_for_what answer_for_what
-    end
-  end
-end