|
|
@ -32,6 +32,8 @@
|
|
|
|
#include "df/squad_order_trainst.h"
|
|
|
|
#include "df/squad_order_trainst.h"
|
|
|
|
#include "df/ui_build_selector.h"
|
|
|
|
#include "df/ui_build_selector.h"
|
|
|
|
#include "df/building_trapst.h"
|
|
|
|
#include "df/building_trapst.h"
|
|
|
|
|
|
|
|
#include "df/item_actual.h"
|
|
|
|
|
|
|
|
#include "df/contaminant.h"
|
|
|
|
|
|
|
|
|
|
|
|
#include <stdlib.h>
|
|
|
|
#include <stdlib.h>
|
|
|
|
|
|
|
|
|
|
|
@ -85,6 +87,8 @@ DFhackCExport command_result plugin_init (color_ostream &out, std::vector <Plugi
|
|
|
|
" when soldiers go off-duty (i.e. civilian).\n"
|
|
|
|
" when soldiers go off-duty (i.e. civilian).\n"
|
|
|
|
" tweak readable-build-plate [disable]\n"
|
|
|
|
" tweak readable-build-plate [disable]\n"
|
|
|
|
" Fixes rendering of creature weight limits in pressure plate build menu.\n"
|
|
|
|
" Fixes rendering of creature weight limits in pressure plate build menu.\n"
|
|
|
|
|
|
|
|
" tweak stable-temp [disable]\n"
|
|
|
|
|
|
|
|
" Fixes performance bug 6012 by squashing jitter in temperature updates.\n"
|
|
|
|
));
|
|
|
|
));
|
|
|
|
return CR_OK;
|
|
|
|
return CR_OK;
|
|
|
|
}
|
|
|
|
}
|
|
|
@ -243,6 +247,52 @@ struct readable_build_plate_hook : df::viewscreen_dwarfmodest
|
|
|
|
|
|
|
|
|
|
|
|
IMPLEMENT_VMETHOD_INTERPOSE(readable_build_plate_hook, render);
|
|
|
|
IMPLEMENT_VMETHOD_INTERPOSE(readable_build_plate_hook, render);
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
struct stable_temp_hook : df::item_actual {
|
|
|
|
|
|
|
|
typedef df::item_actual interpose_base;
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
DEFINE_VMETHOD_INTERPOSE(bool, adjustTemperature, (uint16_t temp, int32_t rate_mult))
|
|
|
|
|
|
|
|
{
|
|
|
|
|
|
|
|
if (temperature != temp)
|
|
|
|
|
|
|
|
{
|
|
|
|
|
|
|
|
// Bug 6012 is caused by fixed-point precision mismatch jitter
|
|
|
|
|
|
|
|
// when an item is being pushed by two sources at N and N+1.
|
|
|
|
|
|
|
|
// This check suppresses it altogether.
|
|
|
|
|
|
|
|
if (temp == temperature+1 ||
|
|
|
|
|
|
|
|
(temp == temperature-1 && temperature_fraction == 0))
|
|
|
|
|
|
|
|
temp = temperature;
|
|
|
|
|
|
|
|
// When SPEC_HEAT is NONE, the original function seems to not
|
|
|
|
|
|
|
|
// change the temperature, yet return true, which is silly.
|
|
|
|
|
|
|
|
else if (getSpecHeat() == 60001)
|
|
|
|
|
|
|
|
temp = temperature;
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
return INTERPOSE_NEXT(adjustTemperature)(temp, rate_mult);
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
DEFINE_VMETHOD_INTERPOSE(bool, updateContaminants, ())
|
|
|
|
|
|
|
|
{
|
|
|
|
|
|
|
|
if (contaminants)
|
|
|
|
|
|
|
|
{
|
|
|
|
|
|
|
|
// Force 1-degree difference in contaminant temperature to 0
|
|
|
|
|
|
|
|
for (size_t i = 0; i < contaminants->size(); i++)
|
|
|
|
|
|
|
|
{
|
|
|
|
|
|
|
|
auto obj = (*contaminants)[i];
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
if (abs(obj->temperature - temperature) == 1)
|
|
|
|
|
|
|
|
{
|
|
|
|
|
|
|
|
obj->temperature = temperature;
|
|
|
|
|
|
|
|
obj->temperature_fraction = temperature_fraction;
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
return INTERPOSE_NEXT(updateContaminants)();
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
IMPLEMENT_VMETHOD_INTERPOSE(stable_temp_hook, adjustTemperature);
|
|
|
|
|
|
|
|
IMPLEMENT_VMETHOD_INTERPOSE(stable_temp_hook, updateContaminants);
|
|
|
|
|
|
|
|
|
|
|
|
static void enable_hook(color_ostream &out, VMethodInterposeLinkBase &hook, vector <string> ¶meters)
|
|
|
|
static void enable_hook(color_ostream &out, VMethodInterposeLinkBase &hook, vector <string> ¶meters)
|
|
|
|
{
|
|
|
|
{
|
|
|
|
if (vector_get(parameters, 1) == "disable")
|
|
|
|
if (vector_get(parameters, 1) == "disable")
|
|
|
@ -375,6 +425,11 @@ static command_result tweak(color_ostream &out, vector <string> ¶meters)
|
|
|
|
|
|
|
|
|
|
|
|
enable_hook(out, INTERPOSE_HOOK(readable_build_plate_hook, render), parameters);
|
|
|
|
enable_hook(out, INTERPOSE_HOOK(readable_build_plate_hook, render), parameters);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
else if (cmd == "stable-temp")
|
|
|
|
|
|
|
|
{
|
|
|
|
|
|
|
|
enable_hook(out, INTERPOSE_HOOK(stable_temp_hook, adjustTemperature), parameters);
|
|
|
|
|
|
|
|
enable_hook(out, INTERPOSE_HOOK(stable_temp_hook, updateContaminants), parameters);
|
|
|
|
|
|
|
|
}
|
|
|
|
else
|
|
|
|
else
|
|
|
|
return CR_WRONG_USAGE;
|
|
|
|
return CR_WRONG_USAGE;
|
|
|
|
|
|
|
|
|
|
|
|