Increase player's amount and add new initial positions (#988)

* feat: increase players amount and modify initial positions in merliot * feat: update players behind wall positions * feat: add more names to bots
lambdaclass · Nov 14, 2024 · 83c3ccd · 83c3ccd
1 parent 17d8669
commit 83c3ccd
Show file tree

Hide file tree

Showing 5 changed files with 31 additions and 32 deletions.
diff --git a/apps/arena/lib/arena/matchmaking/game_launcher.ex b/apps/arena/lib/arena/matchmaking/game_launcher.ex
@@ -19,7 +19,12 @@ defmodule Arena.Matchmaking.GameLauncher do
     "Bob",
     "El javo",
     "Alberso",
-    "Thomas"
+    "Thomas",
+    "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
@@ -19,7 +19,12 @@ defmodule Arena.Matchmaking.PairMode do
     "Bob",
     "El javo",
     "Alberso",
-    "Thomas"
+    "Thomas",
+    "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
@@ -17,7 +17,12 @@ defmodule Arena.Matchmaking.QuickGameMode do
     "Bob",
     "El javo",
     "Alberso",
-    "Thomas"
+    "Thomas",
+    "Timmy",
+    "Pablito",
+    "Nicolino",
+    "Cangrejo",
+    "Mansito"
   ]
 
   # API

diff --git 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
@@ -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: -4961, y: 5001},
+    %{x: -2417, y: 5103},
+    %{x: 952, y: 5603},
+    %{x: 4695, y: 4859},
+    %{x: 5632, y: 2753},
+    %{x: 5242, y: -316},
+    %{x: 4908, y: -3698},
+    %{x: 2442, y: -5476},
+    %{x: -897, y: -5296},
+    %{x: -4871, y: -4868},
+    %{x: -4897, y: -2416},
+    %{x: -5047, y: 853}
   ],
   obstacles: [
     %{