Changeset 254

Timestamp:

04/29/06 17:20:55 (3 years ago)

Author:

ged

Message:

• Checkpointing for Saturday code-sharing.

Location:

trunk

Files:

• .irbrc (modified) (2 diffs)
• FaerieMUD.tmproj (added)
• bin/faeriemud.rb (modified) (9 diffs)
• docs/FaerieMUD Design Diagrams.graffle (modified) (208 diffs)
• docs/Units of Measure.oo3 (added)
• experiments/description-engine.rb (added)
• experiments/shiny-object.rb (modified) (2 diffs)
• lib/fm/animatedobject.rb (modified) (1 diff)
• lib/fm/character.rb (modified) (1 diff)
• lib/fm/entity.rb (modified) (1 diff)
• lib/fm/locus.rb (modified) (1 diff)
• tests/animatedobject.tests.rb (modified) (8 diffs)
• tests/spirit.tests.rb (modified) (1 diff)
• utils.rb (modified) (11 diffs)

trunk/.irbrc

@@ -14 +14 @@
 end
 
+def add_example_objects_to_main( map )
+    $deferr.puts "Pre-creating example objects: "
+    map.each do |name, klass|
+        $deferr.puts "\t%s: %s" % [ name, klass.name ]
+        eval( "#{name} = #{klass.name}.example", TOPLEVEL_BINDING )
+    end
+end
 
 # Modify prompt to do highlighting
@@ -40 +47 @@
     puts "Requiring 'fm' classes..."
     require 'fm'
+
+#   add_example_objects_to_main(
+#       :ent        => FaerieMUD::Entity,
+#       :character  => FaerieMUD::Character
+#     )
+
 rescue => e
     $stderr.puts "Ack! FaerieMUD Environment failed to load: #{e.message}\n\t" +

trunk/bin/faeriemud.rb

@@ -14 +14 @@
     require 'optparse'
     require 'fm'
+    require 'fm/verbs/all'
 }
 
@@ -36 +37 @@
 }
 
-class SimpleVerb < FaerieMUD::Verb
-    @event_class = nil
-    class << self
-        attr_reader :event_class
-    end
-
-    def self::set_event_class( klass )
-        # $deferr.puts "Setting %s's event class to %p" % [ self, klass ]
-        @event_class = klass
-    end
-
-    def self::inherited( mod )
-        super
-        # $deferr.puts "Setting %s's event class to %p" % [ mod, @event_class ]
-        mod.instance_variable_set( :@event_class, @event_class )
-    end
-
-    def invoke( instigator, origin, target=nil )
-        eclass = self.class.event_class or
-            return super
-
-        return eclass.new(
-            :instigator => instigator, 
-            :origin => origin,
-            :target => target,
-            :verb => self )
-    end
-end
 
 # I know, I know -- at least I didn't call it a Heartbeat
 class TickEvent < FaerieMUD::Event
 end
-class TickVerb < SimpleVerb
+class TickVerb < FaerieMUD::SimpleVerb
     set_event_class TickEvent
 end
@@ -75 +48 @@
 class World < FaerieMUD::Area
     def start
+        self.log.notice "Starting the world"
         @thread = Thread::new do
             Thread.current[:running] = true
@@ -94 +68 @@
 
     def stop
+        self.log.notice "Stopping the world"
         return unless @thread
         @thread[:running] = false
+    end
+
+    def immerseEvents( *events )
+        self.log.debug "Immersing %d event/s" % events.length
+        super
     end
 
@@ -101 +81 @@
 
 # Stuff for a Spark to do
-class TwinkleVerb < SimpleVerb
+class TwinkleVerb < FaerieMUD::SimpleVerb
     set_event_class FaerieMUD::VisualEvent
 end
@@ -112 +92 @@
 
     def handleTickEvent( event )
-        if ( rand(100) < 5 )
+        self.log.debug "handling a TickEvent"
+        if ( rand(100) < 50 )
+            self.log.debug "Twinkling"
             return TwinkleVerb.instance.invoke( self, self )
         else
@@ -118 +100 @@
         end
     end
+end
+
+# Verbs for character commands
+class SayVerb < FaerieMUD::Verb
+    
 end
 
@@ -137 +124 @@
 message "Setting the Spirit's IO callbacks...\n"
 spirit.onInputReady do |promptText|
+    $deferr.puts "Input is ready"
     promptText ||= DefaultPrompt
     prompt( promptText )
 end
 spirit.onOutput do |output|
+    $deferr.puts "Output received"
     $defout.puts( output )
 end
@@ -148 +137 @@
 spirit.animate( character )
 
-# Stick the character's body into the world Area
+#  Stick the character's body into the world Area
 message "Setting up the world...\n"
 world = World::new

trunk/docs/FaerieMUD Design Diagrams.graffle

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