Commit Graph

229 Commits

Author SHA1 Message Date
Evan 582ebf3151 rebalance multiplayer maps:
1. reduce number of players per map
2. Modify map frequencies
2025-04-18 13:31:50 -07:00
Duwibi 7342caaafd Fix Australia and Iceland chance (#550)
## Description:
This PR fixes the chances of the Iceland and Australia maps being
picked.
fixes #551

## Please complete the following:

- [ ] I have added screenshots for all UI updates
- [x] I confirm I have thoroughly tested these changes and take full
responsibility for any bugs introduced
- [x] I understand that submitting code with bugs that could have been
caught through manual testing blocks releases and new features for all
contributors

## Please put your Discord username so you can be contacted if a bug or
regression is found:

Nikola123
2025-04-17 19:39:28 -07:00
Duwibi 027f9ac9ac Add Faroe Islands map (#441)
## Description:
This PR adds the new "Faroe Islands" map that is based on the real
islands. It has 6 nations - the 6 regions of the Feroe Islands.

Fixes #460

## Please complete the following:

- [ ] I have added screenshots for all UI updates
- [x] I confirm I have thoroughly tested these changes and take full
responsibility for any bugs introduced
- [x] I understand that submitting code with bugs that could have been
caught through manual testing blocks releases and new features for all
contributors

## Please put your Discord username so you can be contacted if a bug or
regression is found:

Nikola123
2025-04-17 08:51:48 -07:00
Scott Anderson 5167f67b96 Allow up to seven teams for players (#445)
## Description:

- Allow up to seven teams for players, and one for bots.
- Add team count selection to the single player dialog.
- Select random number of teams in server rotation.

Fixes #456

## Please complete the following:

- [x] I have added screenshots for all UI updates
- [x] I confirm I have thoroughly tested these changes and take full
responsibility for any bugs introduced
- [x] I understand that submitting code with bugs that could have been
caught through manual testing blocks releases and new features for all
contributors


![image](https://github.com/user-attachments/assets/cbc1ba82-9d06-4763-896c-abdce067a161)


![image](https://github.com/user-attachments/assets/9f82a0a5-c0bb-49b6-a714-2b13286a64ca)

## Please put your Discord username so you can be contacted if a bug or
regression is found:

fake.neo

---------

Co-authored-by: Scott Anderson <662325+scottanderson@users.noreply.github.com>
2025-04-15 19:02:58 -07:00
Evan cdc56f3191 don't archive game if it hasn't started 2025-04-15 12:21:31 -07:00
Evan 58b151f585 remove slog, use winston instead. 2025-04-12 17:54:36 -07:00
Evan 3caecc1978 create logger component at top of file to prevent reassigning worker 2025-04-12 10:14:52 -07:00
Evan d1da506201 update win modal to link to patreon, create game mode rotation 2025-04-09 19:56:52 -07:00
Evan 5fe1d522de Make teams vs ffa 50/50 2025-04-06 10:44:41 -07:00
Evan 08c2c01dae bugfix: flags not showing in game 2025-04-06 10:27:52 -07:00
Evan f620264ce3 load environment variable for development 2025-04-05 21:39:05 -07:00
Evan b947b764b7 bugfix: npe when winner is null 2025-04-04 16:10:16 -07:00
Duwibi 51bbf2becd Fix difference in translation strings regarding the new Between Two Seas map (#416)
##Description:
I renamed all instances of "TwoSeas" to "BetweenTwoSeas". That way it
lowers the confusion but more importrantly - it removes the difference
between the translation strings for the map.

Please put your Discord username so you can be contacted if a bug or
regression is found:

<Nikola123>
2025-04-04 09:42:56 -07:00
Evan 3b5853ccbc removed db/ dir, has been moved to another repo 2025-04-03 16:21:35 -07:00
APuddle210 f94da14d1f Created MapPlaylist class (#405)
## Description:

Creates new MapPlaylist class, which contains the expanded may playlist
logic. Currently implements two distinct playlists, one for big maps,
and another for small. Designed with future need for more types of
playlist in mind.

It pulls from the big playlist two for every one time it pulls from the
small playlist.

Moved out of the Master.ts as requested.

## Please complete the following:

- [x] I have added screenshots for all UI updates
- [x] I confirm I have thoroughly tested these changes and take full
responsibility for any bugs introduced
- [x] I understand that submitting code with bugs that could have been
caught through manual testing blocks releases and new features for all
contributors

## Please put your Discord username so you can be contacted if a bug or
regression is found:

aPuddle
2025-04-03 16:09:34 -07:00
Evan 950344c0bd created prestart message: add 2 second delay before starting public games to allow all players to connect 2025-04-03 15:42:25 -07:00
Scott Anderson 52f64db6d3 Fix various ESLint violations (#402)
## Description:

Fixes a number of ESLint violations. Although I have tested these
changes through the local dev server, I don't have a high confidence
that the testing is sufficient, as I am new to this codebase. This
change would benefit from heightened scrutiny.

## Please complete the following:

- [x] I have added screenshots for all UI updates
- [x] I confirm I have thoroughly tested these changes and take full
responsibility for any bugs introduced
- [x] I understand that submitting code with bugs that could have been
caught through manual testing blocks releases and new features for all
contributors

## Please put your Discord username so you can be contacted if a bug or
regression is found:

fake.neo

---------

Co-authored-by: Scott Anderson <662325+scottanderson@users.noreply.github.com>
2025-04-02 18:06:08 -07:00
Evan 118a826025 Add teams to public lobby 2025-04-02 13:46:11 -07:00
APuddle210 71ddeca7f0 Map Revisions, one Addition, and Adjustment to Lobby Max Player based on Map Sizes (#389)
## Description:

Implementation of separate lobby playlists, one for large maps another
for small, with the implementation framework being easily adjusted for
additional playlist categories in the future (such as fantasy maps).

Addition of new map 'Between Two Seas' a small map, replacing Black Sea
in the public lobby rotation (Black Sea retained for singleplayer or
private lobbies.

Adjustments to lobbyMaxPlayer configuration function. Broke out into
tranches by map pixel count, commented to communicate to other collabs
which tranch to place their map in. This change pairs well with the
adjustment to lobby map selection to alternate between big and small
maps. For the Potato (and mobile) players.

Revision to Mena, adding lakes and rivers.

Revisions to Japan, adding lakes and rivers, slight change of bounds to
include more mainland and less ocean.


![image](https://github.com/user-attachments/assets/434ad418-3ad4-40d4-841f-2ab71d13effd)


![image](https://github.com/user-attachments/assets/c46863b4-6a29-494f-82f0-d249c5017c1d)


![image](https://github.com/user-attachments/assets/c1e10fc4-b5e8-465a-a4eb-d325447df954)


The below no longer applies, I talked to Duwibi (Nikola123) who
explained the source of the issue is outside my control, but that he was
taking the action necessary to resolve.

The only issue still present after testing the the display of the map
name for Between Two Seas on the Public Lobby button. I've asked for
assistance with this issue on the Discord and will submit a fix as soon
as I can figure out its cause. Does not impact gameplay and its 3:30am
so hopefully this issue is not enough to prevent a merge as aside from a
quick fix PR, I don't think I'll be able to do any more work until after
this weekend.


## Please complete the following:

- [x] I have added screenshots for all UI updates
- [x] I confirm I have thoroughly tested these changes and take full
responsibility for any bugs introduced
- [x] I understand that submitting code with bugs that could have been
caught through manual testing blocks releases and new features for all
contributors

## Please put your Discord username so you can be contacted if a bug or
regression is found:

aPuddle
2025-04-02 10:45:37 -07:00
Evan bdb346de62 update gatekeepr 2025-03-31 13:09:51 -07:00
Evan 8b6895d745 add prettier import plugin 2025-03-31 13:09:27 -07:00
APuddle210 d0e220c0a2 Revised maps, flags. (#382)
## Description:

- Revised 55 Flags (US States and Territories) to resolve aspect ratio
scaling issues in game. Has introduced some minor visual issues with
crosses drawing past the bounds of the flag, but this is a lesser issue
than misrproportioned scaling and is only obvious in menus.
 - Added 43 New flags made by N0ur 
- Revised countries.json to make the new flags available for users to
select
 - Revised 9 existing flags with ones made by N0ur
- New North America map (v3), which is 250,000 pixels smaller than v2,
significant additions of lakes and rivers, addressing complaints about
missing Ohio river and inaccurate Missouri river. West coast and
Central/South America now also have rivers. Updated Json to give most
bots flags.
- New South America map (v2), which has a fully realized Amazon river
system, two separate ocean exits. Southern Fjords turned up to 11.
- New Africa Map (v3), with more fleshed out river systems. size
decreased by 250,000 pixels. Great Rift lake now link up to the Congo
basin, and the rivers to their south, making most of Africa connected by
one river system with a Northern, Southern and Eastern Exit
- New Europe Map (v2), extended map bounds south, include entire North
African coast. bounds drawn in on the West, cutting off Iceland and much
ocean in favor of more detail on the continent. Rivers and lakes
implemented. Western-most edge of the Russia-Siberia massive river
network included (preview). Additional nation bots added to the map, to
fill empty areas. Coastline details significantly improved.
- Edits to the Gateway to the Atlantic json to add flags for most of the
Nation bots.

All maps were tested in game, flag selection menu item was visually
inspected for image loading issues.

![North America Early
Game](https://github.com/user-attachments/assets/5c9d638b-2e4e-4cec-8de2-9ad6640e8363)

![South America Early
Game](https://github.com/user-attachments/assets/238600ef-3a87-435e-8436-d93c9fe2a179)

![Africa v3 early
game](https://github.com/user-attachments/assets/cd9ccc76-223f-4ae6-be6e-eac573ff6095)

![Europe v2 Early
Game](https://github.com/user-attachments/assets/ddbb5bd2-f025-45d9-b4df-a9afa8254c23)



## Please complete the following:

- [x] I have added screenshots for all UI updates
- [x] I confirm I have thoroughly tested these changes and take full
responsibility for any bugs introduced
- [x] I understand that submitting code with bugs that could have been
caught through manual testing blocks releases and new features for all
contributors

## Please put your Discord username so you can be contacted if a bug or
regression is found:

aPuddle
2025-03-31 10:31:51 -07:00
Evan f12d14fd22 bugfix: actually return 404 when game not found 2025-03-31 09:36:38 -07:00
Duwibi fe478c1395 Add Australia to map rotation (#377)
## Description:
I've added the Australia map to map rotation
<Nikola123>
2025-03-30 19:46:34 -07:00
evanpelle ab3f4fbac1 All players must join game before spawn (#380)
## Description:
The server stores all players that have joined, and once the game starts
it sends a list of players to all clients. Players cannot join after the
game has started. Server now generated the PlayerID instead of the
client.

The is necessary for team mode, we need to know how who is playing the
game before it starts so we can properly assign teams based on clans.

## Please complete the following:

- [x] I have added screenshots for all UI updates
- [x] I confirm I have thoroughly tested these changes and take full
responsibility for any bugs introduced
- [x] I understand that submitting code with bugs that could have been
caught through manual testing blocks releases and new features for all
contributors

## Please put your Discord username so you can be contacted if a bug or
regression is found:

evan
2025-03-30 17:04:29 -07:00
evanpelle d8fe41de7a teams (#349) 2025-03-27 20:43:56 -07:00
MRH 9866dbb73a Added map Pangaea (#320)
This map was made by mashing up the world map and putting it in the
general shape of the super-continent
[Pangaea](https://en.wikipedia.org/wiki/Pangaea) It's not super accurate
but the continents are generally in the right places and the nations are
more or less the same as on World, placed in the general location where
they would have been. Hope this is good enough to be added into the
game; even if only among custom lobby maps!
2025-03-25 08:14:29 -07:00
Duwibi ab44751b08 Adding Iceland map (#323)
This is a map of Iceland. It has 8 nations - the 8 regions of Iceland.

![IcelandScreenshot](https://github.com/user-attachments/assets/1debe786-1dac-4274-85e2-9a0c090bd3b0)

![IcelandScreenshot1](https://github.com/user-attachments/assets/681e4a8f-4603-4434-9714-d76b49b82a6e)

![IcelandScreenshot2](https://github.com/user-attachments/assets/69841915-14f4-4e13-961f-c5e523668d41)

![IcelandScreenshot3](https://github.com/user-attachments/assets/51225d7a-c1df-4890-a56f-d459fe62a534)

![IcelandScreenshot4](https://github.com/user-attachments/assets/a5880022-765f-4e62-8f55-2b93d8b89f84)

![IcelandScreenshot5](https://github.com/user-attachments/assets/ec0d6efc-1056-45a1-ad03-152cb5a2baf6)

![IcelandScreenshot6](https://github.com/user-attachments/assets/56c8c8cb-2b3d-41e0-a55d-37b21b4442e3)

![IcelandScreenshot7](https://github.com/user-attachments/assets/b7a7833c-ef64-4067-a44f-c8a762bed0bc)

![IcelandScreenshot8](https://github.com/user-attachments/assets/d9edd402-7885-4e26-95c6-33d387493a80)
2025-03-24 15:44:57 -07:00
Readixyee e02361c2f4 Disable nukes option (#237)
This makes it possible to disable all nukes as well as missile silos
from the game in privat lobbies and singleplayer games
2025-03-21 13:52:36 -07:00
APuddle210 2cac950574 Add gateway map to rotation (#301)
Changes made via GitHub editor. I'll test as soon as I get home ~2.5-3
hours from now.
2025-03-21 10:19:59 -07:00
evanpelle b34dd8acf2 only send desync message once per client (#300) 2025-03-20 10:38:36 -07:00
Evan bfb1c4f138 fix region env variable, fix metric name typo 2025-03-19 20:43:13 -07:00
evanpelle 2c9fc7307e fix config circular dependency (#296) 2025-03-19 15:42:47 -07:00
Evan 8e05268863 add region to worker metrics 2025-03-19 10:49:41 -07:00
Evan 9d2ca6cc89 fix prometheus metric labels 2025-03-19 10:17:48 -07:00
Evan 0169b29de1 prefix metrics with openfront 2025-03-19 10:06:56 -07:00
Evan 350ff217b6 better metrics aggregation logic 2025-03-19 08:24:28 -07:00
evanpelle 6499569240 add winston logger (#289) 2025-03-18 14:36:30 -07:00
evanpelle bd2c270ba3 fixed inverted check for game start (#288) 2025-03-18 14:18:18 -07:00
Evan 5188792cf4 delete public lobby when greater than or equal. this was causing the lobby to overfill when 2 clients joined within 250ms 2025-03-18 12:04:09 -07:00
Evan b20b6a6ba7 Merge branch 'main' of github.com:openfrontio/OpenFrontIO 2025-03-18 09:57:31 -07:00
Evan 388aafbbf5 add more aggressive headers to prevent caching the root. 2025-03-18 09:57:28 -07:00
evanpelle 70e348c94b Export prometheus metrics (#286) 2025-03-18 09:00:05 -07:00
Peter bd91d7c00b Game server ticks too much. Removed duplicate call to .tick (#271)
removes gameManager.tick as it is already ticking inside the
gameManagers contructor
2025-03-17 08:58:45 -07:00
Evan 321cf5e110 update gatekeeper 2025-03-16 20:53:51 -07:00
Evan 8cd8d5bf60 add Britannia, reduce world & europe frequency 2025-03-15 18:24:26 -07:00
Evan 364387578b fix lobby duration at 60s now that we limit lobby size. remove "high traffic time" 2025-03-15 17:22:15 -07:00
Ilan Schemoul 2dd0c56583 fix: lobby were twice as long because of dynamic timer (#252)
We previously had a system where lobbyLifetime = gameCreationRate * 2
It was to always have one lobby ready.
With dynamic timer (start if enough player or timer's over) we cannot
rely on this system (which used setInterval) so we have one lobby and
check every 100ms if we need to create another lobby.
Might add 100ms+time of creating a lobby ms latency. Which is fine I
guess.
2025-03-14 14:30:05 -07:00
Ilan Schemoul b9dad022fc fix timer (#239)
- **improve and fix dynamic lobby**
- **Revert "Change BorderTiles from Array to Set (#230)"**

I'm obviously forced to include the revert patch otherwise I can't
compile. but you should first merge PR dedicated to revert before tthis
2025-03-13 17:03:38 -07:00
Ilan Schemoul 07ad7912bc feat: timer starts if enough player or enough time (#229)
Avoid these huge lobbies
2025-03-12 14:18:34 -07:00