Sync to changes in df-structures.

library/modules/Materials.cpp

@@ -761,8 +761,8 @@ bool Materials::ReadCreatureTypesEx (void)
             {
                 df::body_part_raw *bp = ca->body_info.body_parts[k];
                 t_bodypart part;
-                part.id = bp->part_code;
+                part.id = bp->token;
-                part.category = bp->part_name;
+                part.category = bp->category;
                 caste.bodypart.push_back(part);
             }
             using namespace df::enums::mental_attribute_type;

library/xml

@@ -1 +1 @@
-Subproject commit d991d47b0f6709205c4e333bb86edb3dcf656429
+Subproject commit 7d5c349a40dc1f211de2d37aeece4a3d9d631ed2

plugins/devel/counters.cpp

@@ -25,7 +25,7 @@ command_result df_counters (color_ostream &out, vector <string> & parameters)
     for (size_t i = 0; i < counters.size(); i++)
     {
         auto counter = counters[i];
-        out.print("%i (%s): %i\n", counter->id, ENUM_KEY_STR(unit_misc_trait::T_id, counter->id).c_str(), counter->value);
+        out.print("%i (%s): %i\n", counter->id, ENUM_KEY_STR(misc_trait_type, counter->id).c_str(), counter->value);
     }
 
     return CR_OK;

plugins/forceequip.cpp

@@ -292,7 +292,7 @@ static bool moveToInventory(MapExtras::MapCache &mc, df::item *item, df::unit *u
         else if (bpIndex < unit->body.body_plan->body_parts.size())
         {
             // The current body part is not the one that was specified in the function call, but we can keep searching
-            if (verbose) { Core::printerr("Found bodypart %s; not a match; continuing search.\n", currPart->part_code.c_str()); }
+            if (verbose) { Core::printerr("Found bodypart %s; not a match; continuing search.\n", currPart->token.c_str()); }
             continue;
         }
         else 
@@ -302,35 +302,35 @@ static bool moveToInventory(MapExtras::MapCache &mc, df::item *item, df::unit *u
             return false;
         }
 
-        if (verbose) { Core::print("Inspecting bodypart %s.\n", currPart->part_code.c_str()); }
+        if (verbose) { Core::print("Inspecting bodypart %s.\n", currPart->token.c_str()); }
 
         // Inspect the current bodypart
         if (item->getType() == df::enums::item_type::GLOVES && currPart->flags.is_set(df::body_part_template_flags::GRASP) &&
             ((item->getGloveHandedness() == const_GloveLeftHandedness && currPart->flags.is_set(df::body_part_template_flags::LEFT)) ||
             (item->getGloveHandedness() == const_GloveRightHandedness && currPart->flags.is_set(df::body_part_template_flags::RIGHT))))
         {
-            if (verbose) { Core::print("Hand found (%s)...", currPart->part_code.c_str()); }
+            if (verbose) { Core::print("Hand found (%s)...", currPart->token.c_str()); }
         }
         else if (item->getType() == df::enums::item_type::HELM && currPart->flags.is_set(df::body_part_template_flags::HEAD))
         {
-            if (verbose) { Core::print("Head found (%s)...", currPart->part_code.c_str()); }
+            if (verbose) { Core::print("Head found (%s)...", currPart->token.c_str()); }
         }
         else if (item->getType() == df::enums::item_type::ARMOR && currPart->flags.is_set(df::body_part_template_flags::UPPERBODY))
         {
-            if (verbose) { Core::print("Upper body found (%s)...", currPart->part_code.c_str()); }
+            if (verbose) { Core::print("Upper body found (%s)...", currPart->token.c_str()); }
         }
         else if (item->getType() == df::enums::item_type::PANTS && currPart->flags.is_set(df::body_part_template_flags::LOWERBODY))
         {
-            if (verbose) { Core::print("Lower body found (%s)...", currPart->part_code.c_str()); }
+            if (verbose) { Core::print("Lower body found (%s)...", currPart->token.c_str()); }
         }
         else if (item->getType() == df::enums::item_type::SHOES && currPart->flags.is_set(df::body_part_template_flags::STANCE))
         {
-            if (verbose) { Core::print("Foot found (%s)...", currPart->part_code.c_str()); }
+            if (verbose) { Core::print("Foot found (%s)...", currPart->token.c_str()); }
         }
         else if (targetBodyPart && ignoreRestrictions)
         {
             // The BP in question would normally be considered ineligible for equipment.  But since it was deliberately specified by the user, we'll proceed anyways.
-            if (verbose) { Core::print("Non-standard bodypart found (%s)...", targetBodyPart->part_code.c_str()); }
+            if (verbose) { Core::print("Non-standard bodypart found (%s)...", targetBodyPart->token.c_str()); }
         }
         else if (targetBodyPart)
         {
@@ -538,16 +538,16 @@ command_result df_forceequip(color_ostream &out, vector <string> & parameters)
 		{
 			// Tentatively assume that the part is a match
 			targetBodyPart = targetUnit->body.body_plan->body_parts.at(bpIndex);
-			if (targetBodyPart->part_code.compare(targetBodyPartCode) == 0) 
+			if (targetBodyPart->token.compare(targetBodyPartCode) == 0) 
 			{
 				// It is indeed a match; exit the loop (while leaving the variable populated)
-				if (verbose) { out.print("Matching bodypart (%s) found.\n", targetBodyPart->part_name.c_str()); }
+				if (verbose) { out.print("Matching bodypart (%s) found.\n", targetBodyPart->token.c_str()); }
 				break;
 			}
 			else 
 			{
 				// Not a match; nullify the variable (it will get re-populated on the next pass through the loop)
-				if (verbose) { out.printerr("Bodypart \"%s\" does not match \"%s\".\n", targetBodyPart->part_code.c_str(), targetBodyPartCode.c_str()); }
+				if (verbose) { out.printerr("Bodypart \"%s\" does not match \"%s\".\n", targetBodyPart->token.c_str(), targetBodyPartCode.c_str()); }
 				targetBodyPart = NULL;
 			}
 		}