comments/clean

WWhiteDreamProject · Sep 13, 2024 · f9aa5be · f9aa5be
1 parent 4b6c7ed
commit f9aa5be
Show file tree

Hide file tree

Showing 18 changed files with 28 additions and 25 deletions.
diff --git a/Content.Shared/StepTrigger/Components/StepTriggerComponent.cs b/Content.Shared/StepTrigger/Components/StepTriggerComponent.cs
@@ -62,6 +62,7 @@ public sealed partial class StepTriggerComponent : Component
     /// <summary>
     /// If TriggerGroups is specified, it will check StepTriggerImmunityComponent to have the same TriggerType to activate immunity
     /// </summary>
+    // WD EDIT
     [DataField]
     public StepTriggerGroup? TriggerGroups;
 }

diff --git a/Content.Shared/StepTrigger/Prototypes/StepTriggerGroup.cs b/Content.Shared/StepTrigger/Prototypes/StepTriggerGroup.cs
@@ -7,9 +7,10 @@
 namespace Content.Shared.StepTrigger.Prototypes
 {
     /// <summary>
-    ///A group of <see cref="StepTriggerTypePrototype">
-    ///Used to determine StepTriggerTypes like Tags.
-    ///Used for better work with Immunity
+    /// A group of <see cref="StepTriggerTypePrototype">
+    /// Used to determine StepTriggerTypes like Tags.
+    /// Used for better work with Immunity.
+    /// WD EDIT
     /// </summary>
     /// <code>
     /// stepTriggerGroup:

diff --git a/Content.Shared/StepTrigger/Prototypes/StepTriggerTypePrototype.cs b/Content.Shared/StepTrigger/Prototypes/StepTriggerTypePrototype.cs
@@ -2,6 +2,12 @@
 
 namespace Content.Shared.StepTrigger.Prototypes
 {
+    /// <summary>
+    ///     Prototype representing a StepTriggerType in YAML.
+    ///     Meant to only have an ID property, as that is the only thing that
+    ///     gets saved in StepTriggerGroup.
+    /// </summary>
+    // WD EDIT
     [Prototype("StepTriggerType")]
     public sealed partial class StepTriggerTypePrototype : IPrototype
     {

diff --git a/Content.Shared/StepTrigger/Systems/StepTriggerSystem.cs b/Content.Shared/StepTrigger/Systems/StepTriggerSystem.cs
@@ -119,13 +119,7 @@ private void UpdateColliding(EntityUid uid, StepTriggerComponent component, Tran
 
     private bool CanTrigger(EntityUid uid, EntityUid otherUid, StepTriggerComponent component)
     {
-        /*
-        if (HasComp<StepTriggerImmuneComponent>(otherUid)
-            || !component.Active
-            || component.CurrentlySteppedOn.Contains(otherUid))
-            return false;
-            */
-
+        // WD EDIT START
         if (!component.Active
             || component.CurrentlySteppedOn.Contains(otherUid))
             return false;
@@ -142,6 +136,7 @@ private bool CanTrigger(EntityUid uid, EntityUid otherUid, StepTriggerComponent
                 }
             }
         }
+        // WD EDIT END
 
         // Can't trigger if we don't ignore weightless entities
         // and the entity is flying or currently weightless

diff --git a/Resources/Prototypes/Entities/Effects/chemistry_effects.yml b/Resources/Prototypes/Entities/Effects/chemistry_effects.yml
@@ -77,7 +77,7 @@
     animationState: foam-dissolve
   - type: Slippery
   - type: StepTrigger
-    triggerGroups:
+    triggerGroups: # WD EDIT
       types:
       - Liquid
   # disabled until foam reagent duplication is fixed
@@ -138,7 +138,7 @@
   - type: RCDDeconstructable
     cost: 2
     delay: 2
-    fx: EffectRCDDeconstruct2  
+    fx: EffectRCDDeconstruct2
   - type: Clickable
   - type: InteractionOutline
   - type: Sprite

diff --git a/Resources/Prototypes/Entities/Mobs/Player/ipc.yml b/Resources/Prototypes/Entities/Mobs/Player/ipc.yml
@@ -111,7 +111,7 @@
   - type: OfferItem
   - type: LayingDown
   - type: Carriable
-  - type: StepTriggerImmune
+  - type: StepTriggerImmune #WD EDIT
     whitelist:
       types:
       - Shard

diff --git a/Resources/Prototypes/Entities/Mobs/Species/harpy.yml b/Resources/Prototypes/Entities/Mobs/Species/harpy.yml
@@ -119,7 +119,7 @@
     - GalacticCommon
     - SolCommon
   - type: StepTriggerImmune
-    whitelist:
+    whitelist: # WD EDIT
       types:
       - Shard
       - Liquid

diff --git a/Resources/Prototypes/Entities/Objects/Devices/mousetrap.yml b/Resources/Prototypes/Entities/Objects/Devices/mousetrap.yml
@@ -13,7 +13,7 @@
     - type: StepTrigger
       intersectRatio: 0.2
       requiredTriggeredSpeed: 0
-      triggerGroups:
+      triggerGroups: # WD EDIT
         types:
         - Mousetrap
     - type: Mousetrap

diff --git a/Resources/Prototypes/Entities/Objects/Devices/pda.yml b/Resources/Prototypes/Entities/Objects/Devices/pda.yml
@@ -272,7 +272,7 @@
     paralyzeTime: 4
     launchForwardsMultiplier: 1.5
   - type: StepTrigger
-    triggerGroups:
+    triggerGroups: # WD EDIT
       types:
       - Soap
   - type: CollisionWake

diff --git a/Resources/Prototypes/Entities/Objects/Materials/shards.yml b/Resources/Prototypes/Entities/Objects/Materials/shards.yml
@@ -64,7 +64,7 @@
       - !type:DoActsBehavior
         acts: [ "Destruction" ]
   - type: StepTrigger
-    triggerGroups:
+    triggerGroups: # WD EDIT
       types:
       - Shard
     intersectRatio: 0.2

diff --git a/Resources/Prototypes/Entities/Objects/Misc/land_mine.yml b/Resources/Prototypes/Entities/Objects/Misc/land_mine.yml
@@ -40,7 +40,7 @@
         params:
             maxDistance: 10
   - type: StepTrigger
-    triggerGroups:
+    triggerGroups: # WD EDIT
       types:
       - Landmine
     requiredTriggeredSpeed: 0

diff --git a/Resources/Prototypes/Entities/Objects/Specific/Janitorial/soap.yml b/Resources/Prototypes/Entities/Objects/Specific/Janitorial/soap.yml
@@ -24,7 +24,7 @@
     paralyzeTime: 2
     launchForwardsMultiplier: 1.5
   - type: StepTrigger
-    triggerGroups:
+    triggerGroups: # WD EDIT
       types:
       - Soap
     intersectRatio: 0.2

diff --git a/Resources/Prototypes/Entities/Tiles/bananium.yml b/Resources/Prototypes/Entities/Tiles/bananium.yml
@@ -47,7 +47,7 @@
     paralyzeTime: 2
     launchForwardsMultiplier: 1.5
   - type: StepTrigger
-    triggerGroups:
+    triggerGroups: # WD EDIT
       types:
       - Banana
     intersectRatio: 0.2

diff --git a/Resources/Prototypes/Entities/Tiles/chasm.yml b/Resources/Prototypes/Entities/Tiles/chasm.yml
@@ -14,7 +14,7 @@
     blacklist:
       tags:
       - Catwalk
-    triggerGroup:
+    triggerGroup: # WD EDIT
       types:
       - Chasm
   - type: Transform

diff --git a/Resources/Prototypes/Entities/Tiles/lava.yml b/Resources/Prototypes/Entities/Tiles/lava.yml
@@ -13,7 +13,7 @@
     blacklist:
       tags:
         - Catwalk
-    triggerGroups:
+    triggerGroups: # WD EDIT
       types:
         - Lava
   - type: Lava

diff --git a/Resources/Prototypes/Entities/Tiles/liquid_plasma.yml b/Resources/Prototypes/Entities/Tiles/liquid_plasma.yml
@@ -13,7 +13,7 @@
     blacklist:
       tags:
       - Catwalk
-    triggerGroups:
+    triggerGroups: # WD EDIT
       types:
       - Liquid
   - type: Lava

diff --git a/Resources/Prototypes/Nyanotrasen/Entities/Mobs/Species/felinid.yml b/Resources/Prototypes/Nyanotrasen/Entities/Mobs/Species/felinid.yml
@@ -80,7 +80,7 @@
     stripTimeReduction: 0
     stripTimeMultiplier: 0.667
   - type: StepTriggerImmune
-    whitelist:
+    whitelist: # WD EDIT
       types:
         - Shard
         - Liquid

diff --git a/Resources/Prototypes/Traits/skills.yml b/Resources/Prototypes/Traits/skills.yml
@@ -270,7 +270,7 @@
   points: -3
   components:
     - type: StepTriggerImmune
-      whitelist:
+      whitelist: # WD EDIT
         types:
         - Shard
         - Liquid