Merge branch 'DFHack:develop' into cleaners_etc

Author: Bumber64

CMakeLists.txt

@@ -7,8 +7,8 @@ cmake_policy(SET CMP0074 NEW)
 project(dfhack)
 
 # set up versioning.
-set(DF_VERSION "50.13")
-set(DFHACK_RELEASE "r5")
+set(DF_VERSION "50.14")
+set(DFHACK_RELEASE "r1")
 set(DFHACK_PRERELEASE FALSE)
 
 set(DFHACK_VERSION "${DF_VERSION}-${DFHACK_RELEASE}")

data/blueprints/dreamfort.csv

@@ -2132,11 +2132,11 @@ build3/services_build3
 
 "#zone label(services_zones) start(18; 18) hidden() message(Don't forget to assign a doctor to the hospital!
 If you'd like to fill your wells via bucket brigade instead of routing water (e.g. with the aquifer_tap library blueprint), activate the inactive pond zones one level down from where the wells will be built.) garbage dump, hospital, taverrn, barracks, archery range, and pond zones"
-,,,,,,,,,,,,,"j{name=""Jail 1""}(4x5)",,,,"j{name=""Jail 2""}(4x5)",,,,"j{name=""Jail 3""}(4x5)",,,,"j{name=""Jail 4""}(4x5)",,,,"j{name=""Jail 5""}(4x5)"
-,"b{location=tavern/bigpub name=""Rented room 1""}(1x3)","b{location=tavern/bigpub name=""Rented room 2""}(1x3)","b{location=tavern/bigpub name=""Rented room 3""}(1x3)",,"b{location=tavern/bigpub name=""Rented room 4""}(1x3)","b{location=tavern/bigpub name=""Rented room 5""}(1x3)","b{location=tavern/bigpub name=""Rented room 6""}(1x3)",,"b{location=tavern/bigpub name=""Rented room 7""}(1x3)","b{location=tavern/bigpub name=""Rented room 8""}(1x3)","b{location=tavern/bigpub name=""Rented room 9""}(1x3)",,`,`,`,,`,`,`,,`,`,`,,`,`,`,,`,`,`
-,`,`,`,,`,`,`,,`,`,`,,`,`,`,,`,`,`,,`,`,`,,`,`,`,,`,`,`
-,`,`,`,,`,`,`,,`,`,`,,`,`,`,,`,`,`,,`,`,`,,`,`,`,,`,`,`
-"h{location=tavern/bigpub allow=residents name=""Grand hall tavern""}(13x31)",,`,,,,`,,,,`,,,,`,,,,`,,,,`,,,,`,,,,`
+,,,,,,,,,,,,j/jail1,"j/jail1{name=""Jail 1""}(4x5)",j/jail1,j/jail1,j/jail1,"j{name=""Jail 2""}(4x5)",,,,"j{name=""Jail 3""}(4x5)",,,,"j{name=""Jail 4""}(4x5)",,,,"j{name=""Jail 5""}(4x5)"
+,"b{location=tavern/bigpub name=""Rented room 1""}(1x3)","b{location=tavern/bigpub name=""Rented room 2""}(1x3)","b{location=tavern/bigpub name=""Rented room 3""}(1x3)",,"b{location=tavern/bigpub name=""Rented room 4""}(1x3)","b{location=tavern/bigpub name=""Rented room 5""}(1x3)","b{location=tavern/bigpub name=""Rented room 6""}(1x3)",,"b{location=tavern/bigpub name=""Rented room 7""}(1x3)","b{location=tavern/bigpub name=""Rented room 8""}(1x3)","b{location=tavern/bigpub name=""Rented room 9""}(1x3)",j/jail1,j/jail1,j/jail1,j/jail1,j/jail1,`,`,`,,`,`,`,,`,`,`,,`,`,`
+,`,`,`,,`,`,`,,`,`,`,j/jail1,j/jail1,j/jail1,j/jail1,j/jail1,`,`,`,,`,`,`,,`,`,`,,`,`,`
+,`,`,`,,`,`,`,,`,`,`,j/jail1,j/jail1,j/jail1,j/jail1,j/jail1,`,`,`,,`,`,`,,`,`,`,,`,`,`
+"h{location=tavern/bigpub allow=residents name=""Grand hall tavern""}(13x31)",,`,,,,`,,,,`,,,j/jail1,j/jail1,j/jail1,j/jail1,,`,,,,`,,,,`,,,,`
 ,`,`,`,`,`,`,`,`,`,`,`,,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`
 ,`,`,`,`,`,`,`,`,`,`,`,,,,,,,,,,,,,,`,o/interrogation,o/interrogation,o/interrogation,o/interrogation,o/interrogation,o/interrogation,o/interrogation
 ,`,`,`,`,`,`,`,`,`,`,`,,"B{name=""Marksdwarf barracks""}a{name=""Shooting gallery"" shoot_from=""south""}",Ba,Ba,Ba,Ba,Ba,Ba,Ba,Ba,Ba,Ba,,`,o/interrogation,"j{name=""Drunk tank""}",j,j,j,j,o/interrogation
