gamefic-sdk 1.5.0 → 1.6.0

data/scripts/standard/actions/go.plot.rb

@@ -1,4 +1,4 @@
-respond :go, Query::Reachable.new(Portal) do |actor, portal|
+respond :go, Use.family(Portal) do |actor, portal|
   if actor.parent != actor.room
     actor.perform :leave
   end
@@ -15,11 +15,11 @@ respond :go, Query::Reachable.new(Portal) do |actor, portal|
   end
 end
 
-respond :go, Query::Reachable.new(Door, :locked?) do |actor, door|
+respond :go, Use.family(Door, :locked?) do |actor, door|
   actor.tell "#{The door} is locked."
 end
 
-respond :go, Query::Reachable.new(Door, :closed?) do |actor, door|
+respond :go, Use.family(Door, :closed?) do |actor, door|
   if door.automatic?
     actor.perform :open, door
     if door.open?
@@ -44,9 +44,10 @@ respond :go, Use.text do |actor, text|
     destinations.push portal.destination
     d_map[portal.destination] = portal
   }
-  matches = Query::Base.new.execute(destinations, text)
-  if matches.objects.length == 1
-    actor.perform :go, d_map[matches.objects[0]]
+  matches = destinations.select{|o| o.match? text }
+  matches = destinations.select{|o| o.match? text, fuzzy: true } if matches.empty?
+  if matches.length == 1
+    actor.perform :go, d_map[matches[0]]
   else
     actor.proceed
   end

data/scripts/standard/actions/lock.plot.rb

@@ -2,11 +2,11 @@ respond :lock, Query::Text.new() do |actor, string|
   actor.tell "#{you.pronoun.Subj} #{you.contract you.verb.do + ' not'} see any \"#{string}\" here."
 end
 
-respond :lock, Query::Reachable.new() do |actor, thing|
+respond :lock, Use.family() do |actor, thing|
   actor.tell "#{you.pronoun.Subj} #{you.contract you.verb.can + ' not'} lock #{the thing}."
 end
 
-respond :lock, Query::Reachable.new(Lockable, :has_lock_key?) do |actor, container|
+respond :lock, Use.family(Lockable, :has_lock_key?) do |actor, container|
   # Portable containers need to be picked up before they are locked.
   if container.portable? and container.parent != actor
     actor.perform :take, container
@@ -36,7 +36,7 @@ respond :lock, Query::Reachable.new(Lockable, :has_lock_key?) do |actor, contain
   end
 end
 
-respond :lock, Query::Reachable.new(Lockable, :has_lock_key?), Query::Children.new do |actor, container, key|
+respond :lock, Use.family(Lockable, :has_lock_key?), Query::Children.new do |actor, container, key|
   if container.locked == false
     if container.lock_key == key
       #if container.is?(:not_auto_lockable)

data/scripts/standard/actions/look-under.plot.rb

@@ -1,6 +1,6 @@
 script 'standard/actions/look'
 
-respond :look_under, Query::Reachable.new() do |actor, thing|
+respond :look_under, Use.family() do |actor, thing|
   actor.tell "There's nothing to see under #{the thing}."
 end
 

data/scripts/standard/actions/look.plot.rb

@@ -3,7 +3,7 @@ respond :look, Use.parent(Supporter) do |actor, supporter|
   actor.tell "#{you.pronoun.Subj} are currently on #{the supporter}."
 end
 
-respond :look, Query::Self.new do |actor, _|
+respond :look, Use.itself do |actor, _|
   actor.tell actor.description
   actor.perform :inventory
 end
@@ -43,11 +43,12 @@ respond :look, Use.room do |actor, room|
     portals = room.children.that_are(Portal).that_are(:itemized?)
     if portals.length > 0
       if portals.length == 1
-        actor.tell "There is an exit #{portals[0].direction}."
+        p = portals[0]
+        actor.tell "There is an exit #{p.direction || p.name || "to #{the p.destination}"}."
       else
         dirs = []
         portals.each { |p|
-          dirs.push (p.direction || p.name)
+          dirs.push (p.direction || p.name || "to #{the p.destination}")
         }
         actor.tell "There are exits #{dirs.join_and(', ')}."
       end
@@ -63,7 +64,7 @@ end
 xlate "look", "look around"
 xlate "l", "look around"
 
