tailor: fixes from testing

ab9rf · ab9rf · commit 867da3e0b63f · 2025-08-19T09:32:51.000-05:00
add missing binding for second config persistence item
improve logging
diff --git a/plugins/tailor.cpp b/plugins/tailor.cpp
@@ -771,7 +771,7 @@ class Tailor {
                     else
                     {
                         skipped += count;
-                        INFO(cycle).print("tailor: material %s skipped due to lack of reserves, %d available\n", DF2CONSOLE(m.name).c_str(), supply[m]);
+                        DEBUG(cycle).print("tailor: material %s skipped due to lack of reserves, %d available\n", DF2CONSOLE(m.name).c_str(), supply[m]);
                     }
 
                 }
@@ -786,15 +786,19 @@ class Tailor {
             {
                 int available_dyes = count_dyes();
                 int available_dyeable_cloth = count_dyeables(df::item_type::CLOTH);
+                int dye_cloth_orders = count_dye_cloth_orders();
 
-                int to_dye = std::max(0, std::min(skipped, std::min(count_dyes(), available_dyeable_cloth)) - count_dye_cloth_orders());
+                DEBUG(cycle).print("tailor: available dyes = %d, available dyeable cloth = %d, dye cloth orders = %d\n",
+                    available_dyes, available_dyeable_cloth, dye_cloth_orders);
+                int to_dye = std::min(skipped, std::min(available_dyes, available_dyeable_cloth) - dye_cloth_orders);
+                DEBUG(cycle).print("tailor: to dye = %d\n", to_dye);
                 if (to_dye > 0)
                 {
                     INFO(cycle).print("tailor: dyeing %d cloth\n", to_dye);
                     order_dye_cloth(to_dye);
                 }
 
-                int dyes_to_make = std::max(0, skipped - available_dyes - to_dye);
+                int dyes_to_make = available_dyes - to_dye;
                 if (dyes_to_make > 0)
                 {
                     INFO(cycle).print("tailor: ordering up to %d dyes\n", dyes_to_make);
@@ -872,6 +876,7 @@ DFhackCExport command_result plugin_shutdown (color_ostream &out) {
 DFhackCExport command_result plugin_load_site_data (color_ostream &out) {
     cycle_timestamp = 0;
     config = World::GetPersistentSiteData(CONFIG_KEY);
+    config2 = World::GetPersistentSiteData(CONFIG_KEY_2);
 
     if (!config.isValid()) {
         DEBUG(control,out).print("no config found in this save; initializing\n");

Original file line number	Diff line number	Diff line change
`@@ -771,7 +771,7 @@ class Tailor {`
`771`	`771`	`else`
`772`	`772`	`{`
`773`	`773`	`skipped += count;`
`774`		`- INFO(cycle).print("tailor: material %s skipped due to lack of reserves, %d available\n", DF2CONSOLE(m.name).c_str(), supply[m]);`
	`774`	`+ DEBUG(cycle).print("tailor: material %s skipped due to lack of reserves, %d available\n", DF2CONSOLE(m.name).c_str(), supply[m]);`
`775`	`775`	`}`
`776`	`776`
`777`	`777`	`}`
`@@ -786,15 +786,19 @@ class Tailor {`
`786`	`786`	`{`
`787`	`787`	`int available_dyes = count_dyes();`
`788`	`788`	`int available_dyeable_cloth = count_dyeables(df::item_type::CLOTH);`
	`789`	`+ int dye_cloth_orders = count_dye_cloth_orders();`
`789`	`790`
`790`		`- int to_dye = std::max(0, std::min(skipped, std::min(count_dyes(), available_dyeable_cloth)) - count_dye_cloth_orders());`
	`791`	`+ DEBUG(cycle).print("tailor: available dyes = %d, available dyeable cloth = %d, dye cloth orders = %d\n",`
	`792`	`+ available_dyes, available_dyeable_cloth, dye_cloth_orders);`
	`793`	`+ int to_dye = std::min(skipped, std::min(available_dyes, available_dyeable_cloth) - dye_cloth_orders);`
	`794`	`+ DEBUG(cycle).print("tailor: to dye = %d\n", to_dye);`
`791`	`795`	`if (to_dye > 0)`
`792`	`796`	`{`
`793`	`797`	`INFO(cycle).print("tailor: dyeing %d cloth\n", to_dye);`
`794`	`798`	`order_dye_cloth(to_dye);`
`795`	`799`	`}`
`796`	`800`
`797`		`- int dyes_to_make = std::max(0, skipped - available_dyes - to_dye);`
	`801`	`+ int dyes_to_make = available_dyes - to_dye;`
`798`	`802`	`if (dyes_to_make > 0)`
`799`	`803`	`{`
`800`	`804`	`INFO(cycle).print("tailor: ordering up to %d dyes\n", dyes_to_make);`
`@@ -872,6 +876,7 @@ DFhackCExport command_result plugin_shutdown (color_ostream &out) {`
`872`	`876`	`DFhackCExport command_result plugin_load_site_data (color_ostream &out) {`
`873`	`877`	`cycle_timestamp = 0;`
`874`	`878`	`config = World::GetPersistentSiteData(CONFIG_KEY);`
	`879`	`+ config2 = World::GetPersistentSiteData(CONFIG_KEY_2);`
`875`	`880`
`876`	`881`	`if (!config.isValid()) {`
`877`	`882`	`DEBUG(control,out).print("no config found in this save; initializing\n");`