Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Powercell adjustment #7828

Merged
merged 16 commits into from
May 12, 2022
Merged
Show file tree
Hide file tree
Changes from 11 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
44 changes: 44 additions & 0 deletions Resources/Prototypes/Catalog/Research/technologies.yml
Original file line number Diff line number Diff line change
Expand Up @@ -382,6 +382,50 @@
- SynthesizerInstrument
- DawInstrumentMachineCircuitboard

- type: technology
name: "basic powercell printing"
id: PowerCellBasic
description: Print some Dollar store 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: Now your tesla can finnaly drive longer than 500 m.
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: Believe it or not , you can power a small fleet with those 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
Expand Down
127 changes: 127 additions & 0 deletions Resources/Prototypes/Entities/Objects/Power/powercells.yml
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,15 @@
components:
- type: PowerCell
cellSize: Medium
- type: SolutionContainerManager
solutions:
powerCell:
maxVol: 10
- type: Extractable
juiceSolution:
reagents:
- ReagentId: Licoxide
Quantity: 10

- type: entity
id: PowerCellLargeBase
Expand All @@ -44,6 +53,15 @@
components:
- type: PowerCell
cellSize: Large
- type: SolutionContainerManager
solutions:
powerCell:
maxVol: 15
- type: Extractable
juiceSolution:
reagents:
- ReagentId: Licoxide
Quantity: 15

- type: entity
name: potato battery
Expand All @@ -63,6 +81,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
Expand All @@ -77,10 +96,19 @@
- type: PowerCellVisualizer
prefix: s_st

- type: entity
id: PowerCellSmallStandardPrinted
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
Expand All @@ -95,10 +123,19 @@
- type: PowerCellVisualizer
prefix: s_hi

- type: entity
id: PowerCellSmallHighPrinted
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
Expand All @@ -113,11 +150,19 @@
- type: PowerCellVisualizer
prefix: s_sup

- type: entity
id: PowerCellSmallSuperPrinted
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
Expand All @@ -132,10 +177,19 @@
- type: PowerCellVisualizer
prefix: s_hy

- type: entity
id: PowerCellSmallHyperPrinted
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
Expand All @@ -157,6 +211,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
Expand All @@ -178,6 +233,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
Expand All @@ -192,10 +248,19 @@
- type: PowerCellVisualizer
prefix: m_st

- type: entity
id: PowerCellMediumStandardPrinted
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
Expand All @@ -210,10 +275,19 @@
- type: PowerCellVisualizer
prefix: m_hi

- type: entity
id: PowerCellMediumHighPrinted
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
Expand All @@ -228,10 +302,19 @@
- type: PowerCellVisualizer
prefix: m_sup

- type: entity
id: PowerCellMediumSuperPrinted
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
Expand All @@ -246,10 +329,19 @@
- type: PowerCellVisualizer
prefix: m_hy

- type: entity
id: PowerCellMediumHyperPrinted
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
Expand All @@ -264,10 +356,19 @@
- type: PowerCellVisualizer
prefix: l_st

- type: entity
id: PowerCellLargeStandardPrinted
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
Expand All @@ -282,10 +383,19 @@
- type: PowerCellVisualizer
prefix: l_hi

- type: entity
id: PowerCellLargeHighPrinted
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
Expand All @@ -300,10 +410,19 @@
- type: PowerCellVisualizer
prefix: l_sup

- type: entity
id: PowerCellLargeSuperPrinted
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
Expand All @@ -317,3 +436,11 @@
visuals:
- type: PowerCellVisualizer
prefix: l_hy

- type: entity
id: PowerCellLargeHyperPrinted
parent: PowerCellLargeHyper
components:
- type: Battery
maxCharge: 72000
startingCharge: 0
9 changes: 9 additions & 0 deletions Resources/Prototypes/Entities/Structures/Machines/lathe.yml
Original file line number Diff line number Diff line change
Expand Up @@ -194,6 +194,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
Expand Down
9 changes: 0 additions & 9 deletions Resources/Prototypes/Recipes/Lathes/misc.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Loading