From 1fd0adeeccd1519e4783e481b8bb5e32c52f877b Mon Sep 17 00:00:00 2001
From: Luuk <l.winters@roboteamtwente.nl>
Date: Mon, 17 Jun 2024 11:22:15 +0200
Subject: [PATCH] More defenders, less attackers

---
 roboteam_ai/src/stp/plays/offensive/Attack.cpp            | 8 ++++----
 roboteam_ai/src/stp/plays/offensive/AttackingPass.cpp     | 6 +++---
 .../src/stp/plays/referee_specific/FreeKickUsPass.cpp     | 6 +++---
 3 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/roboteam_ai/src/stp/plays/offensive/Attack.cpp b/roboteam_ai/src/stp/plays/offensive/Attack.cpp
index e56905369..e7a6dab3e 100644
--- 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
index 81a547498..7cec10373 100644
--- 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
index 90b7bfe37..130f8132d 100644
--- 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;
 }