gamefic-commodities 0.1.0 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '08a734e8585509d12f97f384bcd5e7ff9081ee6500ea4f3eaaae6337bbaf0d98'
-  data.tar.gz: 7c83ac167edba79d950397f919faeffe7c12ef76c0f0e82e4b4fbe8cda3d288a
+  metadata.gz: 2f8318cc02457f9206f71ea84788b5ecd36353cefa24a8a5ba00f3dc0a964574
+  data.tar.gz: 0eb3639a2a1e6cfb7e36adb064e1ca889bb2f0a900dec8d82538590cdd8206a5
 SHA512:
-  metadata.gz: ff83060ddb98824b01c98a229697834e5d3448d4ceb8c22f8de11939439c48fae7cdda371c79dd5cc94f2347edc51dc98fca623d1f42ca7a14152e136756f440
-  data.tar.gz: ada7030b38061a939c7ee47b010f67dbd039645f8bf2464a9a71658568fd9144a7c4f9072806d3fc377398aaa28e07c36eb4c3a12e9f770cfbafd42024da69ec
+  metadata.gz: b3606bf2ee4760ddbdbf48f2d3653082b403e0bb0e0c818b17fdecacd06e645978744981aa77e9dc61f8f976c0d8209ba691756ed527e108f46edf8a85a0d157
+  data.tar.gz: cdb59be4c8f1ddef105fd04bc9490e507617fd0d6d4673118f69b18a2d042d279d66786b8ae30d8f97f8729a078c0b5005d7b41c6ad8205ed9009234755ff439

data/CHANGELOG.md

@@ -1,2 +1,6 @@
+## 1.0.0 - February 17, 2026
+- Gamefic 4.0 updates
+- Explicit inclusion
+
 ## 0.1.0 - October 5, 2024
 - First release

data/README.md

@@ -13,7 +13,7 @@ Players can specify quantities in commands, e.g., `take 1 coin`.
 
 Add the library to your Gamefic project's Gemfile:
 
-```
+```ruby
 gem 'gamefic-commodities'
 ```
 
@@ -21,10 +21,19 @@ Run `bundle install`.
 
 Add the requirement to your project's code (typically in `main.rb`):
 
-```
+```ruby
 require 'gamefic-commodities'
 ```
 
+Include the module in your project's plot:
+
+```ruby
+class Example < Gamefic::Plot
+  include Gamefic::Standard
+  include Gamefic::Commodities
+end
+```
+
 ## Usage
 
 The `Commodity` entity and related actions are automatically imported into `Gamefic::Standard`.
@@ -35,13 +44,13 @@ Example of adding a commodity:
 class Example::Plot < Gamefic::Plot
   include Gamefic::Standard
 
-  attr_seed :room, Room,
+  construct :room, Room,
             name: 'room'
 
   make_seed Commodity,
             name: 'coin',
             quantity: 2,
-            parent: _attr(:room)
+            parent: room
 
   introduction do |actor|
     actor.parent = room

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-commodities.gemspec

@@ -33,8 +33,8 @@ 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.5'
-  spec.add_dependency 'gamefic-standard', '~> 3.0'
+  spec.add_dependency 'gamefic', '~> 4.0'
+  spec.add_dependency 'gamefic-standard', '~> 4.0'
 
   spec.add_development_dependency 'opal', '~> 1.7'
   spec.add_development_dependency 'opal-rspec', '~> 1.0'

data/lib/gamefic/commodities/actions.rb

@@ -5,7 +5,9 @@ module Gamefic
     module Actions
       extend Gamefic::Scriptable
 
-      respond :look, ::Commodity do |actor, thing|
+      include Gamefic::What
+
+      respond :look, Commodity do |actor, thing|
         actor.proceed
         next unless thing.plural?
 
@@ -16,46 +18,26 @@ module Gamefic
         end
       end
 
