8000 Custom pool cycle times by applenick · Pull Request #890 · PGMDev/PGM · GitHub
[go: up one dir, main page]
More Web Proxy on the site http://driver.im/
Skip to content

Custom pool cycle times #890

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

Jump to bottom
Merged
merged 4 commits into from
Jun 20, 2021
Merged

Custom pool cycle times #890

merged 4 commits into from
Jun 20, 2021

Conversation

applenick
Copy link
Member
@applenick applenick commented Jun 18, 2021 •
edited
Loading

Custom pool cycle times

This PR allows for map pools to have custom cycle times defined in the map-pools.yml

Example map-pools.yml

pools:
  tnt:
    type: ordered
    cycle-time: 15s   # The match would cycle after 15 seconds instead of 30 in this example
    players: 1
    maps:
    - cos(tnt)
    ...

Also I included a commit which bumps adventure to 4.8.1 which resolves an error when trying to build. Not sure if it was fine to combine the two, but it saved some time. Let me know if you want a separate PR for that.

The changes to map pools have been tested and work as intended 👍

Signed-off-by: applenick applenick@users.noreply.github.com

applenick added 2 commits June 17, 2021 19:04
@applenick
Bump adventure to 4.8.1
c9a6a95 
Signed-off-by: applenick <applenick@users.noreply.github.com>
@applenick
Add per-pool cycle times
b6a7a35 
* Allow each map pool to define a custom cycle-time. When none is set or the duration is negative, pools will default to what is defined in config.yml

Signed-off-by: applenick <applenick@users.noreply.github.com>
@applenick applenick requested a review from Electroid as a code owner June 18, 2021 02:15
Pablete1234
Pablete1234 requested changes Jun 18, 2021
View reviewed changes
@applenick
Move getCycleTime to MapOrder
519eeb7 
Signed-off-by: applenick <applenick@users.noreply.github.com>
Pablete1234
Pablete1234 reviewed Jun 18, 2021
View reviewed changes
@applenick
Clean up cycle time logic
eda8284 
Signed-off-by: applenick <applenick@users.noreply.github.com>
@Electroid Electroid enabled auto-merge (squash) June 20, 2021 22:30
@Electroid Electroid disabled auto-merge June 20, 2021 22:31
@Electroid Electroid merged commit 99818dd into PGMDev:dev Jun 20, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@Electroid Electroid Electroid approved these changes

@Pablete1234 Pablete1234 Pablete1234 approved these changes

Assignees
No one assigned
Labels
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@applenick @Electroid @Pablete1234
0