[REMOVE] BloodBrother

Content.Server/ADT/Changeling/Systems/ChangelingSystem.Useful.cs

@@ -20,7 +20,6 @@
 using Content.Shared.ADT.Stealth.Components;
 using Content.Server.Medical;
 using Content.Shared.Heretic;
-using Content.Shared.ADT.BloodBrothers;
 using Content.Shared.Medical;
 
 namespace Content.Server.Changeling.EntitySystems;
@@ -190,16 +189,6 @@ private void OnAbsorbDoAfter(EntityUid uid, ChangelingComponent component, Absor
                     _store.UpdateUserInterface(uid, uid, store);
                 }
             }
-            if (TryComp<BloodBrotherLeaderComponent>(target, out var bro))
-            {
-                var selfMessage = Loc.GetString("changeling-dna-success-bro", ("target", Identity.Entity(target, EntityManager)));
-                _popup.PopupEntity(selfMessage, uid, uid, PopupType.Medium);
-                if (TryComp<StoreComponent>(uid, out var store))
-                {
-                    _store.TryAddCurrency(new Dictionary<string, FixedPoint2> { { "EvolutionPoints", bro.ConvertedCount } }, uid, store);
-                    _store.UpdateUserInterface(uid, uid, store);
-                }
-            }
             if (HasComp<ChangelingComponent>(target)) // Если это был другой генокрад, получим моментально 5 очков эволюции
             {
                 var selfMessage = Loc.GetString("changeling-dna-success-ling", ("target", Identity.Entity(target, EntityManager)));

Content.Server/ADT/Heretic/Ritual/CustomBehavior.AscensionSacrifice.cs

@@ -6,7 +6,6 @@
 using Content.Server.Medical.SuitSensors;
 using Content.Server.Objectives.Components;
 using Content.Server.Revolutionary.Components;
-using Content.Shared.ADT.BloodBrothers;
 using Content.Shared.Changeling.Components;
 using Content.Shared.Chat;
 using Content.Shared.Damage.Systems;
@@ -115,8 +114,6 @@ public override void Finalize(RitualData args)
                 knowledgeGain += Math.Min(2, heretic.PathStage / 2 - 1);
             if (args.EntityManager.HasComponent<ChangelingComponent>(uids[i]))
                 knowledgeGain += 2;
-            if (args.EntityManager.TryGetComponent<BloodBrotherLeaderComponent>(uids[i], out var bro))
-                knowledgeGain += bro.ConvertedCount / 2;
             if (args.EntityManager.TryGetComponent<HeadRevolutionaryComponent>(uids[i], out var rev))
                 knowledgeGain += rev.ConvertedCount / 3;
 

Content.Server/ADT/Heretic/Ritual/CustomBehavior.Sacrifice.cs

@@ -6,7 +6,6 @@
 using Content.Server.Medical.SuitSensors;
 using Content.Server.Objectives.Components;
 using Content.Server.Revolutionary.Components;
-using Content.Shared.ADT.BloodBrothers;
 using Content.Shared.Changeling.Components;
 using Content.Shared.Chat;
 using Content.Shared.Damage.Systems;
@@ -102,7 +101,6 @@ private bool IsAntagonist(IEntityManager entMan, EntityUid uid)
     {
         return entMan.HasComponent<HereticComponent>(uid)
             || entMan.HasComponent<ChangelingComponent>(uid)
-            || entMan.HasComponent<BloodBrotherLeaderComponent>(uid)
             || entMan.HasComponent<HeadRevolutionaryComponent>(uid);
     }
 
@@ -125,8 +123,6 @@ public override void Finalize(RitualData args)
                 knowledgeGain += Math.Min(2, heretic.PathStage / 2 - 1);
             if (args.EntityManager.HasComponent<ChangelingComponent>(uids[i]))
                 knowledgeGain += 2;
-            if (args.EntityManager.TryGetComponent<BloodBrotherLeaderComponent>(uids[i], out var bro))
-                knowledgeGain += bro.ConvertedCount / 2;
             if (args.EntityManager.TryGetComponent<HeadRevolutionaryComponent>(uids[i], out var rev))
                 knowledgeGain += rev.ConvertedCount / 3;
             // Ganimed

Content.Server/Administration/Systems/AdminVerbSystem.Antags.cs

@@ -22,7 +22,6 @@ public sealed partial class AdminVerbSystem
     [Dependency] private readonly GameTicker _gameTicker = default!;
     [Dependency] private readonly OutfitSystem _outfit = default!;
 
-    private static readonly EntProtoId DefaultBloodBrotherRule = "BloodBrother"; //ADT-tweak
     private static readonly EntProtoId DefaultTraitorRule = "TraitorOnly"; //ADT-tweak
     private static readonly EntProtoId DefaultInitialInfectedRule = "Zombie";
     private static readonly EntProtoId DefaultNukeOpRule = "LoneOpsSpawn";
@@ -186,22 +185,6 @@ private void AddAntagVerbs(GetVerbsEvent<Verb> args)
         args.Verbs.Add(changeling);
         // ADT-Changeling-Tweak-End
 
-        // ADT-blood-brothers-Tweak-Start
-        Verb bloodBrother = new()
-        {
-            Text = Loc.GetString("admin-verb-make-brother"),
-            Category = VerbCategory.Antag,
-            Icon = new SpriteSpecifier.Rsi(new ResPath("/Textures/ADT/Interface/Misc/job_icons.rsi"), "BloodBrotherLead"),
-            Act = () =>
-            {
-                _antag.ForceMakeAntag<TraitorRuleComponent>(targetPlayer, DefaultBloodBrotherRule);
-            },
-            Impact = LogImpact.High,
-            Message = string.Join(": ", traitorName, Loc.GetString("admin-verb-make-brother")),
-        };
-        args.Verbs.Add(bloodBrother);
-        // ADT-blood-brothers-Tweak-End
-
         // Paradox clone
         var paradoxCloneName = Loc.GetString("admin-verb-text-make-paradox-clone");
         Verb paradox = new()

Content.Server/GameTicking/Rules/Components/TraitorRuleComponent.cs

@@ -35,19 +35,6 @@ public sealed partial class TraitorRuleComponent : Component
     /// </summary>
     [DataField]
     public bool GiveUplink = true;
-    //ADT-tweak-start
-    /// <summary>
-    /// Шанс на бразерс вместо трейтора
-    /// </summary>
-    // ADT-Tweak-Start
-    /// <summary>
-    /// Вероятность того, что предатель станет лидером кровных братьев вместо получения аплинка.
-    /// </summary>
-    [DataField]
-    public float BloodBrotherChance = 0f;
-    public ProtoId<NpcFactionPrototype> BloodBrotherFaction = "BloodBrotherFaction"; //ADT-tweak
-    public ProtoId<NpcFactionPrototype> BloodBrotherLeaderFaction = "BloodBrotherLeaderFaction"; //ADT-tweak
-    // ADT-Tweak-End
 
     /// <summary>
     /// Give this traitor the codewords.

Content.Server/GameTicking/Rules/TraitorRuleSystem.cs

@@ -18,7 +18,6 @@
 using System.Linq;
 using System.Text;
 using Content.Server.Codewords;
-using Content.Shared.ADT.BloodBrothers;
 using Content.Shared.Bed.Cryostorage;
 
 namespace Content.Server.GameTicking.Rules;
@@ -64,11 +63,9 @@ public bool MakeTraitor(EntityUid traitor, TraitorRuleComponent component)
             Log.Debug($"MakeTraitor {ToPrettyString(traitor)}  - failed, no Mind found");
             return false;
         }
