From 6a02009885f06e43acee4e7b98e56b82cd9f16e8 Mon Sep 17 00:00:00 2001
From: tvillegas98 <tvillegas@fi.uba.ar>
Date: Thu, 14 Nov 2024 16:53:22 -0300
Subject: [PATCH 1/3] feat: increase players amount and modify initial
 positions in merliot

---
 .../lib/arena/matchmaking/game_launcher.ex    |  3 +-
 apps/arena/lib/arena/matchmaking/pair_mode.ex |  3 +-
 .../lib/arena/matchmaking/quick_game_mode.ex  |  3 +-
 config/config.exs                             |  2 +-
 priv/repo/seeds.exs                           | 40 ++++++-------------
 5 files changed, 19 insertions(+), 32 deletions(-)

diff --git a/apps/arena/lib/arena/matchmaking/game_launcher.ex b/apps/arena/lib/arena/matchmaking/game_launcher.ex
index fb92a9333..26e75ebef 100644
--- a/apps/arena/lib/arena/matchmaking/game_launcher.ex
+++ b/apps/arena/lib/arena/matchmaking/game_launcher.ex
@@ -19,7 +19,8 @@ defmodule Arena.Matchmaking.GameLauncher do
     "Bob",
     "El javo",
     "Alberso",
-    "Thomas"
+    "Thomas",
+    "Timmy"
   ]
 
   # API
diff --git a/apps/arena/lib/arena/matchmaking/pair_mode.ex b/apps/arena/lib/arena/matchmaking/pair_mode.ex
index 7b53ff1b5..b9eaf330a 100644
--- a/apps/arena/lib/arena/matchmaking/pair_mode.ex
+++ b/apps/arena/lib/arena/matchmaking/pair_mode.ex
@@ -19,7 +19,8 @@ defmodule Arena.Matchmaking.PairMode do
     "Bob",
     "El javo",
     "Alberso",
-    "Thomas"
+    "Thomas",
+    "Timmy"
   ]
 
   # API
diff --git a/apps/arena/lib/arena/matchmaking/quick_game_mode.ex b/apps/arena/lib/arena/matchmaking/quick_game_mode.ex
index 82ff88704..1dff51a07 100644
--- a/apps/arena/lib/arena/matchmaking/quick_game_mode.ex
+++ b/apps/arena/lib/arena/matchmaking/quick_game_mode.ex
@@ -17,7 +17,8 @@ defmodule Arena.Matchmaking.QuickGameMode do
     "Bob",
     "El javo",
     "Alberso",
-    "Thomas"
+    "Thomas",
+    "Timmy"
   ]
 
   # API
diff --git a/config/config.exs b/config/config.exs
index a180a0d74..ef14f6048 100644
--- a/config/config.exs
+++ b/config/config.exs
@@ -119,7 +119,7 @@ config :arena, ArenaWeb.Endpoint,
 config :arena, Arena.Mailer, adapter: Swoosh.Adapters.Local
 
 # Amount of clients needed to start a game
-config :arena, :players_needed_in_match, 7
+config :arena, :players_needed_in_match, 12
 config :arena, :spawn_bots, false
 
 ################################
