Changeset 250

Timestamp:

12/30/05 09:12:14 (3 years ago)

Author:

ged

Message:

- Committing what I have in case I get hit by a bus. (No really this time.)

Location:

trunk

Files:

• . (modified) (1 prop)
• acceptance/combat.tests.rb (deleted)
• acceptance/epic4.rb (modified) (10 diffs)
• acceptance/interface.tests.rb (deleted)
• docs (modified) (1 prop)
• docs/FaerieMUD Design Diagrams.graffle (modified) (208 diffs)
• experiments/event-stack-overflow.rb (added)
• experiments/nlg.rb (modified) (3 diffs)
• experiments/taxonomy.rb (added)
• lib/fm/animatedobject.rb (modified) (4 diffs)
• lib/fm/entity.rb (modified) (4 diffs)
• lib/fm/event.rb (modified) (4 diffs)
• lib/fm/events/perceptual.rb (modified) (3 diffs)
• lib/fm/gameobject.rb (modified) (5 diffs)
• lib/fm/linguistics.rb (added)
• lib/fm/mixins.rb (modified) (5 diffs)
• lib/fm/organism.rb (modified) (1 diff)
• lib/fm/perception.rb (added)
• lib/fm/species.rb (added)
• lib/fm/spirit.rb (modified) (1 diff)
• tests/animatedobject.tests.rb (modified) (3 diffs)
• tests/composedobject.tests.rb (modified) (1 diff)
• tests/entity.tests.rb (modified) (6 diffs)
• tests/event.tests.rb (modified) (6 diffs)
• tests/lib/fmfixtures.rb (added)
• tests/lib/fmmocks.rb (added)
• tests/lib/fmtestcase.rb (modified) (4 diffs)
• tests/linguistics.tests.rb (added)
• tests/locus.tests.rb (modified) (2 diffs)
• tests/perception.tests.rb (added)
• tests/utils.tests.rb (added)
• tools/web (added)
• tools/web/fmobjinspector.cgi (added)
• utils.rb (modified) (2 diffs)

trunk

@@ -1 +1 @@
 test.log
+.glimpse*

@@ -1 +1 @@
 test.log
+.glimpse*

trunk/acceptance/epic4.rb

@@ -1 +1 @@
 #!/usr/bin/env ruby
 #
-#   FaerieMUD - The Hidden Path - Epic 4: Events
+#   FaerieMUD - The Hidden Path - Epic 4: Action
 #
 # == Authors
@@ -32 +32 @@
 require "#$basedir/utils"
 require "fm"
-require "linguistics"
-
-include UtilityFunctions
-Linguistics::use( :en )
+require 'fm/mixins'
+require 'fm/linguistics'
+
 
 ### Clocks can 'tick'
 class TickVerb < FaerieMUD::Verb
-    def happen( instigator, origin=nil )
+    def invoke( instigator, origin=nil )
         origin ||= instigator
         return FaerieMUD::AuditoryEvent::new(
             :instigator => instigator,
             :origin => origin,
-            :verb => self
+            :verb => self,
+            :noticability => 0.05
             )
     end
@@ -51 +51 @@
 ### ...and also 'chime'
 class ChimeVerb < FaerieMUD::Verb
-    def happen( instigator, origin=nil )
+    def invoke( instigator, origin=nil )
         origin ||= instigator
         return FaerieMUD::AuditoryEvent::new(
             :instigator => instigator,
             :origin => origin,
-            :verb => self
+            :verb => self,
+            :noticability => 0.25
             )
     end
@@ -102 +103 @@
         @tickCount += 1
         self.log.debug "Tick %d" % [@tickCount]
-        events = @verbs[:tick].happen( self )
+        events = @verbs[:tick].invoke( self )
         self.disperseEvents( events )
         self.chime if (@tickCount % 10).zero?
@@ -111 +112 @@
     def chime
         self.log.debug "Chime!"
-        events = @verbs[:chime].happen( self )
+        events = @verbs[:chime].invoke( self )
         self.disperseEvents( events )
     end
@@ -123 +124 @@
     # the overridden method. Ventriloquism doesn't count. =:P
 
