diff --git a/core/src/mindustry/content/Blocks.java b/core/src/mindustry/content/Blocks.java index dd4e84d547..3f2fc9a70a 100644 --- a/core/src/mindustry/content/Blocks.java +++ b/core/src/mindustry/content/Blocks.java @@ -1086,14 +1086,14 @@ public class Blocks implements ContentList{ powerNode = new PowerNode("power-node"){{ requirements(Category.power, with(Items.copper, 1, Items.lead, 3)); - maxNodes = 20; + maxNodes = 10; laserRange = 6; }}; powerNodeLarge = new PowerNode("power-node-large"){{ requirements(Category.power, with(Items.titanium, 5, Items.lead, 10, Items.silicon, 3)); size = 2; - maxNodes = 30; + maxNodes = 15; laserRange = 9.5f; }}; diff --git a/core/src/mindustry/content/Fx.java b/core/src/mindustry/content/Fx.java index 0f3e77ce73..f09b85b887 100644 --- a/core/src/mindustry/content/Fx.java +++ b/core/src/mindustry/content/Fx.java @@ -901,7 +901,7 @@ public class Fx{ }), - shootSmallFlame = new Effect(32f, e -> { + shootSmallFlame = new Effect(32f, 80f, e -> { color(Pal.lightFlame, Pal.darkFlame, Color.gray, e.fin()); randLenVectors(e.id, 8, e.finpow() * 60f, e.rotation, 10f, (x, y) -> { @@ -910,7 +910,7 @@ public class Fx{ }), - shootPyraFlame = new Effect(33f, e -> { + shootPyraFlame = new Effect(33f, 80f, e -> { color(Pal.lightPyraFlame, Pal.darkPyraFlame, Color.gray, e.fin()); randLenVectors(e.id, 10, e.finpow() * 70f, e.rotation, 10f, (x, y) -> { @@ -919,7 +919,7 @@ public class Fx{ }), - shootLiquid = new Effect(40f, e -> { + shootLiquid = new Effect(40f, 80f, e -> { color(e.color, Color.white, e.fout() / 6f + Mathf.randomSeedRange(e.id, 0.1f)); randLenVectors(e.id, 6, e.finpow() * 60f, e.rotation, 11f, (x, y) -> { diff --git a/core/src/mindustry/entities/Effect.java b/core/src/mindustry/entities/Effect.java index 7681c1fb0c..62ebe99d32 100644 --- a/core/src/mindustry/entities/Effect.java +++ b/core/src/mindustry/entities/Effect.java @@ -40,7 +40,7 @@ public class Effect{ } public Effect(float life, Cons renderer){ - this(life, 28f, renderer); + this(life, 32f, renderer); } public Effect ground(){ diff --git a/core/src/mindustry/world/blocks/distribution/BufferedItemBridge.java b/core/src/mindustry/world/blocks/distribution/BufferedItemBridge.java index c5bc795440..a0eddc20c1 100644 --- a/core/src/mindustry/world/blocks/distribution/BufferedItemBridge.java +++ b/core/src/mindustry/world/blocks/distribution/BufferedItemBridge.java @@ -29,7 +29,7 @@ public class BufferedItemBridge extends ExtendingItemBridge{ } Item item = buffer.poll(speed / timeScale); - if(timer(timerAccept, 4) && item != null && other.acceptItem(this, item)){ + if(timer(timerAccept, 4 / timeScale) && item != null && other.acceptItem(this, item)){ cycleSpeed = Mathf.lerpDelta(cycleSpeed, 4f, 0.05f); other.handleItem(this, item); buffer.remove(); diff --git a/core/src/mindustry/world/blocks/distribution/ItemBridge.java b/core/src/mindustry/world/blocks/distribution/ItemBridge.java index 6ce1107285..7cb6559cca 100644 --- a/core/src/mindustry/world/blocks/distribution/ItemBridge.java +++ b/core/src/mindustry/world/blocks/distribution/ItemBridge.java @@ -41,7 +41,6 @@ public class ItemBridge extends Block{ hasItems = true; unloadable = false; group = BlockGroup.transportation; - canOverdrive = false; noUpdateDisabled = true; //point2 config is relative diff --git a/core/src/mindustry/world/blocks/liquid/LiquidBridge.java b/core/src/mindustry/world/blocks/liquid/LiquidBridge.java index 8c52310022..c658cde66c 100644 --- a/core/src/mindustry/world/blocks/liquid/LiquidBridge.java +++ b/core/src/mindustry/world/blocks/liquid/LiquidBridge.java @@ -15,6 +15,7 @@ public class LiquidBridge extends ItemBridge{ hasItems = false; hasLiquids = true; outputsLiquid = true; + canOverdrive = false; group = BlockGroup.liquids; } diff --git a/gradle.properties b/gradle.properties index 8b95a19da2..c160066854 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,3 +1,3 @@ org.gradle.daemon=true org.gradle.jvmargs=-Xms256m -Xmx1024m -archash=8665da900c8f24c101dd8ab33a910cfa1a58c37c +archash=5c7c5e8d8728880e20f9c39a888ee03612dc1071