From 836e72119c49c83e4459a92e6bbadd597198cc48 Mon Sep 17 00:00:00 2001
From: Patrick 'Quezler' Mounier <patrick@queztech.net>
Date: Thu, 14 Nov 2019 21:21:29 +0100
Subject: [PATCH] =?UTF-8?q?=F0=9F=97=9C=20Pressure=20conduit=20(#949)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* Suggest pressure conduit

* Revert "Suggest pressure conduit"

This reverts commit 721dd9255e690ddd0251434025a504fc703bf025.

* Increase pulse conduit output pressure

* Remove `tile.block().`
---
 core/src/io/anuke/mindustry/content/Blocks.java     | 1 +
 core/src/io/anuke/mindustry/world/BlockStorage.java | 3 ++-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/core/src/io/anuke/mindustry/content/Blocks.java b/core/src/io/anuke/mindustry/content/Blocks.java
index d441d20201..737a35eb60 100644
--- a/core/src/io/anuke/mindustry/content/Blocks.java
+++ b/core/src/io/anuke/mindustry/content/Blocks.java
@@ -1010,6 +1010,7 @@ public class Blocks implements ContentList{
         pulseConduit = new Conduit("pulse-conduit"){{
             requirements(Category.liquid, ItemStack.with(Items.titanium, 2, Items.metaglass, 1));
             liquidCapacity = 16f;
+            liquidPressure = 1.025f;
             health = 90;
         }};
 
diff --git a/core/src/io/anuke/mindustry/world/BlockStorage.java b/core/src/io/anuke/mindustry/world/BlockStorage.java
index 477ca3504f..199a82870c 100644
--- a/core/src/io/anuke/mindustry/world/BlockStorage.java
+++ b/core/src/io/anuke/mindustry/world/BlockStorage.java
@@ -28,6 +28,7 @@ public abstract class BlockStorage extends UnlockableContent{
 
     public int itemCapacity = 10;
     public float liquidCapacity = 10f;
+    public float liquidPressure = 1f;
 
     public final BlockStats stats = new BlockStats();
     public final BlockBars bars = new BlockBars();
@@ -150,7 +151,7 @@ public abstract class BlockStorage extends UnlockableContent{
 
             if(next.block().acceptLiquid(next, tile, liquid, 0f)){
                 float ofract = next.entity.liquids.get(liquid) / next.block().liquidCapacity;
-                float fract = tile.entity.liquids.get(liquid) / liquidCapacity;
+                float fract = tile.entity.liquids.get(liquid) / liquidCapacity * liquidPressure;
                 float flow = Math.min(Mathf.clamp((fract - ofract) * (1f)) * (liquidCapacity), tile.entity.liquids.get(liquid));
                 flow = Math.min(flow, next.block().liquidCapacity - next.entity.liquids.get(liquid) - 0.001f);