gamefic-standard 2.4.0 → 3.1.0

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

@@ -1,11 +1,11 @@
-Gamefic.script do
-  respond :search, Use.available(Thing) do |actor, thing|
+Gamefic::Standard.script do
+  respond :search, available(Thing) do |actor, thing|
     actor.execute :look, thing
   end
 
-  respond :search, Use.available(Receptacle) do |actor, thing|
+  respond :search, available(Receptacle) do |actor, thing|
     if thing.accessible?
-      itemized = thing.children.that_are_not(:attached?).that_are(:itemized?)
+      itemized = thing.children.that_are_not(proc(&:attached?)).that_are(proc(&:itemized?))
       if itemized.empty?
         actor.tell "There's nothing inside #{the thing}."
       else
@@ -16,7 +16,7 @@ Gamefic.script do
     end
   end
 
-  respond :search, Use.available(Container, :closed?) do |actor, container|
+  respond :search, available(Container, proc(&:closed?)) do |actor, container|
     actor.execute :open, container
     actor.proceed if container.open?
   end

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

@@ -1,5 +1,5 @@
-Gamefic.script do
-  respond :take, Use.available do |actor, thing|
+Gamefic::Standard.script do
+  respond :take, available do |actor, thing|
     if thing.parent == actor
       actor.tell "You're already carrying #{the thing}."
     elsif thing.portable?
@@ -14,14 +14,25 @@ Gamefic.script do
     end
   end
 
-  respond :take, Use.available(:attached?) do |actor, thing|
+  respond :take, available(proc(&:attached?)) do |actor, thing|
     actor.tell "#{The thing} is attached to #{the thing.parent}."
   end
 
-  respond :take, Use.available(Rubble) do |actor, rubble|
+  respond :take, available(Rubble) do |actor, rubble|
     actor.tell "You don't have any use for #{the rubble}."
   end
 
+  respond :take, plaintext(/^(all|everything)$/) do |actor, _all|
+    items = Gamefic::Scope::Family.matches(actor)
+                                  .select(&:portable?)
+                                  .reject { |item| actor.flatten.include?(item) }
+    if items.empty?
+      actor.tell "You don't see anything you can carry."
+    else
+      items.each { |item| actor.execute :take, item }
+    end
+  end
+
   interpret "get :thing", "take :thing"
   interpret "pick up :thing", "take :thing"
   interpret "pick :thing up", "take :thing"

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

@@ -1,20 +1,24 @@
-Gamefic.script do
+Gamefic::Standard.script do
   respond :talk do |actor|
     actor.tell "You talk to yourself."
   end
 
-  respond :talk, Use.itself do |actor, yourself|
+  respond :talk, myself do |actor, yourself|
     actor.execute :talk
   end
 
-  respond :talk, Use.available do |actor, thing|
+  respond :talk, available do |actor, thing|
     actor.tell "Nothing happens."
   end
 
-  respond :talk, Use.available(Character) do |actor, character|
+  respond :talk, Character do |actor, character|
     actor.tell "#{The character} has nothing to say."
   end
 
+  respond :talk, Character, plaintext do |actor, character, text|
+    actor.tell "#{The character} has nothing to say about #{text}."
+  end
+
   interpret "talk to :character", "talk :character"
   interpret "talk to :character about :subject", "talk :character :subject"
   interpret "ask :character :subject", "talk :character :subject"
@@ -22,4 +26,12 @@ Gamefic.script do
   interpret "tell :character :subject", "talk :character :subject"
   interpret "tell :character about :subject", "talk :character :subject"
   interpret "ask :character for :subject", "talk :character :subject"
+  interpret "speak :character", "talk :character"
+  interpret "speak to :character", "talk :character"
+  interpret "speak :character :subject", "talk :character :subject"
+  interpret "speak :character about :subject", "talk :character :subject"
+  interpret "speak to :character about :subject", "talk :character :subject"
+  interpret "speak to :character :subject", "talk :character :subject"
+  interpret "discuss :subject :character", "talk :character :subject"
+  interpret "discuss :subject with :character", "talk :character :subject"
 end

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

