gamefic-sdk 1.6.0 → 1.7.0

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

@@ -6,11 +6,11 @@ respond :talk, Use.itself do |actor, yourself|
   actor.perform :talk
 end
 
-respond :talk, Use.family do |actor, thing|
+respond :talk, Use.available do |actor, thing|
   actor.tell "Nothing happens."
 end
 
-respond :talk, Use.family(Character) do |actor, character|
+respond :talk, Use.available(Character) do |actor, character|
   if actor == character
     actor.perform :talk
   else
@@ -18,14 +18,10 @@ respond :talk, Use.family(Character) do |actor, character|
   end
 end
 
-respond :talk, Use.family(Character), Query::Text.new do |actor, character, text|
-  actor.perform :talk, character
-end
-
-xlate "talk to :character", "talk :character"
-xlate "talk to :character about :subject", "talk :character :subject"
-xlate "ask :character :subject", "talk :character :subject"
-xlate "ask :character about :subject", "talk :character :subject"
-xlate "tell :character :subject", "talk :character :subject"
-xlate "tell :character about :subject", "talk :character :subject"
-xlate "ask :character for :subject", "talk :character :subject"
+interpret "talk to :character", "talk :character"
+interpret "talk to :character about :subject", "talk :character :subject"
+interpret "ask :character :subject", "talk :character :subject"
+interpret "ask :character about :subject", "talk :character :subject"
+interpret "tell :character :subject", "talk :character :subject"
+interpret "tell :character about :subject", "talk :character :subject"
+interpret "ask :character for :subject", "talk :character :subject"

data/scripts/standard/clothing.plot.rb

@@ -0,0 +1,4 @@
+# @gamefic.script standard/clothing
+
+script 'standard/clothing/entities'
+script 'standard/clothing/actions'

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

@@ -0,0 +1,4 @@
+script 'standard/clothing/actions/doff'
+script 'standard/clothing/actions/drop'
+script 'standard/clothing/actions/inventory'
+script 'standard/clothing/actions/wear'

data/scripts/{clothing → standard/clothing}/actions/drop.plot.rb

@@ -1,8 +1,8 @@
-respond :drop, Query::Children.new(Clothing) do |actor, clothing|
-  if clothing.attached?
-    actor.perform :doff, clothing
-  end
-  if !clothing.attached?
-    actor.proceed
-  end
-end
+respond :drop, Query::Children.new(Clothing) do |actor, clothing|
+  if clothing.attached?
+    actor.perform :doff, clothing
+  end
+  if !clothing.attached?
+    actor.proceed
+  end
+end

data/scripts/{clothing → standard/clothing}/actions/inventory.plot.rb

@@ -1,14 +1,14 @@
-respond :inventory do |actor|
-  if actor.children.length > 0
-    carried = actor.children.that_are_not(:attached?)
-    worn = actor.children.that_are(:attached?)
-    if carried.length > 0
-      actor.tell "You are carrying #{carried.join_and}."
-    end
-    if worn.length > 0
-      actor.tell "You are wearing #{worn.join_and}."
-    end
-  else
-    actor.tell "You aren't carrying anything."
-  end
-end
+respond :inventory do |actor|
+  if actor.children.length > 0
+    carried = actor.children.that_are_not(:attached?)
+    worn = actor.children.that_are(:attached?)
+    if carried.length > 0
+      actor.tell "You are carrying #{carried.join_and}."
+    end
+    if worn.length > 0
+      actor.tell "You are wearing #{worn.join_and}."
+    end
+  else
+    actor.tell "You aren't carrying anything."
+  end
+end

data/scripts/standard/clothing/actions/wear.plot.rb

@@ -0,0 +1,20 @@
+respond :wear, Use.available(Clothing) do |actor, clothing|
+  if clothing.parent != actor
+    actor.tell "You don't have #{the clothing}."
+  end
+  if clothing.attached?
+    actor.tell "You're already wearing #{the clothing}."
+  else
+    already = actor.children.that_are(clothing.class).that_are(:attached?)
+    if already.length == 0
+      clothing.attached = true
+      actor.tell "You put on #{the clothing}."
+    else
+      actor.tell "You're already wearing #{an already[0]}."
+    end
+  end
+end
+
+xlate "put on :clothing", "wear :clothing"
+xlate "put :clothing on", "wear :clothing"
+xlate "don :clothing", "wear :clothing"

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

@@ -0,0 +1,7 @@
+script 'standard/clothing/entities/clothing'
+script 'standard/clothing/entities/coat'
+script 'standard/clothing/entities/gloves'
+script 'standard/clothing/entities/hat'
+script 'standard/clothing/entities/pants'
+script 'standard/clothing/entities/shirt'
+script 'standard/clothing/entities/shoes'