@@ -2360,7 +2360,7 @@ Assign a minecart to the training ammo quantum dump with ""assign-minecarts all"
 
 ,`,b,`,,`,b,`,,`,b,`,,`,`,`,,`,`,`,,t,l,b,,`,`,`,,`,`,`
 ,`,h,`,,`,h,`,,`,h,`,,`,`,`,,`,`,`,,c,v,`,,`,`,`,,`,`,`
-,`,`,`,,`,`,`,,`,`,`,,`,`,`,,`,`,`,,`,`,`,,`,`,`,,`,`,`
+,`,f,`,,`,f,`,,`,f,`,,`,`,`,,`,`,`,,`,`,`,,`,`,`,,`,`,`
 ,,`,,,,`,,,,`,,,,`,,,,`,,,,d,,,,`,,,,`
 ,`,`,`,`,`,`,`,`,`,`,`,,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`
 ,`,`,`,`,`,`,`,`,`,`,`,,,,,,,,,,,,,,`
@@ -2468,7 +2468,7 @@ Assign a minecart to the training ammo quantum dump with ""assign-minecarts all"
 
 ,b,~,b,,b,~,b,,b,~,b,,t,l,b,,t,l,b,,~,~,~,,t,l,b,,t,l,b
 ,h,~,h,,h,~,h,,h,~,h,,c,v,`,,c,v,`,,~,~,`,,c,v,`,,c,v,`
