gamefic-standard 3.2.4 → 3.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 26551eefaf59857782cfe3e3037d201d5445211ff9982308bf3dd4dcb49ce8e0
-  data.tar.gz: 372052d2f4974d266eeb48a624e6740a1f2d21d49577120f628846ece31e42f6
+  metadata.gz: 83db9094673ea86b25db1d51bf9c06c62be6fadc7ed938f39c71b9c16cba9566
+  data.tar.gz: 579a371ef1c031b2b7bb2bf9d66831e7ce92ad04d3f7ec450dd183b1265e4f80
 SHA512:
-  metadata.gz: 53a2ae91603d9a4fa76f904957da22154f8570d49f4d3367d828c5d0f6e900041b0574575c8aa40fe47feb8e6bbb82a906d210df9b04ce2ee13dd96afadef6c1
-  data.tar.gz: bb11ebc79930b52e425dfab9ad6c2a145ab5b9054d927610d7ca350387d2344e66f530ef384ce0e23d05c56a3c1b4a4312d9db4480f19a6e8d68464df32b47f5
+  metadata.gz: beffd2638efbb5a61fe6f0605a59e7807045aa67705c1cf5a042c28cd279e8efe8b9146690a9e742a9ebc369db035b4ecefcf0b2ea2cdca288b9a68426f253d9
+  data.tar.gz: 324c51c2f6eeec341ee26d81449949521f0cb51063f739fa319faf072abd090b18b31c92ed16e2855934cffadb088f98e6ba3a8a4f05b13e66fbc90b43601b15

data/CHANGELOG.md

@@ -1,3 +1,10 @@
+## 3.3.0 - October 5, 2024
+- Include Pronoun and Give in Standard
+- Add gamefic-what
+- Standard::Actions namespace
+- Room#connect accepts additional portal attributes
+- Add gamefic-grammar
+
 ## 3.2.4 - September 10, 2024
 - Include Articles in Standard
 

data/Rakefile

@@ -7,8 +7,11 @@ RSpec::Core::RakeTask.new(:spec)
 task :default => :spec
 
 Opal::RSpec::RakeTask.new(:opal) do |_, config|
-  Opal.append_path File.expand_path('../lib', __FILE__)
+  Opal.append_path File.join(__dir__, 'lib')
   Opal.use_gem('gamefic')
+  Opal.use_gem('gamefic-grammar')
+  Opal.use_gem('gamefic-what')
+  config.default_path = 'spec'
   config.pattern = 'spec/**/*_spec.rb'
-  config.requires = ['spec_helper']
+  config.requires = ['opal_helper']
 end

data/gamefic-standard.gemspec

