More defenders, less attackers

RoboTeamTwente · Jun 17, 2024 · 1fd0ade · 1fd0ade
1 parent fbb0409
commit 1fd0ade
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 10 deletions.
diff --git a/roboteam_ai/src/stp/plays/offensive/Attack.cpp b/roboteam_ai/src/stp/plays/offensive/Attack.cpp
@@ -32,13 +32,13 @@ Attack::Attack() : Play() {
         std::make_unique<role::Defender>("defender_0"),
         std::make_unique<role::Formation>("attacker_0"),
         std::make_unique<role::Defender>("defender_1"),
-        std::make_unique<role::Formation>("attacker_1"),
+        std::make_unique<role::Defender>("defender_2"),
         // Additional roles if we play 11v11
         std::make_unique<role::Formation>("waller_0"),
         std::make_unique<role::Formation>("waller_1"),
+        std::make_unique<role::Formation>("attacker_1"),
+        std::make_unique<role::Defender>("defender_3"),
         std::make_unique<role::Formation>("attacker_2"),
-        std::make_unique<role::Defender>("defender_2"),
-        std::make_unique<role::Formation>("attacker_3"),
     };
 }
 
@@ -60,10 +60,10 @@ Dealer::FlagMap Attack::decideRoleFlags() const noexcept {
     flagMap.insert({"defender_0", {DealerFlagPriority::MEDIUM_PRIORITY, {}}});
     flagMap.insert({"defender_1", {DealerFlagPriority::MEDIUM_PRIORITY, {}}});
     flagMap.insert({"defender_2", {DealerFlagPriority::MEDIUM_PRIORITY, {}}});
+    flagMap.insert({"defender_3", {DealerFlagPriority::MEDIUM_PRIORITY, {}}});
     flagMap.insert({"attacker_0", {DealerFlagPriority::LOW_PRIORITY, {}}});
     flagMap.insert({"attacker_1", {DealerFlagPriority::LOW_PRIORITY, {}}});
     flagMap.insert({"attacker_2", {DealerFlagPriority::LOW_PRIORITY, {}}});
-    flagMap.insert({"attacker_3", {DealerFlagPriority::LOW_PRIORITY, {}}});
 
     return flagMap;
 }

diff --git a/roboteam_ai/src/stp/plays/offensive/AttackingPass.cpp b/roboteam_ai/src/stp/plays/offensive/AttackingPass.cpp
@@ -39,9 +39,9 @@ AttackingPass::AttackingPass() : Play() {
         // Additional roles if we play 11v11
         std::make_unique<role::Formation>("waller_0"),
         std::make_unique<role::Formation>("waller_1"),
-        std::make_unique<role::Formation>("attacker_1"),
         std::make_unique<role::Defender>("defender_2"),
-        std::make_unique<role::Formation>("attacker_2"),
+        std::make_unique<role::Defender>("defender_3"),
+        std::make_unique<role::Formation>("attacker_1"),
     };
 }
 
@@ -67,9 +67,9 @@ Dealer::FlagMap AttackingPass::decideRoleFlags() const noexcept {
     flagMap.insert({"defender_0", {DealerFlagPriority::MEDIUM_PRIORITY, {}}});
     flagMap.insert({"defender_1", {DealerFlagPriority::MEDIUM_PRIORITY, {}}});
     flagMap.insert({"defender_2", {DealerFlagPriority::MEDIUM_PRIORITY, {}}});
+    flagMap.insert({"defender_3", {DealerFlagPriority::MEDIUM_PRIORITY, {}}});
     flagMap.insert({"attacker_0", {DealerFlagPriority::LOW_PRIORITY, {}}});
     flagMap.insert({"attacker_1", {DealerFlagPriority::LOW_PRIORITY, {}}});
-    flagMap.insert({"attacker_2", {DealerFlagPriority::LOW_PRIORITY, {}}});
 
     return flagMap;
 }

diff --git a/roboteam_ai/src/stp/plays/referee_specific/FreeKickUsPass.cpp b/roboteam_ai/src/stp/plays/referee_specific/FreeKickUsPass.cpp
@@ -32,9 +32,9 @@ FreeKickUsPass::FreeKickUsPass() : Play() {
         // Additional roles if we play 11v11
         std::make_unique<role::Formation>("waller_0"),
         std::make_unique<role::Formation>("waller_1"),
-        std::make_unique<role::Formation>("attacker_1"),
         std::make_unique<role::Defender>("defender_2"),
-        std::make_unique<role::Formation>("attacker_2"),
+        std::make_unique<role::Defender>("defender_3"),
+        std::make_unique<role::Formation>("attacker_1"),
     };
 }
 
@@ -57,9 +57,9 @@ Dealer::FlagMap FreeKickUsPass::decideRoleFlags() const noexcept {
     flagMap.insert({"defender_0", {DealerFlagPriority::MEDIUM_PRIORITY, {}}});
     flagMap.insert({"defender_1", {DealerFlagPriority::MEDIUM_PRIORITY, {}}});
     flagMap.insert({"defender_2", {DealerFlagPriority::MEDIUM_PRIORITY, {}}});
+    flagMap.insert({"defender_3", {DealerFlagPriority::MEDIUM_PRIORITY, {}}});
     flagMap.insert({"attacker_0", {DealerFlagPriority::HIGH_PRIORITY, {}}});
     flagMap.insert({"attacker_1", {DealerFlagPriority::HIGH_PRIORITY, {}}});
-    flagMap.insert({"attacker_2", {DealerFlagPriority::HIGH_PRIORITY, {}}});
 
     return flagMap;
 }