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

Update some plugins/scripts for 0.40.22 

* autolabor, manipulator: Add BUILD_CONSTRUCTION and BUILD_ROAD labors
* mousequery: Support "toggle engravings" sidebar mode
* devel/export-dt-ini.lua: Add body_part_flags

Conflicts:
	plugins/mousequery.cpp
develop
lethosor 2014-12-21 16:42:12 -05:00
parent 5fc8a1f51f
commit ee958c0f8f
4 changed files with 29 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
plugins/autolabor.cpp
Unescape Escape View File

@ -477,7 +477,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

@ -189,7 +189,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"},

11
plugins/mousequery.cpp
Unescape Escape View File

@ -210,13 +210,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:

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')