diff options
| author | Technus <daniel112092@gmail.com> | 2017-10-01 13:18:48 +0200 |
|---|---|---|
| committer | Technus <daniel112092@gmail.com> | 2017-10-01 13:18:48 +0200 |
| commit | 4ec739c927cb1b338383df2f49bb08e33737eb61 (patch) | |
| tree | cdbdcde726b27251eef448ecf673352a9209d7cb /src/main/java/gregtech/api/items | |
| parent | c38822f6cd5199672fbf7d69d3c1521664f51170 (diff) | |
| download | GT5-Unofficial-4ec739c927cb1b338383df2f49bb08e33737eb61.tar.gz GT5-Unofficial-4ec739c927cb1b338383df2f49bb08e33737eb61.tar.bz2 GT5-Unofficial-4ec739c927cb1b338383df2f49bb08e33737eb61.zip | |
LHE, turbine, steam turbine changes.
Diffstat (limited to 'src/main/java/gregtech/api/items')
| -rw-r--r-- | src/main/java/gregtech/api/items/GT_MetaGenerated_Tool.java | 19 |
1 files changed, 17 insertions, 2 deletions
diff --git a/src/main/java/gregtech/api/items/GT_MetaGenerated_Tool.java b/src/main/java/gregtech/api/items/GT_MetaGenerated_Tool.java index c66f71c87e..a255e037c5 100644 --- a/src/main/java/gregtech/api/items/GT_MetaGenerated_Tool.java +++ b/src/main/java/gregtech/api/items/GT_MetaGenerated_Tool.java @@ -354,8 +354,23 @@ public abstract class GT_MetaGenerated_Tool extends GT_MetaBase_Item implements aList.add(tOffset + 1, EnumChatFormatting.WHITE + tMaterial.mDefaultLocalName + EnumChatFormatting.YELLOW + " lvl " + getHarvestLevel(aStack, "") + EnumChatFormatting.GRAY); aList.add(tOffset + 2, EnumChatFormatting.WHITE + "Turbine Efficiency: " + EnumChatFormatting.BLUE + (50.0F + (10.0F * getToolCombatDamage(aStack))) + EnumChatFormatting.GRAY); aList.add(tOffset + 3, EnumChatFormatting.WHITE + "Optimal Steam flow: " + EnumChatFormatting.GOLD + aOptFlow + EnumChatFormatting.GRAY + " L/t"); - aList.add(tOffset + 3, EnumChatFormatting.WHITE + "Optimal Gas flow (Burn energy per tick): " + EnumChatFormatting.GOLD + aOptFlow + EnumChatFormatting.GRAY + " EU/t"); - aList.add(tOffset + 3, EnumChatFormatting.WHITE + "Optimal Plasma flow (Plasma energy per tick): " + EnumChatFormatting.GOLD + aOptFlow*40 + EnumChatFormatting.GRAY + " EU/t"); + { + int aBaseEff=(int)(5+getToolCombatDamage(aStack))*1000; + int aOptFlowLoose=aOptFlow*4; + if(aBaseEff>10000){ + aOptFlowLoose*=Math.pow(1.1f,((aBaseEff-7500)/10000F)*20f); + aBaseEff=7500; + }else if(aBaseEff>7500){ + aOptFlowLoose*=Math.pow(1.1f,((aBaseEff-7500)/10000F)*20f); + aBaseEff*=0.75f; + }else{ + aBaseEff*=0.75f; + } + aList.add(tOffset + 4, EnumChatFormatting.GRAY + "Turbine Efficiency (Loose): " + EnumChatFormatting.BLUE + aBaseEff/100f + EnumChatFormatting.DARK_GRAY); + aList.add(tOffset + 5, EnumChatFormatting.GRAY + "Optimal Steam flow (Loose): " + EnumChatFormatting.GOLD + aOptFlowLoose + EnumChatFormatting.DARK_GRAY + " L/t"); + } + aList.add(tOffset + 6, EnumChatFormatting.WHITE + "Optimal Gas flow (Burn energy per tick): " + EnumChatFormatting.GOLD + aOptFlow + EnumChatFormatting.GRAY + " EU/t"); + aList.add(tOffset + 7, EnumChatFormatting.WHITE + "Optimal Plasma flow (Plasma energy per tick): " + EnumChatFormatting.GOLD + aOptFlow*40 + EnumChatFormatting.GRAY + " EU/t"); } else { aList.add(tOffset + 0, EnumChatFormatting.WHITE + "Durability: " + EnumChatFormatting.GREEN + (tMaxDamage - getToolDamage(aStack)) + " / " + tMaxDamage + EnumChatFormatting.GRAY); |