debugging stuff

cmd/funmow/main.go

@@ -43,6 +43,7 @@ func main() {
 	if seed {
 		log.Print("Seeding database...")
 		seedDB(db)
+		return
 	}
 
 	log.Print("Listening for connections on ", listen)
@@ -71,6 +72,18 @@ func seedDB(db *funmow.DB) {
 
 	f := funmow.NewObjectFactory(db)
 
+	limbo := f.NewRawObject()
+	limbo.Type = "room"
+	limbo.Name = "Limbo"
+	limbo.Description = "There's very little to see here."
+	limbo.Owner = 1
+	limbo.SetFlag("jumk_ok", true)
+	limbo.ID = 0
+	err := limbo.Commit()
+	if err != nil {
+		log.Fatal(err)
+	}
+
 	keelan, _ := db.CreatePlayer("keelan", "123", map[string]bool{"wizard": true})
 	dan, _ := db.CreatePlayer("dan", "123", nil)
 

db.go

@@ -102,7 +102,7 @@ func (s *DB) Open() error {
 	}
 	return s.db.Update(func(tx *bolt.Tx) error {
 		var err error
-		objectBucket, err := tx.CreateBucketIfNotExists([]byte("object"))
+		_, err = tx.CreateBucketIfNotExists([]byte("object"))
 		if err != nil {
 			return fmt.Errorf("create bucket: %s", err)
 		}
@@ -122,15 +122,6 @@ func (s *DB) Open() error {
 			return fmt.Errorf("create bucket: %s", err)
 		}
 
-		// make sure we have a limbo
-		if _, found := s.txRetrieveObject(objectBucket, 0); !found {
-			limbo := Object{Name: "Limbo", Description: "There's very little to see here.", ID: 0}
-			err = s.txStoreObject(objectBucket, limbo, 0)
-			if err != nil {
-				return err
-			}
-		}
-
 		return nil
 	})
 }
@@ -380,7 +371,7 @@ func (s *DB) RetrieveObject(id DBRef) (Object, bool) {
 	s.db.View(func(tx *bolt.Tx) error {
 		b := tx.Bucket([]byte("object"))
 		o, f = s.txRetrieveObject(b, id)
-		return nil
+		return nil	
 	})
 	return o, f
 

execution_context.go

@@ -544,15 +544,24 @@ func (c *ExecutionContext) MatchFirst(context DBRef, matchName string, matchType
 		}
 	}
 
-	if matchType & MatchGlobalDBRef != 0 {
-		ref, valid := NewDBRefFromHashRef(matchName)
-		if valid {
-			o, found := c.db.Fetch(ref)
-			if found && wanted[o.Type] {
+	ref, valid := NewDBRefFromHashRef(matchName)
+	
+	if valid {
+		o, found := c.db.Fetch(ref)
+		if found && wanted[o.Type] {
+			container, _ := c.db.GetParent(o.ID)
+			if container == context && matchType & MatchContext != 0 {
+				return o, true
+			}
+			if container == c.actor.ID && matchType & MatchInventory != 0 {
+				return o, true
+			}
+			if matchType & MatchGlobalDBRef != 0 {
 				return o, true
 			}
 		}
 	}
+	
 
 	if  wanted["player"] && matchType & MatchGlobalPlayer != 0 {
 		o, found := c.MatchPlayerName(matchName)
@@ -573,10 +582,9 @@ func (c *ExecutionContext) MatchFirst(context DBRef, matchName string, matchType
 						}
 					}
 				}
-				_, refValid := NewDBRefFromHashRef(matchName)
 				lowerObjectName := strings.ToLower(o.Name)
 				lowerMatchName := strings.ToLower(matchName)
-				if strings.HasPrefix(lowerObjectName, lowerMatchName) || refValid {
+				if strings.HasPrefix(lowerObjectName, lowerMatchName) {
 					return o, true
 				}
 			}
@@ -587,10 +595,9 @@ func (c *ExecutionContext) MatchFirst(context DBRef, matchName string, matchType
 		for childID, _ := range c.db.GetChildren(c.actor.ID) {
 			o, found := c.db.Fetch(childID)
 			if found && wanted[o.Type] {
-				_, refValid := NewDBRefFromHashRef(matchName)
 				lowerObjectName := strings.ToLower(o.Name)
 				lowerMatchName := strings.ToLower(matchName)
-				if strings.HasPrefix(lowerObjectName, lowerMatchName) || refValid {
+				if strings.HasPrefix(lowerObjectName, lowerMatchName) {
 					return o, true
 				}
 			}
@@ -838,7 +845,8 @@ func (c *ExecutionContext) nameCmd(input string) {
 
 	searchName, newName := params[1], params[2]
 
-	candidate, found := c.MatchFirst(c.context.ID, searchName, MatchContext|MatchGlobalDBRef|MatchExitAliases|MatchInventory|MatchRelative|MatchStuffTypes)
+	candidate, found := c.MatchFirst(c.context.ID, searchName, MatchContext|MatchInventory|MatchRelative|MatchGlobalDBRef|MatchExitAliases|MatchAnyType)
+
 	if !found {
 		c.output("I don't see that here.")
 		return
@@ -879,13 +887,13 @@ func (c *ExecutionContext) descCmd(input string) {
 
 	objectName, description := params[1], params[2]
 
-	object, found := c.MatchFirst(c.context.ID, objectName, MatchContext|MatchGlobalDBRef|MatchExitAliases|MatchInventory|MatchRelative|MatchStuffTypes)
+
+	object, found := c.MatchFirst(c.context.ID, objectName, MatchContext|MatchInventory|MatchRelative|MatchGlobalDBRef|MatchExitAliases|MatchAnyType)
 	if !found {
 		c.output("I don't see that here.")
 		return
 	}
 
-	fmt.Println(object)
 	object.Description = description
 	object.Commit()
 
@@ -902,7 +910,7 @@ func (c *ExecutionContext) setCmd(input string) {
 
 	objectName, value, flag := params[1], params[2] != "!", params[3]
 
-	object, found := c.MatchFirst(c.context.ID, objectName, MatchContext|MatchGlobalDBRef|MatchExitAliases|MatchInventory|MatchRelative|MatchStuffTypes|MatchGlobalPlayer)
+	object, found := c.MatchFirst(c.context.ID, objectName, MatchContext|MatchInventory|MatchRelative|MatchGlobalDBRef|MatchExitAliases|MatchAnyType)
 	if !found {
 		c.output("I don't know what that is")
 		return
@@ -926,7 +934,8 @@ func (c *ExecutionContext) colorCmd(input string) {
 
 	objectName, value := params[1], params[2]
 
-	object, found := c.MatchFirst(c.context.ID, objectName, MatchContext|MatchGlobalDBRef|MatchExitAliases|MatchInventory|MatchRelative|MatchStuffTypes)
+	object, found := c.MatchFirst(c.context.ID, objectName, MatchContext|MatchInventory|MatchRelative|MatchGlobalDBRef|MatchExitAliases|MatchAnyType)
+
 	if !found {
 		c.output("I don't know what that is")
 		return
@@ -953,8 +962,9 @@ func (c *ExecutionContext) telCmd(destStr string) {
 		return
 	}
 
-	if dest.Owner != c.actor.ID && !dest.GetFlag("jump_ok") {
+	if dest.Owner != c.actor.ID && !dest.GetFlag("jump_ok") && !c.actor.GetFlag("wizard") {
 		c.output("You're not allowed to do that.")
+		return
 	}
 
 	c.output("You feel an intense wooshing sensation.")
@@ -966,14 +976,13 @@ func (c *ExecutionContext) telCmd(destStr string) {
 		return
 	}
 
-	c.actor.Refresh()
-	c.lookCmd("")
+	c.command("look")
 
 }
 
-func (c *ExecutionContext) dumpCmd(refStr string) {
+func (c *ExecutionContext) dumpCmd(input string) {
 
-	object, found := c.MatchFirst(c.context.ID, refStr, MatchContext|MatchGlobalDBRef|MatchGlobalPlayer|MatchExitAliases|MatchInventory|MatchRelative|MatchStuffTypes)
+	object, found := c.MatchFirst(c.context.ID, input, MatchContext|MatchInventory|MatchRelative|MatchGlobalDBRef|MatchGlobalPlayer|MatchExitAliases|MatchAnyType)
 
 	if !found {
 		c.output("I can't find that.")
@@ -1040,6 +1049,13 @@ func (c *ExecutionContext) goCmd(dir string) bool {
 
 }
 
+func (c *ExecutionContext) command(format string, a ...interface{}) {
+
+	command := fmt.Sprintf(format, a...)
+	c.outbound <- PlayerEvent{src: c.actor.ID, dst: c.actor.ID, message: command, messageType: EventTypeCommand}
+
+}
+
 func (c *ExecutionContext) wall(format string, a ...interface{}) {
 
 	message := fmt.Sprintf(format, a...)

object.go

@@ -46,6 +46,12 @@ func (f *ObjectFactory) NewObject() Object {
 	return o
 }
 
+func (f *ObjectFactory) NewRawObject() Object {
+	o := Object{}
+	o.db = f.db
+	return o
+}
+
 func (f *ObjectFactory) NewExit(name string, next DBRef, owner DBRef) Object {
 	o := Object{
 		Type:  "exit",