From e5135ed23668d27bec3e26baf8b330e596c38588 Mon Sep 17 00:00:00 2001 From: Calclavia Date: Wed, 10 Dec 2014 22:28:54 +0800 Subject: [PATCH] Increased pump pressure --- .../fluid/transport/{PumpNode.scala => NodePump.scala} | 6 +++--- .../mechanical/fluid/transport/TilePump.scala | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) rename src/main/scala/resonantinduction/mechanical/fluid/transport/{PumpNode.scala => NodePump.scala} (88%) diff --git a/src/main/scala/resonantinduction/mechanical/fluid/transport/PumpNode.scala b/src/main/scala/resonantinduction/mechanical/fluid/transport/NodePump.scala similarity index 88% rename from src/main/scala/resonantinduction/mechanical/fluid/transport/PumpNode.scala rename to src/main/scala/resonantinduction/mechanical/fluid/transport/NodePump.scala index 9d5156fd7..580b03769 100644 --- a/src/main/scala/resonantinduction/mechanical/fluid/transport/PumpNode.scala +++ b/src/main/scala/resonantinduction/mechanical/fluid/transport/NodePump.scala @@ -9,7 +9,7 @@ import resonantinduction.core.prefab.node.NodeFluidPressure * A node for the pump * @author Calclavia */ -class PumpNode(parent: INodeProvider) extends NodeFluidPressure(parent) +class NodePump(parent: INodeProvider) extends NodeFluidPressure(parent) { def pump: TilePump = getParent.asInstanceOf[TilePump] @@ -19,10 +19,10 @@ class PumpNode(parent: INodeProvider) extends NodeFluidPressure(parent) { if (dir == pump.getDirection) { - return Math.max(Math.log(Math.abs(pump.mechanicalNode.torque) + 1), 2).toInt + return Math.max(Math.log(Math.abs(pump.mechanicalNode.torque) + 1) * 3, 2).toInt } - return -Math.max(Math.log(Math.abs(pump.mechanicalNode.torque) + 1), 2).toInt + return -Math.max(Math.log(Math.abs(pump.mechanicalNode.torque) + 1) * 3, 2).toInt } return 0 diff --git a/src/main/scala/resonantinduction/mechanical/fluid/transport/TilePump.scala b/src/main/scala/resonantinduction/mechanical/fluid/transport/TilePump.scala index 8475a679a..0536b2476 100644 --- a/src/main/scala/resonantinduction/mechanical/fluid/transport/TilePump.scala +++ b/src/main/scala/resonantinduction/mechanical/fluid/transport/TilePump.scala @@ -23,7 +23,7 @@ object TilePump class TilePump extends TileMechanical(Material.iron) with IRotatable with IFluidHandler { - val pressureNode = new PumpNode(this) + val pressureNode = new NodePump(this) //Constructor normalRender = false