@@ -1,18 +1,22 @@
-Gamefic.script do
-  respond :unlock, Use.available do |actor, thing|
-    actor.tell "You can't unlock #{the thing}."
+Gamefic::Standard.script do
+  respond :unlock, available(Lockable) do |actor, thing|
+    if thing.has_lock_key? && actor.children.include?(thing.lock_key)
+      actor.execute :unlock, thing, thing.lock_key
+    else
+      actor.tell "You can't unlock #{the thing}."
+    end
   end
 
-  respond :unlock, Use.available(Lockable, :has_lock_key?), Use.children do |actor, thing, key|
+  respond :unlock, available(Lockable, proc(&:has_lock_key?)), children do |actor, thing, key|
     if thing.lock_key == key
       thing.locked = false
-      actor.tell "You unlock ##{the thing} with #{the key}."
+      actor.tell "You unlock #{the thing} with #{the key}."
     else
       actor.tell "You can't unlock #{the thing} with #{the key}."
     end
   end
 
-  respond :unlock, Use.available(Lockable, :has_lock_key?), Use.available do |actor, _thing, key|
+  respond :unlock, available(Lockable, proc(&:has_lock_key?)), available do |actor, _thing, key|
     actor.execute :take, key if key.parent != actor
     actor.proceed if key.parent == actor
   end

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

@@ -1,5 +1,7 @@
-Gamefic.script do
+Gamefic::Standard.script do
   respond :wait do |actor|
     actor.tell "Time passes."
   end
+
+  interpret 'z', 'wait'
 end

data/lib/gamefic-standard/actions.rb

@@ -1,4 +1,5 @@
 require 'gamefic-standard/actions/nil'
+require 'gamefic-standard/actions/attack'
 require 'gamefic-standard/actions/drop'
 require 'gamefic-standard/actions/enter'
 require 'gamefic-standard/actions/open'
@@ -14,5 +15,9 @@ require 'gamefic-standard/actions/search'
 require 'gamefic-standard/actions/place'
 require 'gamefic-standard/actions/quit'
 require 'gamefic-standard/actions/take'
+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'

data/lib/gamefic-standard/articles.rb

@@ -41,10 +41,5 @@ module Articles
   alias The the_
 end
 
-class Gamefic::Plot
-  include Articles
-end
-
-class Gamefic::Subplot
-  include Articles
-end
+# @todo Monkey patch
+Gamefic::Narrative.include Articles

data/lib/gamefic-standard/direction.rb

@@ -1,6 +1,4 @@
 class Direction
-  include Gamefic::Serialize
-
   attr_writer :adjective, :adverb, :reverse
 
   # @return [String]
@@ -51,10 +49,11 @@ class Direction
       }
     end
 
-    # @param dir [Direction, string]
+    # @param dir [Direction, String]
     # @return [Direction, nil]
     def find(dir)
       return dir if dir.is_a?(Direction)
+
       compass[dir.to_s.downcase.to_sym]
     end
   end

data/lib/gamefic-standard/entities/container.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # An openable and lockable receptacle.
 #
 class Container < Receptacle

data/lib/gamefic-standard/entities/door.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # An openable portal.
 #
 class Door < Portal

data/lib/gamefic-standard/entities/fixture.rb

@@ -1,3 +1,4 @@
-class Fixture < Thing
+# frozen_string_literal: true
 
+class Fixture < Thing
 end

data/lib/gamefic-standard/entities/item.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # An entity that is portable by default.
 #
 class Item < Thing

data/lib/gamefic-standard/entities/portal.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class Portal < Thing
   # @return [Gamefic::Entity]
   attr_accessor :destination

data/lib/gamefic-standard/entities/receptacle.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class Receptacle < Thing
   include Enterable
 end

data/lib/gamefic-standard/entities/room.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class Room < Thing
   attr_writer :explicit_exits
 
@@ -11,10 +13,25 @@ class Room < Thing
     children.each { |c| c.tell message }
   end
 