-      respond :take, siblings(::Commodity) do |actor, _|
-        actor.proceed
-      end
-
-      respond :place, siblings(::Commodity), available do |actor, _|
-        actor.proceed
-      end
-
-      respond :place, children(::Commodity), available do |actor, _|
-        actor.proceed
-      end
-
-      respond :insert, siblings(::Commodity), available do |actor, _|
-        actor.proceed
-      end
-
-      respond :insert, children(::Commodity), available do |actor, _|
-        actor.proceed
-      end
+      respond :take, plaintext do |actor, text|
+        commodities = Utils.match_nearby_commodities(actor, text)
+        next actor.proceed if commodities.empty?
 
-      respond :take, available(::Commodity, ambiguous: true) do |actor, comms|
-        comms = comms.reject { |com| com.parent == actor }
-        if comms.one?
-          actor.execute :take, comms.first
+        if commodities.one?
+          actor.execute :take, commodities.first
         else
-          filtered = comms.reject { |ent| actor.flatten.include?(ent) }
-          if filtered.one?
-            actor.execute :take, filtered.first
-          else
-            places = filtered.map { |object| object.parent.definitely }
-            actor.tell "Where do you want to take one from, #{places.join_or}?"
-            actor.ask_for_what "take #{filtered.first.name} from __what__"
-          end
+          places = commodities.map { |object| object.parent.definitely }
+          actor.tell "Where do you want to take one from, #{places.join_or}?"
+          actor.cue AskForWhat, template: "take #{commodities.first.name} from __what__"
         end
       end
 
-      respond :collect, available(::Commodity, ambiguous: true) do |actor, comms|
-        comms.reject { |com| com.parent == actor }
-             .each { |com| actor.perform "take #{com.plural_name} from #{com.parent}" }
+      respond :collect, plaintext do |actor, text|
+        commodities = Utils.match_nearby_commodities(actor, text)
+        next actor.proceed if commodities.empty?
+
+        commodities.each { |com| actor.perform "take #{com.plural_name} from #{com.parent}" }
       end
+
       interpret 'collect all', 'take all'
       interpret 'collect :thing', 'take :thing'
       interpret 'collect all :commodity', 'collect :commodity'
@@ -67,17 +49,24 @@ module Gamefic
       interpret 'take every :commodity', 'collect :commodity'
       interpret 'take each :commodity', 'collect :commodity'
 
-      meta nil, plaintext do |actor, text|
-        words = text.keywords
-        verb = words.shift
-        next actor.proceed if words.empty? || words.first =~ /[^\d]+/
+      respond :take, integer, siblings(Commodity) do |actor, quantity, commodity|
+        Utils.try_quantity(actor, :take, quantity, commodity)
+      end
+
+      respond :drop, integer, children(Commodity) do |actor, quantity, commodity|
+        Utils.try_quantity(actor, :drop, quantity, commodity)
+      end
+
+      respond :insert, integer, children(Commodity), available do |actor, quantity, commodity, other|
+        Utils.try_quantity(actor, :insert, quantity, commodity, other)
+      end
 
-        number = words.shift.to_i
-        Utils.try_quantity(actor, number, "#{verb} #{words.join(' ')}")
+      respond :place, integer, children(Commodity), available do |actor, quantity, commodity, other|
+        Utils.try_quantity(actor, :place, quantity, commodity, other)
       end
 
       on_update do
-        entities.that_are(::Commodity)
+        entities.that_are(Commodity)
                 .reject(&:parent)
                 .each { |entity| destroy entity }
       end

data/lib/gamefic/commodities/commodity.rb

@@ -9,7 +9,7 @@ module Gamefic
     # combined, i.e., the existing commodity's quantity is increased by the new
     # commodity's quantity, and the other commodity is destroyed.
     #
-    class Commodity < Item
+    class Commodity < Gamefic::Standard::Item
       class CommodityError < ArgumentError; end
 
       # @return [Integer]
@@ -101,5 +101,3 @@ module Gamefic
     end
   end
 end
-
-Commodity = Gamefic::Commodities::Commodity

data/lib/gamefic/commodities/quantity_scanner.rb

