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.

Sign up for GitHub

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

Advanced smes recipe fix #2770

Merged
merged 9 commits into from
Jan 31, 2025
Merged

Advanced smes recipe fix #2770

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
889b650
adjust power cell requirement for advanced smes to require double the…
KieueCaprie Jan 23, 2025
aca103b
Merge remote-tracking branch 'origin/advanced-smes-recipe-fix' into a…
KieueCaprie Jan 23, 2025
d653b4c
fixed contributor failure to count to 2
KieueCaprie Jan 23, 2025
51b7aaa
Add missing Frontier note, reinstate componentRequirements in comment…
KieueCaprie Jan 23, 2025
ed35961
Merge branch 'master' into advanced-smes-recipe-fix
KieueCaprie Jan 24, 2025
fcbe89c
update production.yml
KieueCaprie Jan 30, 2025
fb0cea4
SMES cleanup, upgradeable adv smes
whatston3 Jan 30, 2025
85891ac
minimize adv. smes upgradable components
whatston3 Jan 30, 2025
d93cb33
Merge branch 'master' into advanced-smes-recipe-fix
whatston3 Jan 30, 2025
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
8 changes: 3 additions & 5 deletions Resources/Prototypes/Entities/Objects/Devices/Circuitboards/Machine/production.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -679,13 +679,11 @@
state: power_mod
- type: MachineBoard
prototype: SMESAdvancedEmpty
requirements: # Frontier
Capacitor: 2 # Frontier stackRequirements<requirements
PowerCell: 8 # Frontier componentRequirements<requirements, 4<8
stackRequirements:
Capacitor: 2
CableHV: 20
componentRequirements:
PowerCell:
amount: 4
defaultPrototype: PowerCellMedium

- type: entity
id: CellRechargerCircuitboard
Expand Down
18 changes: 12 additions & 6 deletions Resources/Prototypes/Entities/Structures/Power/smes.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,12 +31,6 @@
- map: [ "enum.WiresVisualLayers.MaintenancePanel" ]
state: smes-open
- type: Smes
- type: UpgradeBattery
maxChargeMultiplier: 2
baseMaxCharge: 8000000
- type: UpgradePowerSupplyRamping
scaling: Linear
supplyRampingMultiplier: 1
- type: Appearance
- type: Battery
startingCharge: 0
Expand Down Expand Up @@ -97,6 +91,14 @@
sendBroadcastAttemptEvent: true
examinableAddress: true
- type: WiredNetworkConnection
# Frontier: upgradable SMES
- type: UpgradeBattery
maxChargeMultiplier: 2
baseMaxCharge: 8000000
- type: UpgradePowerSupplyRamping
scaling: Linear
supplyRampingMultiplier: 1
# End Frontier: upgradable SMES

# SMES' in use

Expand Down Expand Up @@ -153,6 +155,10 @@
collectionName: smes
sprite: Structures/Power/smes.rsi
state: advancedsmes-static
# Frontier: upgradable SMES
- type: UpgradeBattery
baseMaxCharge: 16000000
# End Frontier: upgradable SMES

- type: entity
parent: SMESAdvanced
Expand Down
Loading