Merged PR 536: Merge 612_worker_assignment to master

Related work items: #612

dictionaries/domains/sub-dictionaries/henchman.c

@@ -40,13 +40,13 @@ public nomask int isValidHenchman(mapping data)
 
     if (ret && member(data, "traits"))
     {
-        ret &&= mappingp(data["traits"]) && sizeof(data["traits"]);
+        ret &&= pointerp(data["traits"]) && sizeof(data["traits"]);
         if (ret)
         {
             object traitsDictionary = 
                 load_object("/lib/dictionaries/traitsDictionary.c");
 
-            foreach(string trait in m_indices(data["traits"]))
+            foreach(string trait in data["traits"])
             {
                 ret &&= traitsDictionary->validTrait(trait);
             }

instances/traits/domains/apprentice-arcane.c

@@ -0,0 +1,23 @@
+//*****************************************************************************
+// Copyright (c) 2019 - Allen Cummings, RealmsMUD, All rights reserved. See
+//                      the accompanying LICENSE file for details.
+//*****************************************************************************
+inherit "/lib/modules/traits/baseTrait.c";
+
+/////////////////////////////////////////////////////////////////////////////
+public void reset(int arg)
+{
+    if (!arg)
+    {
+        addSpecification("type", "professional");
+        addSpecification("name", "apprentice arcane craftsman");
+        addSpecification("description", "You have just begun learning about arcane craftsmanship");
+        addSpecification("root", "arcane craftsman");
+        addSpecification("opinion", 1);
+        addSpecification("bonus engineering", 2);
+        addSpecification("bonus mathematics", 1);
+        addSpecification("bonus physics", 1);
+        addSpecification("bonus spellcraft", 1);
+        "baseTrait"::reset(arg);
+    }
+}

instances/traits/domains/apprentice-architect.c

@@ -0,0 +1,22 @@
+//*****************************************************************************
+// Copyright (c) 2019 - Allen Cummings, RealmsMUD, All rights reserved. See
+//                      the accompanying LICENSE file for details.
+//*****************************************************************************
+inherit "/lib/modules/traits/baseTrait.c";
+
+/////////////////////////////////////////////////////////////////////////////
+public void reset(int arg)
+{
+    if (!arg)
+    {
+        addSpecification("type", "professional");
+        addSpecification("name", "apprentice architect");
+        addSpecification("description", "You have just begun learning about architecture");
+        addSpecification("root", "architect");
+        addSpecification("opinion", 1);
+        addSpecification("bonus engineering", 2);
+        addSpecification("bonus mathematics", 1);
+        addSpecification("bonus physics", 1);
+        "baseTrait"::reset(arg);
+    }
+}

instances/traits/domains/apprentice-blacksmith.c

@@ -0,0 +1,21 @@
+//*****************************************************************************
+// Copyright (c) 2019 - Allen Cummings, RealmsMUD, All rights reserved. See
+//                      the accompanying LICENSE file for details.
+//*****************************************************************************
+inherit "/lib/modules/traits/baseTrait.c";
+
+/////////////////////////////////////////////////////////////////////////////
+public void reset(int arg)
+{
+    if (!arg)
+    {
+        addSpecification("type", "professional");
+        addSpecification("name", "apprentice blacksmith");
+        addSpecification("description", "You have just begun learning about blacksmithing");
+        addSpecification("root", "blacksmith");
+        addSpecification("opinion", 1);
+        addSpecification("bonus blacksmithing", 2);
+        addSpecification("bonus metal crafting", 1);
+        "baseTrait"::reset(arg);
+    }
+}

instances/traits/domains/apprentice-carpenter.c

@@ -0,0 +1,21 @@
+//*****************************************************************************
+// Copyright (c) 2019 - Allen Cummings, RealmsMUD, All rights reserved. See
+//                      the accompanying LICENSE file for details.
+//*****************************************************************************
+inherit "/lib/modules/traits/baseTrait.c";
+
+/////////////////////////////////////////////////////////////////////////////
+public void reset(int arg)
+{
+    if (!arg)
+    {
+        addSpecification("type", "professional");
+        addSpecification("name", "apprentice carpenter");
+        addSpecification("description", "You have just begun learning about carpentry");
+        addSpecification("root", "carpenter");
+        addSpecification("opinion", 1);
+        addSpecification("bonus carpentry", 2);
+        addSpecification("bonus wood crafting", 1);
+        "baseTrait"::reset(arg);
+    }
+}

instances/traits/domains/apprentice-engineer.c

@@ -0,0 +1,22 @@
+//*****************************************************************************
+// Copyright (c) 2019 - Allen Cummings, RealmsMUD, All rights reserved. See
+//                      the accompanying LICENSE file for details.
+//*****************************************************************************
+inherit "/lib/modules/traits/baseTrait.c";
+
+/////////////////////////////////////////////////////////////////////////////
+public void reset(int arg)
+{
+    if (!arg)
+    {
+        addSpecification("type", "professional");
+        addSpecification("name", "apprentice engineer");
+        addSpecification("description", "You have just begun learning about engineering");
+        addSpecification("root", "engineer");
+        addSpecification("opinion", 1);
+        addSpecification("bonus engineering", 2);
+        addSpecification("bonus mathematics", 1);
+        addSpecification("bonus physics", 1);
+        "baseTrait"::reset(arg);
+    }
+}

instances/traits/domains/apprentice-mason.c

@@ -0,0 +1,20 @@
+//*****************************************************************************
+// Copyright (c) 2019 - Allen Cummings, RealmsMUD, All rights reserved. See
+//                      the accompanying LICENSE file for details.
+//*****************************************************************************
+inherit "/lib/modules/traits/baseTrait.c";
+
+/////////////////////////////////////////////////////////////////////////////
+public void reset(int arg)
+{
+    if (!arg)
+    {
+        addSpecification("type", "professional");
+        addSpecification("name", "apprentice stonemason");
+        addSpecification("description", "You have just begun learning about stonemasonry");
+        addSpecification("root", "stonemason");
+        addSpecification("opinion", 1);
+        addSpecification("bonus stonemasonry", 2);
+        "baseTrait"::reset(arg);
+    }
+}

instances/traits/domains/foreman.c

@@ -0,0 +1,20 @@
+//*****************************************************************************
+// Copyright (c) 2019 - Allen Cummings, RealmsMUD, All rights reserved. See
+//                      the accompanying LICENSE file for details.
+//*****************************************************************************
+inherit "/lib/modules/traits/baseTrait.c";
+
+/////////////////////////////////////////////////////////////////////////////
+public void reset(int arg)
+{
+    if (!arg)
+    {
+        addSpecification("type", "professional");
+        addSpecification("name", "foreman");
+        addSpecification("description", "You are able to lead building projects");
+        addSpecification("root", "foreman");
+        addSpecification("opinion", 5);
+
+        "baseTrait"::reset(arg);
+    }
+}

instances/traits/domains/journeyman-arcane.c

@@ -0,0 +1,24 @@
+//*****************************************************************************
+// Copyright (c) 2019 - Allen Cummings, RealmsMUD, All rights reserved. See
+//                      the accompanying LICENSE file for details.
+//*****************************************************************************
+inherit "/lib/modules/traits/baseTrait.c";
+
+/////////////////////////////////////////////////////////////////////////////
+public void reset(int arg)
+{
+    if (!arg)
+    {
+        addSpecification("type", "professional");
+        addSpecification("name", "journeyman arcane craftsman");
+        addSpecification("description", "You are an adept arcane craftsman");
+        addSpecification("root", "arcane craftsman");
+        addSpecification("opinion", 1);
+        addSpecification("bonus engineering", 10);
+        addSpecification("bonus mathematics", 5);
+        addSpecification("bonus physics", 5);
+        addSpecification("bonus spellcraft", 5);
+
+        "baseTrait"::reset(arg);
+    }
+}

instances/traits/domains/journeyman-architect.c

@@ -0,0 +1,23 @@
+//*****************************************************************************
+// Copyright (c) 2019 - Allen Cummings, RealmsMUD, All rights reserved. See
+//                      the accompanying LICENSE file for details.
+//*****************************************************************************
+inherit "/lib/modules/traits/baseTrait.c";
+
+/////////////////////////////////////////////////////////////////////////////
+public void reset(int arg)
+{
+    if (!arg)
+    {
+        addSpecification("type", "professional");
+        addSpecification("name", "journeyman architect");
+        addSpecification("description", "You are an adept architect");
+        addSpecification("root", "architect");
+        addSpecification("opinion", 1);
+        addSpecification("bonus engineering", 10);
+        addSpecification("bonus mathematics", 5);
+        addSpecification("bonus physics", 5);
+
+        "baseTrait"::reset(arg);
+    }
+}

instances/traits/domains/journeyman-blacksmith.c

@@ -0,0 +1,21 @@
+//*****************************************************************************
+// Copyright (c) 2019 - Allen Cummings, RealmsMUD, All rights reserved. See
+//                      the accompanying LICENSE file for details.
+//*****************************************************************************
+inherit "/lib/modules/traits/baseTrait.c";
+
+/////////////////////////////////////////////////////////////////////////////
+public void reset(int arg)
+{
+    if (!arg)
+    {
+        addSpecification("type", "professional");
+        addSpecification("name", "journeyman blacksmith");
+        addSpecification("description", "You are an adept blacksmith");
+        addSpecification("root", "blacksmith");
+        addSpecification("opinion", 1);
+        addSpecification("bonus blacksmithing", 10);
+        addSpecification("bonus metal crafting", 5);
+        "baseTrait"::reset(arg);
+    }
+}

instances/traits/domains/journeyman-carpenter.c

@@ -0,0 +1,21 @@
+//*****************************************************************************
+// Copyright (c) 2019 - Allen Cummings, RealmsMUD, All rights reserved. See
+//                      the accompanying LICENSE file for details.
+//*****************************************************************************
+inherit "/lib/modules/traits/baseTrait.c";
+
+/////////////////////////////////////////////////////////////////////////////
+public void reset(int arg)
+{
+    if (!arg)
+    {
+        addSpecification("type", "professional");
+        addSpecification("name", "journeyman carpenter");
+        addSpecification("description", "You are an adept carpenter");
+        addSpecification("root", "carpenter");
+        addSpecification("opinion", 1);
+        addSpecification("bonus carpentry", 10);
+        addSpecification("bonus wood crafting", 5);
+        "baseTrait"::reset(arg);
+    }
+}

instances/traits/domains/journeyman-engineer.c

@@ -0,0 +1,23 @@
+//*****************************************************************************
+// Copyright (c) 2019 - Allen Cummings, RealmsMUD, All rights reserved. See
+//                      the accompanying LICENSE file for details.
+//*****************************************************************************
+inherit "/lib/modules/traits/baseTrait.c";
+
+/////////////////////////////////////////////////////////////////////////////
+public void reset(int arg)
+{
+    if (!arg)
+    {
+        addSpecification("type", "professional");
+        addSpecification("name", "journeyman engineer");
+        addSpecification("description", "You are an adept engineer");
+        addSpecification("root", "engineer");
+        addSpecification("opinion", 1);
+        addSpecification("bonus engineering", 10);
+        addSpecification("bonus mathematics", 5);
+        addSpecification("bonus physics", 5);
+
+        "baseTrait"::reset(arg);
+    }
+}

instances/traits/domains/journeyman-mason.c

@@ -0,0 +1,20 @@
+//*****************************************************************************
+// Copyright (c) 2019 - Allen Cummings, RealmsMUD, All rights reserved. See
+//                      the accompanying LICENSE file for details.
+//*****************************************************************************
+inherit "/lib/modules/traits/baseTrait.c";
+
+/////////////////////////////////////////////////////////////////////////////
+public void reset(int arg)
+{
+    if (!arg)
+    {
+        addSpecification("type", "professional");
+        addSpecification("name", "journeyman stonemason");
+        addSpecification("description", "You are an adept stonemason");
+        addSpecification("root", "stonemason");
+        addSpecification("opinion", 1);
+        addSpecification("bonus stonemasonry", 10);
+        "baseTrait"::reset(arg);
+    }
+}

instances/traits/domains/master-arcane.c

@@ -0,0 +1,32 @@
+//*****************************************************************************
+// Copyright (c) 2019 - Allen Cummings, RealmsMUD, All rights reserved. See
+//                      the accompanying LICENSE file for details.
+//*****************************************************************************
+inherit "/lib/modules/traits/baseTrait.c";
+
+/////////////////////////////////////////////////////////////////////////////
+public void reset(int arg)
+{
+    if (!arg)
+    {
+        addSpecification("type", "professional");
+        addSpecification("name", "master arcane craftsman");
+        addSpecification("description", "You are a master arcane craftsman");
+        addSpecification("root", "arcane craftsman");
+        addSpecification("opinion", 5);
+        addSpecification("bonus engineering", 25);
+        addSpecification("bonus mathematics", 20);
+        addSpecification("bonus physics", 20);
+        addSpecification("bonus spellcraft", 20);
+        addSpecification("bonus evocation", 15);
+        addSpecification("bonus transformation", 15);
+        addSpecification("bonus manipulation", 15);
+        addSpecification("bonus elemental air", 15);
+        addSpecification("bonus elemental earth", 15);
+        addSpecification("bonus elemental fire", 15);
+        addSpecification("bonus elemental water", 15);
+        addSpecification("bonus magical essence", 15);
+
+        "baseTrait"::reset(arg);
+    }
+}

instances/traits/domains/master-architect.c

@@ -0,0 +1,23 @@
+//*****************************************************************************
+// Copyright (c) 2019 - Allen Cummings, RealmsMUD, All rights reserved. See
+//                      the accompanying LICENSE file for details.
+//*****************************************************************************
+inherit "/lib/modules/traits/baseTrait.c";
+
+/////////////////////////////////////////////////////////////////////////////
+public void reset(int arg)
+{
+    if (!arg)
+    {
+        addSpecification("type", "professional");
+        addSpecification("name", "master architect");
+        addSpecification("description", "You are a master architect");
+        addSpecification("root", "architect");
+        addSpecification("opinion", 5);
+        addSpecification("bonus engineering", 25);
+        addSpecification("bonus mathematics", 20);
+        addSpecification("bonus physics", 20);
+
+        "baseTrait"::reset(arg);
+    }
+}

instances/traits/domains/master-blacksmith.c

@@ -0,0 +1,22 @@
+//*****************************************************************************
+// Copyright (c) 2019 - Allen Cummings, RealmsMUD, All rights reserved. See
+//                      the accompanying LICENSE file for details.
+//*****************************************************************************
+inherit "/lib/modules/traits/baseTrait.c";
+
+/////////////////////////////////////////////////////////////////////////////
+public void reset(int arg)
+{
+    if (!arg)
+    {
+        addSpecification("type", "professional");
+        addSpecification("name", "master blacksmith");
+        addSpecification("description", "You are a master blacksmith");
+        addSpecification("root", "blacksmith");
+        addSpecification("opinion", 5);
+        addSpecification("bonus blacksmithing", 25);
+        addSpecification("bonus metal crafting", 20);
+        addSpecification("bonus engineering", 5);
+        "baseTrait"::reset(arg);
+    }
+}