From 35d357776c72e191f8d793aca1a6a4fda02c6cf9 Mon Sep 17 00:00:00 2001 From: scamtank Date: Sun, 8 Feb 2015 23:41:22 +0200 Subject: [PATCH 1/2] Substitute removed jobtypes with working ones Replaced StoreItemInChest with StoreItemInHospital and StoreItemInCabinet with StoreOwnedItem. Seem to work on the basic level with waterskins and uniform cloaks. --- plugins/fix-armory.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/plugins/fix-armory.cpp b/plugins/fix-armory.cpp index e2c917f7e..8b062290b 100644 --- a/plugins/fix-armory.cpp +++ b/plugins/fix-armory.cpp @@ -509,11 +509,11 @@ static bool try_store_item(df::building *target, df::item *item) job->flags.bits.specific_dropoff = true; break; case building_type::Cabinet: - job->job_type = job_type::StoreItemInCabinet; + job->job_type = job_type::StoreOwnedItem; dest = true; break; default: - job->job_type = job_type::StoreItemInChest; + job->job_type = job_type::StoreItemInHospital; dest = true; break; } From 9c4dbea3929557b0e7275cc4f6ecf1ad3a2842a4 Mon Sep 17 00:00:00 2001 From: scamtank Date: Mon, 9 Feb 2015 00:22:19 +0200 Subject: [PATCH 2/2] Re-enabled fix-armory plugin --- plugins/CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/CMakeLists.txt b/plugins/CMakeLists.txt index f58c0182d..063e8a90e 100644 --- a/plugins/CMakeLists.txt +++ b/plugins/CMakeLists.txt @@ -117,7 +117,7 @@ if (BUILD_SUPPORTED) DFHACK_PLUGIN(fastdwarf fastdwarf.cpp) DFHACK_PLUGIN(feature feature.cpp) DFHACK_PLUGIN(filltraffic filltraffic.cpp) -# DFHACK_PLUGIN(fix-armory fix-armory.cpp) + DFHACK_PLUGIN(fix-armory fix-armory.cpp) DFHACK_PLUGIN(fixpositions fixpositions.cpp) DFHACK_PLUGIN(fixveins fixveins.cpp) DFHACK_PLUGIN(flows flows.cpp)