@@ -0,0 +1,26 @@
+module Gamefic
+  module Commodities
+    class QuantityScanner < Gamefic::Scanner::Base
+      def scan
+        words = token.keywords
+        first = words.shift
+        return unmatched_result unless first&.match(/\d+/)
+
+        result = subprocess(words.join(' '))
+        # @todo So we know the token might reference a quantity of a commodity. Now what?
+        Gamefic::Scanner::Result.new(result.scanned, result.token. result.matched, result.remainder, self)
+      end
+
+      private
+
+      def subprocess token_wo_number
+        Gamefic::Scanner::DEFAULT_PROCESSORS.each do |scanner|
+          result = scanner.scan(selection, token_wo_number)
+          return result unless result.matched.empty?
+
+          next result
+        end
+      end
+    end
+  end
+end

data/lib/gamefic/commodities/utils.rb

@@ -6,18 +6,26 @@ module Gamefic
       module_function
 
       # @param actor [Gamefic::Actor]
-      # @param number [Integer]
-      # @param input [String]
-      def try_quantity(actor, number, input)
-        command = Gamefic::Command.compose(actor, input)
-        return actor.proceed unless command.arguments.first.is_a?(Commodity)
-
-        command.arguments.first.count(number) do
-          actor.execute command.verb, *command.arguments
-        end
+      # @param verb [Symbol]
+      # @param quantity [Integer]
+      # @param commodity [Commodity]
+      def try_quantity(actor, verb, quantity, commodity, *args)
+        commodity.count(quantity) { actor.execute verb, commodity, *args }
       rescue Commodity::CommodityError => e
         actor.tell e.message
       end
+
+      def match_nearby_commodities(actor, text)
+        available = Gamefic::Query::Family.span(actor)
+        result = Gamefic::Scanner.scan(available, text)
+        if result.remainder.empty? && result.matched.all? do |ent|
+             ent.is_a?(Commodity)
+           end && result.matched.uniq(&:name).one?
+          result.matched.reject { |com| actor.flatten.include?(com) }
+        else
+          []
+        end
+      end
     end
   end
 end

data/lib/gamefic/commodities/version.rb

@@ -2,6 +2,6 @@
 
 module Gamefic
   module Commodities
-    VERSION = '0.1.0'
+    VERSION = '1.0.0'
   end
 end

data/lib/gamefic/commodities.rb

@@ -9,7 +9,7 @@ module Gamefic
     require 'gamefic/commodities/commodity'
     require 'gamefic/commodities/utils'
     require 'gamefic/commodities/actions'
+
+    include Gamefic::Commodities::Actions
   end
 end
-
-Gamefic::Standard.include Gamefic::Commodities::Actions

metadata

@@ -1,14 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: gamefic-commodities
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 1.0.0
 platform: ruby
 authors:
 - Fred Snyder
-autorequire:
 bindir: exe
 cert_chain: []
-date: 2024-10-05 00:00:00.000000000 Z
+date: 1980-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: gamefic
@@ -16,28 +15,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.5'
+        version: '4.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.5'
+        version: '4.0'
 - !ruby/object:Gem::Dependency
   name: gamefic-standard
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '4.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '4.0'
 - !ruby/object:Gem::Dependency
   name: opal
   requirement: !ruby/object:Gem::Requirement
@@ -108,7 +107,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.14'
-description:
 email:
 - fsnyder@castwide.com
 executables: []
@@ -124,12 +122,11 @@ files:
 - lib/gamefic/commodities.rb
 - lib/gamefic/commodities/actions.rb
 - lib/gamefic/commodities/commodity.rb
+- lib/gamefic/commodities/quantity_scanner.rb
 - lib/gamefic/commodities/utils.rb
 - lib/gamefic/commodities/version.rb
-homepage:
 licenses: []
 metadata: {}
-post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -144,8 +141,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.7
-signing_key:
+rubygems_version: 3.6.7
 specification_version: 4
 summary: A Commodity entity for Gamefic.
 test_files: []