Merged PR 496: Merge 111_traits to master

Related work items: #111
realms-mud · Apr 30, 2019 · eeb9209 · eeb9209
1 parent 049d085
commit eeb9209
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 1 deletion.
diff --git a/include/itemFormatters.h b/include/itemFormatters.h
@@ -857,6 +857,11 @@ private nosave mapping decorators = ([
             "8-bit": "\x1b[0;38;5;190m",
             "24-bit": "\x1b[0;38;2;200;200;0m"
         ]),
+        "personality trait":([
+            "3-bit": "\x1b[0;36m",
+            "8-bit": "\x1b[0;38;5;80m",
+            "24-bit": "\x1b[0;38;2;180;180;190m"
+        ]), 
     ]),
     "quests":([
         "description": ([

diff --git a/modules/traits.c b/modules/traits.c
@@ -444,6 +444,10 @@ private nomask string getTraitColor(string trait)
     {
         ret = "negative trait";
     }
+    else if (traitDictionary()->traitIsOfType(trait, "personality"))
+    {
+        ret = "personality trait";
+    }
     else if (traitDictionary()->isValidPersistedTrait(trait))
     {
         ret = "persisted trait";

diff --git a/tests/commands/player/traitsTest.c b/tests/commands/player/traitsTest.c
@@ -99,7 +99,7 @@ void SectionWithMoreThanThreeTraitsCorrectlyDisplays()
 
     ExpectTrue(Player->executeCommand("traits"));
     ExpectEq("\n\x1b[0;31m+-=-=-=-=-=-=-=-=-=-=-=-=-=-=+ Personality Traits +-=-=-=-=-=-=-=-=-=-=-=-=-=-+\n\x1b[0m" +
-        sprintf(TraitsRow, "\x1b[0;36m", "Abrasive", "\x1b[0;33m", "Charming", "\x1b[0;31;1m", "Test 1") +
+        sprintf(TraitsRow, "\x1b[0;36m", "Abrasive", "\x1b[0;36m", "Charming", "\x1b[0;31;1m", "Test 1") +
         sprintf(TraitsRowOne, "\x1b[0;36m", "Test 2", "", "", "", "") + EndBar,
         Player->caughtMessage());
 }