Rip out remaining machine upgrades (#24413)

* Rip out remaining machine upgrades * eek
2024-01-22 17:13:04 -05:00
parent 7daf7ac0be
commit a9e89ab372
79 changed files with 36 additions and 1135 deletions
--- a/Resources/Prototypes/Entities/Objects/Misc/machine_parts.yml
+++ b/Resources/Prototypes/Entities/Objects/Misc/machine_parts.yml
@@ -9,9 +9,6 @@
      sprite: Objects/Misc/stock_parts.rsi
    - type: Item
      size: Tiny
-    - type: GuideHelp
-      guides:
-      - MachineUpgrading

 - type: entity
  id: CapacitorStockPart
--- a/Resources/Prototypes/Entities/Objects/Specific/Research/rped.yml
+++ b/Resources/Prototypes/Entities/Objects/Specific/Research/rped.yml
@@ -10,9 +10,6 @@
  - type: Item
    sprite: Objects/Specific/Research/rped.rsi
    size: Normal
-  - type: GuideHelp
-    guides:
-    - MachineUpgrading
  - type: PartExchanger
  - type: Storage
    grid:
--- a/Resources/Prototypes/Entities/Structures/Dispensers/chem.yml
+++ b/Resources/Prototypes/Entities/Structures/Dispensers/chem.yml
@@ -34,9 +34,6 @@
  - type: Wires
    boardName: wires-board-name-chemdispenser
    layoutId: ChemDispenser
-  - type: UpgradePowerDraw
-    powerDrawMultiplier: 0.75
-    scaling: Exponential
  - type: GuideHelp
    guides:
    - Chemicals
--- a/Resources/Prototypes/Entities/Structures/Machines/anomaly_equipment.yml
+++ b/Resources/Prototypes/Entities/Structures/Machines/anomaly_equipment.yml
@@ -176,8 +176,8 @@
      SetParticleEpsilon: AnomalousParticleEpsilon
      SetParticleZeta: AnomalousParticleZeta
    fireBurstSize: 1
-    baseFireBurstDelayMin: 2
-    baseFireBurstDelayMax: 6
+    fireBurstDelayMin: 2
+    fireBurstDelayMax: 6
  - type: ApcPowerReceiver
    powerLoad: 100
  - type: GuideHelp
--- a/Resources/Prototypes/Entities/Structures/Machines/anomaly_sync.yml
+++ b/Resources/Prototypes/Entities/Structures/Machines/anomaly_sync.yml
@@ -52,10 +52,7 @@
    noRot: false
  - type: ApcPowerReceiver
    powerLoad: 15000
-    needsPower: true 
-  - type: UpgradePowerDraw
-    powerDrawMultiplier: 0.80
-    scaling: Exponential
+    needsPower: true
  - type: ItemPlacer
    whitelist:
      components:
--- a/Resources/Prototypes/Entities/Structures/Machines/artifact_analyzer.yml
+++ b/Resources/Prototypes/Entities/Structures/Machines/artifact_analyzer.yml
@@ -106,9 +106,6 @@
        hard: False
  - type: Transform
    noRot: false
-  - type: UpgradePowerDraw
-    powerDrawMultiplier: 0.80
-    scaling: Exponential
  - type: TraversalDistorter
  - type: ItemPlacer
    # don't limit the number of artifacts that can be biased
--- a/Resources/Prototypes/Entities/Structures/Machines/seed_extractor.yml
+++ b/Resources/Prototypes/Entities/Structures/Machines/seed_extractor.yml
@@ -35,6 +35,3 @@
  - type: SeedExtractor
  - type: Machine
    board: SeedExtractorMachineCircuitboard
-  - type: UpgradePowerDraw
-    powerDrawMultiplier: 0.75
-    scaling: Exponential
--- a/Resources/Prototypes/Entities/Structures/Power/Generation/portable_generator.yml
+++ b/Resources/Prototypes/Entities/Structures/Power/Generation/portable_generator.yml
@@ -163,9 +163,6 @@
      materialWhiteList: [Plasma]
    - type: PortableGenerator
      startChance: 0.8
-    - type: UpgradePowerSupplier
-      powerSupplyMultiplier: 1.25
-      scaling: Exponential
    - type: GeneratorExhaustGas
      gasType: CarbonDioxide
      # 2 moles of gas for every sheet of plasma.
@@ -223,9 +220,6 @@
      storageLimit: 3000
      materialWhiteList: [Uranium]
    - type: PortableGenerator
-    - type: UpgradePowerSupplier
-      powerSupplyMultiplier: 1.25
-      scaling: Exponential
    - type: PowerMonitoringDevice
      group: Generator
      loadNodes:
--- a/Resources/Prototypes/Entities/Structures/Power/smes.yml
+++ b/Resources/Prototypes/Entities/Structures/Power/smes.yml
@@ -29,15 +29,10 @@
          state: "smes-op1"
          shader: unshaded
    - type: Smes
-    - type: UpgradeBattery
-      maxChargeMultiplier: 2
-      baseMaxCharge: 8000000
-    - type: UpgradePowerSupplyRamping
-      scaling: Linear
-      supplyRampingMultiplier: 1     
    - type: Appearance
    - type: Battery
      startingCharge: 0
+      maxCharge: 8000000
    - type: ExaminableBattery
    - type: NodeContainer
      examinable: true
--- a/Resources/Prototypes/Entities/Structures/Power/substation.yml
+++ b/Resources/Prototypes/Entities/Structures/Power/substation.yml
@@ -17,13 +17,8 @@
      shader: unshaded
    - state: full
      shader: unshaded
-  - type: UpgradeBattery
-    maxChargeMultiplier: 2
-    baseMaxCharge: 2500000
-  - type: UpgradePowerSupplyRamping
-    scaling: Linear
-    supplyRampingMultiplier: 1
  - type: Battery
+    maxCharge: 2500000
    startingCharge: 0
  - type: ExaminableBattery
  - type: PointLight
--- a/Resources/Prototypes/Entities/Structures/Shuttles/thrusters.yml
+++ b/Resources/Prototypes/Entities/Structures/Shuttles/thrusters.yml
@@ -143,7 +143,6 @@
  - type: Thruster
    thrusterType: Angular
    requireSpace: false
-    baseThrust: 2000
    thrust: 2000
    machinePartThrust: Manipulator
  - type: Sprite
@@ -193,9 +192,6 @@
            collection: MetalBreak
        - !type:ChangeConstructionNodeBehavior
          node: machineFrame
-  - type: UpgradePowerDraw
-    powerDrawMultiplier: 0.75
-    scaling: Exponential
  - type: Damageable
    damageContainer: Inorganic
    damageModifierSet: Electronic
@@ -220,7 +216,6 @@
  - type: Thruster
    thrusterType: Angular
    requireSpace: false
-    baseThrust: 100
    thrust: 100
  - type: ApcPowerReceiver
    needsPower: false
--- a/Resources/Prototypes/Guidebook/science.yml
+++ b/Resources/Prototypes/Guidebook/science.yml
@@ -7,7 +7,6 @@
  - AnomalousResearch
  - Xenoarchaeology
  - Robotics
-  - MachineUpgrading

 - type: guideEntry
  id: Technologies
@@ -58,11 +57,6 @@
  name: guide-entry-traversal-distorter
  text: "/ServerInfo/Guidebook/Science/TraversalDistorter.xml"

- type: guideEntry
-  id: MachineUpgrading
-  name: guide-entry-machine-upgrading
-  text: "/ServerInfo/Guidebook/Science/MachineUpgrading.xml"
-
 - type: guideEntry
  id: Cyborgs
  name: guide-entry-cyborgs