Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

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

Merged
merged 3 commits into from
Nov 14, 2024
Merged

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
6a02009
feat: increase players amount and modify initial positions in merliot
tvillegas98 Nov 14, 2024
507009c
feat: update players behind wall positions
tvillegas98 Nov 14, 2024
a71010f
feat: add more names to bots
tvillegas98 Nov 14, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 6 additions & 1 deletion apps/arena/lib/arena/matchmaking/game_launcher.ex
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,12 @@ defmodule Arena.Matchmaking.GameLauncher do
"Bob",
"El javo",
"Alberso",
"Thomas"
"Thomas",
"Timmy",
"Pablito",
"Nicolino",
"Cangrejo",
"Mansito"
]

# API
Expand Down
7 changes: 6 additions & 1 deletion apps/arena/lib/arena/matchmaking/pair_mode.ex
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,12 @@ defmodule Arena.Matchmaking.PairMode do
"Bob",
"El javo",
"Alberso",
"Thomas"
"Thomas",
"Timmy",
"Pablito",
"Nicolino",
"Cangrejo",
"Mansito"
]

# API
Expand Down
7 changes: 6 additions & 1 deletion apps/arena/lib/arena/matchmaking/quick_game_mode.ex
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,12 @@ defmodule Arena.Matchmaking.QuickGameMode do
"Bob",
"El javo",
"Alberso",
"Thomas"
"Thomas",
"Timmy",
"Pablito",
"Nicolino",
"Cangrejo",
"Mansito"
]

# API
Expand Down
2 changes: 1 addition & 1 deletion config/config.exs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

################################
Expand Down
40 changes: 12 additions & 28 deletions priv/repo/seeds.exs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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: [
%{
Expand Down
Loading