From 723ca3109398e56515b0c1267f854b7a6acf8461 Mon Sep 17 00:00:00 2001 From: Louis Hong Date: Sat, 9 Nov 2024 11:27:27 -0800 Subject: [PATCH] heat range: the stage ranges are inclusive. showing incorrect out of range when is in range. additional note on previous commit f58e5ad (don't want to force push an ammend) the race condition caused an invalid state which showing incorrect prediction when race condition occurs - when the menu click and the heat/cool ticks occurs simultaniously. --- .../easygiantsfoundry/EasyGiantsFoundryState.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/main/java/com/toofifty/easygiantsfoundry/EasyGiantsFoundryState.java b/src/main/java/com/toofifty/easygiantsfoundry/EasyGiantsFoundryState.java index 331b484..0e1ba90 100644 --- a/src/main/java/com/toofifty/easygiantsfoundry/EasyGiantsFoundryState.java +++ b/src/main/java/com/toofifty/easygiantsfoundry/EasyGiantsFoundryState.java @@ -153,19 +153,19 @@ public class EasyGiantsFoundryState int heat = getHeatAmount(); int[] low = getLowHeatRange(); - if (heat > low[0] && heat < low[1]) + if (heat >= low[0] && heat <= low[1]) { return Heat.LOW; } int[] med = getMedHeatRange(); - if (heat > med[0] && heat < med[1]) + if (heat >= med[0] && heat <= med[1]) { return Heat.MED; } int[] high = getHighHeatRange(); - if (heat > high[0] && heat < high[1]) + if (heat >= high[0] && heat <= high[1]) { return Heat.HIGH; } @@ -326,7 +326,7 @@ public class EasyGiantsFoundryState int[] range = getCurrentHeatRange(); int actions = 0; int heat = getHeatAmount(); - while (heat > range[0] && heat < range[1]) + while (heat >= range[0] && heat <= range[1]) { actions++; heat += stage.getHeatChange();