Corrected outputs of thorium rods.

MauveCloud · Feb 27, 2018 · 1044bbe · 1044bbe
1 parent 0eabdca
commit 1044bbe
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/src/Ic2ExpReactorPlanner/DualFuelRodThorium.java b/src/Ic2ExpReactorPlanner/DualFuelRodThorium.java
@@ -34,7 +34,7 @@ public String toString() {
     @Override
     public double generateHeat() {
         int pulses = countNeutronNeighbors() + 2;
-        int heat = pulses * (pulses + 1);
+        int heat = pulses * (pulses + 1) / 2;
         handleHeat(heat);
         applyDamage(1.0);
         return heat;
@@ -44,7 +44,7 @@ public double generateHeat() {
     public void generateEnergy() {
         int pulses = countNeutronNeighbors() + 2;
         final Reactor parentReactor = getParent();
-        double energy = 40 * pulses;
+        double energy = 80 * pulses;
         parentReactor.addEUOutput(energy);
     }
 

diff --git a/src/Ic2ExpReactorPlanner/FuelRodThorium.java b/src/Ic2ExpReactorPlanner/FuelRodThorium.java
@@ -64,7 +64,7 @@ protected int countNeutronNeighbors() {
     @Override
     public double generateHeat() {
         int pulses = countNeutronNeighbors() + 1;
-        int heat = pulses * (pulses + 1) / 2;
+        int heat = pulses * (pulses + 1) / 4;
         handleHeat(heat);
         applyDamage(1.0);
         return heat;
@@ -74,7 +74,7 @@ public double generateHeat() {
     public void generateEnergy() {
         int pulses = countNeutronNeighbors() + 1;
         final Reactor parentReactor = getParent();
-        double energy = 20 * pulses;
+        double energy = 40 * pulses;
         parentReactor.addEUOutput(energy);
     }
 

diff --git a/src/Ic2ExpReactorPlanner/QuadFuelRodThorium.java b/src/Ic2ExpReactorPlanner/QuadFuelRodThorium.java
@@ -34,7 +34,7 @@ public String toString() {
     @Override
     public double generateHeat() {
         int pulses = countNeutronNeighbors() + 3;
-        int heat = 2 * pulses * (pulses + 1);
+        int heat = pulses * (pulses + 1);
         handleHeat(heat);
         applyDamage(1.0);
         return heat;
@@ -44,7 +44,7 @@ public double generateHeat() {
     public void generateEnergy() {
         int pulses = countNeutronNeighbors() + 3;
         final Reactor parentReactor = getParent();
-        double energy = 80 * pulses;
+        double energy = 160 * pulses;
         parentReactor.addEUOutput(energy);
     }