fix artifact debug assert (#33171)

* fix artifact debug assert

* do the same for EffectBigIron

* 1 tab less

diff --git a/Resources/Prototypes/Entities/Objects/Specific/Xenoarchaeology/structure_artifacts.yml b/Resources/Prototypes/Entities/Objects/Specific/Xenoarchaeology/structure_artifacts.yml
index 4c3dac181608762d9b64fdfc886ffc0f109a8ea3..68947c0a71b5eae41a1620aed7d1203f5eac7013 100644 (file)
--- a/Resources/Prototypes/Entities/Objects/Specific/Xenoarchaeology/structure_artifacts.yml
+++ b/Resources/Prototypes/Entities/Objects/Specific/Xenoarchaeology/structure_artifacts.yml
@@ -5,60 +5,65 @@
   description: A strange alien device.
   abstract: true
   components:
-    - type: Sprite
-      drawdepth: SmallObjects
-      sprite: Objects/Specific/Xenoarchaeology/xeno_artifacts.rsi
-      noRot: true
-      layers:
-      - state: ano30
-        map: [ "enum.ArtifactsVisualLayers.Base" ]
-      - state: ano30_on
-        map: [ "enum.ArtifactsVisualLayers.Effect" ]
-        visible: false
-    - type: Damageable
-    - type: Physics
-      bodyType: Dynamic
-    - type: Transform
-      noRot: true
-    - type: UserInterface #needs to be here for certain effects
-      interfaces:
-        enum.StorageUiKey.Key:
-          type: StorageBoundUserInterface
-        enum.TransferAmountUiKey.Key:
-          type: TransferAmountBoundUserInterface
-        enum.InstrumentUiKey.Key:
-          type: InstrumentBoundUserInterface
-        enum.IntercomUiKey.Key:
-          type: IntercomBoundUserInterface
-    - type: Reactive
-      groups:
-        Acidic: [Touch]
-    - type: Fixtures
-      fixtures:
-        fix1:
-          shape:
-            !type:PhysShapeCircle
-            radius: 0.45
-          density: 75
-          layer: # doesn't collide with artifact storage
-          - Opaque
-          mask:
-          - MachineMask
-    - type: InteractionOutline
-    - type: Artifact
-    - type: RandomArtifactSprite
-      maxSprite: 36
-    - type: RandomSprite
-      available:
-      - enum.ArtifactsVisualLayers.Effect:
-          ano01_on: Rainbow
-    - type: Appearance
-    - type: Actions
-    - type: GuideHelp
-      guides:
-      - Xenoarchaeology
-    - type: StealTarget
-      stealGroup: XenoArtifact
+  - type: Sprite
+    drawdepth: SmallObjects
+    sprite: Objects/Specific/Xenoarchaeology/xeno_artifacts.rsi
+    noRot: true
+    layers:
+    - state: ano30
+      map: [ "enum.ArtifactsVisualLayers.Base" ]
+    - state: ano30_on
+      map: [ "enum.ArtifactsVisualLayers.Effect" ]
+      visible: false
+  - type: Damageable
+  - type: Physics
+    bodyType: Dynamic
+  - type: Transform
+    noRot: true
+  - type: UserInterface #needs to be here for certain effects
+    interfaces:
+      enum.StorageUiKey.Key:
+        type: StorageBoundUserInterface
+      enum.TransferAmountUiKey.Key:
+        type: TransferAmountBoundUserInterface
+      enum.InstrumentUiKey.Key:
+        type: InstrumentBoundUserInterface
+      enum.IntercomUiKey.Key:
+        type: IntercomBoundUserInterface
+  - type: Reactive
+    groups:
+      Acidic: [Touch]
+  - type: Fixtures
+    fixtures:
+      fix1:
+        shape:
+          !type:PhysShapeCircle
+          radius: 0.45
+        density: 75
+        layer: # doesn't collide with artifact storage
+        - Opaque
+        mask:
+        - MachineMask
+  - type: InteractionOutline
+  - type: Artifact
+  - type: RandomArtifactSprite
+    maxSprite: 36
+  - type: RandomSprite
+    available:
+    - enum.ArtifactsVisualLayers.Effect:
+        ano01_on: Rainbow
+  - type: Appearance
+  - type: Actions
+  - type: GuideHelp
+    guides:
+    - Xenoarchaeology
+  - type: StealTarget
+    stealGroup: XenoArtifact
+  - type: ContainerContainer
+    containers:
+      storagebase: !type:Container # needed for the EffectStorage artifactEffect
+        ents: [ ]
+      revolver-ammo: !type:Container # needed for the EffectBigIron artifactEffect
 
 - type: entity
   parent: BaseXenoArtifact

diff --git a/Resources/Prototypes/XenoArch/Effects/utility_effects.yml b/Resources/Prototypes/XenoArch/Effects/utility_effects.yml
index 8cf7fb0b360b9733ef0fb88fc0e8ba2f19979d77..92341a9409645c0a0d61aeea81f00fb61512a877 100644 (file)
--- a/Resources/Prototypes/XenoArch/Effects/utility_effects.yml
+++ b/Resources/Prototypes/XenoArch/Effects/utility_effects.yml
@@ -49,10 +49,6 @@
   permanentComponents:
   - type: Item
     size: Huge
-  - type: ContainerContainer
-    containers:
-      storagebase: !type:Container
-        ents: [ ]
   - type: Storage
     maxItemSize: Huge
     grid:
@@ -163,9 +159,6 @@
     components:
     - Item
   permanentComponents:
-  - type: ContainerContainer
-    containers:
-      revolver-ammo: !type:Container
   - type: RevolverAmmoProvider
     whitelist:
       tags: