Recycler Overhaul (#30802)

* Recycler overhaul

* remove

Resources/Prototypes/Entities/Objects/Devices/Circuitboards/Machine/production.yml

@@ -951,20 +951,6 @@
       Manipulator: 1
       Steel: 1
 
-- type: entity
-  id: MaterialReclaimerMachineCircuitboard
-  parent: BaseMachineCircuitboard
-  name: material reclaimer machine board
-  components:
-    - type: Sprite
-      state: supply
-    - type: MachineBoard
-      prototype: MaterialReclaimer
-      stackRequirements:
-        Manipulator: 2
-        Steel: 5
-        Plastic: 5
-
 - type: entity
   id: OreProcessorMachineCircuitboard
   parent: BaseMachineCircuitboard

Resources/Prototypes/Entities/Structures/Machines/lathe.yml

@@ -419,7 +419,6 @@
     - AutolatheMachineCircuitboard
     - CircuitImprinterMachineCircuitboard
     - OreProcessorMachineCircuitboard
-    - MaterialReclaimerMachineCircuitboard
     - ElectrolysisUnitMachineCircuitboard
     - CentrifugeMachineCircuitboard
     - ChemDispenserMachineCircuitboard

Resources/Prototypes/Entities/Structures/Machines/material_reclaimer.yml

@@ -1,103 +0,0 @@
-- type: entity
-  parent: [ BaseMachinePowered, ConstructibleMachine ]
-  id: MaterialReclaimer
-  name: material reclaimer
-  description: Cannot reclaim immaterial things, like motivation.
-  components:
-  - type: Sprite
-    sprite: Structures/Machines/material_reclaimer.rsi
-    snapCardinals: true
-    layers:
-    - state: icon
-      map: ["enum.LatheVisualLayers.IsRunning"]
-    - state: gear-active
-      map: ["enum.DamageStateVisualLayers.Base"]
-    - state: unlit
-      shader: unshaded
-      map: ["enum.PowerDeviceVisualLayers.Powered"]
-    - state: fill-6
-      map: ["enum.SolutionContainerLayers.Fill"]
-      visible: false
-    - state: panel
-      map: ["enum.WiresVisualLayers.MaintenancePanel"]
-  - type: Appearance
-  - type: SolutionContainerVisuals
-    maxFillLevels: 6
-    fillBaseName: fill-
-  - type: WiresVisuals
-  - type: GenericVisualizer
-    visuals:
-      enum.PowerDeviceVisuals.Powered:
-        enum.DamageStateVisualLayers.Base:
-          True: { state: gear-active}
-          False: { state: gear-idle }
-        enum.PowerDeviceVisualLayers.Powered:
-          True: { visible: true }
-          False: { visible: false }
-  - type: LitOnPowered
-  - type: PointLight
-    radius: 1.5
-    energy: 1.6
-    enabled: false
-    color: "#da824d"
-    mask: /Textures/Effects/LightMasks/cone.png
-    autoRot: true
-    offset: "0, 0.4"
-    castShadows: false
-  - type: PowerSwitch
-  - type: Destructible
-    thresholds:
-    - trigger:
-        !type:DamageTrigger
-        damage: 100
-      behaviors:
-      - !type:PlaySoundBehavior
-        sound:
-          collection: MetalGlassBreak
-      - !type:ChangeConstructionNodeBehavior
-        node: machineFrame
-      - !type:DoActsBehavior
-        acts: ["Destruction"]
-  - type: Machine
-    board: MaterialReclaimerMachineCircuitboard
-  - type: WiresPanel
-  - type: MaterialReclaimer
-    whitelist:
-      components:
-      - PhysicalComposition
-      - SpaceGarbage
-      tags:
-      - Trash
-      - Recyclable
-    blacklist:
-      components:
-      - Material
-      - Pda
-      - IdCard
-      - Brain
-      tags:
-      - HighRiskItem
-    soundCooldown: 0
-    sound:
-      path: /Audio/Ambience/Objects/crushing.ogg
-      params:
-        volume: 5
-        maxDistance: 5
-        loop: true
-  - type: MaterialStorage
-    insertOnInteract: false
-  - type: ContainerContainer
-    containers:
-      active-material-reclaimer-container: !type:Container
-      machine_board: !type:Container
-      machine_parts: !type:Container
-  - type: SolutionContainerManager
-    solutions:
-      output:
-        maxVol: 100
-  - type: DrainableSolution
-    solution: output
-  - type: ExaminableSolution
-    solution: output
-  - type: StaticPrice
-    price: 500

Resources/Prototypes/Entities/Structures/Machines/recycler.yml

@@ -56,32 +56,12 @@
     layers:
     - state: grinder-o0
       map: ["enum.RecyclerVisualLayers.Main"]
-    - state: grinder-o0bld
-      map: ["enum.RecyclerVisualLayers.Bloody"]
-      visible: false
   - type: Appearance
-  - type: GenericVisualizer
-    visuals:
-      enum.RecyclerVisuals.Bloody:
-        enum.RecyclerVisualLayers.Main:
-          True: { visible: false }
-          False: { visible: true }
-        enum.RecyclerVisualLayers.Bloody:
-          True: { visible: true }
-          False: { visible: false }
-      enum.ConveyorVisuals.State:
-        enum.RecyclerVisualLayers.Main:
-          Forward: { state: grinder-o1 }
-          Reverse: { state: grinder-o1 }
-          Off: { state: grinder-o0 }
-        enum.RecyclerVisualLayers.Bloody:
-          Forward: { state: grinder-o1bld }
-          Reverse: { state: grinder-o1bld }
-          Off: { state: grinder-o0bld }
+  - type: RecyclerVisuals
+
   - type: CollideMaterialReclaimer
   - type: MaterialReclaimer
     enabled: false
-    efficiency: 0.25
     scaleProcessSpeed: false #instant!
     minimumProcessDuration: 0
     whitelist:
@@ -104,16 +84,26 @@
       params:
         volume: -3
     cutOffSound: false
-  - type: SolutionContainerManager
-    solutions:
-      output:
-        maxVol: 0 #exists only for the overflow stuff on material reclaimer
   - type: MaterialStorage
   - type: Conveyor
   - type: Rotatable
+  - type: Repairable
+    doAfterDelay: 5
+    fuelCost: 25
+  - type: Destructible
+    thresholds:
+    - trigger:
+        !type:DamageTrigger
+        damage: 300
+      behaviors:
+      - !type:DoActsBehavior
+        acts: ["Breakage"]
+      - !type:PlaySoundBehavior
+        sound:
+          collection: MetalBreak
   - type: InteractionPopup
     successChance: 1.0
     interactSuccessString: petting-success-recycler
     interactFailureString: petting-failure-generic
     interactSuccessSound:
-      path: /Audio/Items/drill_hit.ogg
+      path: /Audio/Items/drill_hit.ogg

Resources/Prototypes/Recipes/Lathes/electronics.yml

@@ -481,15 +481,6 @@
     Steel: 100
     Glass: 500
 
-- type: latheRecipe
-  id: MaterialReclaimerMachineCircuitboard
-  result: MaterialReclaimerMachineCircuitboard
-  category: Circuitry
-  completetime: 4
-  materials:
-    Steel: 100
-    Glass: 500
-
 - type: latheRecipe
   id: OreProcessorMachineCircuitboard
   result: OreProcessorMachineCircuitboard
@@ -967,7 +958,7 @@
      Steel: 100
      Glass: 500
      Gold: 100
- 
+
 - type: latheRecipe
   id: JukeboxCircuitBoard
   result: JukeboxCircuitBoard