dropped useless units

yanntm · Dec 22, 2018 · 4e13ae2 · 4e13ae2
1 parent 150b91c
commit 4e13ae2
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 14 deletions.
diff --git a/TechBot.cpp b/TechBot.cpp
@@ -7,12 +7,13 @@
 #include <fstream>
 
 
-bool isRelevant(const sc2::UnitTypeData & unitdesc) {
+bool isRelevant(const sc2::UnitTypeData & unitdesc, const std::unordered_map<int, int> & abilityToUnit) {
 	return unitdesc.available && unitdesc.race == sc2::Race::Protoss
 		&& !(unitdesc.name.find("Weapon") != std::string::npos
 			|| unitdesc.name.find("MP") != std::string::npos
 			|| unitdesc.name.find("SkinPreview") != std::string::npos
-			|| unitdesc.name.find("Interceptors") != std::string::npos);
+			|| unitdesc.name.find("Interceptors") != std::string::npos)
+		&& (abilityToUnit.empty() || sc2util::IsBuilding(unitdesc.unit_type_id) || (abilityToUnit.find((int)unitdesc.ability_id) != abilityToUnit.end() || unitdesc.name == "Mothership"));
 }
 
 void suboo::TechBot::OnGameStart()
@@ -41,7 +42,7 @@ void suboo::TechBot::OnGameStart()
 	initvesp = Observation()->GetVespene();
 	auto point = map.getPosition(map.ally,map.main);
 	for (const sc2::UnitTypeData & unitdesc : types) {
-		if (isRelevant(unitdesc)) {
+		if (isRelevant(unitdesc, {})) {
 			point = point + sc2::Point3D(3, 0, 0);
 			while (! map.PlacementB(info, point,3)) {
 				point = point + sc2::Point3D(3, 0, 0);
@@ -108,7 +109,7 @@ void suboo::TechBot::OnStep()
 		std::vector<std::pair<int, int> > ind;
 		for (const sc2::UnitTypeData & unitdesc : types) {
 
-			if (isRelevant(unitdesc)) {
+			if (isRelevant(unitdesc,abilityToUnit)) {
 				if ((int)unitdesc.unit_type_id > maxunitID) {
 					maxunitID = (int)unitdesc.unit_type_id;
 				}

diff --git a/TechTree.cpp b/TechTree.cpp
@@ -493,23 +493,13 @@ TechTree::TechTree() :
   indexes[82] = 25;
   indexes[83] = 26;
   indexes[84] = 27;
-  indexes[85] = 28;
   indexes[133] = 28;
-  indexes[135] = 29;
   indexes[136] = 29;
-  indexes[141] = 30;
   indexes[311] = 30;
-  indexes[488] = 31;
   indexes[495] = 31;
   indexes[496] = 32;
-  indexes[569] = 33;
-  indexes[593] = 33;
-  indexes[594] = 33;
   indexes[694] = 33;
   indexes[732] = 34;
-  indexes[733] = 35;
-  indexes[801] = 35;
-  indexes[840] = 35;
   indexes[894] = 35;
   indexes[1910] = 35;
   indexes[1911] = 36;