From 61ab7e156deeec8405cc56b03764b570a82957e5 Mon Sep 17 00:00:00 2001 From: TehTemmie <36060353+TehTemmie@users.noreply.github.com> Date: Thu, 17 Mar 2022 17:47:06 +0800 Subject: [PATCH 1/3] Update ItemRBMKRod.java I should probably do this in a proper dev environment --- src/main/java/com/hbm/items/machine/ItemRBMKRod.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/com/hbm/items/machine/ItemRBMKRod.java b/src/main/java/com/hbm/items/machine/ItemRBMKRod.java index 1643dae67..8fc4735c5 100644 --- a/src/main/java/com/hbm/items/machine/ItemRBMKRod.java +++ b/src/main/java/com/hbm/items/machine/ItemRBMKRod.java @@ -239,7 +239,7 @@ public class ItemRBMKRod extends Item { case PASSIVE: return selfRate * enrichment; case LOG_TEN: return Math.log10(flux + 1) * 0.5D * reactivity; case PLATEU: return (1 - Math.pow(Math.E, -flux / 25D)) * reactivity; - case ARCH: return Math.max(flux - (flux * flux / 10000D) / 100D * reactivity, 0D); + case ARCH: return Math.max((flux - (flux * flux / 10000D)) / 100D * reactivity, 0D); case SIGMOID: return reactivity / (1 + Math.pow(Math.E, -(flux - 50D) / 10D)); case SQUARE_ROOT: return Math.sqrt(flux) * reactivity / 10D; case LINEAR: return flux / 100D * reactivity; From 0138c145add61753c10f181a2e110bfe66e42475 Mon Sep 17 00:00:00 2001 From: TehTemmie <36060353+TehTemmie@users.noreply.github.com> Date: Thu, 17 Mar 2022 17:51:46 +0800 Subject: [PATCH 2/3] Update ItemPlateFuel.java Fixed a rounding error and order of operations error --- src/main/java/com/hbm/items/machine/ItemPlateFuel.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/main/java/com/hbm/items/machine/ItemPlateFuel.java b/src/main/java/com/hbm/items/machine/ItemPlateFuel.java index 62b99da99..7184db282 100644 --- a/src/main/java/com/hbm/items/machine/ItemPlateFuel.java +++ b/src/main/java/com/hbm/items/machine/ItemPlateFuel.java @@ -64,9 +64,9 @@ public class ItemPlateFuel extends ItemFuelRod { switch(this.function) { case LOGARITHM: return (int) (Math.log10(flux + 1) * 0.5D * reactivity); - case SQUARE_ROOT: return (int) (Math.sqrt(flux) * this.reactivity / 10); - case NEGATIVE_QUADRATIC: return (int) (Math.max(flux - (flux * flux / 10000) / 100 * reactivity, 0)); - case LINEAR: return (int) (flux / 100 * reactivity); + case SQUARE_ROOT: return (int) (Math.sqrt(flux) * this.reactivity / 10D); + case NEGATIVE_QUADRATIC: return (int) (Math.max((flux - (flux * flux / 10000D)) / 100D * reactivity, 0)); + case LINEAR: return (int) (flux / 100D * reactivity); case PASSIVE: setLifeTime(stack, getLifeTime(stack) + reactivity); return reactivity; From fabdeb69479ded6abfbf488e1d77e1bc251b09e0 Mon Sep 17 00:00:00 2001 From: TehTemmie <36060353+TehTemmie@users.noreply.github.com> Date: Thu, 17 Mar 2022 17:56:48 +0800 Subject: [PATCH 3/3] Fixing another small mistake --- src/main/java/com/hbm/hazard/HazardRegistry.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/com/hbm/hazard/HazardRegistry.java b/src/main/java/com/hbm/hazard/HazardRegistry.java index 1c007d3ff..86e1e392e 100644 --- a/src/main/java/com/hbm/hazard/HazardRegistry.java +++ b/src/main/java/com/hbm/hazard/HazardRegistry.java @@ -526,7 +526,7 @@ public class HazardRegistry { HazardData data = new HazardData(); data.addEntry(new HazardEntry(RADIATION, base).addMod(new HazardModifierRTGRadiation(target))); if(hot > 0) data.addEntry(new HazardEntry(HOT, hot)); - if(blinding > 0) data.addEntry(new HazardEntry(BLINDING, hot)); + if(blinding > 0) data.addEntry(new HazardEntry(BLINDING, blinding)); HazardSystem.register(pellet, data); }