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

Make progress with action timer API

develop
Tachytaenius 2022-11-09 19:08:06 +00:00
parent 0f8ce360ac
commit fa589b5764
3 changed files with 30 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
library/include/modules/Units.h
Unescape Escape View File

@ -38,6 +38,8 @@ distribution.
#include "df/misc_trait_type.h" #include "df/misc_trait_type.h"
#include "df/physical_attribute_type.h" #include "df/physical_attribute_type.h"
#include "df/unit.h" #include "df/unit.h"
#include "df/unit_action.h"
#include "df/action_type_group.h"
namespace df namespace df
{ {
@ -224,13 +226,12 @@ DFHACK_EXPORT extern const std::vector<int32_t> stress_cutoffs;
DFHACK_EXPORT int getStressCategory(df::unit *unit); DFHACK_EXPORT int getStressCategory(df::unit *unit);
DFHACK_EXPORT int getStressCategoryRaw(int32_t stress_level); DFHACK_EXPORT int getStressCategoryRaw(int32_t stress_level);
enum ActionTypeGroup {All, Movement, MovementFeet, Offensive, Work}; DFHACK_EXPORT void subtractActionTimer(df::unit *unit, int amount, df::unit_action_type affectedActionType);
DFHACK_EXPORT void subtractActionTimer(df::unit *unit, int amount, int affectedActionType); DFHACK_EXPORT void subtractActionTimerCategory(df::unit *unit, int amount, df::action_type_group affectedActionTypes);
DFHACK_EXPORT void subtractActionTimerCategory(df::unit *unit, int amount, int affectedActionTypes); DFHACK_EXPORT void multiplyActionTimer(df::unit *unit, float amount, df::unit_action_type affectedActionType);
DFHACK_EXPORT void multiplyActionTimer(df::unit *unit, float amount, int affectedActionType); DFHACK_EXPORT void multiplyActionTimerCategory(df::unit *unit, float amount, df::action_type_group affectedActionTypes);
DFHACK_EXPORT void multiplyActionTimerCategory(df::unit *unit, float amount, int affectedActionTypes); DFHACK_EXPORT void setActionTimer(df::unit *unit, int amount, df::unit_action_type affectedActionType);
DFHACK_EXPORT void setActionTimer(df::unit *unit, int amount, int affectedActionType); DFHACK_EXPORT void setActionTimerCategory(df::unit *unit, int amount, df::action_type_group affectedActionTypes);
DFHACK_EXPORT void setActionTimerCategory(df::unit *unit, int amount, int affectedActionTypes);
} }
} }

36
library/modules/Units.cpp
Unescape Escape View File