diff --git a/priv/repo/seeds.exs b/priv/repo/seeds.exs
index 8ec0145fc..d75ed6b0b 100644
--- a/priv/repo/seeds.exs
+++ b/priv/repo/seeds.exs
@@ -3673,34 +3673,18 @@ merliot_map_config = %{
   radius: 15000.0,
   active: true,
   initial_positions: [
-    %{
-      x: 5360.0,
-      y: -540.0
-    },
-    %{
-      x: -5130.0,
-      y: -920.0
-    },
-    %{
-      x: 555.0,
-      y: 4314.0
-    },
-    %{
-      x: 2750.0,
-      y: -4200.0
-    },
-    %{
-      x: -3700.0,
-      y: 2700.0
-    },
-    %{
-      x: 4250.0,
-      y: 3000.0
-    },
-    %{
-      x: -1842.0,
-      y: -4505.0
-    }
+    %{x: -5757, y: 4683},
+    %{x: -2417, y: 5103},
+    %{x: 952, y: 5603},
+    %{x: 4782, y: 5583},
+    %{x: 5632, y: 2753},
+    %{x: 5242, y: -316},
+    %{x: 5602, y: -4806},
+    %{x: 2442, y: -5476},
+    %{x: -897, y: -5296},
+    %{x: -4337, y: -5506},
+    %{x: -4897, y: -2416},
+    %{x: -5047, y: 853}
   ],
   obstacles: [
     %{

From 507009cf20b2b68f179a8b83957707dd0a46b4ab Mon Sep 17 00:00:00 2001
From: tvillegas98 <tvillegas@fi.uba.ar>
Date: Thu, 14 Nov 2024 17:31:35 -0300
Subject: [PATCH 2/3] feat: update players behind wall positions

---
 priv/repo/seeds.exs | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/priv/repo/seeds.exs b/priv/repo/seeds.exs
index d75ed6b0b..feebd9532 100644
--- a/priv/repo/seeds.exs
+++ b/priv/repo/seeds.exs
@@ -3673,16 +3673,16 @@ merliot_map_config = %{
   radius: 15000.0,
   active: true,
   initial_positions: [
-    %{x: -5757, y: 4683},
+    %{x: -4961, y: 5001},
     %{x: -2417, y: 5103},
     %{x: 952, y: 5603},
-    %{x: 4782, y: 5583},
+    %{x: 4695, y: 4859},
     %{x: 5632, y: 2753},
     %{x: 5242, y: -316},
-    %{x: 5602, y: -4806},
+    %{x: 4908, y: -3698},
     %{x: 2442, y: -5476},
     %{x: -897, y: -5296},
-    %{x: -4337, y: -5506},
+    %{x: -4871, y: -4868},
     %{x: -4897, y: -2416},
     %{x: -5047, y: 853}
   ],

From a71010fcfa223bfc5c3b65a075b92a39a7c34216 Mon Sep 17 00:00:00 2001
From: tvillegas98 <tvillegas@fi.uba.ar>
Date: Thu, 14 Nov 2024 18:00:01 -0300
Subject: [PATCH 3/3] feat: add more names to bots

---
 apps/arena/lib/arena/matchmaking/game_launcher.ex   | 6 +++++-
 apps/arena/lib/arena/matchmaking/pair_mode.ex       | 6 +++++-
 apps/arena/lib/arena/matchmaking/quick_game_mode.ex | 6 +++++-
 3 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/apps/arena/lib/arena/matchmaking/game_launcher.ex b/apps/arena/lib/arena/matchmaking/game_launcher.ex
index 26e75ebef..e536f47d5 100644
--- a/apps/arena/lib/arena/matchmaking/game_launcher.ex
+++ b/apps/arena/lib/arena/matchmaking/game_launcher.ex
@@ -20,7 +20,11 @@ defmodule Arena.Matchmaking.GameLauncher do
     "El javo",
     "Alberso",
     "Thomas",
-    "Timmy"
+    "Timmy",
+    "Pablito",
+    "Nicolino",
+    "Cangrejo",
+    "Mansito"
   ]
 
   # API
diff --git a/apps/arena/lib/arena/matchmaking/pair_mode.ex b/apps/arena/lib/arena/matchmaking/pair_mode.ex
index b9eaf330a..fc33786bd 100644
--- a/apps/arena/lib/arena/matchmaking/pair_mode.ex
+++ b/apps/arena/lib/arena/matchmaking/pair_mode.ex
@@ -20,7 +20,11 @@ defmodule Arena.Matchmaking.PairMode do
     "El javo",
     "Alberso",
     "Thomas",
-    "Timmy"
+    "Timmy",
+    "Pablito",
+    "Nicolino",
+    "Cangrejo",
+    "Mansito"
   ]
 
   # API
diff --git a/apps/arena/lib/arena/matchmaking/quick_game_mode.ex b/apps/arena/lib/arena/matchmaking/quick_game_mode.ex
index 1dff51a07..7a35a0b4f 100644
--- a/apps/arena/lib/arena/matchmaking/quick_game_mode.ex
+++ b/apps/arena/lib/arena/matchmaking/quick_game_mode.ex
@@ -18,7 +18,11 @@ defmodule Arena.Matchmaking.QuickGameMode do
     "El javo",
     "Alberso",
     "Thomas",
-    "Timmy"
+    "Timmy",
+    "Pablito",
+    "Nicolino",
+    "Cangrejo",
+    "Mansito"
   ]
 
   # API