Dev (#327)

edgegamers · Dec 18, 2024 · 2615317 · 2615317
2 parents 9caf801 + b967bb2
commit 2615317
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 8 deletions.
diff --git 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

diff --git 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;
     }
   }
-}
+}
diff --git 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;
     }
   }
-}
+}