From c672183e21bc589808b990a81670519646b90863 Mon Sep 17 00:00:00 2001 From: Ripmorld <60119809+UKNOWH@users.noreply.github.com> Date: Fri, 13 May 2022 07:49:52 +0800 Subject: [PATCH] Powercell adjustment (#7828) Co-authored-by: Kara --- .../Catalog/Research/technologies.yml | 44 +++++++ .../Entities/Objects/Power/powercells.yml | 121 ++++++++++++++++++ .../Entities/Structures/Machines/lathe.yml | 9 ++ Resources/Prototypes/Recipes/Lathes/misc.yml | 9 -- .../Prototypes/Recipes/Lathes/powercells.yml | 93 ++++++++++++++ 5 files changed, 267 insertions(+), 9 deletions(-) create mode 100644 Resources/Prototypes/Recipes/Lathes/powercells.yml diff --git a/Resources/Prototypes/Catalog/Research/technologies.yml b/Resources/Prototypes/Catalog/Research/technologies.yml index 9d34f69587..c30c2b9541 100644 --- a/Resources/Prototypes/Catalog/Research/technologies.yml +++ b/Resources/Prototypes/Catalog/Research/technologies.yml @@ -387,6 +387,50 @@ - SynthesizerInstrument - DawInstrumentMachineCircuitboard +- type: technology + name: "basic powercell printing" + id: PowerCellBasic + description: Print standard powercells. + icon: + sprite: Objects/Power/PowerCells/power_cell_small_st.rsi + state: s_st + requiredPoints: 2500 + requiredTechnologies: + - ElectromagneticTheory + unlockedRecipes: + - PowerCellSmallStandard + - PowerCellMediumStandard + - PowerCellLargeStandard + +- type: technology + name: "advanced powercell printing" + id: PowerCellAdvanced + description: Print advanced powercells. + icon: + sprite: Objects/Power/PowerCells/power_cell_small_hi.rsi + state: s_hi + requiredPoints: 5000 + requiredTechnologies: + - PowerCellBasic + unlockedRecipes: + - PowerCellSmallHigh + - PowerCellMediumHigh + - PowerCellLargeHigh + +- type: technology + name: "super powercell printing" + id: PowerCellSuper + description: Print super powercells. + icon: + sprite: Objects/Power/PowerCells/power_cell_small_sup.rsi + state: s_sup + requiredPoints: 10000 + requiredTechnologies: + - PowerCellAdvanced + unlockedRecipes: + - PowerCellSmallSuper + - PowerCellMediumSuper + - PowerCellLargeSuper # Basic Parts Technology Tree - type: technology diff --git a/Resources/Prototypes/Entities/Objects/Power/powercells.yml b/Resources/Prototypes/Entities/Objects/Power/powercells.yml index 2879ec8a06..211282e10a 100644 --- a/Resources/Prototypes/Entities/Objects/Power/powercells.yml +++ b/Resources/Prototypes/Entities/Objects/Power/powercells.yml @@ -63,6 +63,7 @@ name: small standard power cell description: A rechargeable standardized power cell, size S. This is the cheapest kind you can find. id: PowerCellSmallStandard + suffix: Full parent: PowerCellSmallBase components: - type: Sprite @@ -77,10 +78,20 @@ - type: PowerCellVisualizer prefix: s_st +- type: entity + id: PowerCellSmallStandardPrinted + suffix: Empty + parent: PowerCellSmallStandard + components: + - type: Battery + maxCharge: 360 + startingCharge: 0 + - type: entity name: small high-capacity power cell description: A rechargeable standardized power cell, size S. This is the popular and reliable version. id: PowerCellSmallHigh + suffix: Full parent: PowerCellSmallBase components: - type: Sprite @@ -95,10 +106,20 @@ - type: PowerCellVisualizer prefix: s_hi +- type: entity + id: PowerCellSmallHighPrinted + suffix: Empty + parent: PowerCellSmallHigh + components: + - type: Battery + maxCharge: 720 + startingCharge: 0 + - type: entity name: small super-capacity power cell description: A rechargeable standardized power cell, size S. This premium high-capacity brand stores up to 50% more energy than the competition. id: PowerCellSmallSuper + suffix: Full parent: PowerCellSmallBase components: - type: Sprite @@ -113,11 +134,20 @@ - type: PowerCellVisualizer prefix: s_sup +- type: entity + id: PowerCellSmallSuperPrinted + suffix: Empty + parent: PowerCellSmallSuper + components: + - type: Battery + maxCharge: 1080 + startingCharge: 0 - type: entity name: small hyper-capacity power cell description: A rechargeable standardized power cell, size S. This one looks like a rare and powerful prototype. id: PowerCellSmallHyper + suffix: Full parent: PowerCellSmallBase components: - type: Sprite @@ -132,10 +162,20 @@ - type: PowerCellVisualizer prefix: s_hy +- type: entity + id: PowerCellSmallHyperPrinted + suffix: Empty + parent: PowerCellSmallHyper + components: + - type: Battery + maxCharge: 1800 + startingCharge: 0 + - type: entity name: small microreactor cell description: A rechargeable standardized microreactor cell, size S. Intended for low-power devices, it slowly recharges by itself. id: PowerCellSmallAutorecharge + suffix: Full parent: PowerCellSmallBase components: - type: Sprite @@ -157,6 +197,7 @@ name: hardsuit helmet power cell description: A small cell that recharges itself intended for hardsuit helmets. id: PowerCellHardsuitHelmet + suffix: Full parent: PowerCellSmallBase components: - type: Sprite @@ -199,6 +240,7 @@ name: medium standard power cell description: A rechargeable standardized power cell, size M. This is the cheapest kind you can find. id: PowerCellMediumStandard + suffix: Full parent: PowerCellMediumBase components: - type: Sprite @@ -213,10 +255,20 @@ - type: PowerCellVisualizer prefix: m_st +- type: entity + id: PowerCellMediumStandardPrinted + suffix: Empty + parent: PowerCellMediumStandard + components: + - type: Battery + maxCharge: 2160 + startingCharge: 0 + - type: entity name: medium high-capacity power cell description: A rechargeable standardized power cell, size M. This is the popular and reliable version. id: PowerCellMediumHigh + suffix: Full parent: PowerCellMediumBase components: - type: Sprite @@ -231,10 +283,20 @@ - type: PowerCellVisualizer prefix: m_hi +- type: entity + id: PowerCellMediumHighPrinted + suffix: Empty + parent: PowerCellMediumHigh + components: + - type: Battery + maxCharge: 2880 + startingCharge: 0 + - type: entity name: medium super-capacity power cell description: A rechargeable standardized power cell, size M. This premium high-capacity brand stores up to 50% more energy than the competition. id: PowerCellMediumSuper + suffix: Full parent: PowerCellMediumBase components: - type: Sprite @@ -249,10 +311,20 @@ - type: PowerCellVisualizer prefix: m_sup +- type: entity + id: PowerCellMediumSuperPrinted + suffix: Empty + parent: PowerCellMediumSuper + components: + - type: Battery + maxCharge: 3600 + startingCharge: 0 + - type: entity name: medium hyper-capacity power cell description: A rechargeable standardized power cell, size M. This one looks like a rare and powerful prototype. id: PowerCellMediumHyper + suffix: Full parent: PowerCellMediumBase components: - type: Sprite @@ -267,10 +339,20 @@ - type: PowerCellVisualizer prefix: m_hy +- type: entity + id: PowerCellMediumHyperPrinted + suffix: Empty + parent: PowerCellMediumHyper + components: + - type: Battery + maxCharge: 5400 + startingCharge: 0 + - type: entity name: large standard power cell description: A rechargeable standardized power cell, size L. This is the cheapest kind you can find. id: PowerCellLargeStandard + suffix: Full parent: PowerCellLargeBase components: - type: Sprite @@ -285,10 +367,20 @@ - type: PowerCellVisualizer prefix: l_st +- type: entity + id: PowerCellLargeStandardPrinted + suffix: Empty + parent: PowerCellLargeStandard + components: + - type: Battery + maxCharge: 9000 + startingCharge: 0 + - type: entity name: large high-capacity power cell description: A rechargeable standardized power cell, size L. This is the popular and reliable version. id: PowerCellLargeHigh + suffix: Full parent: PowerCellLargeBase components: - type: Sprite @@ -303,10 +395,20 @@ - type: PowerCellVisualizer prefix: l_hi +- type: entity + id: PowerCellLargeHighPrinted + suffix: Empty + parent: PowerCellLargeHigh + components: + - type: Battery + maxCharge: 18000 + startingCharge: 0 + - type: entity name: large super-capacity power cell description: A rechargeable standardized power cell, size M. This premium high-capacity brand stores up to 50% more energy than the competition. id: PowerCellLargeSuper + suffix: Full parent: PowerCellLargeBase components: - type: Sprite @@ -321,10 +423,20 @@ - type: PowerCellVisualizer prefix: l_sup +- type: entity + id: PowerCellLargeSuperPrinted + suffix: Empty + parent: PowerCellLargeSuper + components: + - type: Battery + maxCharge: 54000 + startingCharge: 0 + - type: entity name: large hyper-capacity power cell description: A rechargeable standardized power cell, size L. This one looks like a rare and powerful prototype. id: PowerCellLargeHyper + suffix: Full parent: PowerCellLargeBase components: - type: Sprite @@ -338,3 +450,12 @@ visuals: - type: PowerCellVisualizer prefix: l_hy + +- type: entity + id: PowerCellLargeHyperPrinted + suffix: Empty + parent: PowerCellLargeHyper + components: + - type: Battery + maxCharge: 72000 + startingCharge: 0 diff --git a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml index a563858c02..65d3fd8dc8 100644 --- a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml +++ b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml @@ -193,6 +193,15 @@ - FlashPayload - Signaller - SignalTrigger + - PowerCellSmallStandard + - PowerCellSmallHigh + - PowerCellSmallSuper + - PowerCellMediumStandard + - PowerCellMediumHigh + - PowerCellMediumSuper + - PowerCellLargeStandard + - PowerCellLargeHigh + - PowerCellLargeSuper - type: ActivatableUI key: enum.LatheUiKey.Key #Yes only having 1 of them here doesn't break anything - type: ActivatableUIRequiresPower diff --git a/Resources/Prototypes/Recipes/Lathes/misc.yml b/Resources/Prototypes/Recipes/Lathes/misc.yml index 6320e4d114..623f0529cf 100644 --- a/Resources/Prototypes/Recipes/Lathes/misc.yml +++ b/Resources/Prototypes/Recipes/Lathes/misc.yml @@ -16,15 +16,6 @@ Steel: 50 Glass: 50 -- type: latheRecipe - id: PowerCellSmallHigh - icon: Objects/Power/PowerCells/power_cell_small_hi.rsi - result: PowerCellSmallHigh - completetime: 2 - materials: - Steel: 100 - Glass: 100 - - type: latheRecipe id: GlowstickRed icon: Objects/Misc/glowstick.rsi diff --git a/Resources/Prototypes/Recipes/Lathes/powercells.yml b/Resources/Prototypes/Recipes/Lathes/powercells.yml new file mode 100644 index 0000000000..3d92190ea9 --- /dev/null +++ b/Resources/Prototypes/Recipes/Lathes/powercells.yml @@ -0,0 +1,93 @@ +- type: latheRecipe + id: PowerCellSmallStandard + icon: Objects/Power/PowerCells/power_cell_small_st.rsi/s_st.png + result: PowerCellSmallStandardPrinted + completetime: 1 + materials: + Steel: 100 + Plastic: 50 + +- type: latheRecipe + id: PowerCellSmallHigh + icon: Objects/Power/PowerCells/power_cell_small_hi.rsi/s_hi.png + result: PowerCellSmallHighPrinted + completetime: 6 + materials: + Steel: 300 + Glass: 300 + Plastic: 100 + Gold: 10 + +- type: latheRecipe + id: PowerCellSmallSuper + icon: Objects/Power/PowerCells/power_cell_small_sup.rsi/s_sup.png + result: PowerCellSmallSuperPrinted + completetime: 10 + materials: + Steel: 300 + Glass: 400 + Plastic: 200 + Gold: 50 + +# The resource required is scaled to their power capacity +- type: latheRecipe + id: PowerCellMediumStandard + icon: Objects/Power/PowerCells/power_cell_medium_st.rsi/m_st.png + result: PowerCellMediumStandardPrinted + completetime: 1 + materials: + Steel: 600 + Plastic: 300 + +- type: latheRecipe + id: PowerCellMediumHigh + icon: Objects/Power/PowerCells/power_cell_medium_hi.rsi/m_hi.png + result: PowerCellMediumHighPrinted + completetime: 6 + materials: + Steel: 1800 + Glass: 1800 + Plastic: 600 + Gold: 60 + +- type: latheRecipe + id: PowerCellMediumSuper + icon: Objects/Power/PowerCells/power_cell_medium_sup.rsi/m_sup.png + result: PowerCellMediumSuperPrinted + completetime: 10 + materials: + Steel: 1800 + Glass: 2400 + Plastic: 1200 + Gold: 300 + +- type: latheRecipe + id: PowerCellLargeStandard + icon: Objects/Power/PowerCells/power_cell_large_st.rsi/l_st.png + result: PowerCellLargeStandardPrinted + completetime: 1 + materials: + Steel: 2500 + Plastic: 1250 + +- type: latheRecipe + id: PowerCellLargeHigh + icon: Objects/Power/PowerCells/power_cell_large_hi.rsi/l_hi.png + result: PowerCellLargeHighPrinted + completetime: 6 + materials: + Steel: 7500 + Glass: 7500 + Plastic: 2500 + Gold: 250 + +- type: latheRecipe + id: PowerCellLargeSuper + icon: Objects/Power/PowerCells/power_cell_large_sup.rsi/l_sup.png + result: PowerCellLargeSuperPrinted + completetime: 10 + materials: + Steel: 7500 + Glass: 10000 + Plastic: 5000 + Gold: 1250 \ No newline at end of file