-  def find_portal(direction)
-    d = direction.to_s
-    portals = children.that_are(Portal).delete_if { |p| p.direction.to_s != d }
-    portals[0]
+  # @return [Array<Portal>]
+  def portals
+    children.that_are(Portal)
+  end
+
+  # @param destination [Room]
+  # @param direction [Direction, String, nil]
+  # @param type [Class<Portal>]
+  # @param two_way [Boolean]
+  # @return [Portal, Array<Portal>]
+  def connect destination, direction: nil, type: Portal, two_way: true
+    direction = Direction.find(direction)
+    here = type.new(parent: self,
+                      destination: destination,
+                      direction: Direction.find(direction))
+    return here unless two_way
+
+    there = type.new(parent: destination, destination: self, direction: direction&.reverse)
+    [here, there]
   end
 
   class << self
@@ -27,35 +44,3 @@ class Room < Thing
     end
   end
 end
-
-# @todo Monkey patching might not be the best way to handle this. It's only
-#   necessary because of specs that make Plot#connect calls. Consider
-#   changing the specs instead.
-module Gamefic::World
-  # Create portals between rooms.
-  #
-  # @return [Portal]
-  def connect origin, destination, direction = nil, type: Portal, two_way: true
-    if direction.nil?
-      portal = make type, :parent => origin, :destination => destination
-      if two_way == true
-        portal2 = make type, :parent => destination, :destination => origin
-      end
-    else
-      if direction.kind_of?(String)
-        direction = Direction.find(direction)
-      end
-      portal = make type, :direction => direction, :parent => origin, :destination => destination
-      portal.proper_named = true if type == Portal
-      if two_way == true
-        reverse = direction.reverse
-        if reverse == nil
-          raise "#{direction.name.cap_first} does not have an opposite direction"
-        end
-        portal2 = make type, :direction => reverse, :parent => destination, :destination => origin
-        portal2.proper_named = true if type == Portal
-      end
-    end
-    portal
-  end
-end

data/lib/gamefic-standard/entities/rubble.rb

@@ -1,4 +1,5 @@
-# script 'standard/entities/scenery'
+# frozen_string_literal: true
+
 require 'gamefic-standard/entities/scenery'
 
 # Rubble is Scenery with slightly modified action responses.

data/lib/gamefic-standard/entities/scenery.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # Scenery is an entity that is not itemized by default. They're typically used
 # to provide a description for objects that can be observed but do not respond
 # to any other interactions.

data/lib/gamefic-standard/entities/supporter.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class Supporter < Thing
   include Enterable
 end

data/lib/gamefic-standard/entities/thing.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class Gamefic::Entity
   include Grammar::Attributes
   include Standardized

data/lib/gamefic-standard/give.rb

@@ -1,20 +1,21 @@
-Gamefic.script do
-  respond :give, Use.available, Gamefic::Query::Children.new do |actor, _character, _gift|
-    actor.tell 'Nothing happens.'
-  end
+module Gamefic::Standard::Give
+  extend Gamefic::Scriptable
 
-  respond :give, Use.available(Character), Use.available do |actor, character, gift|
-    actor.tell "#{The character} doesn't want #{the gift}."
-  end
+  script do
+    respond :give, available, children do |actor, _character, _gift|
+      actor.tell 'Nothing happens.'
+    end
 
-  respond :give, Use.available(Character), Use.available do |actor, _character, gift|
-    if gift.parent != actor
-      actor.execute :take, gift
+    respond :give, available(Character), available do |actor, character, gift|
+      actor.tell "#{The character} doesn't want #{the gift}."
     end
-    if gift.parent == actor
-      actor.proceed
+
+    respond :give, available(Character), available do |actor, _character, gift|
+      actor.execute :take, gift if gift.parent != actor
+
+      actor.proceed if gift.parent == actor
     end
-  end
 
-  interpret 'give :gift to :character', 'give :character :gift'
+    interpret 'give :gift to :character', 'give :character :gift'
+  end
 end

data/lib/gamefic-standard/grammar/pronoun.rb

