From d2fb51f99e9b722c739d53b102fce91e0ea3e966 Mon Sep 17 00:00:00 2001
From: lethosor
Date: Wed, 1 Oct 2014 20:13:31 -0400
Subject: [PATCH] New tweak: nestbox-color
---
NEWS | 2 +-
Readme.html | 5 +++-
Readme.rst | 2 +-
plugins/tweak/tweak.cpp | 45 +++++++++++++++-------------
plugins/tweak/tweaks/nestbox-color.h | 22 ++++++++++++++
5 files changed, 53 insertions(+), 23 deletions(-)
create mode 100644 plugins/tweak/tweaks/nestbox-color.h
diff --git a/NEWS b/NEWS
index c4b5760c2..212e464fd 100644
--- a/NEWS
+++ b/NEWS
@@ -5,7 +5,7 @@ DFHack future
category when discussing an import agreement with the liaison
- manager-quantity: Removes the limit of 30 jobs per manager order
- civ-view-agreement: Fixes overlapping text on the "view agreement" screen
-
+ - nestbox-color: Fixes the color of built nestboxes
DFHack 0.40.13-r1
Internals:
diff --git a/Readme.html b/Readme.html
index fda1199e2..11a9526c2 100644
--- a/Readme.html
+++ b/Readme.html
@@ -2006,7 +2006,10 @@ category when discussing an import agreement with the liaison
civ-view-agreement:
-
Fixes overlapping text on the "view agreement" screen
+
Fixes overlapping text on the "view agreement" screen
+
+
+
nestbox-color:
Fixes the color of built nestboxes
diff --git a/Readme.rst b/Readme.rst
index 925a29965..13be972d0 100644
--- a/Readme.rst
+++ b/Readme.rst
@@ -1286,7 +1286,7 @@ Subcommands that persist until disabled or DF quit:
category when discussing an import agreement with the liaison
:manager-quantity: Removes the limit of 30 jobs per manager order
:civ-view-agreement: Fixes overlapping text on the "view agreement" screen
-
+:nestbox-color: Fixes the color of built nestboxes
fix-armory
----------
diff --git a/plugins/tweak/tweak.cpp b/plugins/tweak/tweak.cpp
index 389ca3b14..def0d83d5 100644
--- a/plugins/tweak/tweak.cpp
+++ b/plugins/tweak/tweak.cpp
@@ -82,6 +82,7 @@
#include "tweaks/import-priority-category.h"
#include "tweaks/manager-quantity.h"
#include "tweaks/military-assign.h"
+#include "tweaks/nestbox-color.h"
#include "tweaks/stable-cursor.h"
using std::set;
@@ -133,42 +134,44 @@ DFhackCExport command_result plugin_init (color_ostream &out, std::vector \n"
- " Further improves temperature updates by ensuring that 1 degree of\n"
- " item temperature is crossed in no more than specified number of frames\n"
- " when updating from the environment temperature. Use 0 to disable.\n"
/*" tweak fix-dimensions [disable]\n"
" Fixes subtracting small amount of thread/cloth/liquid from a stack\n"
" by splitting the stack and subtracting from the remaining single item.\n"*/
+ " tweak adamantine-cloth-wear [disable]\n"
+ " Stops adamantine clothing from wearing out while being worn (bug 6481).\n"
" tweak advmode-contained [disable]\n"
" Fixes custom reactions with container inputs in advmode. The issue is\n"
" that the screen tries to force you to select the contents separately\n"
" from the container. This forcefully skips child reagents.\n"
+ " tweak civ-view-agreement\n"
+ " Fixes overlapping text on the \"view agreement\" screen\n"
+ " tweak craft-age-wear [disable]\n"
+ " Makes cloth and leather items wear out at the correct rate (bug 6003).\n"
+ " tweak farm-plot-select [disable]\n"
+ " Adds \"Select all\" and \"Deselect all\" options to farm plot menus\n"
+ " tweak fast-heat \n"
+ " Further improves temperature updates by ensuring that 1 degree of\n"
+ " item temperature is crossed in no more than specified number of frames\n"
+ " when updating from the environment temperature. Use 0 to disable.\n"
" tweak fast-trade [disable]\n"
" Makes Shift-Enter in the Move Goods to Depot and Trade screens select\n"
" the current item (fully, in case of a stack), and scroll down one line.\n"
+ " tweak import-priority-category [disable]\n"
+ " When meeting with a liaison, makes Shift+Left/Right arrow adjust\n"
+ " the priority of an entire category of imports.\n"
+ " tweak manager-quantity [disable]\n"
+ " Removes the limit of 30 jobs per manager order\n"
+ " tweak nestbox-color [disable]\n"
+ " Makes built nestboxes use the color of their material\n"
+ " tweak military-color-assigned [disable]\n"
+ " Color squad candidates already assigned to other squads in brown/green\n"
+ " to make them stand out more in the list.\n"
" tweak military-stable-assign [disable]\n"
" Preserve list order and cursor position when assigning to squad,\n"
" i.e. stop the rightmost list of the Positions page of the military\n"
" screen from constantly jumping to the top.\n"
- " tweak military-color-assigned [disable]\n"
- " Color squad candidates already assigned to other squads in brown/green\n"
- " to make them stand out more in the list.\n"
// " tweak military-training [disable]\n"
// " Speed up melee squad training, removing inverse dependency on unit count.\n"
- " tweak farm-plot-select [disable]\n"
- " Adds \"Select all\" and \"Deselect all\" options to farm plot menus\n"
- " tweak manager-quantity [disable]\n"
- " Removes the limit of 30 jobs per manager order\n"
- " tweak import-priority-category [disable]\n"
- " When meeting with a liaison, makes Shift+Left/Right arrow adjust\n"
- " the priority of an entire category of imports.\n"
- " tweak civ-view-agreement\n"
- " Fixes overlapping text on the \"view agreement\" screen\n"
- " tweak craft-age-wear [disable]\n"
- " Makes cloth and leather items wear out at the correct rate (bug 6003).\n"
- " tweak adamantine-cloth-wear [disable]\n"
- " Stops adamantine clothing from wearing out while being worn (bug 6481).\n"
));
TWEAK_HOOK("adamantine-cloth-wear", adamantine_cloth_wear_armor_hook, incWearTimer);
@@ -202,6 +205,8 @@ DFhackCExport command_result plugin_init (color_ostream &out, std::vector fore[0][0] = mat.material->build_color[0];
+ db->back[0][0] = mat.material->build_color[1];
+ db->bright[0][0] = mat.material->build_color[2];
+ }
+ }
+};
+
+IMPLEMENT_VMETHOD_INTERPOSE(nestbox_color_hook, drawBuilding);