Sangui/GT5-Unofficial
2
1
Fork 0
Code Issues 6 Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #780 from codewarrior0/turbine-penalty

Browse source 
Fix efficiency penalty incorrectly applied to large gas+plasma turbines
This commit is contained in:
Blood-Asp 2016-12-07 22:04:23 +01:00 • committed by GitHub
commit 41962f4a36
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_LargeTurbine_Gas.java
View file

@ -112,7 +112,7 @@ public class GT_MetaTileEntity_LargeTurbine_Gas extends GT_MetaTileEntity_LargeT
if (totalFlow != actualOptimalFlow) { if (totalFlow != actualOptimalFlow) {
float efficiency = 1.0f - Math.abs(((totalFlow - (float) actualOptimalFlow) / actualOptimalFlow)); float efficiency = 1.0f - Math.abs(((totalFlow - (float) actualOptimalFlow) / actualOptimalFlow));
if(totalFlow>aOptFlow){efficiency = 1.0f;} if(totalFlow>actualOptimalFlow){efficiency = 1.0f;}
if (efficiency < 0) if (efficiency < 0)
efficiency = 0; // Can happen with really ludicrously poor inefficiency. efficiency = 0; // Can happen with really ludicrously poor inefficiency.
tEU *= efficiency; tEU *= efficiency;

2
src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_LargeTurbine_Plasma.java
View file

@ -128,7 +128,7 @@ public class GT_MetaTileEntity_LargeTurbine_Plasma extends GT_MetaTileEntity_Lar
if (totalFlow != actualOptimalFlow) { if (totalFlow != actualOptimalFlow) {
float efficiency = 1.0f - Math.abs(((totalFlow - (float) actualOptimalFlow) / actualOptimalFlow)); float efficiency = 1.0f - Math.abs(((totalFlow - (float) actualOptimalFlow) / actualOptimalFlow));
if(totalFlow>aOptFlow){efficiency = 1.0f;} if(totalFlow>actualOptimalFlow){efficiency = 1.0f;}
if (efficiency < 0) if (efficiency < 0)
efficiency = 0; // Can happen with really ludicrously poor inefficiency. efficiency = 0; // Can happen with really ludicrously poor inefficiency.
tEU *= efficiency; tEU *= efficiency;