-,`,`,`,,`,`,`,,`,`,`,,`,`,`,,`,`,`,,`,`,`,,`,`,`,,`,`,`
+,f,~,f,,f,~,f,,f,~,f,,`,`,`,,`,`,`,,`,`,`,,`,`,`,,`,`,`
 ,,d,,,,d,,,,d,,,,d,,,,d,,,,~,,,,d,,,,d
 ,`,`,`,s,`,`,`,s,`,`,`,,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`
 ,`,`,`,`,`,`,`,`,`,`,`,,,,,,,,,,,,,,`

docs/changelog.txt

@@ -70,6 +70,26 @@ Template for new versions:
 
 ## Removed
 
+# 50.14-r1
+
+## New Tools
+
+## New Features
+
+## Fixes
+- `preserve-rooms`: don't reserve a room for citizens that you expel from the fort
+- `autobutcher`: fix regression in ordering of butcherable animals
+
+## Misc Improvements
+
+## Documentation
+
+## API
+
+## Lua
+
+## Removed
+
 # 50.13-r5
 
 ## New Tools

library/modules/Gui.cpp

@@ -258,7 +258,7 @@ DEFINE_GET_FOCUS_STRING_HANDLER(world)
 }
 
 static bool widget_is_visible(df::widget * w) {
-    return w && w->visibility_flags.bits.WIDGET_VISIBILITY_VISIBLE;
+    return w && w->flag.bits.WIDGET_VISIBILITY_VISIBLE;
 }
 
 static size_t get_num_children(df::widget * w) {
@@ -700,7 +700,7 @@ DEFINE_GET_FOCUS_STRING_HANDLER(dwarfmode)
         newFocusString += "/ImageCreator";
         focusStrings.push_back(newFocusString);
     }
-    if (game->main_interface.unit_selector.visibility_flags.bits.WIDGET_VISIBILITY_ACTIVE) {
+    if (game->main_interface.unit_selector.flag.bits.WIDGET_VISIBILITY_ACTIVE) {
         newFocusString = baseFocus;
         newFocusString += "/UnitSelector/";
         newFocusString += enum_item_key(game->main_interface.unit_selector.context);

library/modules/Units.cpp

@@ -312,9 +312,9 @@ bool Units::isGay(df::unit *unit) {
     if (!unit->status.current_soul)
         return false;
 
-    auto &o_flag = unit->status.current_soul->orientation_flags;
-    return (!isFemale(unit) || !(o_flag.bits.marry_male && o_flag.bits.romance_male))
-        && (!isMale(unit) || !(o_flag.bits.marry_female && o_flag.bits.romance_female));
+    df::orientation_flags orientation = unit->status.current_soul->orientation_flags;
+    return (!Units::isFemale(unit) || !(orientation.whole & (orientation.mask_marry_male | orientation.mask_romance_male)))
+           && (!Units::isMale(unit) || !(orientation.whole & (orientation.mask_marry_female | orientation.mask_romance_female)));
 }
 
 bool Units::isNaked(df::unit *unit, bool no_items) {

library/xml

@@ -213,7 +213,7 @@ static void doMarkForSlaughter(df::unit *unit) {
     unit->flags2.bits.slaughter = 1;
 }
 
-// returns true if a should be butchered before b
+// returns true if b should be butchered before a
 static bool compareKids(df::unit *a, df::unit *b) {
     if (isHighPriority(a) != isHighPriority(b))
         return isHighPriority(b);
@@ -222,7 +222,7 @@ static bool compareKids(df::unit *a, df::unit *b) {
     return Units::getAge(a, true) > Units::getAge(b, true);
 }
 
-// returns true if a should be butchered before b
+// returns true if b should be butchered before a
 static bool compareAdults(df::unit* a, df::unit* b) {
     if (isHighPriority(a) != isHighPriority(b))
         return isHighPriority(b);

plugins/autobutcher.cpp

@@ -9,9 +9,13 @@
 #include "modules/Units.h"
 #include "modules/World.h"
 
+#include "df/army.h"
+#include "df/army_controller.h"
 #include "df/building_civzonest.h"
 #include "df/historical_figure.h"
+#include "df/historical_figure_info.h"
 #include "df/histfig_hf_link.h"
+#include "df/state_profilest.h"
 #include "df/unit.h"
 #include "df/world.h"
 
@@ -404,6 +408,15 @@ static void scrub_reservations(color_ostream &out) {
         pending_reassignment.erase(hfid);
 }
 
+static bool was_expelled(df::historical_figure *hf) {
+    if (!hf || !hf->info || !hf->info->whereabouts)
+        return false;
+    auto army = df::army::find(hf->info->whereabouts->army_id);
+    if (!army || !army->controller)
+        return false;
+    return army->controller->goal == df::army_controller_goal_type::MOVE_TO_SITE;
+}
+
 // handles when units disappear from their assignments compared to the last scan
 static void handle_missing_assignments(color_ostream &out,
     const unordered_set<int32_t> & active_unit_ids,
@@ -421,6 +434,10 @@ static void handle_missing_assignments(color_ostream &out,
         int32_t hfid = it->second.first;
         int32_t spouse_hfid = it->second.second;
         auto hf = df::historical_figure::find(hfid);
+        if (!hf) {
+            // if the historical figure was culled, bail
+            continue;
+        }
         auto unit = df::unit::find(hf->unit_id);
         if (!unit) {
             // if unit data is completely gone, then they're not likely to come back
@@ -430,8 +447,14 @@ static void handle_missing_assignments(color_ostream &out,
             // unit is still alive on the map; assume the unassigment was intentional/expected
             continue;
         }
-        if (!Units::isCitizen(unit, true) && !Units::isResident(unit, true))
+        if (!Units::isCitizen(unit, true) && !Units::isResident(unit, true)) {
+            // ignore units that are not members of the fort
+            continue;
+        }
+        if (was_expelled(hf)) {
+            // ignore expelled units
             continue;
+        }
         auto zone = virtual_cast<df::building_civzonest>(df::building::find(zone_id));
         if (!zone)
             continue;