diff --git a/build.gradle b/build.gradle index caa303edf1..c797a77b61 100644 --- a/build.gradle +++ b/build.gradle @@ -200,6 +200,7 @@ project(":core"){ compile arcModule("arc-core") compile arcModule("extensions:freetype") + //compile arcModule("extensions:postprocessing") if(localArc() && debugged()) compile arcModule("extensions:recorder") compileOnly project(":annotations") diff --git a/core/assets/bundles/bundle.properties b/core/assets/bundles/bundle.properties index c4611ae599..6a7c2cde6a 100644 --- a/core/assets/bundles/bundle.properties +++ b/core/assets/bundles/bundle.properties @@ -445,7 +445,7 @@ setting.borderless.name = Borderless Window setting.fps.name = Show FPS setting.vsync.name = VSync setting.lasers.name = Show Power Lasers -setting.pixelate.name = Pixelate [LIGHT_GRAY](may decrease performance) +setting.pixelate.name = Pixelate [LIGHT_GRAY](may decrease performance, disables animations) setting.minimap.name = Show Minimap setting.musicvol.name = Music Volume setting.mutemusic.name = Mute Music diff --git a/core/src/io/anuke/mindustry/content/Blocks.java b/core/src/io/anuke/mindustry/content/Blocks.java index 88862f6638..ace1417acc 100644 --- a/core/src/io/anuke/mindustry/content/Blocks.java +++ b/core/src/io/anuke/mindustry/content/Blocks.java @@ -627,7 +627,7 @@ public class Blocks implements ContentList{ requirements(Category.crafting, ItemStack.with(Items.lead, 70, Items.silicon, 60)); liquidCapacity = 60f; craftTime = 20f; - outputLiquid = new LiquidStack(Liquids.oil, 4f); + outputLiquid = new LiquidStack(Liquids.oil, 6f); size = 2; health = 320; hasLiquids = true; @@ -1451,7 +1451,7 @@ public class Blocks implements ContentList{ ); xRand = 4f; reload = 6f; - range = 190f; + range = 200f; size = 3; recoil = 3f; rotatespeed = 10f; diff --git a/core/src/io/anuke/mindustry/content/Bullets.java b/core/src/io/anuke/mindustry/content/Bullets.java index 3fb99d6702..5b19d26914 100644 --- a/core/src/io/anuke/mindustry/content/Bullets.java +++ b/core/src/io/anuke/mindustry/content/Bullets.java @@ -643,6 +643,8 @@ public class Bullets implements ContentList{ lightning = new BulletType(0.001f, 12f){ { lifetime = 1f; + shootEffect = Fx.hitLancer; + smokeEffect = Fx.none; despawnEffect = Fx.none; hitEffect = Fx.hitLancer; keepVelocity = false; diff --git a/core/src/io/anuke/mindustry/content/Mechs.java b/core/src/io/anuke/mindustry/content/Mechs.java index 8af4eb74f6..060e0916b4 100644 --- a/core/src/io/anuke/mindustry/content/Mechs.java +++ b/core/src/io/anuke/mindustry/content/Mechs.java @@ -75,10 +75,12 @@ public class Mechs implements ContentList{ engineColor = Color.valueOf("d3ddff"); weapon = new Weapon("shockgun"){{ + shake = 2f; length = 1f; reload = 40f; + shotDelay = 3f; roundrobin = true; - shots = 1; + shots = 3; inaccuracy = 0f; velocityRnd = 0.2f; ejectEffect = Fx.none; diff --git a/core/src/io/anuke/mindustry/world/BlockStorage.java b/core/src/io/anuke/mindustry/world/BlockStorage.java index 32cc90dcac..c7ad1afbcb 100644 --- a/core/src/io/anuke/mindustry/world/BlockStorage.java +++ b/core/src/io/anuke/mindustry/world/BlockStorage.java @@ -3,6 +3,7 @@ package io.anuke.mindustry.world; import io.anuke.arc.collection.Array; import io.anuke.arc.math.Mathf; import io.anuke.arc.math.geom.Vector2; +import io.anuke.arc.util.Log; import io.anuke.arc.util.Time; import io.anuke.mindustry.Vars; import io.anuke.mindustry.content.Fx; diff --git a/core/src/io/anuke/mindustry/world/blocks/production/Pump.java b/core/src/io/anuke/mindustry/world/blocks/production/Pump.java index 55d1391486..178a56707c 100644 --- a/core/src/io/anuke/mindustry/world/blocks/production/Pump.java +++ b/core/src/io/anuke/mindustry/world/blocks/production/Pump.java @@ -4,6 +4,7 @@ import io.anuke.arc.Core; import io.anuke.arc.collection.Array; import io.anuke.arc.graphics.g2d.Draw; import io.anuke.arc.graphics.g2d.TextureRegion; +import io.anuke.arc.util.Log; import io.anuke.mindustry.graphics.Layer; import io.anuke.mindustry.type.Liquid; import io.anuke.mindustry.world.Tile; diff --git a/core/src/io/anuke/mindustry/world/consumers/ConsumeLiquid.java b/core/src/io/anuke/mindustry/world/consumers/ConsumeLiquid.java index e21376d627..468750e0cd 100644 --- a/core/src/io/anuke/mindustry/world/consumers/ConsumeLiquid.java +++ b/core/src/io/anuke/mindustry/world/consumers/ConsumeLiquid.java @@ -1,6 +1,7 @@ package io.anuke.mindustry.world.consumers; import io.anuke.arc.scene.ui.layout.Table; +import io.anuke.arc.util.Log; import io.anuke.mindustry.entities.type.TileEntity; import io.anuke.mindustry.type.Liquid; import io.anuke.mindustry.ui.ReqImage; diff --git a/core/src/io/anuke/mindustry/world/modules/ConsumeModule.java b/core/src/io/anuke/mindustry/world/modules/ConsumeModule.java index 63280ec9c9..9323375e71 100644 --- a/core/src/io/anuke/mindustry/world/modules/ConsumeModule.java +++ b/core/src/io/anuke/mindustry/world/modules/ConsumeModule.java @@ -22,13 +22,13 @@ public class ConsumeModule extends BlockModule{ boolean docons = entity.block.shouldConsume(entity.tile); for(Consume cons : entity.block.consumes.all()){ + if(cons.isOptional()) continue; + if(docons && cons.isUpdate() && prevValid && cons.valid(entity)){ cons.update(entity); } - if(!cons.isOptional()){ - valid &= cons.valid(entity); - } + valid &= cons.valid(entity); } for(Consume cons : entity.block.consumes.optionals()){ diff --git a/settings.gradle b/settings.gradle index 4a6e6bf82a..be98da3db5 100644 --- a/settings.gradle +++ b/settings.gradle @@ -26,6 +26,7 @@ if(!hasProperty("release")){ use(':Arc:extensions', '../Arc/extensions') use(':Arc:extensions:freetype', '../Arc/extensions/freetype') use(':Arc:extensions:recorder', '../Arc/extensions/recorder') + //use(':Arc:extensions:postprocessing', '../Arc/extensions/postprocessing') use(':Arc:backends', '../Arc/backends') use(':Arc:backends:backend-lwjgl3', '../Arc/backends/backend-lwjgl3') use(':Arc:backends:backend-android', '../Arc/backends/backend-android')