juni/crystall-punk-14
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove capacitors and matter bins (#37725)

Browse Source 
* Remove capacitors and matter bins

* fix migrations and yaml errors, remove parts fully

* Rename to "modular machine part"

* Sloth review
This commit is contained in:
Simon
2025-05-27 13:47:49 +02:00
committed by GitHub
parent a371c15748
commit 2bbe66cea9
22 changed files with 102 additions and 200 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Resources/Prototypes/Entities/Markers/Spawners/Random/Department/science.yml
View File

@@ -26,8 +26,6 @@
- PowerCellSmall
- PowerCellMedium
- FlashlightLantern
- MatterBinStockPart
- CapacitorStockPart
- MicroManipulatorStockPart
- Beaker
chance: 0.8
@@ -63,8 +61,6 @@
- id: SheetGlass10
- id: ToolboxElectricalFilled
- id: ToolboxMechanicalFilled
- id: MatterBinStockPart
- id: CapacitorStockPart
- id: MicroManipulatorStockPart
# Rare Group
- !type:GroupSelector

2
Resources/Prototypes/Entities/Markers/Spawners/Random/industrial.yml
View File

@@ -45,9 +45,7 @@
state: icon
- type: RandomSpawner
rarePrototypes:
- CapacitorStockPart
- MicroManipulatorStockPart
- MatterBinStockPart
- CableHVStack10
- WelderIndustrial
- PowerCellHigh

15
Resources/Prototypes/Entities/Objects/Devices/Circuitboards/Machine/cannons.yml
View File

@@ -13,8 +13,7 @@
- type: MachineBoard
prototype: ShuttleGunSvalinnMachineGun
stackRequirements:
MatterBin: 2
Manipulator: 4
Manipulator: 6
Steel: 5
CableHV: 5
@@ -31,8 +30,7 @@
- type: MachineBoard
prototype: ShuttleGunPerforator
stackRequirements:
MatterBin: 4
Manipulator: 6
Manipulator: 10
Steel: 10
CableHV: 5
@@ -49,8 +47,7 @@
- type: MachineBoard
prototype: ShuttleGunFriendship
stackRequirements:
MatterBin: 3
Manipulator: 2
Manipulator: 5
Steel: 7
CableHV: 5
@@ -67,8 +64,7 @@
- type: MachineBoard
prototype: ShuttleGunDuster
stackRequirements:
MatterBin: 6
Manipulator: 4
Manipulator: 10
Steel: 10
CableHV: 5
Uranium: 2
@@ -86,7 +82,6 @@
- type: MachineBoard
prototype: ShuttleGunKinetic
stackRequirements:
MatterBin: 2
Manipulator: 3
Manipulator: 5
Steel: 5
CableHV: 2

4
Resources/Prototypes/Entities/Objects/Devices/Circuitboards/Machine/holopad.yml
View File

@@ -7,6 +7,6 @@
- type: MachineBoard
prototype: Holopad
stackRequirements:
Capacitor: 4
Manipulator: 4
Cable: 4
Glass: 2
Glass: 2

164
Resources/Prototypes/Entities/Objects/Devices/Circuitboards/Machine/production.yml
View File

@@ -7,8 +7,7 @@
- type: MachineBoard
prototype: Autolathe
stackRequirements:
MatterBin: 3
Manipulator: 1
Manipulator: 4
Glass: 1
- type: entity
@@ -20,7 +19,7 @@
- type: MachineBoard
prototype: AutolatheHyperConvection
stackRequirements:
MatterBin: 3
Manipulator: 3
Glass: 1
tagRequirements:
Igniter:
@@ -38,8 +37,7 @@
- type: MachineBoard
prototype: Protolathe
stackRequirements:
MatterBin: 2
Manipulator: 2
Manipulator: 4
tagRequirements:
GlassBeaker:
amount: 2
@@ -56,7 +54,7 @@
- type: MachineBoard
prototype: ProtolatheHyperConvection
stackRequirements:
MatterBin: 2
Manipulator: 4
tagRequirements:
GlassBeaker:
amount: 2
@@ -76,7 +74,7 @@
- type: MachineBoard
prototype: Biofabricator
stackRequirements:
MatterBin: 4
Manipulator: 4
Glass: 1
- type: entity
@@ -90,8 +88,7 @@
- type: MachineBoard
prototype: SecurityTechFab
stackRequirements:
MatterBin: 2
Manipulator: 2
Manipulator: 4
tagRequirements:
GlassBeaker:
amount: 2
@@ -108,8 +105,7 @@
- type: MachineBoard
prototype: AmmoTechFab
stackRequirements:
MatterBin: 1
Manipulator: 1
Manipulator: 2
- type: entity
id: MedicalTechFabCircuitboard
@@ -122,8 +118,7 @@
- type: MachineBoard
prototype: MedicalTechFab
stackRequirements:
MatterBin: 2
Manipulator: 2
Manipulator: 4
tagRequirements:
GlassBeaker:
amount: 2
@@ -141,8 +136,7 @@
- type: MachineBoard
prototype: CircuitImprinter
stackRequirements:
MatterBin: 1
Manipulator: 1
Manipulator: 2
tagRequirements:
GlassBeaker:
amount: 2
@@ -159,7 +153,7 @@
- type: MachineBoard
prototype: CircuitImprinterHyperConvection
stackRequirements:
MatterBin: 2
Manipulator: 2
tagRequirements:
GlassBeaker:
amount: 2
@@ -178,8 +172,7 @@
- type: MachineBoard
prototype: ExosuitFabricator
stackRequirements:
MatterBin: 1
Manipulator: 3
Manipulator: 4
Glass: 5
- type: GuideHelp
guides:
@@ -210,7 +203,7 @@
- type: MachineBoard
prototype: Biogenerator
stackRequirements:
MatterBin: 2
Manipulator: 2
tagRequirements:
GlassBeaker:
amount: 1
@@ -224,8 +217,7 @@
- type: MachineBoard
prototype: UniformPrinter
stackRequirements:
MatterBin: 1
Manipulator: 2
Manipulator: 3
- type: entity
id: VaccinatorMachineCircuitboard
@@ -237,8 +229,7 @@
- type: MachineBoard
prototype: Vaccinator
stackRequirements:
MatterBin: 1
Manipulator: 1
Manipulator: 2
Cable: 5
tagRequirements:
GlassBeaker:
@@ -276,8 +267,7 @@
- type: MachineBoard
prototype: MachineArtifactAnalyzer
stackRequirements:
Manipulator: 3
Capacitor: 1
Manipulator: 1
Glass: 5
- type: entity
@@ -306,7 +296,7 @@
- type: MachineBoard
prototype: MachineAnomalyVessel
stackRequirements:
Capacitor: 3
Manipulator: 3
Cable: 1
PlasmaGlass: 10
@@ -321,7 +311,7 @@
- type: MachineBoard
prototype: MachineAnomalyVesselExperimental
stackRequirements:
Capacitor: 3
Manipulator: 3
Cable: 5
PlasmaGlass: 15
MetalRod: 4
@@ -337,8 +327,7 @@
- type: MachineBoard
prototype: MachineAnomalySynchronizer
stackRequirements:
Manipulator: 2
Capacitor: 5
Manipulator: 7
PlasmaGlass: 5
Cable: 5
@@ -353,7 +342,7 @@
- type: MachineBoard
prototype: MachineAPE
stackRequirements:
Capacitor: 2
Manipulator: 2
Cable: 1
Glass: 1
@@ -368,8 +357,7 @@
- type: MachineBoard
prototype: GasThermoMachineFreezer
stackRequirements:
MatterBin: 2
Capacitor: 2
Manipulator: 4
Cable: 5
- type: Construction
deconstructionTarget: null
@@ -387,8 +375,7 @@
- type: MachineBoard
prototype: GasThermoMachineHeater
stackRequirements:
MatterBin: 2
Capacitor: 2
Manipulator: 4
Cable: 5
- type: Construction
graph: ThermomachineBoard
@@ -406,8 +393,7 @@
- type: MachineBoard
prototype: GasThermoMachineHellfireFreezer
stackRequirements:
MatterBin: 2
Capacitor: 2
Manipulator: 4
Plasma: 1
- type: Construction
deconstructionTarget: null
@@ -425,8 +411,7 @@
- type: MachineBoard
prototype: GasThermoMachineHellfireHeater
stackRequirements:
MatterBin: 2
Capacitor: 2
Manipulator: 4
Plasma: 1
- type: Construction
graph: ThermomachineBoard
@@ -444,7 +429,7 @@
- type: MachineBoard
prototype: BaseGasCondenser
stackRequirements:
MatterBin: 1
Manipulator: 1
Glass: 1
- type: entity
@@ -458,8 +443,7 @@
- type: MachineBoard
prototype: PortableScrubber
stackRequirements:
MatterBin: 1
Manipulator: 2
Manipulator: 3
Cable: 5
Glass: 2
@@ -474,8 +458,7 @@
- type: MachineBoard
prototype: SpaceHeater
stackRequirements:
MatterBin: 1
Capacitor: 2
Manipulator: 3
Cable: 5
- type: entity
@@ -489,8 +472,7 @@
- type: MachineBoard
prototype: CloningPod
stackRequirements:
MatterBin: 2
Manipulator: 2
Manipulator: 4
Glass: 1
Cable: 1
@@ -505,7 +487,7 @@
- type: MachineBoard
prototype: MedicalScanner
stackRequirements:
Capacitor: 1
Manipulator: 1
Glass: 5
Cable: 1
@@ -546,7 +528,7 @@
- type: MachineBoard
prototype: ChemMaster
stackRequirements:
Capacitor: 1
Manipulator: 1
Glass: 1
Cable: 1
tagRequirements:
@@ -565,7 +547,7 @@
- type: MachineBoard
prototype: ChemDispenserEmpty
stackRequirements:
Capacitor: 1
Manipulator: 1
Glass: 1
Steel: 3
tagRequirements:
@@ -584,8 +566,7 @@
- type: MachineBoard
prototype: BiomassReclaimer
stackRequirements:
MatterBin: 2
Manipulator: 1
Manipulator: 3
Steel: 5
tagRequirements:
Knife:
@@ -623,8 +604,7 @@
- type: MachineBoard
prototype: SeedExtractor
stackRequirements:
Manipulator: 2
Capacitor: 1
Manipulator: 3
# replacing the console screen
Glass: 1
Cable: 2
@@ -641,7 +621,7 @@
- type: MachineBoard
prototype: SMESBasicEmpty
stackRequirements:
Capacitor: 1
Manipulator: 1
CableHV: 10
componentRequirements:
PowerCell:
@@ -660,7 +640,7 @@
- type: MachineBoard
prototype: SMESAdvancedEmpty
stackRequirements:
Capacitor: 2
Manipulator: 2
CableHV: 20
componentRequirements:
PowerCell:
@@ -679,7 +659,7 @@
- type: MachineBoard
prototype: PowerCellRecharger
stackRequirements:
Capacitor: 2
Manipulator: 2
Cable: 5
- type: PhysicalComposition
materialComposition:
@@ -700,7 +680,7 @@
- type: MachineBoard
prototype: PowerCageRecharger
stackRequirements:
Capacitor: 4
Manipulator: 4
Steel: 5
Cable: 10
- type: PhysicalComposition
@@ -722,7 +702,7 @@
- type: MachineBoard
prototype: BorgCharger
stackRequirements:
Capacitor: 2
Manipulator: 2
Cable: 5
- type: PhysicalComposition
materialComposition:
@@ -743,7 +723,7 @@
- type: MachineBoard
prototype: WeaponCapacitorRecharger
stackRequirements:
Capacitor: 2
Manipulator: 2
CableMV: 5
- type: PhysicalComposition
materialComposition:
@@ -764,7 +744,7 @@
- type: MachineBoard
prototype: TurboItemRecharger
stackRequirements:
Capacitor: 2
Manipulator: 2
CableMV: 5
- type: PhysicalComposition
materialComposition:
@@ -780,7 +760,7 @@
- type: MachineBoard
prototype: SubstationBasicEmpty
stackRequirements:
Capacitor: 1
Manipulator: 1
CableMV: 5
CableHV: 5
componentRequirements:
@@ -840,7 +820,7 @@
- type: MachineBoard
prototype: PortableGeneratorPacman
stackRequirements:
Capacitor: 1
Manipulator: 1
CableHV: 5
- type: PhysicalComposition
materialComposition:
@@ -860,7 +840,7 @@
- type: MachineBoard
prototype: Thruster
stackRequirements:
Capacitor: 4
Manipulator: 4
Steel: 5
- type: entity
@@ -873,8 +853,7 @@
- type: MachineBoard
prototype: Gyroscope
stackRequirements:
Manipulator: 2
Capacitor: 1
Manipulator: 3
Glass: 2
- type: entity
@@ -887,7 +866,7 @@
- type: MachineBoard
prototype: PortableGeneratorSuperPacman
stackRequirements:
Capacitor: 2
Manipulator: 2
CableHV: 10
- type: PhysicalComposition
materialComposition:
@@ -907,7 +886,7 @@
- type: MachineBoard
prototype: PortableGeneratorJrPacman
stackRequirements:
Capacitor: 1
Manipulator: 1
Cable: 10
- type: PhysicalComposition
materialComposition:
@@ -926,8 +905,7 @@
- type: MachineBoard
prototype: KitchenReagentGrinder
stackRequirements:
MatterBin: 2
Manipulator: 2
Manipulator: 4
tagRequirements:
GlassBeaker:
amount: 1
@@ -944,7 +922,7 @@
- type: MachineBoard
prototype: ChemistryHotplate
stackRequirements:
Capacitor: 2
Manipulator: 2
Glass: 1
- type: entity
@@ -958,7 +936,7 @@
- type: MachineBoard
prototype: KitchenElectricGrill
stackRequirements:
Capacitor: 4
Manipulator: 4
Glass: 2
Cable: 5
@@ -972,8 +950,7 @@
- type: MachineBoard
prototype: StasisBed
stackRequirements:
Capacitor: 1
Manipulator: 1
Manipulator: 2
Cable: 3
Steel: 2
@@ -988,7 +965,7 @@
- type: MachineBoard
prototype: MachineElectrolysisUnit
stackRequirements:
Capacitor: 2
Manipulator: 2
Cable: 1
- type: entity
@@ -1015,7 +992,7 @@
- type: MachineBoard
prototype: MachineMaterialSilo
stackRequirements:
MatterBin: 4
Manipulator: 4
Cable: 1
- type: entity
@@ -1028,8 +1005,7 @@
- type: MachineBoard
prototype: OreProcessor
stackRequirements:
MatterBin: 1
Manipulator: 3
Manipulator: 4
Glass: 1
- type: entity
@@ -1042,8 +1018,7 @@
- type: MachineBoard
prototype: OreProcessorIndustrial
stackRequirements:
MatterBin: 1
Manipulator: 3
Manipulator: 4
Glass: 1
- type: entity
@@ -1054,8 +1029,7 @@
- type: MachineBoard
prototype: Sheetifier
stackRequirements:
MatterBin: 1
Manipulator: 1
Manipulator: 2
- type: entity
id: MicrowaveMachineCircuitboard
@@ -1067,7 +1041,7 @@
- type: MachineBoard
prototype: KitchenMicrowave
stackRequirements:
Capacitor: 1
Manipulator: 1
Glass: 2
Cable: 2
- type: Tag
@@ -1084,7 +1058,7 @@
- type: MachineBoard
prototype: SyndicateMicrowave
stackRequirements:
Capacitor: 1
Manipulator: 1
Glass: 2
Cable: 2
@@ -1113,8 +1087,7 @@
- type: MachineBoard
prototype: MachineFlatpacker
stackRequirements:
Manipulator: 2
MatterBin: 1
Manipulator: 3
Steel: 1
- type: entity
@@ -1127,7 +1100,7 @@
- type: MachineBoard
prototype: Emitter
stackRequirements:
Capacitor: 2
Manipulator: 2
CableHV: 5
Glass: 2
@@ -1197,8 +1170,7 @@
- type: MachineBoard
prototype: GasRecycler
stackRequirements:
Capacitor: 1
Manipulator: 1
Manipulator: 2
Steel: 10
Plasma: 5
@@ -1230,7 +1202,7 @@
- type: MachineBoard
prototype: CargoTelepad
stackRequirements:
Capacitor: 2
Manipulator: 2
Steel: 5
- type: entity
@@ -1244,7 +1216,7 @@
- type: MachineBoard
prototype: CargoMailTeleporter
stackRequirements:
Capacitor: 2
Manipulator: 2
Steel: 5
- type: entity
@@ -1289,7 +1261,7 @@
- type: MachineBoard
prototype: SalvageMagnet
stackRequirements:
Capacitor: 4
Manipulator: 4
Steel: 5
CableHV: 5
Cable: 2
@@ -1305,8 +1277,7 @@
- type: MachineBoard
prototype: GravityGeneratorMini
stackRequirements:
Capacitor: 4
MatterBin: 3
Manipulator: 7
Steel: 5
CableHV: 5
Uranium: 2
@@ -1320,8 +1291,7 @@
- type: MachineBoard
prototype: StationAnchor
stackRequirements:
Capacitor: 4
MatterBin: 3
Manipulator: 7
Steel: 10
Glass: 5
CableHV: 8
@@ -1335,8 +1305,7 @@
- type: MachineBoard
prototype: ReagentGrinderIndustrial
stackRequirements:
MatterBin: 1
Manipulator: 3
Manipulator: 4
Glass: 1
- type: entity
@@ -1364,6 +1333,5 @@
prototype: CutterMachine
stackRequirements:
Steel: 2
Capacitor: 1
Manipulator: 1
Manipulator: 2
Cable: 1

31
Resources/Prototypes/Entities/Objects/Misc/machine_parts.yml
View File

@@ -12,41 +12,14 @@
- type: Stack
count: 1
- type: entity
id: CapacitorStockPart
name: capacitor
parent: BaseStockPart
description: A basic capacitor used in the construction of a variety of devices.
suffix: Rating 1
components:
- type: Sprite
state: capacitor
- type: Tag
tags:
- CapacitorStockPart
- type: Stack
stackType: Capacitor
- type: entity
id: MicroManipulatorStockPart
name: manipulator
name: modular machine part
parent: BaseStockPart
description: A basic manipulator used in the construction of a variety of devices.
description: A basic machine part used in the construction of a variety of devices.
suffix: Rating 1
components:
- type: Sprite
state: micro_mani
- type: Stack
stackType: Manipulator
- type: entity
id: MatterBinStockPart
name: matter bin
parent: BaseStockPart
description: A basic matter bin used in the construction of a variety of devices.
suffix: Rating 1
components:
- type: Sprite
state: matter_bin
- type: Stack
stackType: MatterBin

4
Resources/Prototypes/Entities/Structures/Power/substation.yml
View File

@@ -247,12 +247,12 @@
- type: ContainerFill
containers:
board: [ WallmountSubstationElectronics ]
capacitor: [ CapacitorStockPart ]
manipulator: [ MicroManipulatorStockPart ]
powercell: [ PowerCellSmall ]
- type: ContainerContainer
containers:
board: !type:Container
capacitor: !type:Container
manipulator: !type:Container
powercell: !type:Container
# Construction Frame