@ -81,6 +81,7 @@ using namespace std;
#include "df/unit_wound.h" #include "df/unit_wound.h"
#include "df/world.h" #include "df/world.h"
#include "df/unit_action.h" #include "df/unit_action.h"
#include "df/action_type_group.h"
using namespace DFHack; using namespace DFHack;
using namespace df::enums; using namespace df::enums;
@ -1957,9 +1958,16 @@ struct AffectedActionTypesGroupContainer
AffectedActionTypesGroupContainer() AffectedActionTypesGroupContainer()
{ {
const int NUM_ACTION_TYPES = ENUM_LAST_ITEM(unit_action_type) - ENUM_FIRST_ITEM(unit_action_type) + 1;
// Length of df::unit_action_type, including unknowns
const int NUM_ACTION_TYPE_GROUPS = ENUM_LAST_ITEM(action_type_group) - ENUM_FIRST_ITEM(action_type_group) + 1;
// Length of df::action_type_group
groups = std::vector<std::vector<bool>>(NUM_ACTION_TYPE_GROUPS, std::vector<bool>(NUM_ACTION_TYPES, false));
// "None" category can be left alone
// "All" category // "All" category
std::vector<bool> & allVector = groups[Units::ActionTypeGroup::All]; std::vector<bool> & allVector = groups[df::action_type_group::All];
// reinitialise allVector to the length of the df::unit_action_type enum
allVector[df::unit_action_type::Move] = true; allVector[df::unit_action_type::Move] = true;
allVector[df::unit_action_type::Attack] = true; allVector[df::unit_action_type::Attack] = true;
allVector[df::unit_action_type::HoldTerrain] = true; allVector[df::unit_action_type::HoldTerrain] = true;
@ -1976,8 +1984,7 @@ struct AffectedActionTypesGroupContainer
allVector[df::unit_action_type::SuckBlood] = true; allVector[df::unit_action_type::SuckBlood] = true;
// "Movement" category // "Movement" category
std::vector<bool> & movementVector = groups[Units::ActionTypeGroup::Movement]; std::vector<bool> & movementVector = groups[df::action_type_group::Movement];
// reinitialise movementVector to falses with the length of the df::unit_action_type enum
movementVector[df::unit_action_type::Move] = true; movementVector[df::unit_action_type::Move] = true;
movementVector[df::unit_action_type::HoldTerrain] = true; movementVector[df::unit_action_type::HoldTerrain] = true;
movementVector[df::unit_action_type::Climb] = true; movementVector[df::unit_action_type::Climb] = true;
@ -1989,8 +1996,7 @@ struct AffectedActionTypesGroupContainer
movementVector[df::unit_action_type::PushObject] = true; movementVector[df::unit_action_type::PushObject] = true;
// "MovementFeet" category // "MovementFeet" category
std::vector<bool> & movementFeetVector = groups[Units::ActionTypeGroup::MovementFeet]; std::vector<bool> & movementFeetVector = groups[df::action_type_group::MovementFeet];
// reinitialise movementFeetVector to falses with the length of the df::unit_action_type enum
movementFeetVector[df::unit_action_type::Move] = true; movementFeetVector[df::unit_action_type::Move] = true;
// Include Unsteady? // Include Unsteady?
movementFeetVector[df::unit_action_type::Dodge] = true; movementFeetVector[df::unit_action_type::Dodge] = true;
@ -1998,14 +2004,12 @@ struct AffectedActionTypesGroupContainer
movementFeetVector[df::unit_action_type::PushObject] = true; movementFeetVector[df::unit_action_type::PushObject] = true;
// "Offensive" category // "Offensive" category
std::vector<bool> & offensiveVector = groups[Units::ActionTypeGroup::Offensive]; std::vector<bool> & offensiveVector = groups[df::action_type_group::Offensive];
// reinitialise offensiveVector to falses with the length of the df::unit_action_type enum
offensiveVector[df::unit_action_type::Attack] = true; offensiveVector[df::unit_action_type::Attack] = true;
offensiveVector[df::unit_action_type::SuckBlood] = true; offensiveVector[df::unit_action_type::SuckBlood] = true;
// "Work" category // "Work" category
std::vector<bool> & workVector = groups[Units::ActionTypeGroup::Work]; std::vector<bool> & workVector = groups[df::action_type_group::Work];
// reinitialise workVector to falses with the length of the df::unit_action_type enum
workVector[df::unit_action_type::Job] = true; workVector[df::unit_action_type::Job] = true;
workVector[df::unit_action_type::Job2] = true; workVector[df::unit_action_type::Job2] = true;
workVector[df::unit_action_type::PushObject] = true; workVector[df::unit_action_type::PushObject] = true;
@ -2065,7 +2069,7 @@ int *getActionTimerPointer(df::unit_action *action) {
return nullptr; return nullptr;
} }
void Units::subtractActionTimer(df::unit *unit, int amount, int affectedActionType) void Units::subtractActionTimer(df::unit *unit, int amount, df::unit_action_type affectedActionType)
{ {
CHECK_NULL_POINTER(unit); CHECK_NULL_POINTER(unit);
for (auto action : unit->actions) { for (auto action : unit->actions) {
@ -2077,7 +2081,7 @@ void Units::subtractActionTimer(df::unit *unit, int amount, int affectedActionTy
} }
} }
void Units::subtractActionTimerCategory(df::unit *unit, int amount, int affectedActionTypes) void Units::subtractActionTimerCategory(df::unit *unit, int amount, df::action_type_group affectedActionTypes)
{ {
CHECK_NULL_POINTER(unit); CHECK_NULL_POINTER(unit);
static AffectedActionTypesGroupContainer groupContainer; static AffectedActionTypesGroupContainer groupContainer;
@ -2090,7 +2094,7 @@ void Units::subtractActionTimerCategory(df::unit *unit, int amount, int affected
} }
} }
void Units::multiplyActionTimer(df::unit *unit, float amount, int affectedActionType) void Units::multiplyActionTimer(df::unit *unit, float amount, df::unit_action_type affectedActionType)
{ {
CHECK_NULL_POINTER(unit); CHECK_NULL_POINTER(unit);
for (auto action : unit->actions) { for (auto action : unit->actions) {
@ -2102,7 +2106,7 @@ void Units::multiplyActionTimer(df::unit *unit, float amount, int affectedAction
} }
} }
void Units::multiplyActionTimerCategory(df::unit *unit, float amount, int affectedActionTypes) void Units::multiplyActionTimerCategory(df::unit *unit, float amount, df::action_type_group affectedActionTypes)
{ {
CHECK_NULL_POINTER(unit); CHECK_NULL_POINTER(unit);
static AffectedActionTypesGroupContainer groupContainer; static AffectedActionTypesGroupContainer groupContainer;
@ -2115,7 +2119,7 @@ void Units::multiplyActionTimerCategory(df::unit *unit, float amount, int affect
} }
} }
void Units::setActionTimer(df::unit *unit, int amount, int affectedActionType) void Units::setActionTimer(df::unit *unit, int amount, df::unit_action_type affectedActionType)
{ {
CHECK_NULL_POINTER(unit); CHECK_NULL_POINTER(unit);
for (auto action : unit->actions) { for (auto action : unit->actions) {
@ -2127,7 +2131,7 @@ void Units::setActionTimer(df::unit *unit, int amount, int affectedActionType)
} }
} }
void Units::setActionTimerCategory(df::unit *unit, int amount, int affectedActionTypes) void Units::setActionTimerCategory(df::unit *unit, int amount, df::action_type_group affectedActionTypes)
{ {
CHECK_NULL_POINTER(unit); CHECK_NULL_POINTER(unit);
static AffectedActionTypesGroupContainer groupContainer; static AffectedActionTypesGroupContainer groupContainer;

3
plugins/fastdwarf.cpp
Unescape Escape View File

@ -12,6 +12,7 @@
#include "df/unit_relationship_type.h" #include "df/unit_relationship_type.h"
#include "df/units_other_id.h" #include "df/units_other_id.h"
#include "df/world.h" #include "df/world.h"
#include "df/action_type_group.h"
using std::string; using std::string;
using std::vector; using std::vector;
@ -82,7 +83,7 @@ DFhackCExport command_result plugin_onupdate ( color_ostream &out )
if (enable_fastdwarf) if (enable_fastdwarf)
{ {
Units::setActionTimerCategory(unit, 1, Units::ActionTypeGroup::All); Units::setActionTimerCategory(unit, 1, df::action_type_group::All);
} }
} }
return CR_OK; return CR_OK;