diff --git a/Utility Mods/Stable/Modular Assembly Mods/MoA Fusion Systems/Data/BlockCategories.sbc b/Utility Mods/Stable/Modular Assembly Mods/MoA Fusion Systems/Data/BlockCategories.sbc index ffb8b2b92..b9195b695 100644 --- a/Utility Mods/Stable/Modular Assembly Mods/MoA Fusion Systems/Data/BlockCategories.sbc +++ b/Utility Mods/Stable/Modular Assembly Mods/MoA Fusion Systems/Data/BlockCategories.sbc @@ -20,6 +20,10 @@ Heat_Heatsink Heat_FlatRadiator Caster_ConveyorCap + RadiatorPanel + ExtendableRadiatorBase + Heat_FlatRadiator + ActiveRadiator diff --git a/Utility Mods/Stable/Modular Assembly Mods/MoA Fusion Systems/Data/BlockVariantGroups.sbc b/Utility Mods/Stable/Modular Assembly Mods/MoA Fusion Systems/Data/BlockVariantGroups.sbc index e0e0358ce..ae720cfbf 100644 --- a/Utility Mods/Stable/Modular Assembly Mods/MoA Fusion Systems/Data/BlockVariantGroups.sbc +++ b/Utility Mods/Stable/Modular Assembly Mods/MoA Fusion Systems/Data/BlockVariantGroups.sbc @@ -1,31 +1,44 @@ - - - - - - - Textures\GUI\Icons\Cubes\Caster_Accelerator_0.dds - Fusion Accelerators - Fusion Accelerator Components - - - - - - - - - - Textures\GUI\Icons\Cubes\Caster_CentralPipe_0.dds - Fusion Pipes - Fusion Pipe Components - - - - - - - - - - + + + + + + + Textures\GUI\Icons\Cubes\Caster_Accelerator_0.dds + Fusion Accelerators + Fusion Accelerator Components + + + + + + + + + + Textures\GUI\Icons\Cubes\Caster_CentralPipe_0.dds + Fusion Pipes + Fusion Pipe Components + + + + + + + + + + Textures\GUI\Icons\Cubes\RadiatorPanel.dds + Fusion Radiators + Fusion Radiator Components + + + + + + + + + + + diff --git a/Utility Mods/Stable/Modular Assembly Mods/MoA Fusion Systems/Data/CubeBlocks/ActiveRadiator.sbc b/Utility Mods/Stable/Modular Assembly Mods/MoA Fusion Systems/Data/CubeBlocks/ActiveRadiator.sbc index cce13f0ba..491910d46 100644 --- a/Utility Mods/Stable/Modular Assembly Mods/MoA Fusion Systems/Data/CubeBlocks/ActiveRadiator.sbc +++ b/Utility Mods/Stable/Modular Assembly Mods/MoA Fusion Systems/Data/CubeBlocks/ActiveRadiator.sbc @@ -6,23 +6,35 @@ TerminalBlock ActiveRadiator - - Rotary Active Radiator - + Rotary Active Radiator Provides massive heat dissipation at the cost of a high surface area. - Textures\GUI\Icons\AstronautBackpack.dds + Textures\GUI\Icons\Cubes\ActiveRadiator.dds Large TriangleMesh Models\ActiveRadiator.mwm - + + + + + + - + + 0.3 ActiveRadiator + + + + + + + + \ No newline at end of file diff --git a/Utility Mods/Stable/Modular Assembly Mods/MoA Fusion Systems/Data/Scripts/ModularAssemblies/FusionParts/FusionReactor/FusionReactorLogic.cs b/Utility Mods/Stable/Modular Assembly Mods/MoA Fusion Systems/Data/Scripts/ModularAssemblies/FusionParts/FusionReactor/FusionReactorLogic.cs index 3af302316..a29983433 100644 --- a/Utility Mods/Stable/Modular Assembly Mods/MoA Fusion Systems/Data/Scripts/ModularAssemblies/FusionParts/FusionReactor/FusionReactorLogic.cs +++ b/Utility Mods/Stable/Modular Assembly Mods/MoA Fusion Systems/Data/Scripts/ModularAssemblies/FusionParts/FusionReactor/FusionReactorLogic.cs @@ -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) { diff --git a/Utility Mods/Stable/Modular Assembly Mods/MoA Fusion Systems/Data/Scripts/ModularAssemblies/FusionParts/FusionThruster/FusionThrusterLogic.cs b/Utility Mods/Stable/Modular Assembly Mods/MoA Fusion Systems/Data/Scripts/ModularAssemblies/FusionParts/FusionThruster/FusionThrusterLogic.cs index cf061490c..10f34ad4f 100644 --- a/Utility Mods/Stable/Modular Assembly Mods/MoA Fusion Systems/Data/Scripts/ModularAssemblies/FusionParts/FusionThruster/FusionThrusterLogic.cs +++ b/Utility Mods/Stable/Modular Assembly Mods/MoA Fusion Systems/Data/Scripts/ModularAssemblies/FusionParts/FusionThruster/FusionThrusterLogic.cs @@ -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) { diff --git a/Utility Mods/Stable/Modular Assembly Mods/MoA Fusion Systems/Models/ActiveRadiator.mwm b/Utility Mods/Stable/Modular Assembly Mods/MoA Fusion Systems/Models/ActiveRadiator.mwm index 660e1572b..73ae2520e 100644 Binary files a/Utility Mods/Stable/Modular Assembly Mods/MoA Fusion Systems/Models/ActiveRadiator.mwm and b/Utility Mods/Stable/Modular Assembly Mods/MoA Fusion Systems/Models/ActiveRadiator.mwm differ diff --git a/Utility Mods/Stable/Modular Assembly Mods/MoA Fusion Systems/Textures/GUI/Icons/Cubes/ActiveRadiator.dds b/Utility Mods/Stable/Modular Assembly Mods/MoA Fusion Systems/Textures/GUI/Icons/Cubes/ActiveRadiator.dds new file mode 100644 index 000000000..014c70b39 Binary files /dev/null and b/Utility Mods/Stable/Modular Assembly Mods/MoA Fusion Systems/Textures/GUI/Icons/Cubes/ActiveRadiator.dds differ