From 06bd4ecb452f005ef8eac89a31670b09c1b9c9d5 Mon Sep 17 00:00:00 2001
From: sofab194 <sofab194@student.liu.se>
Date: Tue, 18 Dec 2018 11:21:25 +0100
Subject: [PATCH] Fixed spacing in code
---
python-api-src/lib_unit.cpp | 16 ++++++++--------
python-api-src/lib_unittype.cpp | 6 +++---
src/Unit.cpp | 8 +-------
src/Unit.h | 16 ++++++++--------
src/UnitType.cpp | 2 +-
src/UnitType.h | 6 +++---
6 files changed, 24 insertions(+), 30 deletions(-)
diff --git a/python-api-src/lib_unit.cpp b/python-api-src/lib_unit.cpp
index f04d5cb87..7a7ee508b 100644
--- a/python-api-src/lib_unit.cpp
+++ b/python-api-src/lib_unit.cpp
@@ -28,14 +28,14 @@ void define_unit(py::module & m)
.def_property_readonly("is_blip", &Unit::isBlip)
.def_property_readonly("target", &Unit::getTarget)
.def_property_readonly("has_target", &Unit::hasTarget)
- .def_property_readonly("max_hit_points", &Unit::getMaxHitPoints)
- .def_property_readonly("progress", &Unit::getProgress)
- .def_property_readonly("ability_id", &Unit::getAbilityID, "The AbilityID of currently used ability")
- .def_property_readonly("facing", &Unit::getFacing)
- .def_property_readonly("radius", &Unit::getRadius)
- .def("hold_position", &Unit::holdPosition)
- .def("patrol", py::overload_cast<const CCPosition &>(&Unit::patrol, py::const_))
- .def("stop_dance", &Unit::stopDance)
+ .def_property_readonly("max_hit_points", &Unit::getMaxHitPoints)
+ .def_property_readonly("progress", &Unit::getProgress)
+ .def_property_readonly("ability_id", &Unit::getAbilityID, "The AbilityID of currently used ability")
+ .def_property_readonly("facing", &Unit::getFacing)
+ .def_property_readonly("radius", &Unit::getRadius)
+ .def("hold_position", &Unit::holdPosition)
+ .def("patrol", py::overload_cast<const CCPosition &>(&Unit::patrol, py::const_))
+ .def("stop_dance", &Unit::stopDance)
.def("stop", &Unit::stop)
.def("attack_unit", &Unit::attackUnit)
.def("attack_move", &Unit::attackMove)
diff --git a/python-api-src/lib_unittype.cpp b/python-api-src/lib_unittype.cpp
index 1dc74370c..edeebeaed 100644
--- a/python-api-src/lib_unittype.cpp
+++ b/python-api-src/lib_unittype.cpp
@@ -10,9 +10,9 @@ void define_unittype(py::module & m)
.def_property_readonly("unit_typeid", [](UnitType & unit_type) { return static_cast<sc2::UNIT_TYPEID>(unit_type.getAPIUnitType()); })
.def_property_readonly("name", &UnitType::getName)
.def_property_readonly("race", &UnitType::getRace)
- .def_property_readonly("movement_speed", &UnitType::getMovementSpeed)
- .def_property_readonly("sight_range", &UnitType::getSightRange)
- .def_property_readonly("tech_requirement", &UnitType::getTechRequirement)
+ .def_property_readonly("movement_speed", &UnitType::getMovementSpeed)
+ .def_property_readonly("sight_range", &UnitType::getSightRange)
+ .def_property_readonly("tech_requirement", &UnitType::getTechRequirement)
.def_property_readonly("is_valid", &UnitType::isValid)
.def_property_readonly("is_building", &UnitType::isBuilding)
.def_property_readonly("is_combat_unit", &UnitType::isCombatUnit, "The unit is not any of the following: worker, supply provider, building, larva, egg")
diff --git a/src/Unit.cpp b/src/Unit.cpp
index cac0e3069..b47005e09 100644
--- a/src/Unit.cpp
+++ b/src/Unit.cpp
@@ -343,21 +343,18 @@ bool Unit::isBlip() const
CCHealth Unit::getMaxHitPoints() const
{
BOT_ASSERT(isValid(), "Unit is not valid");
-
return m_unit->health_max;
}
float Unit::getFacing() const
{
BOT_ASSERT(isValid(), "Unit is not valid");
-
return m_unit->facing;
}
float Unit::getRadius() const
{
BOT_ASSERT(isValid(), "Unit is not valid");
-
return m_unit->radius;
}
@@ -377,7 +374,7 @@ sc2::AbilityID Unit::getAbilityID() const
{
BOT_ASSERT(isValid(), "Unit is not valid");
- //if unit has order, return progress of first order
+ //if unit has order, return AbilityID of first order
if (getUnitPtr()->orders.size() > 0) {
return getUnitPtr()->orders[0].ability_id;
}
@@ -388,20 +385,17 @@ sc2::AbilityID Unit::getAbilityID() const
void Unit::holdPosition() const
{
BOT_ASSERT(isValid(), "Unit is not valid");
-
m_bot->Actions()->UnitCommand(m_unit, sc2::ABILITY_ID::HOLDPOSITION);
}
void Unit::patrol(const CCPosition & targetPosition) const
{
BOT_ASSERT(isValid(), "Unit is not valid");
-
m_bot->Actions()->UnitCommand(m_unit, sc2::ABILITY_ID::PATROL, targetPosition);
}
void Unit::stopDance() const
{
BOT_ASSERT(isValid(), "Unit is not valid");
-
m_bot->Actions()->UnitCommand(m_unit, sc2::ABILITY_ID::STOP_DANCE);
}
diff --git a/src/Unit.h b/src/Unit.h
index d10e52e8e..2a645b5e6 100644
--- a/src/Unit.h
+++ b/src/Unit.h
@@ -50,14 +50,14 @@ public:
bool isBlip() const;
bool hasTarget() const;
Unit getTarget() const;
- CCHealth getMaxHitPoints() const;
- float getProgress() const;
- sc2::AbilityID getAbilityID() const;
- void holdPosition() const;
- void patrol(const CCPosition & targetPosition) const;
- void stopDance() const;
- float getFacing() const;
- float getRadius() const;
+ CCHealth getMaxHitPoints() const;
+ float getProgress() const;
+ sc2::AbilityID getAbilityID() const;
+ void holdPosition() const;
+ void patrol(const CCPosition & targetPosition) const;
+ void stopDance() const;
+ float getFacing() const;
+ float getRadius() const;
void stop () const;
void attackUnit (const Unit & target) const;
diff --git a/src/UnitType.cpp b/src/UnitType.cpp
index 154654f11..44225edcc 100644
--- a/src/UnitType.cpp
+++ b/src/UnitType.cpp
@@ -383,7 +383,7 @@ int UnitType::getSightRange() const
return m_bot->Observation()->GetUnitTypeData()[m_type].sight_range;
}
-UnitType UnitType::getTechRequirement() const
+sc2::UnitTypeID UnitType::getTechRequirement() const
{
return m_bot->Observation()->GetUnitTypeData()[m_type].tech_requirement;
}
diff --git a/src/UnitType.h b/src/UnitType.h
index 8568f4a16..ceaaef3f6 100644
--- a/src/UnitType.h
+++ b/src/UnitType.h
@@ -23,9 +23,9 @@ public:
std::string getName() const;
CCRace getRace() const;
- int getMovementSpeed() const;
- int getSightRange() const;
- UnitType getTechRequirement() const;
+ int getMovementSpeed() const;
+ int getSightRange() const;
+ sc2::UnitTypeID getTechRequirement() const;
bool isValid() const;
bool isBuilding() const;
--
GitLab