MetzNet
/
dfhack
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'lethosor/0.40.22-plugins' 

Also update NEWS
develop
lethosor 2015-01-05 16:35:56 -05:00
parent 83142b9657 efc42c253e
commit 7da9ab8f80
5 changed files with 35 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
NEWS
Unescape Escape View File

@ -3,10 +3,12 @@ DFHack Future
plugins will not be loaded if globals they specify as required are not located (should prevent some crashes) plugins will not be loaded if globals they specify as required are not located (should prevent some crashes)
Fixes Fixes
advfort works again advfort works again
devel/export-dt-ini: Updated for 0.40.20+
digfort: now checks file type and existence digfort: now checks file type and existence
exportlegends: Fixed map export exportlegends: Fixed map export
full-heal: Fixed a problem with selecting units in the GUI full-heal: Fixed a problem with selecting units in the GUI
gui/hack-wish: Fixed restrictive material filters gui/hack-wish: Fixed restrictive material filters
mousequery: Changed box-select key to Alt+M
plugins/dwarfmonitor: correct date display (month index, separator) plugins/dwarfmonitor: correct date display (month index, separator)
scripts/putontable: added to the readme scripts/putontable: added to the readme
stderr.log: removed excessive debug output on OS X stderr.log: removed excessive debug output on OS X

4
plugins/autolabor.cpp
Unescape Escape View File

@ -475,7 +475,9 @@ static const struct labor_default default_labor_infos[] = {
/* PULL_LEVER */ {HAULERS, false, 1, 200, 0}, /* PULL_LEVER */ {HAULERS, false, 1, 200, 0},
/* REMOVE_CONSTRUCTION */ {HAULERS, false, 1, 200, 0}, /* REMOVE_CONSTRUCTION */ {HAULERS, false, 1, 200, 0},
/* HAUL_WATER */ {HAULERS, false, 1, 200, 0}, /* HAUL_WATER */ {HAULERS, false, 1, 200, 0},
/* GELD */ {AUTOMATIC, false, 1, 200, 0} /* GELD */ {AUTOMATIC, false, 1, 200, 0},
/* BUILD_ROAD */ {AUTOMATIC, false, 1, 200, 0},
/* BUILD_CONSTRUCTION */ {AUTOMATIC, false, 1, 200, 0}
}; };
static const int responsibility_penalties[] = { static const int responsibility_penalties[] = {

4
plugins/manipulator.cpp
Unescape Escape View File

@ -191,7 +191,9 @@ const SkillColumn columns[] = {
{12, 4, profession::ALCHEMIST, unit_labor::ALCHEMIST, job_skill::ALCHEMY, "Al"}, {12, 4, profession::ALCHEMIST, unit_labor::ALCHEMIST, job_skill::ALCHEMY, "Al"},
{12, 4, profession::NONE, unit_labor::CLEAN, job_skill::NONE, "Cl"}, {12, 4, profession::NONE, unit_labor::CLEAN, job_skill::NONE, "Cl"},
{12, 4, profession::NONE, unit_labor::PULL_LEVER, job_skill::NONE, "Lv"}, {12, 4, profession::NONE, unit_labor::PULL_LEVER, job_skill::NONE, "Lv"},
{12, 4, profession::NONE, unit_labor::REMOVE_CONSTRUCTION, job_skill::NONE, "Co"}, {12, 4, profession::NONE, unit_labor::BUILD_ROAD, job_skill::NONE, "Ro"},
{12, 4, profession::NONE, unit_labor::BUILD_CONSTRUCTION, job_skill::NONE, "Co"},
{12, 4, profession::NONE, unit_labor::REMOVE_CONSTRUCTION, job_skill::NONE, "CR"},
// Military - Weapons // Military - Weapons
{13, 7, profession::WRESTLER, unit_labor::NONE, job_skill::WRESTLING, "Wr"}, {13, 7, profession::WRESTLER, unit_labor::NONE, job_skill::WRESTLING, "Wr"},
{13, 7, profession::AXEMAN, unit_labor::NONE, job_skill::AXE, "Ax"}, {13, 7, profession::AXEMAN, unit_labor::NONE, job_skill::AXE, "Ax"},

19
plugins/mousequery.cpp
Unescape Escape View File

@ -209,13 +209,22 @@ struct mousequery_hook : public df::viewscreen_dwarfmodest
case DesignateCarveTrack: case DesignateCarveTrack:
case DesignateEngrave: case DesignateEngrave:
case DesignateCarveFortification: case DesignateCarveFortification:
case DesignateItemsClaim:
case DesignateItemsForbid:
case DesignateItemsMelt:
case DesignateItemsUnmelt:
case DesignateItemsDump:
case DesignateItemsUndump:
case DesignateItemsHide:
case DesignateItemsUnhide:
case DesignateChopTrees: case DesignateChopTrees:
case DesignateToggleEngravings: case DesignateToggleEngravings:
case DesignateRemoveConstruction: case DesignateToggleMarker:
case DesignateTrafficHigh: case DesignateTrafficHigh:
case DesignateTrafficNormal: case DesignateTrafficNormal:
case DesignateTrafficLow: case DesignateTrafficLow:
case DesignateTrafficRestricted: case DesignateTrafficRestricted:
case DesignateRemoveConstruction:
return true; return true;
case Burrows: case Burrows:
@ -435,7 +444,7 @@ struct mousequery_hook : public df::viewscreen_dwarfmodest
sendKey(interface_key::CURSOR_DOWN_FAST); sendKey(interface_key::CURSOR_DOWN_FAST);
} }
} }
else if (input->count(interface_key::CUSTOM_M) && isInDesignationMenu()) else if (input->count(interface_key::CUSTOM_ALT_M) && isInDesignationMenu())
{ {
box_designation_enabled = !box_designation_enabled; box_designation_enabled = !box_designation_enabled;
} }
@ -570,9 +579,9 @@ struct mousequery_hook : public df::viewscreen_dwarfmodest
if (isInDesignationMenu()) if (isInDesignationMenu())
{ {
int x = left_margin; int x = left_margin;
int y = 24; int y = gps->dimy - 2;
OutputString(COLOR_BROWN, x, y, "DFHack MouseQuery", true, left_margin); OutputToggleString(x, y, "Box Select", "Alt+M", box_designation_enabled,
OutputToggleString(x, y, "Box Select", "m", box_designation_enabled, true, left_margin); true, left_margin, COLOR_WHITE, COLOR_LIGHTRED);
} }
//Display selection dimensions //Display selection dimensions

1
scripts/devel/export-dt-ini.lua
Unescape Escape View File

@ -269,6 +269,7 @@ address('shape_name_plural',df.descriptor_shape,'name_plural')
header('health_offsets') header('health_offsets')
address('parent_id',df.body_part_raw,'con_part_id') address('parent_id',df.body_part_raw,'con_part_id')
address('body_part_flags',df.body_part_raw,'flags')
address('layers_vector',df.body_part_raw,'layers') address('layers_vector',df.body_part_raw,'layers')
address('number',df.body_part_raw,'number') address('number',df.body_part_raw,'number')
address('names_vector',df.body_part_raw,'name_singular') address('names_vector',df.body_part_raw,'name_singular')