From a883d032c0782aef002916f49752896fb850f69c Mon Sep 17 00:00:00 2001 From: MSWS Date: Mon, 16 Dec 2024 00:15:38 -0800 Subject: [PATCH 1/3] Add concurrency restriction --- .github/workflows/nightly.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml index f4ff3466..838bec3b 100644 --- a/.github/workflows/nightly.yml +++ b/.github/workflows/nightly.yml @@ -5,6 +5,10 @@ name: Nightlies on: [push, pull_request] +concurrency: + group: ${{ github.workflow }}-${{ github.ref }} + cancel-in-progress: true + jobs: build: runs-on: ubuntu-latest From b41b62e00f7e1b74dac01f8a7896af23d84681fe Mon Sep 17 00:00:00 2001 From: Markiscool2 <117500951+Markiscool2@users.noreply.github.com> Date: Tue, 17 Dec 2024 22:34:16 -0800 Subject: [PATCH 2/3] Make FFA Starting Time Longer From 20 seconds to 40 seconds starting time --- mod/Jailbreak.SpecialDay/SpecialDays/FFADay.cs | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/mod/Jailbreak.SpecialDay/SpecialDays/FFADay.cs b/mod/Jailbreak.SpecialDay/SpecialDays/FFADay.cs index e7e64cd3..21401a03 100644 --- a/mod/Jailbreak.SpecialDay/SpecialDays/FFADay.cs +++ b/mod/Jailbreak.SpecialDay/SpecialDays/FFADay.cs @@ -17,9 +17,10 @@ public virtual ISDInstanceLocale Locale "Everyone for themselves! No camping, actively pursue!"); public override void Setup() { - Timers[10] += () => Locale.BeginsIn(10).ToAllChat(); - Timers[15] += () => Locale.BeginsIn(5).ToAllChat(); - Timers[20] += Execute; + Timers[20] += () => Locale.BeginsIn(20).ToAllChat(); + Timers[30] += () => Locale.BeginsIn(10).ToAllChat(); + Timers[35] += () => Locale.BeginsIn(5).ToAllChat(); + Timers[40] += Execute; base.Setup(); } @@ -43,4 +44,4 @@ public override float FreezeTime(CCSPlayerController player) { return rng.NextSingle() * 5 + 2; } } -} \ No newline at end of file +} From 476c3daa53b62380a22e2c23b36c18ef673f5c0f Mon Sep 17 00:00:00 2001 From: Markiscool2 <117500951+Markiscool2@users.noreply.github.com> Date: Tue, 17 Dec 2024 22:36:35 -0800 Subject: [PATCH 3/3] Warday Starting Time Increase From 30 seconds to 50 seconds starting time --- mod/Jailbreak.SpecialDay/SpecialDays/WardayDay.cs | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/mod/Jailbreak.SpecialDay/SpecialDays/WardayDay.cs b/mod/Jailbreak.SpecialDay/SpecialDays/WardayDay.cs index b40aaa77..4d0c4137 100644 --- a/mod/Jailbreak.SpecialDay/SpecialDays/WardayDay.cs +++ b/mod/Jailbreak.SpecialDay/SpecialDays/WardayDay.cs @@ -19,9 +19,10 @@ public class WardayDay(BasePlugin plugin, IServiceProvider provider) public ISDInstanceLocale Locale => new WardayInstanceLocale(); public override void Setup() { - Timers[15] += () => Locale.BeginsIn(15).ToAllChat(); - Timers[30] += () => Locale.BeginsIn(5).ToAllChat(); - Timers[35] += Execute; + Timers[20] += () => Locale.BeginsIn(30).ToAllChat(); + Timers[35] += () => Locale.BeginsIn(15).ToAllChat(); + Timers[45] += () => Locale.BeginsIn(5).ToAllChat(); + Timers[50] += Execute; Timers[120] += () => msg.ExpandIn(30).ToAllChat(); Timers[150] += () => { msg.ExpandNow.ToAllChat(); @@ -48,4 +49,4 @@ public override float FreezeTime(CCSPlayerController player) { return player.Team == CsTeam.CounterTerrorist ? 3 : 5; } } -} \ No newline at end of file +}