@@ -5,97 +5,97 @@ module Grammar
   # gender.
   #
   module Pronoun
-    class << self
-      # @param entity [#person, #plural?, #gender]
-      # @return [String]
-      def subjective(entity)
-        map(entity)[:subjective]
-      end
-      alias they subjective
-      alias he subjective
-      alias she subjective
+    extend self
 
-      # @param entity [#person, #plural?, #gender]
-      # @return [String]
-      def subjective_(entity)
-        subjective(entity).cap_first
-      end
-      alias they_ subjective_
-      alias he_ subjective_
-      alias she_ subjective_
+    # @param entity [#person, #plural?, #gender]
+    # @return [String]
+    def subjective(entity)
+      map(entity)[:subjective]
+    end
+    alias they subjective
+    alias he subjective
+    alias she subjective
 
-      # @param entity [#person, #plural?, #gender]
-      # @return [String]
-      def objective(entity)
-        map(entity)[:objective]
-      end
-      alias them objective
+    # @param entity [#person, #plural?, #gender]
+    # @return [String]
+    def subjective_(entity)
+      subjective(entity).cap_first
+    end
+    alias they_ subjective_
+    alias he_ subjective_
+    alias she_ subjective_
 
-      # @param entity [#person, #plural?, #gender]
-      # @return [String]
-      def objective_(entity)
-        objective(entity).cap_first
-      end
-      alias them_ objective_
+    # @param entity [#person, #plural?, #gender]
+    # @return [String]
+    def objective(entity)
+      map(entity)[:objective]
+    end
+    alias them objective
 
-      # @param entity [#person, #plural?, #gender]
-      # @return [String]
-      def possessive(entity)
-        map(entity)[:possessive]
-      end
-      alias their possessive
+    # @param entity [#person, #plural?, #gender]
+    # @return [String]
+    def objective_(entity)
+      objective(entity).cap_first
+    end
+    alias them_ objective_
 
-      # @param entity [#person, #plural?, #gender]
-      # @return [String]
-      def possessive_(entity)
-        possessive(entity).cap_first
-      end
-      alias their_ possessive_
+    # @param entity [#person, #plural?, #gender]
+    # @return [String]
+    def possessive(entity)
+      map(entity)[:possessive]
+    end
+    alias their possessive
 
-      # @param entity [#person, #plural?, #gender]
-      # @return [String]
-      def reflexive(entity)
-        map(entity)[:reflexive]
-      end
-      alias themselves reflexive
-      alias themself reflexive
+    # @param entity [#person, #plural?, #gender]
+    # @return [String]
+    def possessive_(entity)
+      possessive(entity).cap_first
+    end
+    alias their_ possessive_
 
-      # @param entity [#person, #plural?, #gender]
-      # @return [String]
-      def reflexive_(entity)
-        reflexive(entity).cap_first
-      end
-      alias themselves_ reflexive_
-      alias themself_ reflexive_
+    # @param entity [#person, #plural?, #gender]
+    # @return [String]
+    def reflexive(entity)
+      map(entity)[:reflexive]
+    end
+    alias themselves reflexive
+    alias themself reflexive
 
-      # @param entity [#person, #plural?, #gender]
-      # @return [Hash]
-      def map(entity)
-        plurality = (entity.plural? ? :plural : :singular)
-        maps[[(entity.person || 3), plurality, entity.gender]] ||
-          maps[[(entity.person || 3), plurality]]
-      end
+    # @param entity [#person, #plural?, #gender]
+    # @return [String]
+    def reflexive_(entity)
+      reflexive(entity).cap_first
+    end
+    alias themselves_ reflexive_
+    alias themself_ reflexive_
 
-      private
+    # @param entity [#person, #plural?, #gender]
+    # @return [Hash]
+    def map(entity)
+      plurality = (entity.plural? ? :plural : :singular)
+      maps[[(entity.person || 3), plurality, entity.gender]] ||
+        maps[[(entity.person || 3), plurality]]
+    end
 
