gamefic 0.0.5 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 20c3e34c3d13071e770eda8495d563a655dcbeb1
-  data.tar.gz: e426f447d23f070f3e8ba86e53869dfd1a1bbbaf
+  metadata.gz: 0ebda04fc06a182081d6516d328bd23501586ecd
+  data.tar.gz: 1e8aa7db0b490b0f864071fb74317a7a2f1b330d
 SHA512:
-  metadata.gz: e3021ba57098702d8432f469a5df40a69b18560cb51680bec94a5eae0dd55291432c1191faec2456554e42a53027f4a8e6439e5b7a5b509827181e34469228ca
-  data.tar.gz: 83877a6aef2eb5150087840fdd4f8349bf489e21b3b0516484f6a25a3d07ecadf2861ddedc6192afdad9ebfe67ba5c0713e5dc711074c410b654dba12b9fa215
+  metadata.gz: 74a8a6dc8951a30802fb5bb8e6ee764525885572fc0fa18018ea4cd9890f48674830dc94274528ca4e1f0b58de2043d547f1f8e60f14d6e8cb1a41ce30f53d1c
+  data.tar.gz: 3181204289bc694587d60ffebf14f660a6c85d7f5140927f27f5e3c13fff60684f63c7fd59cf89d1acc8ac0ccaf85f5566f09f5d626a2a9d588518036acacc73

data/bin/gamefic

@@ -0,0 +1,7 @@
+#!/usr/bin/env ruby
+
+require 'gamefic'
+require 'gamefic/shell'
+
+shell = Gamefic::Shell.new
+shell.execute

data/lib/gamefic/character.rb

@@ -2,6 +2,7 @@ module Gamefic
 
 	class Character < Entity
 		attr_reader :state, :queue, :user, :last_command
+    attr_accessor :object_of_pronoun
 		def initialize(plot, args = {})
 			@state = CharacterState.new(self)
 			@queue = Array.new
@@ -78,4 +79,5 @@ module Gamefic
       "GAME OVER"
     end
   end
+
 end

data/lib/gamefic/core_ext/string.rb

@@ -20,7 +20,7 @@ class String
 		lines.each { |line|
 			if line.size > 79
 				while (line.size > 79)
-					offset = line.rindex(/[\s\W]/, 79)
+					offset = line.rindex(/[\s\-]/, 79)
 					if (offset == 0 or offset == nil)
 						output = output + line + "\n"
 						line = ''
@@ -34,7 +34,7 @@ class String
 				output = output + line + "\n"
 			end
 		}
-		return output.strip
+		return output
 	end
 	def split_words
 		self.gsub(/ +/, ' ').strip.split

data/lib/gamefic/director.rb

@@ -3,6 +3,26 @@ module Gamefic
 	class Director
 		def self.dispatch(actor, command)
 			command.strip!
