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

Merge branch '0.40-plugin-updates' of github.com:lethosor/dfhack into develop

develop
Quietust 2014-08-06 08:27:29 -05:00
parent f34d68e567 fa26aa79ea
commit 0463021823
5 changed files with 14 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
plugins/CMakeLists.txt
Unescape Escape View File

@ -104,11 +104,11 @@ if (BUILD_SUPPORTED)
DFHACK_PLUGIN(createitem createitem.cpp)
DFHACK_PLUGIN(cursecheck cursecheck.cpp)
DFHACK_PLUGIN(deramp deramp.cpp)
# DFHACK_PLUGIN(dig dig.cpp)
DFHACK_PLUGIN(dig dig.cpp)
DFHACK_PLUGIN(digFlood digFlood.cpp)
# add_subdirectory(diggingInvaders)
add_subdirectory(diggingInvaders)
DFHACK_PLUGIN(drybuckets drybuckets.cpp)
# DFHACK_PLUGIN(dwarfmonitor dwarfmonitor.cpp)
DFHACK_PLUGIN(dwarfmonitor dwarfmonitor.cpp)
DFHACK_PLUGIN(embark-tools embark-tools.cpp)
DFHACK_PLUGIN(eventful eventful.cpp LINK_LIBRARIES lua)
DFHACK_PLUGIN(fastdwarf fastdwarf.cpp)
@ -145,7 +145,7 @@ if (BUILD_SUPPORTED)
DFHACK_PLUGIN(search search.cpp)
DFHACK_PLUGIN(seedwatch seedwatch.cpp)
DFHACK_PLUGIN(showmood showmood.cpp)
# DFHACK_PLUGIN(siege-engine siege-engine.cpp LINK_LIBRARIES lua)
DFHACK_PLUGIN(siege-engine siege-engine.cpp LINK_LIBRARIES lua)
DFHACK_PLUGIN(sort sort.cpp LINK_LIBRARIES lua)
DFHACK_PLUGIN(steam-engine steam-engine.cpp)
DFHACK_PLUGIN(stockflow stockflow.cpp LINK_LIBRARIES lua)

4
plugins/dig.cpp
Unescape Escape View File

@ -134,7 +134,9 @@ bool dig (MapExtras::MapCache & MCache,
}
if (tsb == tiletype_shape_basic::Floor
&& (type == tile_dig_designation::DownStair || type == tile_dig_designation::Channel)
&& ts != tiletype_shape::TREE
&& ts != tiletype_shape::BRANCH
&& ts != tiletype_shape::TRUNK_BRANCH
&& ts != tiletype_shape::TWIG
)
{
std::cerr << "allowing tt" << (int)tt << ", is floor\n";

4
plugins/diggingInvaders/edgeCost.cpp
Unescape Escape View File

@ -73,7 +73,9 @@ cost_t getEdgeCost(color_ostream& out, df::coord pt1, df::coord pt2, DigAbilitie
return -1;
}
if ( shape2 == df::enums::tiletype_shape::TREE )
if ( shape2 == df::enums::tiletype_shape::BRANCH ||
shape2 == df::enums::tiletype_shape::TRUNK_BRANCH ||
shape2 == df::enums::tiletype_shape::TWIG )
return -1;
/*

4
plugins/dwarfmonitor.cpp
Unescape Escape View File

@ -524,8 +524,6 @@ public:
case job_type::StoreItemInStockpile:
case job_type::StoreItemInBag:
case job_type::StoreItemInHospital:
case job_type::StoreItemInChest:
case job_type::StoreItemInCabinet:
case job_type::StoreWeapon:
case job_type::StoreArmor:
case job_type::StoreItemInBarrel:
@ -575,7 +573,6 @@ public:
case job_type::MakeHelm:
case job_type::MakePants:
case job_type::StudWith:
case job_type::ProcessPlantsBag:
case job_type::ProcessPlantsVial:
case job_type::ProcessPlantsBarrel:
case job_type::WeaveCloth:
@ -699,7 +696,6 @@ public:
case job_type::MakeCheese:
case job_type::PrepareMeal:
case job_type::ProcessPlants:
case job_type::BrewDrink:
case job_type::CollectHiveProducts:
real_activity = JOB_FOOD_PROD;
break;

5
plugins/siege-engine.cpp
Unescape Escape View File

@ -900,7 +900,10 @@ static bool isTreeTile(df::coord pos)
{
auto ptile = Maps::getTileType(pos);
return ptile && tileShape(*ptile) == tiletype_shape::TREE;
return ptile &&
(tileShape(*ptile) == tiletype_shape::BRANCH ||
tileShape(*ptile) == tiletype_shape::TRUNK_BRANCH ||
tileShape(*ptile) == tiletype_shape::TWIG);
}
static bool adjustToTarget(EngineInfo *engine, df::coord *pos)