improved function names

python-api-src/lib_unit.cpp

@@ -30,7 +30,7 @@ void define_unit(py::module & m)
         .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("current_ability_id", &Unit::getCurrentAbilityID, "The AbilityID of currently used ability")
         .def_property_readonly("facing", &Unit::getFacing)
         .def_property_readonly("radius", &Unit::getRadius)
         .def("hold_position", &Unit::holdPosition)

python-api-src/lib_unittype.cpp

@@ -12,7 +12,7 @@ void define_unittype(py::module & m)
         .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("required_structure", &UnitType::getRequiredStructure)
         .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")

src/Unit.cpp

@@ -370,7 +370,7 @@ float Unit::getProgress() const
 	return -1;
 }
 
-sc2::AbilityID Unit::getAbilityID() const
+sc2::AbilityID Unit::getCurrentAbilityID() const
 {
 	BOT_ASSERT(isValid(), "Unit is not valid");
 

src/Unit.h

@@ -52,7 +52,7 @@ public:
     Unit getTarget() const;
     CCHealth getMaxHitPoints() const;
     float getProgress() const;
-    sc2::AbilityID getAbilityID() const;
+    sc2::AbilityID getCurrentAbilityID() const;
     void holdPosition() const;
     void patrol(const CCPosition & targetPosition) const;
     void stopDance() const;

src/UnitType.cpp

@@ -383,7 +383,7 @@ int UnitType::getSightRange() const
 	return m_bot->Observation()->GetUnitTypeData()[m_type].sight_range;
 }
 
-sc2::UnitTypeID UnitType::getTechRequirement() const
+sc2::UnitTypeID UnitType::getRequiredStructure() const
 {
 	return m_bot->Observation()->GetUnitTypeData()[m_type].tech_requirement;
 }

src/UnitType.h

@@ -25,7 +25,7 @@ public:
 	
     int getMovementSpeed() const;
     int getSightRange() const;
-    sc2::UnitTypeID getTechRequirement() const;
+    sc2::UnitTypeID getRequiredStructure() const;
     
     bool isValid() const;
     bool isBuilding() const;