-respond :look, Query::Visible.new() do |actor, thing|
+respond :look, Use.available() do |actor, thing|
   actor.tell thing.description
   thing.children.that_are(:attached?).that_are(:itemized?).each { |item|
     actor.tell "#{An item} is attached to #{the thing}."
@@ -71,17 +72,21 @@ respond :look, Query::Visible.new() do |actor, thing|
 end
 
 respond :look, Use.text do |actor, string|
-  actor.tell "You don't see any \"#{string}\" here."
+  if string == 'around'
+    actor.perform :look, actor.parent
+  else
+    actor.tell "You don't see any \"#{string}\" here."
+  end
 end
 
-respond :look, Use.reachable(Receptacle) do |actor, receptacle|
+respond :look, Use.available(Receptacle) do |actor, receptacle|
   if receptacle.has_description?
     actor.tell receptacle.description
   end
   actor.perform :search, receptacle
 end
 
-respond :look, Query::Visible.new(Supporter) do |actor, supporter|
+respond :look, Use.available(Supporter) do |actor, supporter|
   actor.proceed
   supported = supporter.children.that_are_not(:attached?)
   if supported.length > 0
@@ -89,7 +94,7 @@ respond :look, Query::Visible.new(Supporter) do |actor, supporter|
   end
 end
 
-respond :look, Query::Reachable.new(Door) do |actor, door|
+respond :look, Use.available(Door) do |actor, door|
   if door.has_description?
     actor.proceed
   end

data/scripts/standard/actions/nil.plot.rb

@@ -26,7 +26,7 @@ meta nil, Query::Text.new() do |actor, string|
   end
 end
 
-meta nil, Query::Text.new("it") do |actor, string|
+meta nil, Query::Text.new(/^it$/) do |actor, string|
   words = string.split_words
   if verbs(to_s: true).include?(words[0])
     actor.tell "I'm not sure what you mean by \"it.\""

data/scripts/standard/actions/place.plot.rb

@@ -7,7 +7,8 @@ respond :place, Use.visible, Use.reachable(Supporter) do |actor, thing, supporte
     actor.perform :take, thing
   end
   if thing.parent == actor
-    actor.perform :place, thing
+    thing.parent = supporter
+    actor.tell "You put #{the thing} on #{the supporter}."
   end
 end
 

data/scripts/standard/actions/read.plot.rb

@@ -1,3 +1,3 @@
-respond :read, Query::Visible.new do |actor, thing|
+respond :read, Use.family do |actor, thing|
   actor.perform :look, thing
 end

data/scripts/standard/actions/search.plot.rb

@@ -9,6 +9,7 @@ respond :search, Use.reachable(Receptacle) do |actor, receptacle|
 end
 
 respond :search, Use.reachable(Container) do |actor, container|
+  next unless container.kind_of?(Container)
   if container.open? or container.transparent?
     actor.proceed
   else

data/scripts/standard/actions/take.plot.rb

@@ -35,7 +35,7 @@ respond :take, Use.reachable(Entity, :portable?) do |actor, thing|
   end
 end
 
-respond :take, Use.reachable(Gamefic::Rubble) do |actor, rubble|
+respond :take, Use.reachable(Rubble) do |actor, rubble|
   actor.tell "#{you.pronoun.Subj} #{you.contract(you.verb.do + ' not')} have any use for #{the rubble}."
 end
 

data/scripts/standard/actions/talk.plot.rb

@@ -2,15 +2,15 @@ respond :talk do |actor|
   actor.tell "#{you.pronoun.Subj} #{you.verb.talk} to #{you.pronoun.reflex}."
 end
 
-respond :talk, Query::Self.new do |actor, yourself|
+respond :talk, Use.itself do |actor, yourself|
   actor.perform :talk
 end
 
-respond :talk, Query::Reachable.new do |actor, thing|
+respond :talk, Use.family do |actor, thing|
   actor.tell "Nothing happens."
 end
 
-respond :talk, Query::Reachable.new(Character) do |actor, character|
+respond :talk, Use.family(Character) do |actor, character|
   if actor == character
     actor.perform :talk
   else
@@ -18,7 +18,7 @@ respond :talk, Query::Reachable.new(Character) do |actor, character|
   end
 end
 
-respond :talk, Query::Reachable.new(Character), Query::Text.new do |actor, character, text|
+respond :talk, Use.family(Character), Query::Text.new do |actor, character, text|
   actor.perform :talk, character
 end
 

data/scripts/standard/actions/unlock.plot.rb

@@ -2,11 +2,11 @@ respond :unlock, Query::Text.new() do |actor, string|
   actor.tell "#{you.pronoun.Subj} #{you.contract you.verb.do + ' not'} see any \"#{string}\" here."
 end
 
-respond :unlock, Query::Reachable.new() do |actor, thing|
+respond :unlock, Use.family() do |actor, thing|
   actor.tell "#{you.pronoun.Subj} can't unlock #{the thing}."
 end
 
-respond :unlock, Query::Reachable.new(Lockable) do |actor, container|
+respond :unlock, Use.family(Lockable) do |actor, container|
   # Portable containers need to be picked up before they are unlocked.
   if container.portable? and container.parent != actor
     actor.perform :take, container
@@ -36,11 +36,11 @@ respond :unlock, Query::Reachable.new(Lockable) do |actor, container|
   end
 end
 
-respond :unlock, Query::Reachable.new(Lockable), Query::Text.new do |actor, container, thing|
+respond :unlock, Use.family(Lockable), Query::Text.new do |actor, container, thing|
   actor.tell "#{you.pronoun.Subj} #{you.contract you.verb.do + ' not'} have anything called '#{thing}.'"
 end
 
-respond :unlock, Query::Reachable.new(Lockable, :has_lock_key?), Query::Children.new do |actor, container, key|
+respond :unlock, Use.family(Lockable, :has_lock_key?), Query::Children.new do |actor, container, key|
   if container.is?(:locked)
     if container.key == key
       #if container.is?(:not_auto_lockable)
@@ -58,7 +58,7 @@ respond :unlock, Query::Reachable.new(Lockable, :has_lock_key?), Query::Children
   end
 end
 
-respond :open, Query::Reachable.new(Lockable, :has_lock_key?), Query::Children.new do |actor, container, key|
+respond :open, Use.family(Lockable, :has_lock_key?), Query::Children.new do |actor, container, key|
   if container.is?(:locked)
     actor.perform :unlock, container, key
     if !container.is?(:locked)
@@ -69,7 +69,7 @@ respond :open, Query::Reachable.new(Lockable, :has_lock_key?), Query::Children.n
   end
 end
 
-respond :use, Query::Children.new, Query::Reachable.new(Lockable, :has_lock_key?) do |actor, key, container|
+respond :use, Query::Children.new, Use.family(Lockable, :has_lock_key?) do |actor, key, container|
   actor.perform :unlock, container, key
 end
 

data/scripts/standard/actions/use.plot.rb

@@ -1,4 +1,4 @@
-respond :use, Query::Reachable.new do |actor, tool|
+respond :use, Use.family do |actor, tool|
   actor.tell "I don't know how to use #{the tool}. (A more specific command might work.)"
 end
 
@@ -6,7 +6,7 @@ respond :use, Gamefic::Query::Text.new do |actor, thing|
   actor.tell "#{you.pronoun.Subj} #{you.contract you.verb.do + ' not'} see any '#{thing}' #{you.pronoun.subj} can use here."
 end
 
-respond :use, Query::Reachable.new, Query::Reachable.new do |actor, tool, object|
+respond :use, Use.family, Use.family do |actor, tool, object|
   actor.tell "#{you.contract you.pronoun.Subj + ' ' + you.verb.be} not carrying the #{tool}."
 end
 
@@ -14,11 +14,11 @@ respond :use, Gamefic::Query::Children.new, Gamefic::Query::Text.new do |actor,
   actor.tell "#{you.pronoun.Subj} #{you.contract you.verb.do + ' not'} see any '#{object}' here."
 end
 
-respond :use, Query::Text.new, Query::Reachable.new do |actor, tool, object|
+respond :use, Query::Text.new, Use.family do |actor, tool, object|
   actor.tell "#{you.pronoun.Subj} #{you.contract you.verb.do + ' not'} have anything called '#{tool}.'"
 end
 
-respond :use, Query::Children.new, Query::Reachable.new do |actor, tool, object|
+respond :use, Query::Children.new, Use.family do |actor, tool, object|
   actor.tell "I don't know how to use #{the tool} on #{the object}. (A more specific command might work.)"
 end
 

data/scripts/standard/entities/character.plot.rb

@@ -4,6 +4,4 @@ class Gamefic::Character
   include Itemizable
   include AutoTakes
   
-  serialize :attached?, :itemized?
-  
 end

data/scripts/standard/entities/container.plot.rb

@@ -1,11 +1,8 @@
 script 'standard/entities/receptacle'
 
-class Gamefic::Container < Gamefic::Receptacle
+class Container < Receptacle
   include Enterable
   include Openable
   include Lockable
   include Transparent
-  
-  serialize :enterable?, :open?, :locked?, :lock_key, :transparent?
-  
 end

data/scripts/standard/entities/door.plot.rb

@@ -1,11 +1,9 @@
 script 'standard/entities/portal'
 
-class Gamefic::Door < Gamefic::Portal
+class Door < Portal
   include Openable
   include Lockable
   
-  serialize :open?, :locked?, :lock_key, :automatic?
-  
   def post_initialize
     super
     if @name.nil? and !@direction.nil?

data/scripts/standard/entities/entity.plot.rb

@@ -5,7 +5,6 @@ class Gamefic::Entity
   include Attachable
 
   attr_writer :locale_description
-  serialize :locale_description, :portable?, :itemized?, :attached?
   
   def locale_description
     @locale_description ||= ""

data/scripts/standard/entities/exterior.plot.rb

@@ -1,5 +1,5 @@
 script 'standard/entities/room'
 
-class Gamefic::Exterior < Gamefic::Room
+class Exterior < Room
   
 end

data/scripts/standard/entities/fixture.plot.rb

@@ -1,3 +1,3 @@
-class Gamefic::Fixture < Gamefic::Entity
+class Fixture < Gamefic::Entity
 
 end

data/scripts/standard/entities/item.plot.rb

@@ -1,4 +1,4 @@
-class Gamefic::Item < Gamefic::Entity
+class Item < Gamefic::Entity
   def pre_initialize
     self.portable = true
   end

data/scripts/standard/entities/portal.plot.rb

@@ -1,6 +1,5 @@
-class Gamefic::Portal < Gamefic::Entity
+class Portal < Gamefic::Entity
   attr_accessor :destination
-  serialize :destination, :direction
 
   # Find the portal in the destination that returns to this portal's parent
   #
@@ -32,7 +31,7 @@ class Gamefic::Portal < Gamefic::Entity
   end
 
   def name
-    @name || direction.name
+    @name || (direction.nil? ? destination.name : direction.name)
   end
   
   def synonyms

data/scripts/standard/entities/receptacle.plot.rb

@@ -1,4 +1,3 @@
-class Gamefic::Receptacle < Gamefic::Entity
+class Receptacle < Gamefic::Entity
   include Enterable
-  serialize :enterable?, :enter_verb, :leave_verb, :inside_verb
 end

data/scripts/standard/entities/room.plot.rb

@@ -1,9 +1,7 @@
-class Gamefic::Room < Gamefic::Entity
+class Room < Gamefic::Entity
   include Darkenable
   include ExplicitExits
-  
-  serialize :dark?, :explicit_exits?
-  
+
   def connect(destination, direction = nil, type = Portal, two_way = true)
     if direction.kind_of?(Hash)
       connect2(destination, direction)
@@ -31,9 +29,9 @@ class Gamefic::Room < Gamefic::Entity
   private
   def connect2 destination, direction:nil, type:Portal, two_way:true
     if direction.nil?
-      portal = type.new :parent => self, :destination => destination, :name => destination.definitely
+      portal = type.new :parent => self, :destination => destination
       if two_way == true
-        portal2 = type.new :parent => destination, :destination => self, :name => self.definitely
+        portal2 = type.new :parent => destination, :destination => self
       end
     else
       if direction.kind_of?(String)

data/scripts/standard/entities/rubble.plot.rb

@@ -6,6 +6,6 @@ script 'standard/entities/scenery'
 # like a table or the sky; and Rubble is something that might
 # be portable but is otherwise useless, like trash or debris.
 
-class Gamefic::Rubble < Gamefic::Scenery
+class Rubble < Scenery
   
 end

data/scripts/standard/entities/scenery.plot.rb

@@ -1,4 +1,4 @@
-class Gamefic::Scenery < Gamefic::Entity
+class Scenery < Gamefic::Entity
   def pre_initialize
     self.itemized = false
   end

data/scripts/standard/entities/supporter.plot.rb

@@ -1,6 +1,6 @@
-class Gamefic::Supporter < Gamefic::Entity
+class Supporter < Gamefic::Entity
   include Enterable
-  serialize :enterable?
+
   def initialize(args = {})
     self.enter_verb = "get on"
     self.leave_verb = "get off"

data/scripts/standard/modules/attachable.plot.rb

@@ -1,4 +1,4 @@
-module Gamefic::Attachable
+module Attachable
   def attached?
     if @attached.nil?
       @attached = false

data/scripts/standard/modules/auto_takes.plot.rb

@@ -1,4 +1,4 @@
-module Gamefic::AutoTakes
+module AutoTakes
   def auto_takes?(entity)
     return true if entity.parent == self
     if AutoTakes.enabled?

data/scripts/standard/modules/darkenable.plot.rb

@@ -1,4 +1,4 @@
-module Gamefic::Darkenable
+module Darkenable
   attr_writer :dark
   def dark?
     @dark ||= false