Skip to content

Fusion update #1866

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

Merged
ari-steas merged 2 commits into from
Jan 12, 2025
Merged

Fusion update #1866

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8ae74fe
fix bug related to power not updating when fusion consumers are not a…
ari-steas Jan 12, 2025
e2766cd
SBC work - block categories and buffed active radiator integrity
ari-steas Jan 12, 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
4 changes: 4 additions & 0 deletions Utility Mods/Stable/Modular Assembly Mods/MoA Fusion Systems/Data/BlockCategories.sbc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,10 @@
<string>Heat_Heatsink</string>
<string>Heat_FlatRadiator</string>
<string>Caster_ConveyorCap</string>
<string>RadiatorPanel</string>
<string>ExtendableRadiatorBase</string>
<string>Heat_FlatRadiator</string>
<string>ActiveRadiator</string>
</ItemIds>
</Category>
</CategoryClasses>
Expand Down
75 changes: 44 additions & 31 deletions Utility Mods/Stable/Modular Assembly Mods/MoA Fusion Systems/Data/BlockVariantGroups.sbc
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,31 +1,44 @@
<?xml version="1.0" encoding="utf-8"?>
<Definitions xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
<BlockVariantGroups>

<BlockVariantGroup>
<Id Type="MyObjectBuilder_BlockVariantGroup" Subtype="FusionAcceleratorBlockVariantGroup" />
<Icon>Textures\GUI\Icons\Cubes\Caster_Accelerator_0.dds</Icon>
<DisplayName>Fusion Accelerators</DisplayName>
<Description>Fusion Accelerator Components</Description>
<Blocks>
<Block Type="MyObjectBuilder_CubeBlock" Subtype="Caster_Accelerator_0" />
<Block Type="MyObjectBuilder_CubeBlock" Subtype="Caster_Accelerator_90" />
<Block Type="MyObjectBuilder_CubeBlock" Subtype="Caster_Feeder" />
</Blocks>
</BlockVariantGroup>

<BlockVariantGroup>
<Id Type="MyObjectBuilder_BlockVariantGroup" Subtype="FusionPipeBlockVariantGroup" />
<Icon>Textures\GUI\Icons\Cubes\Caster_CentralPipe_0.dds</Icon>
<DisplayName>Fusion Pipes</DisplayName>
<Description>Fusion Pipe Components</Description>
<Blocks>
<Block Type="MyObjectBuilder_CubeBlock" Subtype="Caster_CentralPipe_0" />
<Block Type="MyObjectBuilder_CubeBlock" Subtype="Caster_CentralPipe_90" />
<Block Type="MyObjectBuilder_CubeBlock" Subtype="Caster_CentralPipe_T" />
</Blocks>
</BlockVariantGroup>


</BlockVariantGroups>
</Definitions>
<?xml version="1.0" encoding="utf-8"?>
<Definitions xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
<BlockVariantGroups>

<BlockVariantGroup>
<Id Type="MyObjectBuilder_BlockVariantGroup" Subtype="FusionAcceleratorBlockVariantGroup" />
<Icon>Textures\GUI\Icons\Cubes\Caster_Accelerator_0.dds</Icon>
<DisplayName>Fusion Accelerators</DisplayName>
<Description>Fusion Accelerator Components</Description>
<Blocks>
<Block Type="MyObjectBuilder_CubeBlock" Subtype="Caster_Accelerator_0" />
<Block Type="MyObjectBuilder_CubeBlock" Subtype="Caster_Accelerator_90" />
<Block Type="MyObjectBuilder_CubeBlock" Subtype="Caster_Feeder" />
</Blocks>
</BlockVariantGroup>

<BlockVariantGroup>
<Id Type="MyObjectBuilder_BlockVariantGroup" Subtype="FusionPipeBlockVariantGroup" />
<Icon>Textures\GUI\Icons\Cubes\Caster_CentralPipe_0.dds</Icon>
<DisplayName>Fusion Pipes</DisplayName>
<Description>Fusion Pipe Components</Description>
<Blocks>
<Block Type="MyObjectBuilder_CubeBlock" Subtype="Caster_CentralPipe_0" />
<Block Type="MyObjectBuilder_CubeBlock" Subtype="Caster_CentralPipe_90" />
<Block Type="MyObjectBuilder_CubeBlock" Subtype="Caster_CentralPipe_T" />
</Blocks>
</BlockVariantGroup>

