Фиксы (#332)

* - fix: Fix desword flipping on server.

* - fix: Fix invalid cult target.

* - fix: Fix narsie summon.

* - tweak: Weaker heavy attack.

* - tweak: Less toy desword stamina damage.

* - fix: FrameUpdate.

* - tweak: Less blunt bleed.

Content.Server/_White/Animations/FlipOnHitSystem.cs

@@ -0,0 +1,17 @@
+using Content.Shared._White.Animations;
+using Robust.Shared.Player;
+
+namespace Content.Server._White.Animations;
+
+public sealed class FlipOnHitSystem : SharedFlipOnHitSystem
+{
+    protected override void PlayAnimation(EntityUid user)
+    {
+        var filter = Filter.Pvs(user, entityManager: EntityManager);
+
+        if (TryComp<ActorComponent>(user, out var actor))
+            filter.RemovePlayer(actor.PlayerSession);
+
+        RaiseNetworkEvent(new FlipOnHitEvent(GetNetEntity(user)), filter);
+    }
+}

Content.Server/_White/Cult/GameRule/CultRuleSystem.cs

@@ -123,25 +123,34 @@ public sealed class CultRuleSystem : GameRuleSystem<CultRuleComponent>
 
     private void OnNarsieSummon(CultNarsieSummoned ev)
     {
-        var query = EntityQueryEnumerator<MobStateComponent, MindContainerComponent, CultistComponent>();
+        var query =
+            EntityQueryEnumerator<MobStateComponent, MindContainerComponent, CultistComponent, TransformComponent>();
+
+        List<Entity<MindContainerComponent, TransformComponent>> cultists = new();
+
+        while (query.MoveNext(out var uid, out _, out var mindContainer, out _, out var transform))
+        {
+            cultists.Add((uid, mindContainer, transform));
+        }
+
         var rulesQuery = QueryActiveRules();
         while (rulesQuery.MoveNext(out _, out var cult, out _))
         {
             cult.WinCondition = CultWinCondition.Win;
             _roundEndSystem.EndRound();
 
-            while (query.MoveNext(out var uid, out _, out var mindContainer, out _))
+            foreach (var ent in cultists)
             {
-                if (!mindContainer.HasMind || mindContainer.Mind is null)
-                {
+                if (ent.Comp1.Mind is null)
                     continue;
-                }
 
-                var reaper = Spawn(cult.ReaperPrototype, Transform(uid).Coordinates);
-                _mindSystem.TransferTo(mindContainer.Mind.Value, reaper);
+                var reaper = Spawn(cult.ReaperPrototype, ent.Comp2.Coordinates);
+                _mindSystem.TransferTo(ent.Comp1.Mind.Value, reaper);
 
-                _bodySystem.GibBody(uid);
+                _bodySystem.GibBody(ent);
             }
+
+            return;
         }
     }
 
@@ -211,13 +220,13 @@ public sealed class CultRuleSystem : GameRuleSystem<CultRuleComponent>
 
         var selectedCultists = _antagSelection.ChooseAntags(cultistsToSelect, eligiblePlayers);
 
+        var potentialTargets = FindPotentialTargets(selectedCultists);
+        rule.CultTarget = _random.PickAndTake(potentialTargets).Mind;
+
         foreach (var cultist in selectedCultists)
         {
             MakeCultist(cultist, rule);
         }
-
-        var potentialTargets = FindPotentialTargets(selectedCultists);
-        rule.CultTarget = _random.PickAndTake(potentialTargets).Mind;
     }
 
     public MindComponent? GetTarget()

Content.Server/_White/Other/RandomDamageSystem/RandomDamageSystem.cs

@@ -22,7 +22,7 @@ public sealed class RandomDamageSystem : EntitySystem
     {
         var damage = _random.NextFloat() * ent.Comp.Max;
         if (args.Direction != null) // Heavy attack
-            damage *= 0.7f;
+            damage *= 0.5f;
         args.BonusDamage = new DamageSpecifier(_prototypeManager.Index<DamageTypePrototype>("Slash"), damage);
     }
 }