-    def happen( speaker, language, words )
+    def invoke( speaker, language, words )
         return FaerieMUD::SpeechEvent::new(
             :instigator => speaker,
@@ -129 +130 @@
             :verb => self,
             :language => language,
-            :words => words
+            :words => words,
+            :noticability => 0.65
             )
     end
@@ -179 +181 @@
         end
         
-        return @sayVerb.happen( self, :trade, msg )
+        return @sayVerb.invoke( self, :trade, msg )
     end
 end
@@ -187 +189 @@
 ### environment to $defout.
 class Observer < FaerieMUD::Locus
+
+    include FaerieMUD::Linguistics
 
     ### Handle events that are sensed through auditory perception
@@ -206 +210 @@
     ### Create a sentence to describe an event.
     def describeEvent( ev )
-        sentence = []
-
-        # Subject
-        sentence << objectToNounPhrase( ev.instigator )
-
-        # Verb
-        sentence << conjugateVerb( ev.verb )
-
-        # Direct object if any
-        if ev.target
-            sentence << objectToNounPhrase( ev.target )
-        end
-
-        if ev.origin != ev.instigator
-            sentence << "in %s" % objectToNounPhrase( ev.origin )
-        end
-
-        return sentence.join( " " )
-    end
-
-    ### Create a noun phrase from the given +obj+.
-    def objectToNounPhrase( obj )
-        simplename = obj.class.name.sub( /.*::/, '' ).downcase
-        simplename.en.a
-    end
-
-
-    ### This is a really simplistic version of what should really happen. 
-    ### Ideally, verbs will be able to respond with the appropriate word form of
-    ### themselves. However, the NLG engine should be able to pervert the canonical
-    ### form to achieve tainted or ecstatic views, etc.
-
-    ### Conjugate the given +verb+ (a FaerieMUD::Verb object) and return it.
-    def conjugateVerb( verb )
-        if /(\w+)Verb/.match( verb.class.name )
-            $1.downcase
-        else
-            verb.class.name.downcase
-        end
-    end
-
+        $deferr.puts ev.inspect
+
+        prep_phrase = "in %s" % objectToNounPhrase( ev.origin ) if ev.origin != ev.instigator
+        sentence = Sentence.new( ev.instigator, ev.verb, ev.target, prep_phrase )
+
+        return sentence.to_s
+    end
 
 end

trunk/docs/FaerieMUD Design Diagrams.graffle

@@ -96 +96 @@
                         <integer>2</integer>
                         <key>Text</key>
