Merge remote-tracking branch 'upstream/develop' into SquidHack

Author: realSquidCoder

CMakeLists.txt

@@ -7,7 +7,7 @@ cmake_policy(SET CMP0074 NEW)
 
 # set up versioning.
 set(DF_VERSION "52.03")
-set(DFHACK_RELEASE "r1.1")
+set(DFHACK_RELEASE "r2")
 set(DFHACK_PRERELEASE FALSE)
 set(SQUIDHACK_INFO "Compatible with DFxTwitch v0.1.x")
 

docs/changelog.txt

@@ -53,6 +53,24 @@ Template for new versions:
 
 ## New Tools
 
+## New Features
+
+## Fixes
+
+## Misc Improvements
+
+## Documentation
+
+## API
+
+## Lua
+
+## Removed
+
+# 52.03-r2
+
+## New Tools
+
 ## New Features
 - `nestboxes`: allow limiting egg protection to nestboxes inside a designated burrow
 - `tailor`: tailor now provides optional dye automation
@@ -70,7 +88,6 @@ Template for new versions:
 - ``Units``: new functions ``getFocusPenalty``, ``unbailableSocialActivity``, ``isJobAvailable``
 
 ## Lua
-
 - New functions: ``dfhack.jobs.createLinked``, ``dfhack.jobs.assignToWorkshop``, ``dfhack.units.getFocusPenalty``, ``dfhack.units.unbailableSocialActivity``, and ``dfhack.units.isJobAvailable``
 
 ## Removed

docs/dev/Lua API.rst

@@ -1908,11 +1908,12 @@ Units module
 
   Unit has an uninterruptible social activity (e.g. a purple "Socialize!").
 
-* ``dfhack.units.isJobAvailable(unit [, interrupt_social])``
+* ``dfhack.units.isJobAvailable(unit [, preserve_social])``
 
   Check whether a unit can be assigned to (i.e. is looking for) a job. Will
   return ``true`` if the unit is engaged in "green" social activities, unless
-  the boolean ``interrupt_social`` is true.
+  the boolean ``preserve_social`` is true. Will never interrupt uninterruptible
+  social activities (e.g. a purple "Socialize!").
 
 * ``dfhack.units.getFocusPenalty(unit, need_type [, need_type, ...])``
 

library/include/modules/Units.h

@@ -350,7 +350,7 @@ DFHACK_EXPORT int32_t getFocusPenalty(df::unit* unit, df::need_type need_type);
 // unit has an unbailable social activity (e.g. "Socialize!")
 DFHACK_EXPORT bool hasUnbailableSocialActivity(df::unit *unit);
 // unit can be assigned a job
-DFHACK_EXPORT bool isJobAvailable(df::unit *unit, bool interrupt_social);
+DFHACK_EXPORT bool isJobAvailable(df::unit *unit, bool preserve_social);
 
 // Stress categories. 0 is highest stress, 6 is lowest.
 DFHACK_EXPORT extern const std::vector<int32_t> stress_cutoffs;

library/modules/Units.cpp

@@ -2090,6 +2090,8 @@ bool Units::isJobAvailable(df::unit *unit, bool preserve_social = false){
         return false;
     if (unit->flags1.bits.caged || unit->flags1.bits.chained)
         return false;
+    if (Units::getSpecificRef(unit, df::specific_ref_type::ACTIVITY))
+        return false;
     if (unit->individual_drills.size() > 0) {
         if (unit->individual_drills.size() > 1)
             return false; // this is even possible

library/xml

@@ -54,7 +54,7 @@ namespace DFHack {
 }
 
 static const string CONFIG_KEY = string(plugin_name) + "/config";
-static const string CONFIG_KEY_2 = string(plugin_name) + "/config1";
+static const string CONFIG_KEY_2 = string(plugin_name) + "/config_2";
 static PersistentDataItem config;
 static PersistentDataItem config2;
 
@@ -885,8 +885,6 @@ DFhackCExport command_result plugin_shutdown (color_ostream &out) {
     return CR_OK;
 }
 
-
-
 DFhackCExport command_result plugin_load_site_data (color_ostream &out) {
     cycle_timestamp = 0;
     config = World::GetPersistentSiteData(CONFIG_KEY);
@@ -910,7 +908,6 @@ DFhackCExport command_result plugin_load_site_data (color_ostream &out) {
         config.set_bool(CONFIG_CONFISCATE, true);
     }
 
-    config2 = World::GetPersistentSiteData(CONFIG_KEY_2);
     // transition existing saves to CONFIG_AUTOMATE_DYE=false
     if (config2.get_int(CONFIG_AUTOMATE_DYE) < 0)
     {
@@ -922,9 +919,12 @@ DFhackCExport command_result plugin_load_site_data (color_ostream &out) {
     DEBUG(control,out).print("loading persisted enabled state: %s\n",
                             is_enabled ? "true" : "false");
     tailor_instance->set_confiscate(config.get_bool(CONFIG_CONFISCATE));
-    tailor_instance->set_automate_dye(config2.get_bool(CONFIG_AUTOMATE_DYE));
     DEBUG(control,out).print("loading persisted confiscation state: %s\n",
                             tailor_instance->get_confiscate() ? "true" : "false");
+    tailor_instance->set_automate_dye(config2.get_bool(CONFIG_AUTOMATE_DYE));
+    DEBUG(control, out).print("loading persisted dye automation state: %s\n",
+                            tailor_instance->get_automate_dye() ? "true" : "false");
+
     tailor_instance->sync_material_order();
 
     return CR_OK;