From 868a9944fd7c031d225f192d5ec4b6fcd3685a94 Mon Sep 17 00:00:00 2001 From: Chris Dombroski Date: Thu, 29 Jan 2015 14:59:06 -0500 Subject: [PATCH] Update LuaApi for new Units/Buildings functions. --- library/LuaApi.cpp | 35 +++++++++++++++++++++++++++++++++++ 1 file changed, 35 insertions(+) diff --git a/library/LuaApi.cpp b/library/LuaApi.cpp index 2d44c04d2..30789fce2 100644 --- a/library/LuaApi.cpp +++ b/library/LuaApi.cpp @@ -1401,6 +1401,29 @@ static const LuaWrapper::FunctionReg dfhack_units_module[] = { WRAPM(Units, getCasteProfessionName), WRAPM(Units, getProfessionColor), WRAPM(Units, getCasteProfessionColor), + WRAPM(Units, isWar), + WRAPM(Units, isHunter), + WRAPM(Units, isAvailableForAdoption), + WRAPM(Units, isOwnCiv), + WRAPM(Units, isOwnRace), + WRAPM(Units, getRaceName), + WRAPM(Units, getRaceNamePlural), + WRAPM(Units, getRaceBabyName), + WRAPM(Units, getRaceChildName), + WRAPM(Units, isBaby), + WRAPM(Units, isChild), + WRAPM(Units, isAdult), + WRAPM(Units, isEggLayer), + WRAPM(Units, isGrazer), + WRAPM(Units, isMilkable), + WRAPM(Units, isTrainableWar), + WRAPM(Units, isTrainableHunting), + WRAPM(Units, isTamable), + WRAPM(Units, isMale), + WRAPM(Units, isFemale), + WRAPM(Units, isMerchant), + WRAPM(Units, isForest), + WRAPM(Units, isMarkedForSlaughter), { NULL, NULL } }; @@ -1678,6 +1701,10 @@ static const LuaWrapper::FunctionReg dfhack_buildings_module[] = { WRAPM(Buildings, constructWithItems), WRAPM(Buildings, constructWithFilters), WRAPM(Buildings, deconstruct), + WRAPM(Buildings, isActivityZone), + WRAPM(Buildings, isPenPasture), + WRAPM(Buildings, isPitPond), + WRAPM(Buildings, isActive), { NULL, NULL } }; @@ -1699,6 +1726,13 @@ static int buildings_findCivzonesAt(lua_State *L) return 1; } +static int buildings_findPenPitAtCoord(lua_State *L) +{ + auto pos = CheckCoordXYZ(L, 1, true); + Lua::PushDFObject(L, Buildings::findPenPitAtCoord(pos)); + return 1; +} + static int buildings_getCorrectSize(lua_State *state) { df::coord2d size(luaL_optint(state, 1, 1), luaL_optint(state, 2, 1)); @@ -1758,6 +1792,7 @@ static const luaL_Reg dfhack_buildings_funcs[] = { { "getCorrectSize", buildings_getCorrectSize }, { "setSize", &Lua::CallWithCatchWrapper }, { "getStockpileContents", buildings_getStockpileContents}, + { "findPenPitAt", buildings_findPenPitAtCoord}, { NULL, NULL } };