fix test failures

Simple-Station · Apr 7, 2024 · f8eb4ec · f8eb4ec
1 parent f746110
commit f8eb4ec
Show file tree

Hide file tree

Showing 10 changed files with 5 additions and 39 deletions.
diff --git a/Content.Server/StationEvents/Events/FalseAlarmRule.cs b/Content.Server/StationEvents/Events/FalseAlarmRule.cs
@@ -24,7 +24,7 @@ protected override void Started(EntityUid uid, FalseAlarmRuleComponent component
         var picked = RobustRandom.Pick(allEv);
 
         _announcer.SendAnnouncement(_announcer.GetAnnouncementId(picked.ID), Filter.Broadcast(),
-            Loc.GetString(_announcer.GetEventLocaleString(picked.ID)),
+            Loc.GetString(_announcer.GetEventLocaleString(_announcer.GetAnnouncementId(picked.ID))),
             colorOverride: Color.Gold); // Parkstation-RandomAnnouncers
     }
 }
diff --git a/Content.Server/StationEvents/Events/StationEventSystem.cs b/Content.Server/StationEvents/Events/StationEventSystem.cs
@@ -74,7 +74,7 @@ protected override void Started(EntityUid uid, T component, GameRuleComponent ga
         if (stationEvent.StartAnnouncement)
         {
             _announcer.SendAnnouncement(_announcer.GetAnnouncementId(args.RuleId), Filter.Broadcast(),
-                Loc.GetString(_announcer.GetEventLocaleString(args.RuleId)),
+                Loc.GetString(_announcer.GetEventLocaleString(_announcer.GetAnnouncementId(args.RuleId))),
                 colorOverride: Color.Gold);
         }
         // Parkstation-RandomAnnouncers-End
@@ -102,8 +102,8 @@ protected override void Ended(EntityUid uid, T component, GameRuleComponent game
         // Parkstation-RandomAnnouncers-Start
         if (stationEvent.EndAnnouncement)
         {
-            _announcer.SendAnnouncement(_announcer.GetAnnouncementId(args.RuleId, true),
-                Filter.Broadcast(), Loc.GetString(_announcer.GetEventLocaleString(args.RuleId + "Complete")),
+            _announcer.SendAnnouncement(_announcer.GetAnnouncementId(args.RuleId, true), Filter.Broadcast(),
+                Loc.GetString(_announcer.GetEventLocaleString(_announcer.GetAnnouncementId(args.RuleId, true))),
                 colorOverride: Color.Gold);
         }
         // Parkstation-RandomAnnouncers-End

diff --git a/Content.Shared/Parkstation/Announcements/Systems/SharedAnnouncerSystem.cs b/Content.Shared/Parkstation/Announcements/Systems/SharedAnnouncerSystem.cs
@@ -138,7 +138,7 @@ public string GetAnnouncementId(string announcementId, bool ended = false)
     /// <param name="localeBase">Format for the locale string, replaces "{}" with the converted ID</param>
     /// <remarks>The IDs use a hardcoded format, you can probably handle other formats yourself</remarks>
     /// <returns>Localized announcement</returns>
-    public string GetEventLocaleString(string eventId, string localeBase = "station-event{}-announcement")
+    public string GetEventLocaleString(string eventId, string localeBase = "station-event-{}-announcement")
     {
         // Replace capital letters with lowercase plus a hyphen before it
         var capsCapture = new Regex("([A-Z])");

diff --git a/Resources/Prototypes/GameRules/events.yml b/Resources/Prototypes/GameRules/events.yml
@@ -4,7 +4,6 @@
   noSpawn: true
   components:
   - type: StationEvent
-    startAnnouncement: true # Parkstation-RandomAnnouncers
     weight: 12 # DeltaV - was 10
     startDelay: 30
     duration: 35
@@ -16,7 +15,6 @@
   noSpawn: true
   components:
   - type: StationEvent
-    startAnnouncement: true # Parkstation-RandomAnnouncers
     weight: 5
     startDelay: 30
     duration: 35
@@ -28,7 +26,6 @@
   noSpawn: true
   components:
   - type: StationEvent
-    startAnnouncement: true # Parkstation-RandomAnnouncers
     weight: 1
     reoccurrenceDelay: 5
     earliestStart: 1
@@ -41,7 +38,6 @@
   noSpawn: true
   components:
   - type: StationEvent
-    startAnnouncement: true # Parkstation-RandomAnnouncers
     weight: 10
     duration: 1
     minimumPlayers: 15
@@ -88,7 +84,6 @@
   noSpawn: true
   components:
   - type: StationEvent
-    startAnnouncement: true # Parkstation-RandomAnnouncers
     weight: 1 # DeltaV - was 5
     duration: 1
     earliestStart: 45
@@ -116,7 +111,6 @@
   noSpawn: true
   components:
   - type: StationEvent
-    startAnnouncement: true # Parkstation-RandomAnnouncers
     weight: 7.5
     duration: 1
     earliestStart: 45
@@ -296,7 +290,6 @@
   components:
   - type: StationEvent
     startAnnouncement: true # Parkstation-RandomAnnouncers
-    endAnnouncement: true # Parkstation-RandomAnnouncers
     earliestStart: 15
     minimumPlayers: 15
     weight: 5
@@ -310,7 +303,6 @@
   noSpawn: true
   components:
   - type: StationEvent
-    startAnnouncement: true # Parkstation-RandomAnnouncers
     startDelay: 10
     earliestStart: 15
     minimumPlayers: 15
@@ -331,7 +323,6 @@
   noSpawn: true
   components:
   - type: StationEvent
-    startAnnouncement: true # Parkstation-RandomAnnouncers
     startDelay: 10
     earliestStart: 20
     minimumPlayers: 15
@@ -352,7 +343,6 @@
   noSpawn: true
   components:
   - type: StationEvent
-    startAnnouncement: true # Parkstation-RandomAnnouncers
     startDelay: 10
     earliestStart: 20
     minimumPlayers: 15

diff --git a/Resources/Prototypes/Parkstation/Announcers/intern.yml b/Resources/Prototypes/Parkstation/Announcers/intern.yml
@@ -94,10 +94,6 @@
     #   path: events/solar_flare-complete.ogg
     # - id: ventClog # A random reagent is coming out of a scrubber
     #   path: events/vent_clog.ogg
-    # - id: ventClogComplete # The reagent has stopped coming out of the scrubber
-    #   path: events/vent_clog-complete.ogg
-    # - id: ventCritters # A species of animal are coming out of several vents
-    #   path: events/vent_critters.ogg
     # - id: slimesSpawn # Some simple slimes are appearing in vents
     #   path: events/slimes_spawn.ogg
     # - id: spiderSpawn # Some simple spiders are appearing in vents

diff --git a/Resources/Prototypes/Parkstation/Announcers/medbot.yml b/Resources/Prototypes/Parkstation/Announcers/medbot.yml
@@ -92,10 +92,6 @@
     #   path: events/solar_flare-complete.ogg
     # - id: ventClog # A random reagent is coming out of a scrubber
     #   path: events/vent_clog.ogg
-    # - id: ventClogComplete # The reagent has stopped coming out of the scrubber
-    #   path: events/vent_clog-complete.ogg
-    # - id: ventCritters # A species of animal are coming out of several vents
-    #   path: events/vent_critters.ogg
     # - id: slimesSpawn # Some simple slimes are appearing in vents
     #   path: events/slimes_spawn.ogg
     # - id: spiderSpawn # Some simple spiders are appearing in vents

diff --git a/Resources/Prototypes/Parkstation/Announcers/michael.yml b/Resources/Prototypes/Parkstation/Announcers/michael.yml
@@ -94,10 +94,6 @@
     #   path: events/solar_flare-complete.ogg
     - id: ventClog # A random reagent is coming out of a scrubber
       path: events/vent_clog.ogg
-    # - id: ventClogComplete # The reagent has stopped coming out of the scrubber
-    #   path: events/vent_clog-complete.ogg
-    # - id: ventCritters # A species of animal are coming out of several vents
-    #   path: events/vent_critters.ogg
     # - id: slimesSpawn # Some simple slimes are appearing in vents
     #   path: events/slimes_spawn.ogg
     # - id: spiderSpawn # Some simple spiders are appearing in vents

diff --git a/Resources/Prototypes/Parkstation/Announcers/neil.yml b/Resources/Prototypes/Parkstation/Announcers/neil.yml
@@ -94,10 +94,6 @@
     #   path: events/solar_flare-complete.ogg
     - id: ventClog # A random reagent is coming out of a scrubber
       path: events/vent_clog.ogg
-    # - id: ventClogComplete # The reagent has stopped coming out of the scrubber
-    #   path: events/vent_clog-complete.ogg
-    # - id: ventCritters # A species of animal are coming out of several vents
-    #   path: events/vent_critters.ogg
     # - id: slimesSpawn # Some simple slimes are appearing in vents
     #   path: events/slimes_spawn.ogg
     # - id: spiderSpawn # Some simple spiders are appearing in vents

diff --git a/Resources/Prototypes/Parkstation/Announcers/template b/Resources/Prototypes/Parkstation/Announcers/template
@@ -118,10 +118,6 @@
       path: events/solar_flare-complete.ogg
     - id: ventClog # A random reagent is coming out of a scrubber
       path: events/vent_clog.ogg
-    - id: ventClogComplete # The reagent has stopped coming out of the scrubber
-      path: events/vent_clog-complete.ogg
-    - id: ventCritters # A species of animal are coming out of several vents
-      path: events/vent_critters.ogg
     - id: slimesSpawn # Some simple slimes are appearing in vents
       path: events/slimes_spawn.ogg
     - id: spiderSpawn # Some simple spiders are appearing in vents

diff --git a/Resources/Prototypes/Parkstation/Announcers/voxfem.yml b/Resources/Prototypes/Parkstation/Announcers/voxfem.yml
@@ -92,10 +92,6 @@
     #   path: events/solar_flare-complete.ogg
     # - id: ventClog # A random reagent is coming out of a scrubber
     #   path: events/vent_clog.ogg
-    # - id: ventClogComplete # The reagent has stopped coming out of the scrubber
-    #   path: events/vent_clog-complete.ogg
-    # - id: ventCritters # A species of animal are coming out of several vents
-    #   path: events/vent_critters.ogg
     # - id: slimesSpawn # Some simple slimes are appearing in vents
     #   path: events/slimes_spawn.ogg
     # - id: spiderSpawn # Some simple spiders are appearing in vents