Cinka/OldThink
1
0
Fork 0
Code Issues Pull Requests Actions 3 Packages Projects Releases Wiki Activity

SMES and substation require power cells as machine parts (#20344)

Browse Source 
* Initial commit

* Balancing and tweaks
This commit is contained in:
chromiumboy
2023-10-12 11:06:03 -05:00
committed by GitHub
parent 3323b617dd
commit 535b013f63
10 changed files with 117 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Content.Server/Power/Components/UpgradeBatteryComponent.cs
View File

@@ -11,7 +11,7 @@ namespace Content.Server.Power.Components
/// The machine part that affects the power capacity.
/// </summary>
[DataField("machinePartPowerCapacity", customTypeSerializer: typeof(PrototypeIdSerializer<MachinePartPrototype>))]
public string MachinePartPowerCapacity = "Capacitor";
public string MachinePartPowerCapacity = "PowerCell";
/// <summary>
/// The machine part rating is raised to this power when calculating power gain

38
Content.Server/Power/Components/UpgradePowerSupplyRampingComponent.cs Normal file
View File

@@ -0,0 +1,38 @@
using Content.Server.Construction.Components;
using Content.Shared.Construction.Prototypes;
using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype;
namespace Content.Server.Power.Components
{
[RegisterComponent]
public sealed partial class UpgradePowerSupplyRampingComponent : Component
{
[ViewVariables(VVAccess.ReadWrite)]
public float BaseRampRate;
/// <summary>
/// The machine part that affects the power supply ramping
/// </summary>
[DataField("machinePartPowerCapacity", customTypeSerializer: typeof(PrototypeIdSerializer<MachinePartPrototype>))]
public string MachinePartRampRate = "Capacitor";
/// <summary>
/// The multiplier used for scaling the power supply ramping
/// </summary>
[DataField("supplyRampingMultiplier")]
public float SupplyRampingMultiplier = 1f;
/// <summary>
/// What type of scaling is being used?
/// </summary>
[DataField("scaling", required: true), ViewVariables(VVAccess.ReadWrite)]
public MachineUpgradeScalingType Scaling;
/// <summary>
/// The current value that the power supply is being scaled by
/// </summary>
[DataField("actualScalar"), ViewVariables(VVAccess.ReadWrite)]
public float ActualScalar = 1f;
}
}

6
Content.Server/Power/EntitySystems/UpgradeBatterySystem.cs
View File

@@ -7,6 +7,8 @@ namespace Content.Server.Power.EntitySystems
[UsedImplicitly]
public sealed class UpgradeBatterySystem : EntitySystem
{
[Dependency] private readonly BatterySystem _batterySystem = default!;
public override void Initialize()
{
base.Initialize();
@@ -17,11 +19,11 @@ namespace Content.Server.Power.EntitySystems
public void OnRefreshParts(EntityUid uid, UpgradeBatteryComponent component, RefreshPartsEvent args)
{
var capacitorRating = args.PartRatings[component.MachinePartPowerCapacity];
var powerCellRating = args.PartRatings[component.MachinePartPowerCapacity];
if (TryComp<BatteryComponent>(uid, out var batteryComp))
{
batteryComp.MaxCharge = MathF.Pow(component.MaxChargeMultiplier, capacitorRating - 1) * component.BaseMaxCharge;
_batterySystem.SetMaxCharge(uid, MathF.Pow(component.MaxChargeMultiplier, powerCellRating - 1) * component.BaseMaxCharge, batteryComp);
}
}

43
Content.Server/Power/EntitySystems/UpgradePowerSystem.cs
View File

@@ -1,4 +1,4 @@
using Content.Server.Construction;
using Content.Server.Construction;
using Content.Server.Construction.Components;
using Content.Server.Power.Components;
@@ -20,6 +20,10 @@ public sealed class UpgradePowerSystem : EntitySystem
SubscribeLocalEvent<UpgradePowerSupplierComponent, MapInitEvent>(OnSupplierMapInit);
SubscribeLocalEvent<UpgradePowerSupplierComponent, RefreshPartsEvent>(OnSupplierRefreshParts);
SubscribeLocalEvent<UpgradePowerSupplierComponent, UpgradeExamineEvent>(OnSupplierUpgradeExamine);
SubscribeLocalEvent<UpgradePowerSupplyRampingComponent, MapInitEvent>(OnSupplyRampingMapInit);
SubscribeLocalEvent<UpgradePowerSupplyRampingComponent, RefreshPartsEvent>(OnSupplyRampingRefreshParts);
SubscribeLocalEvent<UpgradePowerSupplyRampingComponent, UpgradeExamineEvent>(OnSupplyRampingUpgradeExamine);
}
private void OnMapInit(EntityUid uid, UpgradePowerDrawComponent component, MapInitEvent args)
@@ -76,7 +80,7 @@ public sealed class UpgradePowerSystem : EntitySystem
switch (component.Scaling)
{
case MachineUpgradeScalingType.Linear:
supply += component.BaseSupplyRate * (rating - 1);
supply += component.PowerSupplyMultiplier * component.BaseSupplyRate * (rating - 1);
break;
case MachineUpgradeScalingType.Exponential:
supply *= MathF.Pow(component.PowerSupplyMultiplier, rating - 1);
@@ -97,4 +101,39 @@ public sealed class UpgradePowerSystem : EntitySystem
{
args.AddPercentageUpgrade("upgrade-power-supply", component.ActualScalar);
}
private void OnSupplyRampingMapInit(EntityUid uid, UpgradePowerSupplyRampingComponent component, MapInitEvent args)
{
if (TryComp<PowerNetworkBatteryComponent>(uid, out var battery))
component.BaseRampRate = battery.SupplyRampRate;
}
private void OnSupplyRampingRefreshParts(EntityUid uid, UpgradePowerSupplyRampingComponent component, RefreshPartsEvent args)
{
var rampRate = component.BaseRampRate;
var rating = args.PartRatings[component.MachinePartRampRate];
switch (component.Scaling)
{
case MachineUpgradeScalingType.Linear:
rampRate += component.SupplyRampingMultiplier * component.BaseRampRate * (rating - 1);
break;
case MachineUpgradeScalingType.Exponential:
rampRate *= MathF.Pow(component.SupplyRampingMultiplier, rating - 1);
break;
default:
Log.Error($"invalid power supply ramping type for {ToPrettyString(uid)}.");
rampRate = component.BaseRampRate;
break;
}
component.ActualScalar = rampRate / component.BaseRampRate;
if (TryComp<PowerNetworkBatteryComponent>(uid, out var battery))
battery.SupplyRampRate = rampRate;
}
private void OnSupplyRampingUpgradeExamine(EntityUid uid, UpgradePowerSupplyRampingComponent component, UpgradeExamineEvent args)
{
args.AddPercentageUpgrade("upgrade-power-supply-ramping", component.ActualScalar);
}
}

1
Resources/Locale/en-US/machine/machine.ftl
View File

@@ -15,6 +15,7 @@ machine-part-name-matter-bin = Matter Bin
upgrade-power-draw = power draw
upgrade-max-charge = max charge
upgrade-power-supply = power supply
upgrade-power-supply-ramping = power ramp rate
two-way-lever-left = push left
two-way-lever-right = push right

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

@@ -476,7 +476,10 @@
- type: MachineBoard
prototype: SMESBasicEmpty
requirements:
Capacitor: 5
Capacitor: 1
PowerCell: 4
materialRequirements:
CableHV: 10
- type: entity
id: CellRechargerCircuitboard
@@ -553,7 +556,8 @@
- type: MachineBoard
prototype: SubstationBasicEmpty
requirements:
Capacitor: 3
Capacitor: 1
PowerCell: 1
materialRequirements:
CableMV: 5
CableHV: 5

16
Resources/Prototypes/Entities/Objects/Power/powercells.yml
View File

@@ -62,6 +62,9 @@
- type: Battery
maxCharge: 360
startingCharge: 360
- type: MachinePart
part: PowerCell
rating: 1
- type: Tag
tags:
- PowerCellSmall
@@ -100,6 +103,9 @@
- type: Battery
maxCharge: 720
startingCharge: 720
- type: MachinePart
part: PowerCell
rating: 2
- type: entity
id: PowerCellMediumPrinted
@@ -135,7 +141,10 @@
- type: Battery
maxCharge: 1080
startingCharge: 1080
- type: MachinePart
part: PowerCell
rating: 3
- type: entity
id: PowerCellHighPrinted
suffix: Empty
@@ -170,7 +179,10 @@
- type: Battery
maxCharge: 1800
startingCharge: 1800
- type: MachinePart
part: PowerCell
rating: 4
- type: entity
id: PowerCellHyperPrinted
suffix: Empty

3
Resources/Prototypes/Entities/Structures/Power/smes.yml
View File

@@ -32,6 +32,9 @@
- type: UpgradeBattery
maxChargeMultiplier: 2
baseMaxCharge: 8000000
- type: UpgradePowerSupplyRamping
scaling: Linear
supplyRampingMultiplier: 1
- type: Appearance
- type: Battery
startingCharge: 0

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

@@ -20,6 +20,9 @@
- type: UpgradeBattery
maxChargeMultiplier: 2
baseMaxCharge: 2500000
- type: UpgradePowerSupplyRamping
scaling: Linear
supplyRampingMultiplier: 1
- type: Battery
startingCharge: 0
- type: ExaminableBattery

6
Resources/Prototypes/MachineParts/machine_parts.yml
View File

@@ -12,3 +12,9 @@
id: MatterBin
name: machine-part-name-matter-bin
stockPartPrototype: MatterBinStockPart
- type: machinePart
id: PowerCell
name: machine-part-name-power-cell
stockPartPrototype: PowerCellSmall