Skip to content
Permalink
Browse files

Merged PR 535: Merge 612_worker_assignment to master

Related work items: #612
  • Loading branch information...
realms-mud committed Jul 11, 2019
1 parent d4cf664 commit 6299c176a800f51187fe44ec0000aa30e79905f0
Showing 488 changed files with 229 additions and 219 deletions.
@@ -252,7 +252,7 @@ private nomask void setPersonalityArchetype(object user, string *results)
trait += result[0..0];
}

user->addTrait(sprintf("lib/modules/traits/archetypes/%s.c", trait));
user->addTrait(sprintf("lib/instances/traits/archetypes/%s.c", trait));
}

/////////////////////////////////////////////////////////////////////////////
@@ -263,7 +263,7 @@ public nomask void updateUserPersonality(object user, string *results)

foreach(string result in results)
{
user->addTrait(sprintf("lib/modules/traits/personality/%s.c", result));
user->addTrait(sprintf("lib/instances/traits/personality/%s.c", result));
}
}

@@ -12,51 +12,51 @@
/////////////////////////////////////////////////////////////////////////////
private mapping drugEffects = ([
"alcohol":([
"trait": "lib/modules/traits/biological/drunk.c",
"trait": "lib/instances/traits/biological/drunk.c",
"toxicity": 3,
]),
"opiate": ([
"trait": "lib/modules/traits/biological/wasted-on-opiates.c",
"trait": "lib/instances/traits/biological/wasted-on-opiates.c",
"toxicity": 10,
]),
"salicylate": ([
"trait": "lib/modules/traits/biological/salicylate.c",
"trait": "lib/instances/traits/biological/salicylate.c",
"toxicity": 1,
]),
"psychedelic": ([
"trait": "lib/modules/traits/biological/stoned.c",
"trait": "lib/instances/traits/biological/stoned.c",
"toxicity": 4,
]),
"dissociative": ([
"trait": "lib/modules/traits/biological/hallucinating.c",
"trait": "lib/instances/traits/biological/hallucinating.c",
"toxicity": 5,
]),
"dileriant": ([
"trait": "lib/modules/traits/biological/drug-dilerious.c",
"trait": "lib/instances/traits/biological/drug-dilerious.c",
"toxicity": 5,
]),
"steroid": ([
"trait": "lib/modules/traits/biological/steroids.c",
"trait": "lib/instances/traits/biological/steroids.c",
"toxicity": 4,
]),
"barbituate": ([
"trait": "lib/modules/traits/biological/impaired-barbituates.c",
"trait": "lib/instances/traits/biological/impaired-barbituates.c",
"toxicity": 5,
]),
"benzodiazepine": ([
"trait": "lib/modules/traits/biological/on-benzodiazepine.c",
"trait": "lib/instances/traits/biological/on-benzodiazepine.c",
"toxicity": 3,
]),
"antidepressant": ([
"trait": "lib/modules/traits/biological/antidepressant.c",
"trait": "lib/instances/traits/biological/antidepressant.c",
"toxicity": 4,
]),
"xanthine": ([
"trait": "lib/modules/traits/biological/caffeinated.c",
"trait": "lib/instances/traits/biological/caffeinated.c",
"toxicity": 1,
]),
"adrenaline": ([
"trait": "lib/modules/traits/biological/adrenaline.c",
"trait": "lib/instances/traits/biological/adrenaline.c",
"toxicity": 1,
]),
"sympathomimetic amine": ([
@@ -89,7 +89,8 @@ private nomask void SetResearch(object character, string persona)
private nomask void SetTraits(object character, string persona)
{
string *traits = personaBlueprints()[persona]["traits"];
character->addTrait(sprintf("lib/modules/traits/personas/%s/%s.c",

character->addTrait(sprintf("lib/instances/traits/personas/%s/%s.c",
personaBlueprints()[persona]["category"],
regreplace(persona, " ", "-", 1)));

@@ -221,7 +221,7 @@ private nosave mapping creatureBlueprints = ([
"category": "creatures",
"primary skills":({ "parry", "dodge", "no armor" }),
"secondary skills" : ({ "perception", "listen", "spot" }),
"traits" : ({ "lib/modules/traits/effects/ethereal" }),
"traits" : ({ "lib/instances/traits/effects/ethereal" }),
"potential traits" : ({}),
"minimum level": 5,
"attacks": ([
@@ -944,7 +944,7 @@ private nosave mapping creatureBlueprints = ([
"category": "creatures",
"primary skills":({ "parry", "dodge", "no armor" }),
"secondary skills" : ({ "perception", "listen", "spot" }),
"traits" : ({ "lib/modules/traits/effects/ethereal" }),
"traits" : ({ "lib/instances/traits/effects/ethereal" }),
"potential traits" : ({}),
"minimum level": 10,
"attacks": ([
@@ -990,7 +990,7 @@ private nosave mapping creatureBlueprints = ([
"category": "creatures",
"primary skills":({ "parry", "dodge", "no armor" }),
"secondary skills" : ({ "perception", "listen", "spot" }),
"traits" : ({ "lib/modules/traits/effects/ethereal" }),
"traits" : ({ "lib/instances/traits/effects/ethereal" }),
"potential traits" : ({}),
"minimum level": 5,
"attacks": ([
@@ -1192,7 +1192,7 @@ private nosave mapping creatureBlueprints = ([
"category": "creatures",
"primary skills":({ "parry", "dodge", "no armor" }),
"secondary skills" : ({ "perception", "listen", "spot" }),
"traits" : ({ "lib/modules/traits/effects/ethereal" }),
"traits" : ({ "lib/instances/traits/effects/ethereal" }),
"potential traits" : ({}),
"minimum level": 6,
"attacks": ([
@@ -1237,7 +1237,7 @@ private nosave mapping creatureBlueprints = ([
"category": "creatures",
"primary skills":({ "parry", "dodge", "no armor" }),
"secondary skills" : ({ "perception", "listen", "spot" }),
"traits" : ({ "lib/modules/traits/effects/ethereal" }),
"traits" : ({ "lib/instances/traits/effects/ethereal" }),
"potential traits" : ({}),
"minimum level": 12,
"attacks": ([
@@ -9,8 +9,9 @@
#include "/lib/dictionaries/races/hair.h"
#include "/lib/dictionaries/races/races.h"

private string SubraceRoot = "/lib/modules/traits/racial/";
private string TraitRoot = "/lib/modules/traits/%s/";
private string SubraceRoot = "/lib/instances/traits/racial/";
private string TraitRoot = "/lib/instances/traits/%s/";

private object configuration =
load_object("/lib/dictionaries/configurationDictionary.c");

@@ -670,7 +670,7 @@ public nomask mapping creationListForTraitType(string type)
if ((member(validTraitTypes, type) > -1) || (type == "sexuality"))
{
string *traitList = get_dir(
sprintf("/lib/modules/traits/%s/*.c", type), 0x10);
sprintf("/lib/instances/traits/%s/*.c", type), 0x10);

if (sizeof(traitList))
{
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.