From 9a79425b96dfb6feb30ba0aeb6f101593bff9bae Mon Sep 17 00:00:00 2001 From: MauveCloud Date: Tue, 27 Feb 2018 09:07:19 -0800 Subject: [PATCH] Added separate resource string for showing cooldown heat output in fluid reactor. --- src/Ic2ExpReactorPlanner/Bundle.properties | 1 + src/Ic2ExpReactorPlanner/SimpleSimulator.java | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/Ic2ExpReactorPlanner/Bundle.properties b/src/Ic2ExpReactorPlanner/Bundle.properties index 9291800..9450a7c 100644 --- a/src/Ic2ExpReactorPlanner/Bundle.properties +++ b/src/Ic2ExpReactorPlanner/Bundle.properties @@ -159,6 +159,7 @@ ACTIVE_TIME=Reactor was active for a total of %,d seconds (%,d to %,d seconds at INACTIVE_TIME=Reactor was inactive for a total of %,d seconds.\n COMPONENTS_REPLACED=Components replaced:\n%s HEAT_OUTPUTS=Total heat output: %,.0f\nAverage heat output before fuel rods stopped: %.2f Hu/s\nMinimum heat output: %.2f Hu/s\nMaximum heat output: %.2f Hu/s\n +HEAT_OUTPUTS_COOLDOWN=Total heat output: %,.0f\nAverage heat output during cooldown: %.2f Hu/s\nMinimum heat output: %.2f Hu/s\nMaximum heat output: %.2f Hu/s\n EFFICIENCY=Efficiency: %.2f average, %.2f minimum, %.2f maximum\n EU_OUTPUTS=Total EU output: %,.0f (%.2f EU/t min, %.2f EU/t max, %.2f EU/t average)\n REACTOR_REMAINING_HEAT=Reactor remained at %,.2f heat after cycle.\n diff --git a/src/Ic2ExpReactorPlanner/SimpleSimulator.java b/src/Ic2ExpReactorPlanner/SimpleSimulator.java index 650dbd9..7ee983b 100644 --- a/src/Ic2ExpReactorPlanner/SimpleSimulator.java +++ b/src/Ic2ExpReactorPlanner/SimpleSimulator.java @@ -256,7 +256,7 @@ protected Void doInBackground() throws Exception { } } } - } while (lastHeatOutput > 0 && cooldownTicks < 20000); + } while (lastHeatOutput > 0 && cooldownTicks < 50000); if (reactor.getCurrentHeat() < reactor.getMaxHeat()) { if (reactor.getCurrentHeat() == 0.0) { publish(String.format(java.util.ResourceBundle.getBundle("Ic2ExpReactorPlanner/Bundle").getString("REACTOR_COOLDOWN_TIME"), reactorCooldownTime)); @@ -282,7 +282,7 @@ protected Void doInBackground() throws Exception { publish(String.format(java.util.ResourceBundle.getBundle("Ic2ExpReactorPlanner/Bundle").getString("REACTOR_OVERHEATED_TIME"), reactorTicks)); } if (reactor.isFluid()) { - publish(String.format(java.util.ResourceBundle.getBundle("Ic2ExpReactorPlanner/Bundle").getString("HEAT_OUTPUTS"), 2 * totalHeatOutput, 2 * totalHeatOutput / cooldownTicks, 2 * minHeatOutput, 2 * maxHeatOutput)); + publish(String.format(java.util.ResourceBundle.getBundle("Ic2ExpReactorPlanner/Bundle").getString("HEAT_OUTPUTS_COOLDOWN"), 2 * totalHeatOutput, 2 * totalHeatOutput / cooldownTicks, 2 * minHeatOutput, 2 * maxHeatOutput)); } double totalEffectiveVentCooling = 0.0; double totalVentCoolingCapacity = 0.0;