From 0607fd461792c6f7c486d11bda6c953a6ad1a4f1 Mon Sep 17 00:00:00 2001
From: myk002 <myk002@yahoo.com>
Date: Sun, 22 Aug 2021 14:40:08 -0700
Subject: [PATCH 1/5] fix enum definitions of hauler_type

while implementing the --hauler-type param for the prioritize script, I
noticed that the job->item_subtype field, which is tagged as being a
hauler_type enum, did not match up with the type of item being hauled. I
fixed this enum based on observation of which enum values resulted in
which types of items were hauled.

I was unabled to verify the "Bin" enum. I could not get any hauling jobs
of this type to be generated in my fort, even when explicitly building
bins and enabling bins for stockpiles.
---
 df.stockpile.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/df.stockpile.xml b/df.stockpile.xml
index ab1833e80..753ecb616 100644
--- a/df.stockpile.xml
+++ b/df.stockpile.xml
@@ -3,13 +3,13 @@
         <enum-item name='Any'/>
         <enum-item name='Stone'/>
         <enum-item name='Wood'/>
-        <enum-item name='Item'/>
-        <enum-item name='Bin'/>
         <enum-item name='Body'/>
         <enum-item name='Food'/>
         <enum-item name='Refuse'/>
+        <enum-item name='Item'/>
         <enum-item name='Furniture'/>
         <enum-item name='Animal'/>
+        <enum-item name='Bin'/>
     </enum-type>
 
     <enum-type type-name='furniture_type'>

From adecea0b99f6aa67fbab6c14cc39d87eb5376b43 Mon Sep 17 00:00:00 2001
From: myk002 <myk002@yahoo.com>
Date: Sun, 22 Aug 2021 14:43:55 -0700
Subject: [PATCH 2/5] update changelog

---
 changelog.txt | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/changelog.txt b/changelog.txt
index 98293a769..d2f4a2d04 100644
--- a/changelog.txt
+++ b/changelog.txt
@@ -14,6 +14,9 @@ that repo.
 
 # Future
 
+## Structures
+- Identified correct value assignments for the ``hauler_type`` enum
+
 # 0.47.05-r2
 
 ## Structures

From 9623364a89876d0b12d31a625775c11ed366c491 Mon Sep 17 00:00:00 2001
From: myk002 <myk002@yahoo.com>
Date: Sun, 22 Aug 2021 17:22:22 -0700
Subject: [PATCH 3/5] Revert "update changelog"

This reverts commit adecea0b99f6aa67fbab6c14cc39d87eb5376b43.
---
 changelog.txt | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/changelog.txt b/changelog.txt
index d2f4a2d04..98293a769 100644
--- a/changelog.txt
+++ b/changelog.txt
@@ -14,9 +14,6 @@ that repo.
 
 # Future
 
-## Structures
-- Identified correct value assignments for the ``hauler_type`` enum
-
 # 0.47.05-r2
 
 ## Structures

From 1a6f7b7e5c3c0361da0362668925aad2c2917ae6 Mon Sep 17 00:00:00 2001
From: myk002 <myk002@yahoo.com>
Date: Sun, 22 Aug 2021 17:22:30 -0700
Subject: [PATCH 4/5] Revert "fix enum definitions of hauler_type"

This reverts commit 0607fd461792c6f7c486d11bda6c953a6ad1a4f1.
---
 df.stockpile.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/df.stockpile.xml b/df.stockpile.xml
index 753ecb616..ab1833e80 100644
--- a/df.stockpile.xml
+++ b/df.stockpile.xml
@@ -3,13 +3,13 @@
         <enum-item name='Any'/>
         <enum-item name='Stone'/>
         <enum-item name='Wood'/>
+        <enum-item name='Item'/>
+        <enum-item name='Bin'/>
         <enum-item name='Body'/>
         <enum-item name='Food'/>
         <enum-item name='Refuse'/>
-        <enum-item name='Item'/>
         <enum-item name='Furniture'/>
         <enum-item name='Animal'/>
-        <enum-item name='Bin'/>
     </enum-type>
 
     <enum-type type-name='furniture_type'>

From 56338c7336d3408c3673a6e7db57f175417acd79 Mon Sep 17 00:00:00 2001
From: myk002 <myk002@yahoo.com>
Date: Sun, 22 Aug 2021 17:23:32 -0700
Subject: [PATCH 5/5] correct comment for job->item_subtype

---
 df.jobs.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/df.jobs.xml b/df.jobs.xml
index 54f8a54eb..b842fdc76 100644
--- a/df.jobs.xml
+++ b/df.jobs.xml
@@ -106,7 +106,7 @@
         <int32_t name='mat_index' init-value='-1'/>
         <int16_t name='unk5' init-value='-1'/>
         <enum base-type='int16_t' name='item_type' type-name='item_type' comment='for Bait Trap jobs'/>
-        <int16_t name='item_subtype' init-value='-1' comment='for StoreInStockpile: hauler_type'/>
+        <int16_t name='item_subtype' init-value='-1' comment='when StoreInStockpile this is a unit_labor'/>
 
         -- For building construction, bit 0 marks if location was updated:
         <bitfield name="item_category" type-name='stockpile_group_set'/>