@@ -1,17 +1,17 @@
-lib = File.expand_path("../lib", __FILE__)
+lib = File.expand_path('lib', __dir__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require 'gamefic-standard/version'
 
 Gem::Specification.new do |spec|
-  spec.name          = "gamefic-standard"
+  spec.name          = 'gamefic-standard'
   spec.version       = Gamefic::Standard::VERSION
-  spec.authors       = ["Fred Snyder"]
-  spec.email         = ["fsnyder@castwide.com"]
+  spec.authors       = ['Fred Snyder']
+  spec.email         = ['fsnyder@castwide.com']
 
-  spec.summary       = %q{The Gamefic standard script library.}
-  spec.description   = %q{A collection of components for building games and interactive fiction in Gamefic.}
-  spec.homepage      = "http://gamefic.com"
-  spec.license       = "MIT"
+  spec.summary       = 'The Gamefic standard script library.'
+  spec.description   = 'A collection of components for building games and interactive fiction in Gamefic.'
+  spec.homepage      = 'https://gamefic.com'
+  spec.license       = 'MIT'
 
   # Prevent pushing this gem to RubyGems.org. To allow pushes either set the 'allowed_push_host'
   # to allow pushing to a single host or delete this section to allow pushing to any host.
@@ -28,16 +28,18 @@ Gem::Specification.new do |spec|
 
   # Specify which files should be added to the gem when it is released.
   # The `git ls-files -z` loads the files in the RubyGem that have been added into git.
-  spec.files         = Dir.chdir(File.expand_path('..', __FILE__)) do
+  spec.files         = Dir.chdir(File.expand_path(__dir__)) do
     `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) }
   end
-  spec.bindir        = "exe"
+  spec.bindir        = 'exe'
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
-  spec.require_paths = ["lib"]
+  spec.require_paths = ['lib']
 
   spec.required_ruby_version = '>= 2.7.0'
 
   spec.add_dependency 'gamefic', '~> 3.3'
+  spec.add_dependency 'gamefic-grammar', '~> 1.0'
+  spec.add_dependency 'gamefic-what', '~> 1.0'
 
   spec.add_development_dependency 'opal', '~> 1.7'
   spec.add_development_dependency 'opal-rspec', '~> 1.0'

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

@@ -2,27 +2,31 @@
 
 module Gamefic
   module Standard
-    script do
-      respond :attack do |actor, thing|
-        actor.tell "Violence is not the answer here."
-      end
+    module Actions
+      module Attack
+        extend Gamefic::Scriptable
 
-      respond :attack, Thing do |actor, _thing|
-        actor.execute :attack
-      end
+        respond :attack do |actor|
+          actor.tell 'Violence is not the answer here.'
+        end
 
-      interpret 'fight', 'attack'
-      interpret 'battle', 'attack'
-      interpret 'kill', 'attack'
-      interpret 'punch', 'attack'
-      interpret 'kick', 'attack'
-      interpret 'hit', 'attack'
-      interpret 'fight :thing', 'attack :thing'
-      interpret 'battle :thing', 'attack :thing'
-      interpret 'kill :thing', 'attack :thing'
-      interpret 'punch :thing', 'attack :thing'
-      interpret 'kick :thing', 'attack :thing'
-      interpret 'hit :thing', 'attack :thing'
+        respond :attack, Thing do |actor, _thing|
+          actor.execute :attack
+        end
+
+        interpret 'fight', 'attack'
+        interpret 'battle', 'attack'
+        interpret 'kill', 'attack'
+        interpret 'punch', 'attack'
+        interpret 'kick', 'attack'
+        interpret 'hit', 'attack'
+        interpret 'fight :thing', 'attack :thing'
+        interpret 'battle :thing', 'attack :thing'
+        interpret 'kill :thing', 'attack :thing'
+        interpret 'punch :thing', 'attack :thing'
+        interpret 'kick :thing', 'attack :thing'
+        interpret 'hit :thing', 'attack :thing'
+      end
     end
   end
 end

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

@@ -1,16 +1,22 @@
+# frozen_string_literal: true
+
 module Gamefic
   module Standard
-    script do
-      respond :close, available do |actor, thing|
-        actor.tell "You can't close #{the thing}."
-      end
+    module Actions
+      module Close
+        extend Gamefic::Scriptable
+
+        respond :close, available do |actor, thing|
+          actor.tell "You can't close #{the thing}."
+        end
 
-      respond :close, available(Openable) do |actor, thing|
-        if thing.open?
-          actor.tell "You close #{the thing}."
-          thing.open = false
-        else
-          actor.tell "#{The thing} is already closed."
+        respond :close, available(Openable) do |actor, thing|
+          if thing.open?
+            actor.tell "You close #{the thing}."
+            thing.open = false
+          else
+            actor.tell "#{The thing} is already closed."
+          end
         end
       end
     end

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

@@ -1,24 +1,39 @@
+# frozen_string_literal: true
+
 module Gamefic
   module Standard
-    script do
-      respond :drop, available do |actor, thing|
-        actor.tell "You're not carrying #{the thing}."
-      end
+    module Actions
+      module Drop
+        extend Gamefic::Scriptable
 
-      respond :drop, children do |actor, thing|
-        actor.execute :take, thing
-        next unless thing.parent == actor
-        thing.parent = actor.parent
-        actor.tell "You drop #{the thing}."
-      end
+        respond :drop, available do |actor, thing|
+          actor.tell "You're not carrying #{the thing}."
+        end
 
-      respond :drop, children do |actor, thing|
-        thing.parent = actor.parent
-        actor.tell "You drop #{the thing}."
-      end
+        respond :drop, children do |actor, thing|
+          actor.execute :take, thing
+          next unless thing.parent == actor
 
-      interpret "put down :thing", "drop :thing"
-      interpret "put :thing down", "drop :thing"
+          thing.parent = actor.parent
+          actor.tell "You drop #{the thing}."
+        end
+
+        respond :drop, children do |actor, thing|
+          thing.parent = actor.parent
+          actor.tell "You drop #{the thing}."
+        end
+
+        respond :drop, plaintext(/^(all|everything)$/) do |actor, _all|
+          if actor.children.empty?
+            actor.tell "You're not carrying anything."
+          else
+            actor.children.each { |item| actor.execute :drop, item }
+          end
+        end
+
+        interpret 'put down :thing', 'drop :thing'
+        interpret 'put :thing down', 'drop :thing'
+      end
     end
   end
 end

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

@@ -1,36 +1,42 @@
+# frozen_string_literal: true
+
 module Gamefic
   module Standard
-    script do
-      respond :enter, siblings do |actor, thing|
-        actor.tell "#{The thing} can't accommodate you."
-      end
+    module Actions
+      module Enter
+        extend Gamefic::Scriptable
 
-      respond :enter, siblings(Enterable, proc(&:enterable?)) do |actor, supporter|
-        actor.parent = supporter
-        actor.tell "You get in #{the supporter}."
-      end
+        respond :enter, siblings do |actor, thing|
+          actor.tell "#{The thing} can't accommodate you."
+        end
 
-      respond :enter, parent do |actor, container|
-        actor.tell "You're already in #{the container}."
-      end
+        respond :enter, siblings(Enterable, proc(&:enterable?)) do |actor, supporter|
+          actor.parent = supporter
+          actor.tell "You get in #{the supporter}."
+        end
 
-      respond :enter, parent(Supporter) do |actor, supporter|
-        actor.tell "You're inside #{the supporter} already."
-      end
+        respond :enter, parent do |actor, container|
+          actor.tell "You're already in #{the container}."
+        end
 
-      respond :enter, siblings(Container, proc(&:enterable?), proc(&:closed?)) do |actor, container|
-        actor.tell "#{The container} is closed."
-      end
+        respond :enter, parent(Supporter) do |actor, supporter|
+          actor.tell "You're inside #{the supporter} already."
+        end
 
-      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"
-      interpret "lie in :thing", "enter :thing"
-      interpret "stand on :thing", "enter :thing"
-      interpret "stand in :thing", "enter :thing"
+        respond :enter, siblings(Container, proc(&:enterable?), proc(&:closed?)) do |actor, container|
+          actor.tell "#{The container} is closed."
+        end
+
+        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'
+        interpret 'lie in :thing', 'enter :thing'
+        interpret 'stand on :thing', 'enter :thing'
+        interpret 'stand in :thing', 'enter :thing'
+      end
     end
   end
 end

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

@@ -0,0 +1,41 @@
+# frozen_string_literal: true
+
+module Gamefic
+  module Standard
+    module Actions
+      module Give
+        extend Gamefic::Scriptable
+
+        include Gamefic::What
+
+        script do
+          respond :give, available, children do |actor, _character, _gift|
+            actor.tell 'Nothing happens.'
+          end
+
+          respond :give, available(Character), available do |actor, character, gift|
+            actor.tell "#{The character} has no use for #{the gift}."
+          end
+
+          respond :give, available(Character), available do |actor, _character, gift|
+            actor.execute :take, gift if gift.parent != actor
+
+            actor.proceed if gift.parent == actor
+          end
+
+          respond :give, Thing do |actor, thing|
+            actor.tell "Who do you want to give #{the thing} to?"
+            actor.ask_for_what "give #{thing} to __what__"
+          end
+
+          respond :give, Character do |actor, character|
+            actor.tell "What do you want to give to #{the character}?"
+            actor.ask_for_what "give __what__ to #{character}"
+          end
+
+          interpret 'give :gift to :character', 'give :character :gift'
+        end
+      end
+    end
+  end
+end

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

@@ -1,59 +1,63 @@
+# frozen_string_literal: true
+
 module Gamefic
   module Standard
-    script do
-      respond :go, siblings(Portal) do |actor, portal|
-        if portal.destination.nil?
-          actor.tell "That portal leads nowhere."
-        else
-          actor.parent = portal.destination
-          if !portal.direction.nil?
-            actor.tell "You go #{portal.direction}."
+    module Actions
+      module Go
+        extend Gamefic::Scriptable
+
+        respond :go, siblings(Portal) do |actor, portal|
+          if portal.destination.nil?
+            actor.tell 'That portal leads nowhere.'
+          else
+            actor.parent = portal.destination
+            actor.tell "You go #{portal.direction}." unless portal.direction.nil?
+            actor.execute :look
           end
-          actor.execute :look
         end
-      end
 
-      respond :go, plaintext do |actor, text|
-        if actor.parent == actor.room
-          actor.tell "I don't see any way to go \"#{text}\" from here."
-        else
-          actor.execute :leave
+        respond :go, plaintext do |actor, text|
           if actor.parent == actor.room
-            actor.perform "go #{text}"
+            actor.tell "I don't see any way to go \"#{text}\" from here."
           else
-            actor.proceed
+            actor.execute :leave
+            if actor.parent == actor.room
+              actor.perform "go #{text}"
+            else
+              actor.proceed
+            end
           end
         end
-      end
 
-      respond :go, available(Door) do |actor, door|
-        actor.execute :open, door unless door.open?
-        actor.proceed if door.open?
-      end
+        respond :go, available(Door) do |actor, door|
+          actor.execute :open, door unless door.open?
+          actor.proceed if door.open?
+        end
 
-      interpret "north", "go north"
-      interpret "south", "go south"
-      interpret "west", "go west"
-      interpret "east", "go east"
-      interpret "up", "go up"
-      interpret "down", "go down"
-      interpret "northwest", "go northwest"
-      interpret "northeast", "go northeast"
-      interpret "southwest", "go southwest"
-      interpret "southeast", "go southeast"
+        interpret 'north', 'go north'
+        interpret 'south', 'go south'
+        interpret 'west', 'go west'
+        interpret 'east', 'go east'
+        interpret 'up', 'go up'
+        interpret 'down', 'go down'
+        interpret 'northwest', 'go northwest'
+        interpret 'northeast', 'go northeast'
+        interpret 'southwest', 'go southwest'
+        interpret 'southeast', 'go southeast'
 
-      interpret "n", "go north"
-      interpret "s", "go south"
-      interpret "w", "go west"
-      interpret "e", "go east"
-      interpret "u", "go up"
-      interpret "d", "go down"
-      interpret "nw", "go northwest"
-      interpret "ne", "go northeast"
-      interpret "sw", "go southwest"
-      interpret "se", "go southeast"
+        interpret 'n', 'go north'
+        interpret 's', 'go south'
+        interpret 'w', 'go west'
+        interpret 'e', 'go east'
+        interpret 'u', 'go up'
+        interpret 'd', 'go down'
+        interpret 'nw', 'go northwest'
+        interpret 'ne', 'go northeast'
+        interpret 'sw', 'go southwest'
+        interpret 'se', 'go southeast'
 
-      interpret "go to :place", "go :place"
+        interpret 'go to :place', 'go :place'
+      end
     end
   end
 end

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

@@ -1,39 +1,53 @@
+# frozen_string_literal: true
+
 module Gamefic
   module Standard
-    script do
-      respond :insert, available, available do |actor, thing, target|
-        actor.tell "You can't put #{the thing} inside #{the target}."
-      end
+    module Actions
+      module Insert
+        extend Gamefic::Scriptable
 
-      respond :insert, available, available(Receptacle) do |actor, thing, receptacle|
-        actor.execute :take, thing unless thing.parent == actor
-        next unless thing.parent == actor
-        thing.parent = receptacle
-        actor.tell "You put #{the thing} in #{the receptacle}."
-      end
+        respond :insert, available, available do |actor, thing, target|
+          actor.tell "You can't put #{the thing} inside #{the target}."
+        end
+
+        respond :insert, available, available(Receptacle) do |actor, thing, receptacle|
+          actor.execute :take, thing unless thing.parent == actor
+          next unless thing.parent == actor
 
-      respond :insert, available, available(Container) do |actor, _thing, container|
-        if container.open?
-          actor.proceed
-        else
-          actor.tell "#{The container} is closed."
+          thing.parent = receptacle
+          actor.tell "You put #{the thing} in #{the receptacle}."
         end
-      end
 
-      interpret "drop :item in :container", "insert :item :container"
-      interpret "put :item in :container", "insert :item :container"
-      interpret "place :item in :container", "insert :item :container"
-      interpret "insert :item in :container", "insert :item :container"
+        respond :insert, available, available(Container) do |actor, _thing, container|
+          if container.open?
+            actor.proceed
+          else
+            actor.tell "#{The container} is closed."
+          end
+        end
+
+        respond :insert, children, room do |actor, thing|
+          actor.execute :drop, thing
+        end
 
-      interpret "drop :item inside :container", "insert :item :container"
-      interpret "put :item inside :container", "insert :item :container"
-      interpret "place :item inside :container", "insert :item :container"
-      interpret "insert :item inside :container", "insert :item :container"
+        interpret 'drop :item in :container', 'insert :item :container'
+        interpret 'put :item in :container', 'insert :item :container'
+        interpret 'place :item in :container', 'insert :item :container'
+        interpret 'set :item in :container', 'insert :item :container'
+        interpret 'insert :item in :container', 'insert :item :container'
 
-      interpret "drop :item into :container", "insert :item :container"
-      interpret "put :item into :container", "insert :item :container"
-      interpret "place :item into :container", "insert :item :container"
-      interpret "insert :item into :container", "insert :item :container"
+        interpret 'drop :item inside :container', 'insert :item :container'
+        interpret 'put :item inside :container', 'insert :item :container'
+        interpret 'place :item inside :container', 'insert :item :container'
+        interpret 'set :item inside :container', 'insert :item :container'
+        interpret 'insert :item inside :container', 'insert :item :container'
+
+        interpret 'drop :item into :container', 'insert :item :container'
+        interpret 'put :item into :container', 'insert :item :container'
+        interpret 'place :item into :container', 'insert :item :container'
+        interpret 'set :item into :container', 'insert :item :container'
+        interpret 'insert :item into :container', 'insert :item :container'
+      end
     end
   end
 end

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

@@ -1,15 +1,20 @@
+# frozen_string_literal: true
+
 module Gamefic
   module Standard
-    script do
-      respond :inventory do |actor|
-        if actor.children.length > 0
-          actor.tell "You are carrying #{actor.children.join_and}."
-        else
-          actor.tell "You aren't carrying anything."
+    module Actions
+      module Inventory
+        extend Gamefic::Scriptable
+
+        respond :inventory do |actor|
+          if actor.children.length > 0
+            actor.tell "You are carrying #{actor.children.join_and}."
+          else
+            actor.tell "You aren't carrying anything."
+          end
         end
+        interpret 'i', 'inventory'
       end
-
-      interpret "i", "inventory"
     end
   end
 end