Merge pull request #5721 from pajawojciech/orders-export-name

Include name in orders export

Author: ab9rf

docs/changelog.txt

@@ -259,6 +259,7 @@ Template for new versions:
 
 ## New Features
 - `orders`: added search overlay to find and navigate to matching manager orders with arrow indicators
+- `orders`: exported orders now include a human-readable ``name`` field
 - `sort`: added ``Uniformed`` filter to squad assignment screen to filter dwarves with mining, woodcutting, or hunting labors
 - `sort`: Add death cause button to dead/missing tab in the creatures screen
 

plugins/orders.cpp

@@ -4,6 +4,7 @@
 #include "PluginManager.h"
 
 #include "modules/Filesystem.h"
+#include "modules/Job.h"
 #include "modules/Materials.h"
 #include "modules/World.h"
 
@@ -383,6 +384,7 @@ static command_result orders_export_command(color_ostream & out, const std::stri
             order["art"] = art;
         }
 
+        order["name"] = Job::getManagerOrderName(it);
         order["amount_left"] = it->amount_left;
         order["amount_total"] = it->amount_total;
         order["is_validated"] = bool(it->status.bits.validated);

test/plugins/orders.lua

@@ -190,6 +190,7 @@ function test.import_export_reaction_condition()
                     }
                 ],
                 "job" : "CustomReaction",
+                "name" : "Make soap from tallow",
                 "reaction" : "MAKE_SOAP_FROM_TALLOW"
             }
         ]