Merged PR 510: Merge 609_component_selector_formatting to master

Related work items: #609
realms-mud · May 31, 2019 · 567846f · 567846f
1 parent 3a26d49
commit 567846f
Show file tree

Hide file tree

Showing 7 changed files with 35 additions and 45 deletions.
diff --git a/README b/README
diff --git a/modules/crafting/componentSelector.c b/modules/crafting/componentSelector.c
@@ -199,7 +199,7 @@ protected nomask string additionalInstructions()
         configuration->decorate(" denotes a selected material.\n", "details",
             "selector", colorConfiguration) +
         configuration->decorate((User->charsetConfiguration() == "unicode") ?
-            "   (\xe2\x80\xa0)" : "(*)", "selected", "selector", colorConfiguration) +
+            "(\xe2\x80\xa0)" : "(*)", "selected", "selector", colorConfiguration) +
         configuration->decorate(" denotes that a specific component type has been chosen.\n", 
             "details", "selector", colorConfiguration);
 }
diff --git a/modules/crafting/selectMaterialsSelector.c b/modules/crafting/selectMaterialsSelector.c
@@ -91,9 +91,9 @@ private nomask string getDescription()
                 "information", "selector", colorConfiguration); 
         }
     }
-    return sprintf("From this menu, you will select the\ncomponents that "
+    return regreplace(format(sprintf("%s - From this menu, you will select the components that "
-        "will be used to craft your %s. The relative statistics\nfor the item "
+        "will be used to craft your %s. The relative statistics for the item "
-        "you are creating are:", CraftingItem) + ret;
+        "you are creating are:", Type, CraftingItem), 78), (Type + " - "), "") + ret;
 }
 
 /////////////////////////////////////////////////////////////////////////////
@@ -106,8 +106,8 @@ protected nomask void setUpUserForSelection()
     }
     getItemToCraft();
 
-    Description = getDescription();
     Type = "Craft " + capitalize(CraftingItem);
+    Description = getDescription();
 
     Data = Dictionary->getCraftingDataForItem(CraftingType, CraftingItem, User);
 

diff --git a/tests/modules/crafting/craftArmorTest.c b/tests/modules/crafting/craftArmorTest.c
@@ -81,9 +81,9 @@ void ChoosingRobesDisplaysRobesMenu()
     command("2", Player);
     command("7", Player);
 
