Fix jedi (#42)

* back triple wall * fix bubble shield * fix bubble shield 2
MetalSage · Jan 5, 2025 · a5095fe · a5095fe
1 parent 8547763
commit a5095fe
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 5 deletions.
diff --git a/Content.Shared/Weapons/Melee/SharedMeleeWeaponSystem.cs b/Content.Shared/Weapons/Melee/SharedMeleeWeaponSystem.cs
@@ -729,13 +729,29 @@ protected HashSet<EntityUid> ArcRayCast(Vector2 position, Angle angle, Angle arc
                 false)
                 .ToList();
 
-            for (var a = 0; a < res.Count; a++) // Space Stories - start
+            // Space Stories - start (ignore HeavyAttack for ProtectiveBubble)
+            /*if (res.Count != 0)
             {
-                // if (Transform(ignore).ChildEntities.Contains(res[a].HitEntity)) // Мне просто нужно, чтобы он не бил своих детей, но его удары проходили дальше.
-                //     continue;
-                resSet.Add(res[a].HitEntity);
+                resSet.Add(res[0].HitEntity);
+            }*/
+            for (var index = 0; index < res.Count; index++)
+            {
+                if(IsContains(Transform(ignore).ChildEnumerator, index))
+                    continue;
+                resSet.Add(res[index].HitEntity);
                 break;
-            }  // Space Stories - end
+            }
+
+            bool IsContains(TransformChildrenEnumerator enumerator, int index)
+            {
+                for (var a = 0; enumerator.MoveNext(out var child); a++)
+                {
+                    if (res[index].HitEntity == child)
+                        return true;
+                }
+                return false;
+            }
+            // Space Stories - end
         }
 
         return resSet;

diff --git a/Resources/Prototypes/_Stories/Actions/force/lightside.yml b/Resources/Prototypes/_Stories/Actions/force/lightside.yml
@@ -33,6 +33,7 @@
       volume: 100
       event: !type:InstantSpawnSpellEvent
         prototype: WallForceJedi
+        posData: !type:TargetInFront
 
 - type: entity
   id: ActionHibernationTrance