Merge lp:~timfelgentreff/stratagus/distance-owner-rules into lp:stratagus

[timfelgentreff]

This extends distance rules for buildings so I can specify which owners the buildings to which I specify a distance can have. In WC1, this allows me to specify that all buildings can be next to my own buildings, walls can be at most 3 fields from allied buildings and so on.

[Kyran Jackson (erstmap)]

Will existing scripts need to be modified?

[timfelgentreff (timfelgentreff)]

No, existing scripts continue to work. This is an additional option. If it isn't specified, the old behavior is used.

[Kyran Jackson (erstmap)]

review: Approve

=== modified file 'src/include/unittype.h'
--- src/include/unittype.h	2013-05-08 12:10:35 +0000
+++ src/include/unittype.h	2013-06-05 09:54:39 +0000
@@ -408,6 +408,7 @@
 	int Distance;        /// distance to build (circle)
 	DistanceTypeType DistanceType;
 	std::string RestrictTypeName;
+	std::string RestrictTypeOwner;
 	CUnitType *RestrictType;
 };
 
 
=== modified file 'src/unit/build.cpp'
--- src/unit/build.cpp	2013-04-26 13:04:33 +0000
+++ src/unit/build.cpp	2013-06-05 09:54:39 +0000
@@ -134,43 +134,45 @@
 	std::vector<CUnit *> table;
 	Select(pos1, pos2, table);
 
-	switch (this->DistanceType) {
-		case GreaterThan :
-		case GreaterThanEqual :
-			for (size_t i = 0; i != table.size(); ++i) {
-				if (builder != table[i] && this->RestrictType == table[i]->Type &&
-					MapDistanceBetweenTypes(type, pos, *table[i]->Type, table[i]->tilePos) <= distance) {
-					return false;
-				}
-			}
-			return true;
-		case LessThan :
-		case LessThanEqual :
-			for (size_t i = 0; i != table.size(); ++i) {
-				if (builder != table[i] && this->RestrictType == table[i]->Type &&
-					MapDistanceBetweenTypes(type, pos, *table[i]->Type, table[i]->tilePos) <= distance) {
-					return true;
-				}
-			}
-			return false;
-		case Equal :
-			for (size_t i = 0; i != table.size(); ++i) {
-				if (builder != table[i] && this->RestrictType == table[i]->Type &&
-					MapDistanceBetweenTypes(type, pos, *table[i]->Type, table[i]->tilePos) == distance) {
-					return true;
-				}
-			}
-			return false;
-		case NotEqual :
-			for (size_t i = 0; i != table.size(); ++i) {
-				if (builder != table[i] && this->RestrictType == table[i]->Type &&
-					MapDistanceBetweenTypes(type, pos, *table[i]->Type, table[i]->tilePos) == distance) {
-					return false;
-				}
-			}
-			return true;
+	for (size_t i = 0; i != table.size(); ++i) {
+		if (builder != table[i] &&
+		    // unit has RestrictType or no RestrictType was set, but a RestrictTypeOwner
+		    (this->RestrictType == table[i]->Type || !this->RestrictType && this->RestrictTypeOwner.size() > 0) &&
+		    // RestrictTypeOwner is not set or unit belongs to a suitable player
+		    (this->RestrictTypeOwner.size() == 0 ||
+		     !this->RestrictTypeOwner.compare("self") && ThisPlayer == table[i]->Player ||
+		     !this->RestrictTypeOwner.compare("allied") && (ThisPlayer == table[i]->Player || ThisPlayer->IsAllied(*table[i]->Player)) ||
+		     !this->RestrictTypeOwner.compare("enemy") && ThisPlayer->IsEnemy(*table[i]->Player))) {
+
+			switch (this->DistanceType) {
+			case GreaterThan :
+			case GreaterThanEqual :
+				if (MapDistanceBetweenTypes(type, pos, *table[i]->Type, table[i]->tilePos) <= distance) {
+					return false;
+				}
+				break;
+		        case LessThan :
+		        case LessThanEqual :
+				if (MapDistanceBetweenTypes(type, pos, *table[i]->Type, table[i]->tilePos) <= distance) {
+					return true;
+				}
+				break;
+			case Equal :
+				if (MapDistanceBetweenTypes(type, pos, *table[i]->Type, table[i]->tilePos) == distance) {
+					return true;
+				}
+				break;
+			case NotEqual :
+				if (MapDistanceBetweenTypes(type, pos, *table[i]->Type, table[i]->tilePos) == distance) {
+					return false;
+				}
+				break;
+			}
+		}
 	}
-	return false;
+	return (this->DistanceType == GreaterThan ||
+		this->DistanceType == GreaterThanEqual ||
+		this->DistanceType == NotEqual);
 }
 
 inline bool CBuildRestrictionAddOn::functor::operator()(const CUnit *const unit) const
 
=== modified file 'src/unit/script_unittype.cpp'
--- src/unit/script_unittype.cpp	2013-05-08 12:10:35 +0000
+++ src/unit/script_unittype.cpp	2013-06-05 09:54:39 +0000
@@ -254,6 +254,8 @@
 					}
 				} else if (!strcmp(value, "Type")) {
 					b->RestrictTypeName = LuaToString(l, -1);
+				} else if (!strcmp(value, "Owner")) {
+					b->RestrictTypeOwner = LuaToString(l, -1);
 				} else {
 					LuaError(l, "Unsupported BuildingRules distance tag: %s" _C_ value);
 				}