From 46b7b2d6298b96bd3558237d003dfd4b44e99dc5 Mon Sep 17 00:00:00 2001
From: dawab699 <dawab699@student.liu.se>
Date: Tue, 10 Dec 2019 21:54:17 +0100
Subject: [PATCH] refactor: change some files needed for merge request
---
docs/unit.rst | 3 +++
python-api-src/lib_unit.cpp | 2 +-
src/Unit.cpp | 20 ++++++++++----------
src/Unit.h | 2 +-
4 files changed, 15 insertions(+), 12 deletions(-)
diff --git a/docs/unit.rst b/docs/unit.rst
index d2f37af..d298b02 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 7cc303b..83b3166 100644
--- a/python-api-src/lib_unit.cpp
+++ b/python-api-src/lib_unit.cpp
@@ -34,7 +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_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 eeb5cdb..9cc165a 100644
--- a/src/Unit.cpp
+++ b/src/Unit.cpp
@@ -428,14 +428,14 @@ void Unit::stopDance() const
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;
+ 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 efaff97..5a7cef4 100644
--- a/src/Unit.h
+++ b/src/Unit.h
@@ -47,7 +47,7 @@ public:
bool isValid() const;
bool isTraining() const;
bool isConstructing(const UnitType & type) const;
- bool isCarryingMinerals() const;
+ bool isCarryingMinerals() const;
bool isBlip() const;
bool hasTarget() const;
--
GitLab