events, locals, cooldown tweaks

SerbiaStrong-220 · Jan 12, 2025 · ebee5d7 · ebee5d7
1 parent ceec6ff
commit ebee5d7
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 18 deletions.
diff --git a/Content.Server/SS220/CultYogg/Sacraficials/SacraficialReplacementSystem.cs b/Content.Server/SS220/CultYogg/Sacraficials/SacraficialReplacementSystem.cs
@@ -66,8 +66,6 @@ private void OnPlayerAttached(Entity<CultYoggSacrificialComponent> ent, ref Play
             return;
         }
 
-        var meta = MetaData(ent);
-
         var ev = new CultYoggAnouncementEvent(ent, Loc.GetString("cult-yogg-sacraficial-cant-be-replaced", ("name", MetaData(ent).EntityName)));
         RaiseLocalEvent(ent, ref ev, true);
     }
@@ -89,9 +87,8 @@ private void ReplacamantStatusAnnounce(EntityUid uid)
         if (!TryComp<CultYoggSacrificialComponent>(uid, out var comp))
             return;
 
-        var meta = MetaData(uid);
-
-        var ev = new CultYoggAnouncementEvent(uid, Loc.GetString("cult-yogg-sacraficial-may-be-replaced", ("name", meta.EntityName)));
+        var time = (comp.ReplacementCooldown.TotalSeconds - comp.AnnounceReplacementCooldown.TotalSeconds).ToString();
+        var ev = new CultYoggAnouncementEvent(uid, Loc.GetString("cult-yogg-sacraficial-will-be-replaced", ("name", MetaData(uid).EntityName), ("time", time)));
         RaiseLocalEvent(uid, ref ev, true);
     }
 

diff --git a/Content.Server/SS220/GameTicking/Rules/CultYoggRuleSystem.cs b/Content.Server/SS220/GameTicking/Rules/CultYoggRuleSystem.cs
@@ -220,7 +220,7 @@ private void SetSacraficeTarget(CultYoggRuleComponent component, EntityUid? uid,
         if (mind.Session.AttachedEntity is null)
             return;
 
-        var meta = MetaData(uid.Value);
+        //var meta = MetaData(uid.Value);
 
         //_adminLogger.Add(LogType.EventRan, LogImpact.High, $"CultYogg person {meta.EntityName} where picked for a tier: {tier}");
 
@@ -295,7 +295,6 @@ private void SacraficialReplacement(ref SacraficialReplacementEvent args)
 
         RemComp<CultYoggSacrificialComponent>(args.Entity);
 
-        var meta = MetaData(args.Entity);
         var ev = new CultYoggAnouncementEvent(args.Entity, Loc.GetString("cult-yogg-sacraficial-was-replaced", ("name", MetaData(args.Entity).EntityName)));
         RaiseLocalEvent(args.Entity, ref ev, true);
     }

diff --git a/Content.Server/SS220/Telepathy/TelepathySystem.cs b/Content.Server/SS220/Telepathy/TelepathySystem.cs
@@ -32,7 +32,7 @@ public override void Initialize()
         SubscribeLocalEvent<RoundStartedEvent>(OnRoundStart);
 
         SubscribeLocalEvent<TelepathyComponent, TelepathySendEvent>(OnTelepathySend);
-        SubscribeLocalEvent<TelepathyComponent, TelepathyAnnouncementSendEvent>(OnTelepathyAnnouncementSend);
+        SubscribeLocalEvent<TelepathyAnnouncementSendEvent>(OnTelepathyAnnouncementSend);
     }
 
     private void OnRoundStart(RoundStartedEvent args)
@@ -43,7 +43,7 @@ private void OnRoundStart(RoundStartedEvent args)
         }
     }
 
-    private void OnTelepathyAnnouncementSend(Entity<TelepathyComponent> ent, ref TelepathyAnnouncementSendEvent args)
+    private void OnTelepathyAnnouncementSend(TelepathyAnnouncementSendEvent args)
     {
         SendMessageToEveryoneWithRightChannel(args.TelepathyChannel, args.Message, null);
     }
@@ -151,7 +151,9 @@ private string GetWrappedTelepathyMessage(string messageString, EntityUid? sende
         {
             return Loc.GetString(
                 "chat-manager-send-telepathy-announce",
-                ("announce", FormattedMessage.EscapeText(messageString))
+                ("announce", FormattedMessage.EscapeText(messageString)),
+                 ("channel", $"\\[{Loc.GetString(telepathyChannelParameters.Name)}\\]"),
+                ("color", telepathyChannelParameters.Color)
             );
         }
 

diff --git a/Content.Shared/SS220/CultYogg/Sacraficials/CultYoggSacrificialComponent.cs b/Content.Shared/SS220/CultYogg/Sacraficials/CultYoggSacrificialComponent.cs
@@ -31,7 +31,7 @@ public sealed partial class CultYoggSacrificialComponent : Component
     /// Time required for announcement
     /// </summary>
     [DataField]
-    public TimeSpan AnnounceReplacementCooldown = TimeSpan.FromSeconds(120);
+    public TimeSpan AnnounceReplacementCooldown = TimeSpan.FromSeconds(60);
     /// <summary>
     /// Time required for replacement
     /// </summary>

diff --git a/Resources/Locale/ru-RU/ss220/cultYogg/cult_yogg_replacement_announces.ftl b/Resources/Locale/ru-RU/ss220/cultYogg/cult_yogg_replacement_announces.ftl
@@ -1,7 +1,7 @@
-cult-yogg-migo-can-replace = Ми-Го {$name}" утерян, верните его или замените
-cult-yogg-migo-cancel-replace = Ми-Го "{$name}" вернулся к служению
-cult-yogg-sacraficial-replaced = Жертва "{$name}" была заменена
-cult-yogg-sacraficial-may-be-replaced = Жертва "{$name}" потеряла душу, в скором времени она будет заменена
-cult-yogg-sacraficial-cant-be-replaced = Жертва "{$name}" смогла вернуться к сознанию, и снова подходит как жертва
-cult-yogg-sacraficial-was-replaced = Жертва "{$name}" больше не доступна для жертвоприношения и была заменена
-cult-yogg-sacraficial-was-picked = Жертвой был выбран "{$name}"
+cult-yogg-migo-can-replace = Ми-Го {$name} утерян, верните его или замените
+cult-yogg-migo-cancel-replace = Ми-Го {$name} вернулся к служению
+cult-yogg-sacraficial-replaced = Жертва {$name} была заменена
+cult-yogg-sacraficial-will-be-replaced = Жертва {$name} потеряла душу, через {$time} секунд она будет заменена
+cult-yogg-sacraficial-cant-be-replaced = Жертва {$name} смогла вернуться к сознанию, и снова подходит как жертва
+cult-yogg-sacraficial-was-replaced = Жертва {$name} больше не доступна для жертвоприношения и была заменена
+cult-yogg-sacraficial-was-picked = Жертвой был выбран {$name}