+      verbs = actor.plot.commandwords
+      first = command.split(' ')[0].downcase
+      if verbs.include?(first) == false
+        possibles = []
+        verbs.each { |v|
+          if v.start_with?(first)
+            possibles.push v
+          end
+        }
+        if possibles.length == 1
+          command = possibles[0] + command[first.length..-1]
+        else
+          if possibles.length > 1
+            actor.tell "'#{first.cap_first}' is ambiguous."
+          else
+            actor.tell "I don't understand '#{first}' as a command."
+          end
+          return
+        end
+      end
 			handlers = Syntax.match(command, actor.plot.syntaxes)
 			options = Array.new
 			handlers.each { |handler|
@@ -31,7 +51,7 @@ module Gamefic
 			}
 			options.push([
 				Proc.new { |actor|
-          first = Keywords.new(command)[0]
+          first = command.split(' ')[0].downcase
           if actor.plot.commandwords.include?(first)
             actor.tell "I know the verb '#{first}' but couldn't understand the rest of your sentence."
           else
@@ -63,9 +83,17 @@ module Gamefic
 							valid = false
 							next
 						end
-						result = context.execute(last[0], arg)
+            if arg == 'it' and actor.object_of_pronoun != nil
+              result = context.execute(last[0], "#{actor.object_of_pronoun.longname}")
+            else
+              result = context.execute(last[0], arg)
+            end
 					else
-						result = context.execute(actor, arg)
+            if arg == 'it' and actor.object_of_pronoun != nil
+              result = context.execute(actor, "#{actor.object_of_pronoun.longname}")
+            else
+              result = context.execute(actor, arg)
+            end
 					end
 					if result.objects.length == 0
 						valid = false
@@ -104,6 +132,11 @@ module Gamefic
 					if opt[1].length == 1
 						opt[0].call(opt[1][0])
 					else
+            if opt[1].length == 2 and opt[1][1].kind_of?(Entity)
+              opt[1][0].object_of_pronoun = opt[1][1]
+            else
+              opt[1][0].object_of_pronoun = nil
+            end
 						opt[0].call(opt[1])
 					end
 				end

data/lib/gamefic/engine.rb

@@ -6,11 +6,15 @@ module Gamefic
 		end
 		def run
 			user = User.new @plot
-			@plot.introduce user.character
-			while true
-				user.stream.select user.character.state.prompt
-				user.state.update
-				@plot.update
+      @plot.introduce user.character
+			while user.character.state.kind_of?(GameOverState) == false
+        proc {
+          $SAFE = 3
+          user.stream.select user.character.state.prompt
+          print "\n"
+          user.state.update
+          @plot.update
+        }.call
 			end
 		end
 	end

data/lib/gamefic/entity.rb

@@ -4,7 +4,7 @@ require "gamefic/describable"
 require "gamefic/plot"
 
 module Gamefic
-	
+
 	class Entity
 		include Branch
 		include Describable

data/lib/gamefic/import/basics.rb

@@ -0,0 +1,2 @@
+import 'basics/entities'
+import 'basics/*'

data/lib/gamefic/import/basics/actions.rb

@@ -0,0 +1 @@
+import 'basics/actions/*'

data/lib/gamefic/import/basics/actions/container.rb

@@ -0,0 +1,111 @@
+respond :look, Query.new(:family, Container) do |actor, thing|
+  passthru
+  if thing.closeable?
+    actor.tell "#{thing.longname.specify.cap_first} is #{thing.closed? ? 'closed' : 'open'}."
+  end
+end
+
+respond :look_inside, Query.new(:family, Container) do |actor, container|
+  if container.closed?
+    actor.tell "#{container.longname.cap_first.specify} is closed."
+  else
+    if container.children.length == 0
+      actor.tell "You don't find anything."
+    else
+      if container.children.length == 1
+        actor.tell "#{container.longname.specify.cap_first} contains #{container.children[0].longname}."
+      else
+        actor.tell "#{container.longname.specify.cap_first} contains: #{container.children.join_and(', ')}."
+      end
+    end
+  end
+end
+xlate "look inside :container", :look_inside, :container
+xlate "search :container", :look_inside, :container
+xlate "look in :container", :look_inside, :container
+
+respond :look_in_at, Query.new(:family, Container), Subquery.new(:children, Entity) do |actor, container, item|
+  if container.closed?
+    actor.tell "#{container.longname.cap_first.specify} is closed."
+  else
+    actor.tell item.description
+  end
+end
+
+respond :look_in_at, Query.new(:family, Container), Query.new(:string) do |actor, container, item|
+  if container.closed?
+    actor.tell "#{container.longname.cap_first.specify} is closed."
+  else
+    passthru
+  end
+end
+
+xlate "look at :item in :container", :look_in_at, :container, :item
+xlate "look :item in :container", :look_in_at, :container, :item
+
+respond :take_from, Query.new(:family, Container), Subquery.new(:children, Portable) do |actor, container, item|
+  if container.closed?
+    actor.tell "#{container.longname.cap_first.specify} is closed."
+  else
+    item.parent = actor
+    actor.tell "You take #{item.longname} from #{container.longname.specify}."
+  end
+end
+xlate "take :item from :container", :take_from, :container, :item
+xlate "get :item from :container", :take_from, :container, :item
+xlate "remove :item from :container", :take_from, :container, :item
+
+respond :drop_in, Query.new(:family, Container), Query.new(:children) do |actor, container, item|
+  if container.closed?
+    actor.tell "#{container.longname.cap_first.specify} is closed."
+  else
+    item.parent = container
+    actor.tell "You put #{item.longname} in #{container.longname}."
+  end
+end
+xlate "drop :item in :container", :drop_in, :container, :item
+xlate "put :item in :container", :drop_in, :container, :item
+xlate "place :item in :container", :drop_in, :container, :item
+
+respond :open, Query.new(:string) do |actor, string|
+  actor.tell "You don't see any \"#{string}\" here."
+end
+
+respond :open, Query.new(:family, Entity) do |actor, thing|
+  actor.tell "You can't open #{thing.longname.specify}."
+end
+
+respond :open, Query.new(:family, Container) do |actor, container|
+  if container.closeable?
+    if container.closed?
+      actor.tell "You open #{container.longname.specify}."
+      container.closed = false
+      actor.perform "look inside #{container.longname}"
+    else
+      actor.tell "It's already open."
+    end
+  else
+    actor.tell "You can't open #{container.longname.specify}."
+  end
+end
+
+respond :close, Query.new(:string) do |actor, string|
+  actor.tell "You don't see any \"#{string}\" here."
+end
+
+respond :close, Query.new(:family, Entity) do |actor, thing|
+  actor.tell "You can't close #{thing.longname.specify}."
+end
+
+respond :close, Query.new(:family, Container) do |actor, container|
+  if container.closeable?
+    if container.closed?
+      actor.tell "It's already closed."
+    else
+      actor.tell "You close #{container.longname.specify}."
+      container.closed = true
+    end
+  else
+    actor.tell "You can't close #{container.longname.specify}."
+  end  
+end

data/lib/gamefic/import/basics/actions/inventory.rb

@@ -0,0 +1,49 @@
+respond :inventory do |actor|
+  if actor.children.length > 0
+    actor.tell actor.children.join(', ')
+  else
+    actor.tell "You aren't carrying anything."
+  end
+end
+xlate "i", :inventory
+
+respond :take, Query.new(:siblings, Portable) do |actor, thing|
+  thing.parent = actor
+  actor.tell "You take #{thing.longname.specify}.", true
+end
+
+respond :take, Query.new(:siblings) do |actor, thing|
+  actor.tell "You can't carry #{thing.longname.specify}."
+end
+
+respond :take, Query.new(:string) do |actor, thing|
+  containers = actor.children.that_are(Container)
+  containers = containers + actor.parent.children.that_are(Container)
+  found = false
+  containers.each { |container|
+    if container.closed? == false
+      query = Query.new(:children, Portable)
+      result = query.execute(container, thing)
+      if result.objects.length == 1
+        found = true
+        actor.perform "take #{result.objects[0].longname} from #{container.longname}"
+        break
+      end
+    end
+  }
+  if found == false
+    actor.tell "You don't see any \"#{thing}\" here."
+  end
+end
+
+respond :drop, Query.new(:children) do |actor, thing|
+  thing.parent = actor.parent
+  actor.tell "You drop #{thing.longname.specify}.", true
+end
+
+xlate "get :thing", :take, :thing
+xlate "pick :thing up", :take, :thing
+xlate "pick up :thing", :take, :thing
+
+xlate "put down :thing", :drop, :thing
+xlate "put :thing down", :drop, :thing

data/lib/gamefic/import/basics/actions/look.rb

@@ -0,0 +1,67 @@
+respond :look do |actor|
+  actor.perform "itemize room full"
+end
+
+respond :look_around do |actor|
+  actor.perform "look"
+end
+
+respond :itemize_room, Query.new(:string) do |actor, option|
+  actor.tell "## #{actor.parent.longname.cap_first}"
+  if option == "full"
+    actor.tell actor.parent.description
+  end
+  chars = actor.parent.children.that_are(Character) - [actor]
+  if chars.length > 0
+    actor.tell "Others here: #{chars.join(", ")}"
+  end
+  #items = actor.parent.children.that_are(Itemized) - [chars] - [actor] - actor.parent.children.that_are(Portal)
+  items = actor.parent.children.that_are(Itemized)
+  if items.length > 0
+    actor.tell "Visible items: #{items.join(", ")}"
+  end
+  portals = actor.parent.children.that_are(Portal)
+  if portals.length > 0
+    actor.tell "Obvious exits: #{portals.join(', ')}"
+  else
+    actor.tell "Obvious exits: none"	
+  end
+end
+xlate "itemize room", :itemize_room, "short"
+xlate "itemize room :option", :itemize_room, :option
+
+respond :look, Query.new(:family) do |actor, thing|
+  actor.tell thing.description
+end
+
+respond :look, Query.new(:parent) do |actor, thing|
+  actor.perform "look"
+end
+
+respond :look, String do |actor, string|
+  containers = actor.children.that_are(Container)
+  containers = containers + actor.parent.children.that_are(Container)
+  found = false
+  containers.each { |container|
+    if container.closed? == false
+      query = Query.new(:children, Portable)
+      result = query.execute(container, string)
+      if result.objects.length == 1
+        found = true
+        actor.tell "You look at #{result.objects[0].longname.specify} in #{container.longname.specify}."
+        actor.perform "look #{result.objects[0].longname} in #{container.longname}"
+        break
+      end
+    end
+  }
+  if found == false
+    actor.tell "You don't see any \"#{string}\" here."
+  end
+end
+
+xlate "look at :thing", :look, :thing
+xlate "l", :look
+xlate "l :thing", :look, :thing
+xlate "examine :thing", :look, :thing
+xlate "exam :thing", :look, :thing
+xlate "x :thing", :look, :thing

data/lib/gamefic/import/basics/actions/meta.rb

@@ -0,0 +1,6 @@
+respond :quit do |actor|
+  actor.destroy
+end
+respond :commands do |actor|
+  actor.tell actor.plot.commandwords.sort.join(", ")
+end

data/lib/gamefic/import/basics/actions/traversal.rb

@@ -0,0 +1,35 @@
+respond :go, Query.new(:siblings, Portal) do |actor, portal|
+  actor.parent = portal.destination
+  actor.tell "You go #{portal.name}."
+  actor.perform "itemize room"
+end
+
+respond :go, String do |actor, string|
+  actor.tell "You don't see any exit \"#{string}\" from here."
+end
+
+respond :go do |actor|
+  actor.tell "Where do you want to go?"
+end
+
+xlate "north", :go, "north"
+xlate "south", :go, "south"
+xlate "west", :go, "west"
+xlate "east", :go, "east"
+xlate "up", :go, "up"
+xlate "down", :go, "down"
+xlate "northwest", :go, "northwest"
+xlate "northeast", :go, "northeast"
+xlate "southwest", :go, "southwest"
+xlate "southeast", :go, "southeast"
+
+xlate "n", :go, "north"
+xlate "s", :go, "south"
+xlate "w", :go, "west"
+xlate "e", :go, "east"
+xlate "u", :go, "up"
+xlate "d", :go, "down"
+xlate "nw", :go, "northwest"
+xlate "ne", :go, "northeast"
+xlate "sw", :go, "southwest"
+xlate "se", :go, "southeast"

data/lib/gamefic/import/basics/entities.rb

@@ -0,0 +1 @@
+import 'basics/entities/*'

data/lib/gamefic/import/basics/entities/container.rb

@@ -0,0 +1,24 @@
+import 'basics/entities/itemized'
+
+class Container < Entity
+  include Itemized
+  def closeable=(bool)
+    @closeable = bool
+  end
+  def closeable?
+    @closeable ||= false
+    if (@closeable == true && @closed == nil)
+      @closed = false
+    end
+    @closeable
+  end
+  def closed?
+    (@closed == true)
+  end
+  def closed=(bool)
+    if bool == true
+      @closeable = true
+    end
+    @closed = bool
+  end
+end