data/scripts/{clothing → standard/clothing}/entities/clothing.plot.rb

@@ -1,5 +1,3 @@
-script 'standard/entities/item'
-
 class Clothing < Item
   def worn?
     self.parent.kind_of?(Character) and self.attached?

data/scripts/standard/clothing/entities/coat.plot.rb

@@ -0,0 +1,3 @@
+class Coat < Clothing
+
+end

data/scripts/standard/clothing/entities/gloves.plot.rb

@@ -0,0 +1,3 @@
+class Gloves < Clothing
+
+end

data/scripts/standard/clothing/entities/hat.plot.rb

@@ -0,0 +1,3 @@
+class Hat < Clothing
+
+end

data/scripts/standard/clothing/entities/pants.plot.rb

@@ -0,0 +1,3 @@
+class Pants < Clothing
+
+end

data/scripts/standard/clothing/entities/shirt.plot.rb

@@ -0,0 +1,3 @@
+class Shirt < Clothing
+
+end

data/scripts/standard/clothing/entities/shoes.plot.rb

@@ -0,0 +1,3 @@
+class Shoes < Clothing
+
+end

data/scripts/standard/container.plot.rb

@@ -0,0 +1,28 @@
+# @gamefic.script standard/container
+
+script 'standard/openable'
+script 'standard/lockable'
+#script 'standard/container/entities'
+#script 'standard/container/actions'
+
+class Container < Receptacle
+  include Openable
+  include Lockable
+  #include Transparent
+end
+
+respond :insert, Use.available, Use.available(Container) do |actor, thing, container|
+  if container.open?
+    actor.proceed
+  else
+    actor.tell "#{The container} is closed."
+  end
+end
+
+respond :leave, Use.parent(Container, :enterable?, :closed?) do |actor, container|
+  actor.tell "#{The container} is closed."
+end
+
+respond :enter, Use.siblings(Container, :enterable?, :closed?) do |actor, container|
+  actor.tell "#{The container} is closed."
+end

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

@@ -0,0 +1,5 @@
+class Container < Receptacle
+  include Openable
+  include Lockable
+  #include Transparent
+end

data/scripts/standard/direction.plot.rb

@@ -1,4 +1,4 @@
-class ::Gamefic::Direction
+class Direction
     attr_accessor :name, :adjective, :adverb, :reverse
 
     def initialize args = {}
@@ -52,5 +52,4 @@ class ::Gamefic::Direction
         compass[dir.to_s.downcase.to_sym]
       end
     end
-
 end

data/scripts/{edible.plot.rb → standard/edible.plot.rb}

@@ -1,3 +1,5 @@
+# @gamefic.script standard/edible
+
 module Edibility
   attr_writer :edible
   def edible?
@@ -5,15 +7,15 @@ module Edibility
   end
 end
 
-class Gamefic::Entity
+class Thing
   include Edibility
 end
 
-respond :eat, Use.reachable do |actor, item|
+respond :eat, Use.available do |actor, item|
   actor.tell "You can't eat #{the item}."
 end
 
-respond :eat, Use.reachable(:edible?) do |actor, item|
+respond :eat, Use.available(:edible?) do |actor, item|
   actor.tell "You eat #{the item}."
   destroy item
 end

data/scripts/standard/entities.plot.rb

@@ -1,7 +1,7 @@
-script 'standard/entities/entity'
+script 'standard/entities/thing'
 script 'standard/entities/character'
-script 'standard/entities/container'
-script 'standard/entities/door'
+#script 'standard/entities/container'
+#script 'standard/entities/door'
 script 'standard/entities/fixture'
 script 'standard/entities/item'
 script 'standard/entities/portal'

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

@@ -1,7 +1,10 @@
-class Gamefic::Character
-  include ParentRoom
-  include Attachable
-  include Itemizable
-  include AutoTakes
-  
+class Character < Thing
+  #include ParentRoom
+  #include Attachable
+  #include Itemizable
+  #include AutoTakes
+  #include LocaleDescription
+  include Gamefic::Active
 end
+
+player_class Character

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

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

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

@@ -1,5 +1,3 @@
-class Item < Gamefic::Entity
-  def pre_initialize
-    self.portable = true
-  end
+class Item < Thing
+  set_default portable: true
 end

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

@@ -1,4 +1,4 @@
-class Portal < Gamefic::Entity
+class Portal < Thing
   attr_accessor :destination
 
   # Find the portal in the destination that returns to this portal's parent
@@ -16,7 +16,7 @@ class Portal < Gamefic::Entity
     end
     nil
   end
