aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorDraknyte1 <Draknyte1@hotmail.com>2017-07-09 23:25:24 +1000
committerDraknyte1 <Draknyte1@hotmail.com>2017-07-09 23:25:24 +1000
commit4d52aaf32ad684653885352b67e1535c7795a9ee (patch)
tree001f08396ca079109d4cee56de7c4781e3e44568 /src
parentf8c218fe6220a89ca479765ce9a79b86cf96aef5 (diff)
downloadGT5-Unofficial-4d52aaf32ad684653885352b67e1535c7795a9ee.tar.gz
GT5-Unofficial-4d52aaf32ad684653885352b67e1535c7795a9ee.tar.bz2
GT5-Unofficial-4d52aaf32ad684653885352b67e1535c7795a9ee.zip
Revert "Revert "$ Actually made the Blast Alloy Smelter 20% cheaper to run over using the Electric Blast Furnace.""
This reverts commit 2d24fb951aaf2196596e9edd5dfdc5c19e77a88f. Fuck Git somedays.
Diffstat (limited to 'src')
-rw-r--r--src/Java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_BlastSmelterGT.java6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/Java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_BlastSmelterGT.java b/src/Java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_BlastSmelterGT.java
index 38f4f5c808..9d006c4926 100644
--- a/src/Java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_BlastSmelterGT.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_BlastSmelterGT.java
@@ -45,15 +45,15 @@ public class RecipeGen_BlastSmelterGT implements Runnable{
//Set a duration
int duration = 0;
if (M.mBlastFurnaceTemp > 150){
- duration = (int) Math.max(M.getMass() / 50L, 1L) * M.mBlastFurnaceTemp;
+ duration = (int) ((Math.max(M.getMass() / 50L, 1L) * M.mBlastFurnaceTemp)*0.8);
}
else {
- duration = (int) Math.max(M.getMass() / 50L, 1L) * 150;
+ duration = (int) ((Math.max(M.getMass() / 50L, 1L) * 150)*0.8);
}
//Sets the materials 'tier'. Will probably replace this logic.
final int x = M.mMeltingPoint;
- final int vVoltageMultiplier = (x <= 800 ? 8 : (x <= 1600 ? 16 : (x <= 2800 ? 32 : (x <= 3600 ? 64 : (x <= 4200 ? 128 : (x <= 5400 ? 256 : (x <= 7200 ? 512 : 1024)))))));
+ final int vVoltageMultiplier = (x <= 800 ? 8 : (x <= 1600 ? 15 : (x <= 2800 ? 30 : (x <= 3600 ? 60 : (x <= 4200 ? 120 : (x <= 5400 ? 240 : (x <= 7200 ? 480 : 1000)))))));
//Make a simple one Material Materialstack[] and log it for validity.