<BlockVariantGroup>
<Id Type="MyObjectBuilder_BlockVariantGroup" Subtype="FusionRadiatorBlockVariantGroup" />
<Icon>Textures\GUI\Icons\Cubes\RadiatorPanel.dds</Icon>
<DisplayName>Fusion Radiators</DisplayName>
<Description>Fusion Radiator Components</Description>
<Blocks>
<Block Type="MyObjectBuilder_CubeBlock" Subtype="RadiatorPanel" />
<Block Type="MyObjectBuilder_TerminalBlock" Subtype="ExtendableRadiatorBase" />
<Block Type="MyObjectBuilder_CubeBlock" Subtype="Heat_FlatRadiator" />
<Block Type="MyObjectBuilder_CubeBlock" Subtype="MDA_Radiator_1x2" />
<Block Type="MyObjectBuilder_TerminalBlock" Subtype="ActiveRadiator" />
</Blocks>
</BlockVariantGroup>

</BlockVariantGroups>
</Definitions>
24 changes: 18 additions & 6 deletions ...y Mods/Stable/Modular Assembly Mods/MoA Fusion Systems/Data/CubeBlocks/ActiveRadiator.sbc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,23 +6,35 @@
<TypeId>TerminalBlock</TypeId>
<SubtypeId>ActiveRadiator</SubtypeId>
</Id>
<DisplayName>
Rotary Active Radiator
</DisplayName>
<DisplayName>Rotary Active Radiator</DisplayName>
<Description>
Provides massive heat dissipation at the cost of a high surface area.
</Description>
<Icon>Textures\GUI\Icons\AstronautBackpack.dds</Icon>
<Icon>Textures\GUI\Icons\Cubes\ActiveRadiator.dds</Icon>
<CubeSize>Large</CubeSize>
<BlockTopology>TriangleMesh</BlockTopology>
<Size x="5" y="1" z="5"/>
<ModelOffset x="0" y="0" z="0"/>
<Model>Models\ActiveRadiator.mwm</Model>
<Components>
<Component Subtype="SteelPlate" Count="10"/>
<Component Subtype="SteelPlate" Count="100" />
<Component Subtype="Construction" Count="100" />
<Component Subtype="LargeTube" Count="40" />
<Component Subtype="Motor" Count="40" />
<Component Subtype="Computer" Count="20" />
<Component Subtype="SteelPlate" Count="500" />
</Components>
<CriticalComponent Subtype="SteelPlate" Index="0"/>
<CriticalComponent Subtype="Computer" Index="0"/>
<GeneralDamageMultiplier>0.3</GeneralDamageMultiplier>
<BlockPairName>ActiveRadiator</BlockPairName>
<MountPoints>
<MountPoint Side="Front" StartX="0.00" StartY="0.00" EndX="5.00" EndY="1.00"/>
<MountPoint Side="Back" StartX="0.00" StartY="0.00" EndX="5.00" EndY="1.00"/>
<MountPoint Side="Left" StartX="0.00" StartY="0.00" EndX="5.00" EndY="1.00"/>
<MountPoint Side="Right" StartX="0.00" StartY="0.00" EndX="5.00" EndY="1.00"/>
<MountPoint Side="Top" StartX="0.00" StartY="0.00" EndX="5.00" EndY="5.00"/>
<MountPoint Side="Bottom" StartX="0.00" StartY="0.00" EndX="5.00" EndY="5.00"/>
</MountPoints>
</Definition>
</CubeBlocks>
</Definitions>
4 changes: 3 additions & 1 deletion ...on Systems/Data/Scripts/ModularAssemblies/FusionParts/FusionReactor/FusionReactorLogic.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,9 @@ public override void Init(MyObjectBuilder_EntityBase definition)
public override void UpdateAfterSimulation()
{
base.UpdateAfterSimulation();
var storagePct = MemberSystem?.PowerStored / MemberSystem?.MaxPowerStored ?? 0;
var storagePct = (MemberSystem?.PowerStored / MemberSystem?.MaxPowerStored) ?? 0;
if (float.IsNaN(storagePct) || float.IsInfinity(storagePct))
storagePct = 0;

if (storagePct <= 0)
{
Expand Down
4 changes: 3 additions & 1 deletion ... Systems/Data/Scripts/ModularAssemblies/FusionParts/FusionThruster/FusionThrusterLogic.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,9 @@ public override void Init(MyObjectBuilder_EntityBase definition)
public override void UpdateAfterSimulation()
{
base.UpdateAfterSimulation();
var storagePct = MemberSystem?.PowerStored / MemberSystem?.MaxPowerStored ?? 0;
var storagePct = (MemberSystem?.PowerStored / MemberSystem?.MaxPowerStored) ?? 0;
if (float.IsNaN(storagePct) || float.IsInfinity(storagePct))
storagePct = 0;

if (storagePct <= 0.05f)
{
Expand Down
Binary file modified Utility Mods/Stable/Modular Assembly Mods/MoA Fusion Systems/Models/ActiveRadiator.mwm
View file
Open in desktop
Binary file not shown.
Binary file added ...able/Modular Assembly Mods/MoA Fusion Systems/Textures/GUI/Icons/Cubes/ActiveRadiator.dds
View file
Open in desktop
Binary file not shown.
Loading