Merge branch 'master' into pre-improvecarriercost-dirty

data/RTTR/assets/base/languages.ini

@@ -21,3 +21,4 @@ Norwegian Bokmal=nb
 Slovenian=sl
 Latin=la
 Portuguese=pt
+Chinese=zh_CN

libs/s25main/world/GameWorld.cpp

@@ -574,30 +574,32 @@ void GameWorld::CleanTerritoryRegion(TerritoryRegion& region, TerritoryChangeRea
 {
     if(GetGGS().isEnabled(AddonId::NO_ALLIED_PUSH))
     {
-        const unsigned char ownerOfTriggerBld = GetNode(triggerBld.GetPos()).owner;
-        const unsigned char newOwnerOfTriggerBld = region.GetOwner(region.GetPosFromMapPos(triggerBld.GetPos()));
+        const bool isHq = triggerBld.GetBuildingType() == BuildingType::Headquarters;
+        const auto newOwnerOfTriggerBld = region.GetOwner(region.GetPosFromMapPos(triggerBld.GetPos()));
+        // An HQ can be placed independently of the current owner.
+        // So ensure the HQ position is always considered to belong to the HQ owner
+        const auto ownerOfTriggerBld = isHq ? newOwnerOfTriggerBld : GetNode(triggerBld.GetPos()).owner;
 
         RTTR_FOREACH_PT(Position, region.size)
         {
             const MapPoint curMapPt = MakeMapPoint(pt + region.startPt);
-            const unsigned char oldOwner = GetNode(curMapPt).owner;
-            const unsigned char newOwner = region.GetOwner(pt);
+            const auto oldOwner = GetNode(curMapPt).owner;
+            const auto newOwner = region.GetOwner(pt);
 
             // If nothing changed, there is nothing to do (ownerChanged was already initialized)
             if(oldOwner == newOwner)
                 continue;
 
-            // rule 1: only take territory from an ally if that ally loses a building - special case: headquarter can
-            // take territory
             const bool ownersAllied = oldOwner > 0 && newOwner > 0 && GetPlayer(oldOwner - 1).IsAlly(newOwner - 1);
-            if((ownersAllied && (ownerOfTriggerBld != oldOwner || reason == TerritoryChangeReason::Build)
-                && triggerBld.GetBuildingType() != BuildingType::Headquarters)
-               ||
-               // rule 2: do not gain territory when you lose a building (captured or destroyed)
-               (ownerOfTriggerBld == newOwner && reason != TerritoryChangeReason::Build) ||
-               // rule 3: do not lose territory when you gain a building (newBuilt or capture)
-               ((ownerOfTriggerBld == oldOwner && oldOwner > 0 && reason == TerritoryChangeReason::Build)
-                || (newOwnerOfTriggerBld == oldOwner && reason == TerritoryChangeReason::Captured)))
+            if(
+              // rule 1: only take territory from an ally if that ally loses a building
+              // special case: headquarter can take territory
+              (ownersAllied && (ownerOfTriggerBld != oldOwner || reason == TerritoryChangeReason::Build) && !isHq) ||
+              // rule 2: do not gain territory when you lose a building (captured or destroyed)
+              (ownerOfTriggerBld == newOwner && reason != TerritoryChangeReason::Build) ||
+              // rule 3: do not lose territory when you gain a building (newBuilt or capture)
+              ((ownerOfTriggerBld == oldOwner && oldOwner > 0 && reason == TerritoryChangeReason::Build)
+               || (newOwnerOfTriggerBld == oldOwner && reason == TerritoryChangeReason::Captured)))
             {
                 region.SetOwner(pt, oldOwner);
             }

tests/s25Main/integration/testTerritoryRegion.cpp

@@ -5,6 +5,7 @@
 #include "GamePlayer.h"
 #include "PointOutput.h"
 #include "RttrForeachPt.h"
+#include "buildings/nobHQ.h"
 #include "buildings/nobMilitary.h"
 #include "factories/BuildingFactory.h"
 #include "figures/nofPassiveSoldier.h"
@@ -310,4 +311,31 @@ BOOST_FIXTURE_TEST_CASE(CreateTerritoryRegion, WorldFixtureEmpty2P)
     }
 }
 
+BOOST_FIXTURE_TEST_CASE(CreateTerritoryRegionForHQs, WorldFixtureEmpty2P)
+{
+    // All points should belong to the HQ closest with and without improved alliances
+
+    const MapPoint hq0Pos = world.GetPlayer(0).GetHQPos();
+    const MapPoint hq1Pos = world.GetPlayer(1).GetHQPos();
+    auto distance = hq1Pos.x - hq0Pos.x;
+
+    for(const MapPoint pt : world.GetPointsInRadiusWithCenter(hq0Pos, distance / 2))
+        BOOST_TEST_CONTEXT("pt: " << pt) { BOOST_TEST(world.GetNode(pt).owner == 1); }
+    for(const MapPoint pt : world.GetPointsInRadiusWithCenter(hq1Pos, distance / 2))
+        BOOST_TEST_CONTEXT("pt: " << pt) { BOOST_TEST(world.GetNode(pt).owner == 2); }
+
+    // Remove HQ 1 and its fire to place it closer to HQ 0
+    world.DestroyNO(hq1Pos);
+    world.DestroyNO(hq1Pos);
+
+    this->ggs.setSelection(AddonId::NO_ALLIED_PUSH, true);
+    distance = 7; // Odd number such that there is no point in the same distance to both HQs
+    const MapPoint newHq1Pos = hq0Pos + MapPoint(distance, 0);
+    BuildingFactory::CreateBuilding(world, BuildingType::Headquarters, newHq1Pos, 1, Nation::Africans);
+    for(const MapPoint pt : world.GetPointsInRadiusWithCenter(hq0Pos, distance / 2))
+        BOOST_TEST_CONTEXT("pt: " << pt) { BOOST_TEST(world.GetNode(pt).owner == 1); }
+    for(const MapPoint pt : world.GetPointsInRadiusWithCenter(newHq1Pos, distance / 2))
+        BOOST_TEST_CONTEXT("pt: " << pt) { BOOST_TEST(world.GetNode(pt).owner == 2); }
+}
+
 BOOST_AUTO_TEST_SUITE_END()