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

Merge pull request #2834 from TealSeer/zonecheckfixes 

Fix logic for zone type checks and re-enables autonestbox
develop
Myk 2023-02-06 16:21:17 -08:00 committed by GitHub
parent c0358d642d 826f918954
commit 26e57a9780
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 8 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
library/include/modules/Buildings.h
Unescape Escape View File

@ -275,7 +275,6 @@ DFHACK_EXPORT bool isActivityZone(df::building * building);
DFHACK_EXPORT bool isPenPasture(df::building * building);
DFHACK_EXPORT bool isPitPond(df::building * building);
DFHACK_EXPORT bool isActive(df::building * building);
DFHACK_EXPORT bool isHospital(df::building * building);
DFHACK_EXPORT bool isAnimalTraining(df::building * building);
DFHACK_EXPORT df::building* findPenPitAt(df::coord coord);

28
library/modules/Buildings.cpp
Unescape Escape View File

@ -1589,45 +1589,31 @@ bool Buildings::isPenPasture(df::building * building)
if (!isActivityZone(building))
return false;
/* TODO: understand how this changes for v50
return ((df::building_civzonest*) building)->zone_flags.bits.pen_pasture != 0;
*/ return false;
return ((df::building_civzonest*)building)->type == civzone_type::Pen;
}
bool Buildings::isPitPond(df::building * building)
{
if (!isActivityZone(building))
return false;
/* TODO: understand how this changes for v50
return ((df::building_civzonest*) building)->zone_flags.bits.pit_pond != 0;
*/ return false;
return ((df::building_civzonest*)building)->type == civzone_type::Pond;
}
bool Buildings::isActive(df::building * building)
{
if (!isActivityZone(building))
return false;
/* TODO: understand how this changes for v50
return ((df::building_civzonest*) building)->zone_flags.bits.active != 0;
*/ return false;
// 8 is the value obtained by reverse engineering
return ((df::building_civzonest*)building)->is_active == 8;
}
bool Buildings::isHospital(df::building * building)
{
if (!isActivityZone(building))
return false;
/* TODO: understand how this changes for v50
return ((df::building_civzonest*) building)->zone_flags.bits.hospital != 0;
*/ return false;
}
bool Buildings::isAnimalTraining(df::building * building)
{
if (!isActivityZone(building))
return false;
/* TODO: understand how this changes for v50
return ((df::building_civzonest*) building)->zone_flags.bits.animal_training != 0;
*/ return false;
return ((df::building_civzonest*)building)->type == civzone_type::AnimalTraining;
}
// returns building of pen/pit at cursor position (NULL if nothing found)

2
plugins/CMakeLists.txt
Unescape Escape View File

@ -84,7 +84,7 @@ dfhack_plugin(autofarm autofarm.cpp)
add_subdirectory(autolabor)
#dfhack_plugin(automaterial automaterial.cpp LINK_LIBRARIES lua)
dfhack_plugin(automelt automelt.cpp LINK_LIBRARIES lua)
#dfhack_plugin(autonestbox autonestbox.cpp LINK_LIBRARIES lua)
dfhack_plugin(autonestbox autonestbox.cpp LINK_LIBRARIES lua)
#dfhack_plugin(autotrade autotrade.cpp)
dfhack_plugin(blueprint blueprint.cpp LINK_LIBRARIES lua)
#dfhack_plugin(burrows burrows.cpp LINK_LIBRARIES lua)