-  
+
   # Get the ordinal direction of this Portal
   # Portals have distinct direction and name properties so games can display a
   # bare compass direction for exits, e.g., "south" vs. "the southern door."
@@ -25,7 +25,7 @@ class Portal < Gamefic::Entity
   def direction
     @direction
   end
-  
+
   def direction= d
     @direction = Direction.find(d)
   end
@@ -33,8 +33,12 @@ class Portal < Gamefic::Entity
   def name
     @name || (direction.nil? ? destination.name : direction.name)
   end
-  
+
+  def instruction
+    direction || (destination ? "to #{destination.definitely}" : name)
+  end
+
   def synonyms
-    "#{super} #{@direction} #{!direction.nil? ? direction.synonyms : ''}"
+    "#{super} #{@destination} #{@direction} #{!direction.nil? ? direction.synonyms : ''}"
   end
 end

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

@@ -1,3 +1,3 @@
-class Receptacle < Gamefic::Entity
+class Receptacle < Thing
   include Enterable
 end

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

@@ -1,5 +1,4 @@
-class Room < Gamefic::Entity
-  include Darkenable
+class Room < Thing
   include ExplicitExits
 
   def connect(destination, direction = nil, type = Portal, two_way = true)
@@ -13,20 +12,21 @@ class Room < Gamefic::Entity
   def synonyms
     @synonyms.to_s + " around here room"
   end
-  
+
   def tell(message)
     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]
   end
-  
+
   private
+
   def connect2 destination, direction:nil, type:Portal, two_way:true
     if direction.nil?
       portal = type.new :parent => self, :destination => destination

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

@@ -1,5 +1,3 @@
-class Scenery < Gamefic::Entity
-  def pre_initialize
-    self.itemized = false
-  end
+class Scenery < Thing
+  set_default itemized: false
 end

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

@@ -1,10 +1,7 @@
-class Supporter < Gamefic::Entity
+class Supporter < Thing
   include Enterable
 
-  def initialize(args = {})
-    self.enter_verb = "get on"
-    self.leave_verb = "get off"
-    self.inside_verb = "be on"
-    super
-  end
+  set_default enter_verb: 'get on'
+  set_default leave_verb: 'get off'
+  set_default inside_verb: 'be on'
 end

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

@@ -0,0 +1,7 @@
+class Thing < Gamefic::Entity
+  include Portable
+  include Itemizable
+  include ParentRoom
+  include Attachable
+  include LocaleDescription
+end

data/scripts/standard/{actions/give.plot.rb → give.plot.rb}

@@ -1,25 +1,27 @@
-respond :give, Use.available, Query::Children.new do |actor, character, gift|
-  actor.tell "Nothing happens."
-end
-
-respond :give, Use.available(Character), Use.available do |actor, character, gift|
-  if gift.sticky?
-    actor.tell gift.sticky_message || "#{you.pronoun.Subj} #{you.verb.need} to keep #{the gift} for now."
-  else
-    actor.tell "#{The character} doesn't want #{the gift}."
-  end
-end
-
-respond :give, Use.available(Character), Use.available do |actor, character, gift|
-  if gift.parent == actor
-    actor.proceed
-  else
-    actor.tell "#{you.pronoun.Subj} #{you.contract(you.verb.do + ' not')} have #{the gift}."
-  end
-end
-
-respond :give, Use.text, Use.available do |actor, character, gift|
-  actor.tell "#{you.pronoun.Subj} #{you.contract(you.verb.do + ' not')} see any \"#{character}\" here."
-end
-
-interpret "give :gift to :character", "give :character :gift"
+# @gamefic.script standard/give
+
+respond :give, Use.available, Query::Children.new do |actor, character, gift|
+  actor.tell "Nothing happens."
+end
+
+respond :give, Use.available(Character), Use.available do |actor, character, gift|
+  if gift.sticky?
+    actor.tell gift.sticky_message || "#{you.pronoun.Subj} #{you.verb.need} to keep #{the gift} for now."
+  else
+    actor.tell "#{The character} doesn't want #{the gift}."
+  end
+end
+
+respond :give, Use.available(Character), Use.available do |actor, character, gift|
+  if gift.parent == actor
+    actor.proceed
+  else
+    actor.tell "#{you.pronoun.Subj} #{you.contract(you.verb.do + ' not')} have #{the gift}."
+  end
+end
+
+respond :give, Use.text, Use.available do |actor, character, gift|
+  actor.tell "#{you.pronoun.Subj} #{you.contract(you.verb.do + ' not')} see any \"#{character}\" here."
+end
+
+interpret "give :gift to :character", "give :character :gift"