diff --git a/docs/unit.rst b/docs/unit.rst index d2f37afc8ca67aff2926a36615109078101eba87..d298b02253208bd1905dfdd18e0aabf3010d812f 100644 --- a/docs/unit.rst +++ b/docs/unit.rst @@ -73,6 +73,9 @@ Unit .. autoattribute:: tile_position .. autoattribute:: unit_type .. autoattribute:: weapon_cooldown + .. autoattribute:: is_carrying_minerals + + Returns if this unit is currently holding minerals .. attribute:: Unit.target diff --git a/python-api-src/lib_unit.cpp b/python-api-src/lib_unit.cpp index cb99e65615ae22a661ef9a954f2640f316e1dbb5..83b3166272f4303cabb444eec4da2b6bda75d084 100644 --- a/python-api-src/lib_unit.cpp +++ b/python-api-src/lib_unit.cpp @@ -34,6 +34,7 @@ void define_unit(py::module & m) .def_property_readonly("current_ability_id", &Unit::getCurrentAbilityID, "The AbilityID of currently used ability") .def_property_readonly("facing", &Unit::getFacing) .def_property_readonly("radius", &Unit::getRadius) + .def_property_readonly("is_carrying_minerals", &Unit::isCarryingMinerals) .def("hold_position", &Unit::holdPosition) .def("patrol", py::overload_cast<const CCPosition &>(&Unit::patrol, py::const_)) .def("stop_dance", &Unit::stopDance) diff --git a/src/Unit.cpp b/src/Unit.cpp index 7316c0801d565a1cde4b9f710333fe6e3f27b2f8..9cc165a2b2a1c72aec083346c0a0235f3fc513da 100644 --- a/src/Unit.cpp +++ b/src/Unit.cpp @@ -425,3 +425,17 @@ void Unit::stopDance() const BOT_ASSERT(isValid(), "Unit is not valid"); m_bot->Actions()->UnitCommand(m_unit, sc2::ABILITY_ID::STOP_DANCE); } + +bool Unit::isCarryingMinerals() const +{ + BOT_ASSERT(isValid(), "Unit is not valid"); + std::vector<CCBuff> buffs = m_unit->buffs; + for (auto & b : buffs) + { + if (b.to_string() == "271" or b.to_string() == "272") + { + return true; + } + } + return false; +} diff --git a/src/Unit.h b/src/Unit.h index 3d5017726eb16b1b6ccc9ede69c6e1b9cc30571d..5a7cef49664e37ee60a197e26a12cbf8065f9854 100644 --- a/src/Unit.h +++ b/src/Unit.h @@ -47,6 +47,7 @@ public: bool isValid() const; bool isTraining() const; bool isConstructing(const UnitType & type) const; + bool isCarryingMinerals() const; bool isBlip() const; bool hasTarget() const;