-                        <string>{\rtf1\mac\ansicpg10000\cocoartf824\cocoasubrtf110
+                        <string>{\rtf1\mac\ansicpg10000\cocoartf824\cocoasubrtf230
 {\fonttbl\f0\fnil\fcharset77 LucidaGrande-Bold;}
 {\colortbl;\red255\green255\blue255;}
@@ -251 +251 @@
     </array>
     <key>ModificationDate</key>
-    <string>2005-10-22 21:09:48 -0400</string>
+    <string>2005-12-14 16:12:53 -0800</string>
     <key>Modifier</key>
     <string>Michael Granger</string>
@@ -353 +353 @@
                     <dict>
                         <key>Text</key>
-                        <string>{\rtf1\mac\ansicpg10000\cocoartf824\cocoasubrtf110
+                        <string>{\rtf1\mac\ansicpg10000\cocoartf824\cocoasubrtf230
 {\fonttbl\f0\fnil\fcharset77 TektonPro-BoldExt;}
 {\colortbl;\red255\green255\blue255;}
@@ -496 +496 @@
                             <dict>
                                 <key>Text</key>
-                                <string>{\rtf1\mac\ansicpg10000\cocoartf824\cocoasubrtf110
+                                <string>{\rtf1\mac\ansicpg10000\cocoartf824\cocoasubrtf230
 {\fonttbl\f0\fnil\fcharset77 TektonPro-BoldCondObl;}
 {\colortbl;\red255\green255\blue255;}
@@ -648 +648 @@
                             <dict>
                                 <key>Text</key>
-                                <string>{\rtf1\mac\ansicpg10000\cocoartf824\cocoasubrtf110
+                                <string>{\rtf1\mac\ansicpg10000\cocoartf824\cocoasubrtf230
 {\fonttbl\f0\fnil\fcharset77 TektonPro-BoldCondObl;}
 {\colortbl;\red255\green255\blue255;}
@@ -712 +712 @@
                             <dict>
                                 <key>Text</key>
-                                <string>{\rtf1\mac\ansicpg10000\cocoartf824\cocoasubrtf110
+                                <string>{\rtf1\mac\ansicpg10000\cocoartf824\cocoasubrtf230
 {\fonttbl\f0\fnil\fcharset77 TektonPro-BoldCond;}
 {\colortbl;\red255\green255\blue255;}
@@ -776 +776 @@
                             <dict>
                                 <key>Text</key>
-                                <string>{\rtf1\mac\ansicpg10000\cocoartf824\cocoasubrtf110
+                                <string>{\rtf1\mac\ansicpg10000\cocoartf824\cocoasubrtf230
 {\fonttbl\f0\fnil\fcharset77 TektonPro-BoldCondObl;}
 {\colortbl;\red255\green255\blue255;}
@@ -924 +924 @@
                             <dict>
                                 <key>Text</key>
-                                <string>{\rtf1\mac\ansicpg10000\cocoartf824\cocoasubrtf110
+                                <string>{\rtf1\mac\ansicpg10000\cocoartf824\cocoasubrtf230
 {\fonttbl\f0\fnil\fcharset77 TektonPro-BoldCond;}
 {\colortbl;\red255\green255\blue255;}
@@ -988 +988 @@
                             <dict>
                                 <key>Text</key>
-                                <string>{\rtf1\mac\ansicpg10000\cocoartf824\cocoasubrtf110
+                                <string>{\rtf1\mac\ansicpg10000\cocoartf824\cocoasubrtf230
 {\fonttbl\f0\fnil\fcharset77 TektonPro-BoldCondObl;}
 {\colortbl;\red255\green255\blue255;}
@@ -1669 +1669 @@
                             <dict>
                                 <key>Text</key>
-                                <string>{\rtf1\mac\ansicpg10000\cocoartf824\cocoasubrtf110
+                                <string>{\rtf1\mac\ansicpg10000\cocoartf824\cocoasubrtf230
 {\fonttbl\f0\fnil\fcharset77 TektonPro-BoldCond;}
 {\colortbl;\red255\green255\blue255;}
@@ -1733 +1733 @@
                             <dict>
                                 <key>Text</key>
-                                <string>{\rtf1\mac\ansicpg10000\cocoartf824\cocoasubrtf110
+                                <string>{\rtf1\mac\ansicpg10000\cocoartf824\cocoasubrtf230
 {\fonttbl\f0\fnil\fcharset77 TektonPro-BoldCondObl;}
 {\colortbl;\red255\green255\blue255;}
@@ -1797 +1797 @@
                             <dict>
                                 <key>Text</key>
-                                <string>{\rtf1\mac\ansicpg10000\cocoartf824\cocoasubrtf110
+                                <string>{\rtf1\mac\ansicpg10000\cocoartf824\cocoasubrtf230
 {\fonttbl\f0\fnil\fcharset77 TektonPro-BoldCondObl;}
 {\colortbl;\red255\green255\blue255;}
@@ -1861 +1861 @@
                             <dict>
                                 <key>Text</key>
-                                <string>{\rtf1\mac\ansicpg10000\cocoartf824\cocoasubrtf110
+                                <string>{\rtf1\mac\ansicpg10000\cocoartf824\cocoasubrtf230
 {\fonttbl\f0\fnil\fcharset77 TektonPro-BoldCondObl;}
 {\colortbl;\red255\green255\blue255;}
@@ -1925 +1925 @@
                             <dict>
                                 <key>Text</key>
-                                <string>{\rtf1\mac\ansicpg10000\cocoartf824\cocoasubrtf110
+                                <string>{\rtf1\mac\ansicpg10000\cocoartf824\cocoasubrtf230
 {\fonttbl\f0\fnil\fcharset77 TektonPro-BoldCondObl;}
 {\colortbl;\red255\green255\blue255;}
@@ -1989 +1989 @@
                             <dict>
                                 <key>Text</key>
-                                <string>{\rtf1\mac\ansicpg10000\cocoartf824\cocoasubrtf110
+                                <string>{\rtf1\mac\ansicpg10000\cocoartf824\cocoasubrtf230
 {\fonttbl\f0\fnil\fcharset77 TektonPro-BoldCond;}
 {\colortbl;\red255\green255\blue255;}
@@ -2053 +2053 @@
                             <dict>
                                 <key>Text</key>
-                                <string>{\rtf1\mac\ansicpg10000\cocoartf824\cocoasubrtf110
+                                <string>{\rtf1\mac\ansicpg10000\cocoartf824\cocoasubrtf230
 {\fonttbl\f0\fnil\fcharset77 TektonPro-BoldCondObl;}
 {\colortbl;\red255\green255\blue255;}
@@ -2117 +2117 @@
                             <dict>
                                 <key>Text</key>
-                                <string>{\rtf1\mac\ansicpg10000\cocoartf824\cocoasubrtf110
+                                <string>{\rtf1\mac\ansicpg10000\cocoartf824\cocoasubrtf230
 {\fonttbl\f0\fnil\fcharset77 TektonPro-BoldCond;}
 {\colortbl;\red255\green255\blue255;}
@@ -2181 +2181 @@
                             <dict>
                                 <key>Text</key>
-                                <string>{\rtf1\mac\ansicpg10000\cocoartf824\cocoasubrtf110
+                                <string>{\rtf1\mac\ansicpg10000\cocoartf824\cocoasubrtf230
 {\fonttbl\f0\fnil\fcharset77 TektonPro-BoldCondObl;}
 {\colortbl;\red255\green255\blue255;}
@@ -2245 +2245 @@
                             <dict>
                                 <key>Text</key>
-                                <string>{\rtf1\mac\ansicpg10000\cocoartf824\cocoasubrtf110
+                                <string>{\rtf1\mac\ansicpg10000\cocoartf824\cocoasubrtf230
 {\fonttbl\f0\fnil\fcharset77 TektonPro-BoldCondObl;}
 {\colortbl;\red255\green255\blue255;}
@@ -2309 +2309 @@
                             <dict>
                                 <key>Text</key>
-                                <string>{\rtf1\mac\ansicpg10000\cocoartf824\cocoasubrtf110
+                                <string>{\rtf1\mac\ansicpg10000\cocoartf824\cocoasubrtf230
 {\fonttbl\f0\fnil\fcharset77 TektonPro-BoldCondObl;}
 {\colortbl;\red255\green255\blue255;}
@@ -2373 +2373 @@
                             <dict>
                                 <key>Text</key>
-                                <string>{\rtf1\mac\ansicpg10000\cocoartf824\cocoasubrtf110
+                                <string>{\rtf1\mac\ansicpg10000\cocoartf824\cocoasubrtf230
 {\fonttbl\f0\fnil\fcharset77 TektonPro-BoldCond;}
 {\colortbl;\red255\green255\blue255;}
@@ -2437 +2437 @@
                             <dict>
                                 <key>Text</key>
-                                <string>{\rtf1\mac\ansicpg10000\cocoartf824\cocoasubrtf110
+                                <string>{\rtf1\mac\ansicpg10000\cocoartf824\cocoasubrtf230
 {\fonttbl\f0\fnil\fcharset77 TektonPro-BoldCondObl;}
 {\colortbl;\red255\green255\blue255;}
@@ -2501 +2501 @@
                             <dict>
                                 <key>Text</key>
-                                <string>{\rtf1\mac\ansicpg10000\cocoartf824\cocoasubrtf110
+                                <string>{\rtf1\mac\ansicpg10000\cocoartf824\cocoasubrtf230
 {\fonttbl\f0\fnil\fcharset77 TektonPro-BoldCond;}
 {\colortbl;\red255\green255\blue255;}
@@ -2572 +2572 @@
                             <dict>
                                 <key>Text</key>
-                                <string>{\rtf1\mac\ansicpg10000\cocoartf824\cocoasubrtf110
+                                <string>{\rtf1\mac\ansicpg10000\cocoartf824\cocoasubrtf230
 {\fonttbl\f0\fnil\fcharset77 TektonPro-BoldCondObl;}
 {\colortbl;\red255\green255\blue255;}
@@ -2678 +2678 @@
                             <dict>
                                 <key>Text</key>
-                                <string>{\rtf1\mac\ansicpg10000\cocoartf824\cocoasubrtf110
+                                <string>{\rtf1\mac\ansicpg10000\cocoartf824\cocoasubrtf230
 {\fonttbl\f0\fnil\fcharset77 TektonPro-BoldCondObl;}
 {\colortbl;\red255\green255\blue255;}
@@ -2739 +2739 @@
                             <dict>
                                 <key>Text</key>
-                                <string>{\rtf1\mac\ansicpg10000\cocoartf824\cocoasubrtf110
+                                <string>{\rtf1\mac\ansicpg10000\cocoartf824\cocoasubrtf230
 {\fonttbl\f0\fnil\fcharset77 TektonPro-BoldCondObl;}
 {\colortbl;\red255\green255\blue255;}
@@ -2913 +2913 @@
                     <dict>
                         <key>Text</key>
-                        <string>{\rtf1\mac\ansicpg10000\cocoartf824\cocoasubrtf110
+                        <string>{\rtf1\mac\ansicpg10000\cocoartf824\cocoasubrtf230
 {\fonttbl\f0\fnil\fcharset77 LucidaGrande;}
 {\colortbl;\red255\green255\blue255;}
@@ -2976 +2976 @@
                     <dict>
                         <key>Text</key>
-                        <string>{\rtf1\mac\ansicpg10000\cocoartf824\cocoasubrtf110
+                        <string>{\rtf1\mac\ansicpg10000\cocoartf824\cocoasubrtf230
 {\fonttbl\f0\fnil\fcharset77 LucidaGrande;}
 {\colortbl;\red255\green255\blue255;}
@@ -3038 +3038 @@
                     <dict>
                         <key>Text</key>
-                        <string>{\rtf1\mac\ansicpg10000\cocoartf824\cocoasubrtf110
+                        <string>{\rtf1\mac\ansicpg10000\cocoartf824\cocoasubrtf230
 {\fonttbl\f0\fnil\fcharset77 TektonPro-BoldExtObl;}
 {\colortbl;\red255\green255\blue255;}
@@ -3226 +3226 @@
                             <dict>
                                 <key>Text</key>
-                                <string>{\rtf1\mac\ansicpg10000\cocoartf824\cocoasubrtf110
+                                <string>{\rtf1\mac\ansicpg10000\cocoartf824\cocoasubrtf230
 {\fonttbl\f0\fnil\fcharset77 TektonPro-BoldExtObl;}
 {\colortbl;\red255\green255\blue255;}
@@ -3271 +3271 @@
                                 <integer>0</integer>
                                 <key>Text</key>
-                                <string>{\rtf1\mac\ansicpg10000\cocoartf824\cocoasubrtf110
+                                <string>{\rtf1\mac\ansicpg10000\cocoartf824\cocoasubrtf230
 {\fonttbl\f0\fnil\fcharset77 TektonPro-Regular;}
 {\colortbl;\red255\green255\blue255;}
@@ -3319 +3319 @@
                                 <integer>0</integer>
                                 <key>Text</key>
-                                <string>{\rtf1\mac\ansicpg10000\cocoartf824\cocoasubrtf110
+                                <string>{\rtf1\mac\ansicpg10000\cocoartf824\cocoasubrtf230
 {\fonttbl\f0\fnil\fcharset77 TektonPro-Regular;}
 {\colortbl;\red255\green255\blue255;}
@@ -3492 +3492 @@
                     <dict>
                         <key>Text</key>
-                        <string>{\rtf1\mac\ansicpg10000\cocoartf824\cocoasubrtf110
+                        <string>{\rtf1\mac\ansicpg10000\cocoartf824\cocoasubrtf230
 {\fonttbl\f0\fnil\fcharset77 LucidaGrande;}
 {\colortbl;\red255\green255\blue255;}
@@ -3550 +3550 @@
                     <dict>
                         <key>Text</key>
-                        <string>{\rtf1\mac\ansicpg10000\cocoartf824\cocoasubrtf110
+                        <string>{\rtf1\mac\ansicpg10000\cocoartf824\cocoasubrtf230
 {\fonttbl\f0\fnil\fcharset77 TektonPro-BoldExtObl;}
 {\colortbl;\red255\green255\blue255;}
@@ -3731 +3731 @@
                     <dict>
                         <key>Text</key>
-                        <string>{\rtf1\mac\ansicpg10000\cocoartf824\cocoasubrtf110
+                        <string>{\rtf1\mac\ansicpg10000\cocoartf824\cocoasubrtf230
 {\fonttbl\f0\fnil\fcharset77 TektonPro-BoldExtObl;}
 {\colortbl;\red255\green255\blue255;}
@@ -3758 +3758 @@
                     <dict>
                         <key>Text</key>
-                        <string>{\rtf1\mac\ansicpg10000\cocoartf824\cocoasubrtf110
+                        <string>{\rtf1\mac\ansicpg10000\cocoartf824\cocoasubrtf230
 {\fonttbl\f0\fnil\fcharset77 TektonPro-BoldExtObl;}
 {\colortbl;\red255\green255\blue255;}
@@ -3785 +3785 @@
                     <dict>
                         <key>Text</key>
-                        <string>{\rtf1\mac\ansicpg10000\cocoartf824\cocoasubrtf110
+                        <string>{\rtf1\mac\ansicpg10000\cocoartf824\cocoasubrtf230
 {\fonttbl\f0\fnil\fcharset77 TektonPro-BoldExtObl;}
 {\colortbl;\red255\green255\blue255;}
@@ -3812 +3812 @@
                     <dict>
                         <key>Text</key>
-                        <string>{\rtf1\mac\ansicpg10000\cocoartf824\cocoasubrtf110
+                        <string>{\rtf1\mac\ansicpg10000\cocoartf824\cocoasubrtf230
 {\fonttbl\f0\fnil\fcharset77 TektonPro-BoldExtObl;}
 {\colortbl;\red255\green255\blue255;}
@@ -3858 +3858 @@
                             <dict>
                                 <key>Text</key>
-                                <string>{\rtf1\mac\ansicpg10000\cocoartf824\cocoasubrtf110
+                                <string>{\rtf1\mac\ansicpg10000\cocoartf824\cocoasubrtf230
 {\fonttbl\f0\fnil\fcharset77 TektonPro-Bold;}
 {\colortbl;\red255\green255\blue255;}
@@ -3903 +3903 @@
                                 <integer>0</integer>
                                 <key>Text</key>
-                                <string>{\rtf1\mac\ansicpg10000\cocoartf824\cocoasubrtf110
+                                <string>{\rtf1\mac\ansicpg10000\cocoartf824\cocoasubrtf230
 {\fonttbl\f0\fnil\fcharset77 TektonPro-Regular;}
 {\colortbl;\red255\green255\blue255;}
@@ -3948 +3948 @@
                                 <integer>0</integer>
                                 <key>Text</key>
-                                <string>{\rtf1\mac\ansicpg10000\cocoartf824\cocoasubrtf110
+                                <string>{\rtf1\mac\ansicpg10000\cocoartf824\cocoasubrtf230
 {\fonttbl\f0\fnil\fcharset77 TektonPro-Regular;}
 {\colortbl;\red255\green255\blue255;}
@@ -4114 +4114 @@
                     <dict>
                         <key>Text</key>
-                        <string>{\rtf1\mac\ansicpg10000\cocoartf824\cocoasubrtf110
+                        <string>{\rtf1\mac\ansicpg10000\cocoartf824\cocoasubrtf230
 {\fonttbl\f0\fnil\fcharset77 TektonPro-BoldExt;}
 {\colortbl;\red255\green255\blue255;}
@@ -4197 +4197 @@
                     <dict>
                         <key>Text</key>

@@ -1 +1 @@
 test.log
+.glimpse*