-      def maps
-        @maps ||= {
-          [1, :singular] => Hash[map_keys.zip(%w[I me my myself])],
-          [2, :singular] => Hash[map_keys.zip(%w[you you your yourself])],
-          [3, :singular] => Hash[map_keys.zip(%w[it it its itself])],
-          [3, :singular, :male] => Hash[map_keys.zip(%w[he him his himself])],
-          [3, :singular, :female] => Hash[map_keys.zip(%w[she her her herself])],
-          [3, :singular, :other] => Hash[map_keys.zip(%w[they them their themselves])],
-          [3, :singular, :neutral] => Hash[map_keys.zip(%w[it it its itself])],
-          [1, :plural] => Hash[map_keys.zip(%w[we us our ourselves])],
-          [2, :plural] => Hash[map_keys.zip(%w[you you your yourselves])],
-          [3, :plural] => Hash[map_keys.zip(%w[they them their themselves])]
-        }
-      end
+    private
+
+    def maps
+      @maps ||= {
+        [1, :singular] => Hash[map_keys.zip(%w[I me my myself])],
+        [2, :singular] => Hash[map_keys.zip(%w[you you your yourself])],
+        [3, :singular] => Hash[map_keys.zip(%w[it it its itself])],
+        [3, :singular, :male] => Hash[map_keys.zip(%w[he him his himself])],
+        [3, :singular, :female] => Hash[map_keys.zip(%w[she her her herself])],
+        [3, :singular, :other] => Hash[map_keys.zip(%w[they them their themselves])],
+        [3, :singular, :neutral] => Hash[map_keys.zip(%w[it it its itself])],
+        [1, :plural] => Hash[map_keys.zip(%w[we us our ourselves])],
+        [2, :plural] => Hash[map_keys.zip(%w[you you your yourselves])],
+        [3, :plural] => Hash[map_keys.zip(%w[they them their themselves])]
+      }
+    end
 
-      def map_keys
-        @map_keys ||= %i[subjective objective possessive reflexive]
-      end
+    def map_keys
+      @map_keys ||= %i[subjective objective possessive reflexive]
     end
   end
 end

data/lib/gamefic-standard/introduction.rb

@@ -0,0 +1,8 @@
+# frozen_string_literal: true
+
+Gamefic::Standard.script do
+  introduction do |actor|
+    actor.name = 'myself'
+    actor.synonyms = 'self me yourself you'
+  end
+end

data/lib/gamefic-standard/modules/enterable.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Enterable
   attr_writer :enterable
 

data/lib/gamefic-standard/modules/lockable.rb

@@ -8,13 +8,15 @@ module Lockable
   def locked=(bool)
     @locked = bool
     if @locked == true
-      self.open = false
+      @open = false
     end
+    @locked
   end
 
   def open=(bool)
     @open = bool
     @locked = false if @open == true
+    @open
   end
 
   def locked?

data/lib/gamefic-standard/modules/standardized.rb

@@ -32,16 +32,16 @@ module Standardized
   end
 
   # @param bool [Boolean]
-  def attached= bool
+  def attached=(bool)
     @attached = if parent.nil?
-      # @todo Log attachment failure
-      false
-    else
-      bool
-    end
+                  # @todo Log attachment failure
+                  false
+                else
+                  bool
+                end
   end
 
-  def parent= new_parent
+  def parent=(new_parent)
     self.attached = false unless new_parent == parent
     super
   end
@@ -50,10 +50,8 @@ module Standardized
   #
   # @return [Room]
   def room
-    p = parent
-    until p.is_a?(Room) or p.nil?
-      p = p.parent
-    end
-    p
+    ascendant = parent
+    ascendant = ascendant.parent until ascendant.is_a?(Room) || ascendant.nil?
+    ascendant
   end
 end

data/lib/gamefic-standard/modules.rb

@@ -4,7 +4,6 @@
 #
 
 require 'gamefic-standard/modules/standardized'
-require 'gamefic-standard/modules/use'
 require 'gamefic-standard/modules/enterable'
 require 'gamefic-standard/modules/openable'
 require 'gamefic-standard/modules/lockable'