From 6ef592ddba336a41330eaf3760a600c805907e1d Mon Sep 17 00:00:00 2001 From: Boaz1111 <149967078+Boaz1111@users.noreply.github.com> Date: Sat, 30 Mar 2024 03:46:20 +0100 Subject: [PATCH] Industrial Reagent Grinder (#25020) * all work done * adress whitespace * millions must factorio * conflict fix * i forgot --- .../Circuitboards/Machine/production.yml | 13 ++++++ .../Entities/Structures/Machines/lathe.yml | 1 + .../Structures/Machines/reagent_grinder.yml | 42 +++++++++++++++++++ .../Entities/Structures/Machines/recycler.yml | 2 +- .../Prototypes/Recipes/Lathes/electronics.yml | 9 ++++ .../Prototypes/Research/civilianservices.yml | 1 + 6 files changed, 67 insertions(+), 1 deletion(-) diff --git a/Resources/Prototypes/Entities/Objects/Devices/Circuitboards/Machine/production.yml b/Resources/Prototypes/Entities/Objects/Devices/Circuitboards/Machine/production.yml index 093c0524b4a913..7a9e60ac566d10 100644 --- a/Resources/Prototypes/Entities/Objects/Devices/Circuitboards/Machine/production.yml +++ b/Resources/Prototypes/Entities/Objects/Devices/Circuitboards/Machine/production.yml @@ -1357,3 +1357,16 @@ materialRequirements: Steel: 5 CableHV: 2 + +- type: entity + parent: BaseMachineCircuitboard + id: ReagentGrinderIndustrialMachineCircuitboard + name: industrial reagent grinder machine board + components: + - type: MachineBoard + prototype: ReagentGrinderIndustrial + requirements: + MatterBin: 1 + Manipulator: 3 + materialRequirements: + Glass: 1 \ No newline at end of file diff --git a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml index 28bc62894e5eb7..5fbe84a3fe7335 100644 --- a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml +++ b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml @@ -451,6 +451,7 @@ - ArtifactCrusherMachineCircuitboard - TelecomServerCircuitboard - MassMediaCircuitboard + - ReagentGrinderIndustrialMachineCircuitboard - type: MaterialStorage whitelist: tags: diff --git a/Resources/Prototypes/Entities/Structures/Machines/reagent_grinder.yml b/Resources/Prototypes/Entities/Structures/Machines/reagent_grinder.yml index d19e2379972127..3bb1458b8c5037 100644 --- a/Resources/Prototypes/Entities/Structures/Machines/reagent_grinder.yml +++ b/Resources/Prototypes/Entities/Structures/Machines/reagent_grinder.yml @@ -56,3 +56,45 @@ inputContainer: !type:Container machine_board: !type:Container machine_parts: !type:Container + +- type: entity + parent: Recycler #too different so different parent + id: ReagentGrinderIndustrial + name: industrial reagent grinder + description: An industrial reagent grinder. + components: + - type: SolutionContainerManager + solutions: + output: + maxVol: 400 #*slaps roof of machine* This baby can fit so much omnizine in it + - type: MaterialReclaimer + whitelist: + components: + - Extractable #same as reagent grinder + blacklist: + tags: + - HighRiskItem #ian meat + efficiency: 0.9 + - type: Sprite + sprite: Structures/Machines/recycling.rsi + layers: + - state: grinder-b0 + - type: Machine + board: ReagentGrinderIndustrialMachineCircuitboard + - type: GenericVisualizer + visuals: + enum.ConveyorVisuals.State: + enum.RecyclerVisualLayers.Main: + Forward: { state: grinder-b1 } + Reverse: { state: grinder-b1 } + Off: { state: grinder-b0 } + - type: ContainerContainer + containers: + machine_board: !type:Container + machine_parts: !type:Container + - type: Construction + graph: Machine + node: machine + containers: + - machine_parts + - machine_board \ No newline at end of file diff --git a/Resources/Prototypes/Entities/Structures/Machines/recycler.yml b/Resources/Prototypes/Entities/Structures/Machines/recycler.yml index 814852125a005e..138795cbf132ca 100644 --- a/Resources/Prototypes/Entities/Structures/Machines/recycler.yml +++ b/Resources/Prototypes/Entities/Structures/Machines/recycler.yml @@ -116,4 +116,4 @@ interactSuccessString: petting-success-recycler interactFailureString: petting-failure-generic interactSuccessSound: - path: /Audio/Items/drill_hit.ogg + path: /Audio/Items/drill_hit.ogg \ No newline at end of file diff --git a/Resources/Prototypes/Recipes/Lathes/electronics.yml b/Resources/Prototypes/Recipes/Lathes/electronics.yml index f0c59a0bdf9151..c4417f868b56ab 100644 --- a/Resources/Prototypes/Recipes/Lathes/electronics.yml +++ b/Resources/Prototypes/Recipes/Lathes/electronics.yml @@ -956,3 +956,12 @@ Steel: 100 Glass: 900 Gold: 100 + +- type: latheRecipe + id: ReagentGrinderIndustrialMachineCircuitboard + result: ReagentGrinderIndustrialMachineCircuitboard + completetime: 5 + materials: + Steel: 100 + Glass: 900 + Gold: 100 diff --git a/Resources/Prototypes/Research/civilianservices.yml b/Resources/Prototypes/Research/civilianservices.yml index 61f95894ee69ef..79dac2751010da 100644 --- a/Resources/Prototypes/Research/civilianservices.yml +++ b/Resources/Prototypes/Research/civilianservices.yml @@ -14,6 +14,7 @@ - BorgModuleHarvesting - SeedExtractorMachineCircuitboard - HydroponicsTrayMachineCircuitboard + - ReagentGrinderIndustrialMachineCircuitboard - type: technology id: CritterMechs