-        var bloodBrother = _random.Prob(component.BloodBrotherChance);//ADT-tweak
         var briefing = "";
 
-        if (component.GiveCodewords
-         && !bloodBrother) //ADT-tweak
+        if (component.GiveCodewords)
         {
             Log.Debug($"MakeTraitor {ToPrettyString(traitor)} - added codewords flufftext to briefing");
             briefing = Loc.GetString("traitor-role-codewords-short", ("codewords", string.Join(", ", factionCodewords)));
@@ -79,8 +76,7 @@ public bool MakeTraitor(EntityUid traitor, TraitorRuleComponent component)
         // Uplink code will go here if applicable, but we still need the variable if there aren't any
         Note[]? code = null;
 
-        if (component.GiveUplink
-        && !bloodBrother)//ADT-tweak
+        if (component.GiveUplink)
         {
             Log.Debug($"MakeTraitor {ToPrettyString(traitor)} - Uplink start");
             // Calculate the amount of currency on the uplink.
@@ -102,29 +98,17 @@ public bool MakeTraitor(EntityUid traitor, TraitorRuleComponent component)
         }
 
         string[]? codewords = null;
-        if (component.GiveCodewords
-         && !bloodBrother) //ADT-tweak
+        if (component.GiveCodewords)
         {
             Log.Debug($"MakeTraitor {ToPrettyString(traitor)} - set codewords from component");
             codewords = factionCodewords;
         }
 
-        if (component.GiveBriefing && !bloodBrother) //ADT-tweak
+        if (component.GiveBriefing)
         {
             _antag.SendBriefing(traitor, GenerateBriefing(codewords, code, issuer), null, component.GreetSoundNotification);
             Log.Debug($"MakeTraitor {ToPrettyString(traitor)} - Sent the Briefing");
         }
-        //ADT-tweak-start
-        else if (component.GiveBriefing && bloodBrother)
-        {
-            _antag.SendBriefing(traitor, Loc.GetString("brother-lead-briefing"), null, component.GreetSoundNotification);
-            Log.Debug($"MakeBrother {ToPrettyString(traitor)} - Sent the Briefing");
-            EnsureComp<BloodBrotherLeaderComponent>(traitor); //лидера ВСЕГДА должно выдавать прежде чем простого брата
-            EnsureComp<BloodBrotherComponent>(traitor);
-            _npcFaction.AddFaction(traitor, component.BloodBrotherFaction);
-            _npcFaction.AddFaction(traitor, component.BloodBrotherLeaderFaction);
-        }
-        //ADT-tweak-end
 
         Log.Debug($"MakeTraitor {ToPrettyString(traitor)} - Adding TraitorMind");
         component.TraitorMinds.Add(mindId);