-    ExpectEq("\x1b[0;36mCraft Robes - \x1b[0m\x1b[0;37;1mFrom this menu, you will select the\n"
+    ExpectEq("\x1b[0;36mCraft Robes - \x1b[0m\x1b[0;37;1mFrom this menu, you "
-        "components that will be used to craft your robes. The relative statistics\n"
+		"will select the components that will be used\nto craft your robes. "
-        "for the item you are creating are:\n"
+		"The relative statistics for the item you are creating\nare:\n\n"
         "\x1b[0m\x1b[0;36m\tMaterial: \x1b[0;31mnone selected\x1b[0m\n"
         "\x1b[0;36m\tDamage Protection: \x1b[0m\x1b[0;33m1\x1b[0m\n"
         "\x1b[0;36m\tEncumberance: \x1b[0m\x1b[0;33m6\x1b[0m\n"
@@ -128,9 +128,9 @@ void SelectingMaterialUpdatesRobesMenu()
     command("1", Player);
     command("17", Player);
 
-    ExpectEq("\x1b[0;36mCraft Robes - \x1b[0m\x1b[0;37;1mFrom this menu, you will select the\n"
+    ExpectEq("\x1b[0;36mCraft Robes - \x1b[0m\x1b[0;37;1mFrom this menu, you "
-        "components that will be used to craft your robes. The relative statistics\n"
+		"will select the components that will be used\nto craft your robes. "
-        "for the item you are creating are:\n"
+		"The relative statistics for the item you are creating\nare:\n\n"
         "\x1b[0m\x1b[0;36m\tMaterial: \x1b[0m\x1b[0;33mSilk\x1b[0m\n"
         "\x1b[0;36m\tDamage Protection: \x1b[0m\x1b[0;33m2\x1b[0m\n"
         "\x1b[0;36m\tEncumberance: \x1b[0m\x1b[0;33m5\x1b[0m\n"

diff --git a/tests/modules/crafting/craftHelmetTest.c b/tests/modules/crafting/craftHelmetTest.c
@@ -118,9 +118,9 @@ void ChoosingHelmDisplaysHelmMenu()
     command("1", Player);
     command("13", Player);
 
-    ExpectEq("Craft Helm - From this menu, you will select the\n"
+    ExpectEq("Craft Helm - From this menu, you will select the components "
-        "components that will be used to craft your helm. The relative statistics\n"
+		"that will be used\nto craft your helm. The relative statistics "
-        "for the item you are creating are:\n"
+        "for the item you are creating are:\n\n"
         "\tMaterial: none selected\n"
         "\tWeight: 1\n"
         "\n"

diff --git a/tests/modules/crafting/craftJewelryTest.c b/tests/modules/crafting/craftJewelryTest.c
@@ -111,9 +111,9 @@ void ChoosingRingDisplaysRingMenu()
     command("1", Player);
     command("16", Player);
 
-    ExpectEq("\x1b[0;36mCraft Ring - \x1b[0m\x1b[0;37;1mFrom this menu, you will select the\n"
+    ExpectEq("\x1b[0;36mCraft Ring - \x1b[0m\x1b[0;37;1mFrom this menu, you "
-        "components that will be used to craft your ring. The relative statistics\n"
+		"will select the components that will be used\nto craft your ring. "
-        "for the item you are creating are:\n"
+		"The relative statistics for the item you are creating are:\n\n"
         "\x1b[0m\x1b[0;36m\tMaterial: \x1b[0;31mnone selected\x1b[0m\n\x1b[0m\n"
         "\t[\x1b[0;31;1m1\x1b[0m] - \x1b[0;32mSelect Metal        \x1b[0m\n"
         "\t[\x1b[0;31;1m2\x1b[0m] - \x1b[0;32mSelect Ring design  \x1b[0m\n"
@@ -153,9 +153,9 @@ void SelectingMaterialUpdatesRingMenu()
     command("1", Player);
     command("1", Player);
 
-    ExpectEq("\x1b[0;36mCraft Ring - \x1b[0m\x1b[0;37;1mFrom this menu, you will select the\n"
+    ExpectEq("\x1b[0;36mCraft Ring - \x1b[0m\x1b[0;37;1mFrom this menu, you "
-        "components that will be used to craft your ring. The relative statistics\n"
+		"will select the components that will be used\nto craft your ring. "
-        "for the item you are creating are:\n"
+		"The relative statistics for the item you are creating are:\n\n"
         "\x1b[0m\x1b[0;36m\tMaterial: \x1b[0m\x1b[0;33mAdmantite\x1b[0m\n\x1b[0m\n"
         "\t[\x1b[0;31;1m1\x1b[0m] - \x1b[0;32mSelect Metal        \x1b[0m\x1b[0;34;1m   (*)\x1b[0m\n"
         "\t[\x1b[0;31;1m2\x1b[0m] - \x1b[0;32mSelect Ring design  \x1b[0m\n"
@@ -181,9 +181,9 @@ void CanAddComponentThatDoesNotModifyMaterials()
     command("10", Player);
     command("19", Player);
 
-    ExpectEq("\x1b[0;36mCraft Ring - \x1b[0m\x1b[0;37;1mFrom this menu, you will select the\n"
+    ExpectEq("\x1b[0;36mCraft Ring - \x1b[0m\x1b[0;37;1mFrom this menu, you "
-        "components that will be used to craft your ring. The relative statistics\n"
+		"will select the components that will be used\nto craft your ring. "
-        "for the item you are creating are:\n"
+		"The relative statistics for the item you are creating are:\n\n"
         "\x1b[0m\x1b[0;36m\tMaterial: \x1b[0;31mnone selected\x1b[0m\n\x1b[0m\n"
         "\t[\x1b[0;31;1m1\x1b[0m] - \x1b[0;32mSelect Metal        \x1b[0m\n"
         "\t[\x1b[0;31;1m2\x1b[0m] - \x1b[0;32mSelect Ring design  \x1b[0m\x1b[0;34;1m   (*)\x1b[0m\n"

diff --git a/tests/modules/crafting/weaponComponentSelectorTest.c b/tests/modules/crafting/weaponComponentSelectorTest.c
@@ -78,9 +78,9 @@ void SpecificWeaponMenuDisplaysCorrectly()
 {
     Selector->initiateSelector(Player);
 
-    ExpectEq("\x1b[0;36mCraft Long sword - \x1b[0m\x1b[0;37;1mFrom this menu, you will select the\n"
+    ExpectEq("\x1b[0;36mCraft Long sword - \x1b[0m\x1b[0;37;1mFrom this menu, "
-        "components that will be used to craft your long sword. The relative statistics\n"
+		"you will select the components that will be\nused to craft your long "
-        "for the item you are creating are:\n"
+		"sword. The relative statistics for the item you are\ncreating are:\n\n"
         "\x1b[0m\x1b[0;36m\tMaterial: \x1b[0;31mnone selected\x1b[0m\n"
         "\x1b[0;36m\tAttack: \x1b[0m\x1b[0;33m5\x1b[0m\x1b[0;33m to 105\x1b[0m\n"
         "\x1b[0;36m\tDamage: \x1b[0m\x1b[0;33m7\x1b[0m\x1b[0;33m to 10\x1b[0m\n"
@@ -311,9 +311,9 @@ void CancelDoesNotSetValuesForWeaponCraftingMenu()
     command("6", Player);
     command("26", Player);
 
-    ExpectEq("\x1b[0;36mCraft Long sword - \x1b[0m\x1b[0;37;1mFrom this menu, you will select the\n"
+    ExpectEq("\x1b[0;36mCraft Long sword - \x1b[0m\x1b[0;37;1mFrom this menu, "
-        "components that will be used to craft your long sword. The relative statistics\n"
+		"you will select the components that will be\nused to craft your long "
-        "for the item you are creating are:\n"
+		"sword. The relative statistics for the item you are\ncreating are:\n\n"
         "\x1b[0m\x1b[0;36m\tMaterial: \x1b[0;31mnone selected\x1b[0m\n"
         "\x1b[0;36m\tAttack: \x1b[0m\x1b[0;33m5\x1b[0m\x1b[0;33m to 105\x1b[0m\n"
         "\x1b[0;36m\tDamage: \x1b[0m\x1b[0;33m7\x1b[0m\x1b[0;33m to 10\x1b[0m\n"
@@ -352,9 +352,9 @@ void ConfirmSetsValuesForWeaponCraftingMenu()
     command("6", Player);
     command("25", Player);
 
-    ExpectEq("\x1b[0;36mCraft Long sword - \x1b[0m\x1b[0;37;1mFrom this menu, you will select the\n"
+    ExpectEq("\x1b[0;36mCraft Long sword - \x1b[0m\x1b[0;37;1mFrom this menu, "
-        "components that will be used to craft your long sword. The relative statistics\n"
+		"you will select the components that will be\nused to craft your long "
-        "for the item you are creating are:\n"
+		"sword. The relative statistics for the item you are\ncreating are:\n\n"
         "\x1b[0m\x1b[0;36m\tMaterial: \x1b[0m\x1b[0;33mAdmantite\x1b[0m\n"
         "\x1b[0;36m\tAttack: \x1b[0m\x1b[0;33m8\x1b[0m\x1b[0;33m to 108\x1b[0m\n"
         "\x1b[0;36m\tDamage: \x1b[0m\x1b[0;33m12\x1b[0m\x1b[0;33m to 15\x1b[0m\x1b[0;31m [+2 magical]\x1b[0m\n"
@@ -632,9 +632,9 @@ void TurningOffColorDisplaysCorrectly()
     Player->colorConfiguration("none");
     Selector->initiateSelector(Player);
 
-    ExpectEq("Craft Long sword - From this menu, you will select the\n"
+    ExpectEq("Craft Long sword - From this menu, you will select the components "
-        "components that will be used to craft your long sword. The relative statistics\n"
+		"that will be\nused to craft your long sword. The relative statistics "
-        "for the item you are creating are:\n"
+        "for the item you are\ncreating are:\n\n"
         "\tMaterial: none selected\n"
         "\tAttack: 5 to 105\n"
         "\tDamage: 7 to 10\n"