From 83c3ccd9b6dca723dcc348060955e3b5c1b2cdc3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1s=20Villegas?= <67444519+tvillegas98@users.noreply.github.com> Date: Thu, 14 Nov 2024 18:22:43 -0300 Subject: [PATCH] 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 --- .../lib/arena/matchmaking/game_launcher.ex | 7 +++- apps/arena/lib/arena/matchmaking/pair_mode.ex | 7 +++- .../lib/arena/matchmaking/quick_game_mode.ex | 7 +++- config/config.exs | 2 +- priv/repo/seeds.exs | 40 ++++++------------- 5 files changed, 31 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..e536f47d5 100644 --- 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 index 7b53ff1b5..fc33786bd 100644 --- 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 index 82ff88704..7a35a0b4f 100644 --- 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 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 d4743ca35..5e2ff93a1 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: -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: [ %{