Nothing major

Author: Blecki

DefaultDatabase/DefaultDatabase.csproj

@@ -159,9 +159,6 @@
     <None Include="database\static\matchers.mud">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </None>
-    <None Include="database\static\players\god\god.mud">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </None>
     <None Include="database\static\room.mud">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </None>

DefaultDatabase/MudEngine2012.dll

@@ -65,6 +65,29 @@ private void SetupStandardLibrary()
                     return arguments[0];
                 }));
 
+            functions.Add("raise-error", new Function("raise-error",
+                ArgumentInfo.ParseArguments(this, "string msg"),
+                "",
+                (context, arguments) =>
+                {
+                    context.RaiseNewError(MISP.ScriptObject.AsString(arguments[0]), context.currentNode);
+                    return null;
+                }));
+
+            functions.Add("catch-error", new Function("catch-error",
+                ArgumentInfo.ParseArguments(this, "code good", "code bad"),
+                "",
+                (context, arguments) =>
+                {
+                    var result = Evaluate(context, arguments[0], true, false);
+                    if (context.evaluationState == EvaluationState.UnwindingError)
+                    {
+                        context.evaluationState = EvaluationState.Normal;
+                        return Evaluate(context, arguments[1], true, false);
+                    }
+                    return result;
+                }));
+
 
             SetupVariableFunctions();
             SetupObjectFunctions();

DefaultDatabase/MudServer.exe

@@ -26,6 +26,20 @@ public MISP.ScriptObject CreateObject(String path)
             return namedObjects[path];
         }
 
+        public MISP.ScriptObject CreateUniquelyNamedObject(String basePath)
+        {
+            while (true)
+            {
+                var randomPart = Guid.NewGuid();
+                var path = basePath + "/" + randomPart.ToString();
+                if (LoadObject(path) == null)
+                {
+                    namedObjects.Upsert(path, new MISP.GenericScriptObject("@path", path));
+                    return namedObjects[path];
+                }
+            }
+        }
+
         public MISP.ScriptObject LoadObject(String path, bool timeOut = true)
         {
             if (namedObjects.ContainsKey(path)) return namedObjects[path];

DefaultDatabase/database/static/players/god/god.mud

@@ -61,6 +61,15 @@ private void SetupScript()
                 },
                 "string name");
 
+            scriptEngine.AddFunction("create-uniquely-named", "base-path: Directory to create new object in.",
+                (context, arguments) =>
+                {
+                    var basePath = MISP.ScriptObject.AsString(arguments[0]);
+                    try { return database.CreateUniquelyNamedObject(basePath); }
+                    catch (Exception e) { return null; }
+                },
+                "string base-path");
+
             scriptEngine.AddFunction("save", "name: Save a named object.",
                (context, arguments) =>
                {