diff --git a/core/src/mindustry/content/Blocks.java b/core/src/mindustry/content/Blocks.java index 291e8ff745..8d21893cdc 100644 --- a/core/src/mindustry/content/Blocks.java +++ b/core/src/mindustry/content/Blocks.java @@ -1655,6 +1655,8 @@ public class Blocks implements ContentList{ length = brange; damage = 105f; ammoMultiplier = 5f; + toColor = Pal.thoriumPink; + shootEffect = smokeEffect = Fx.thoriumShoot; }}, Items.titanium, new ShrapnelBulletType(){{ length = brange; @@ -2034,7 +2036,7 @@ public class Blocks implements ContentList{ }}; microProcessor = new LogicBlock("micro-processor"){{ - requirements(Category.logic, with(Items.copper, 80, Items.lead, 50, Items.silicon, 50)); + requirements(Category.logic, with(Items.copper, 80, Items.lead, 50, Items.silicon, 30)); instructionsPerTick = 2; @@ -2042,7 +2044,7 @@ public class Blocks implements ContentList{ }}; logicProcessor = new LogicBlock("logic-processor"){{ - requirements(Category.logic, with(Items.lead, 320, Items.silicon, 100, Items.graphite, 60, Items.thorium, 50)); + requirements(Category.logic, with(Items.lead, 320, Items.silicon, 60, Items.graphite, 60, Items.thorium, 50)); instructionsPerTick = 8; @@ -2052,7 +2054,7 @@ public class Blocks implements ContentList{ }}; hyperProcessor = new LogicBlock("hyper-processor"){{ - requirements(Category.logic, with(Items.lead, 450, Items.silicon, 150, Items.thorium, 75, Items.surgeAlloy, 50)); + requirements(Category.logic, with(Items.lead, 450, Items.silicon, 130, Items.thorium, 75, Items.surgeAlloy, 50)); consumes.liquid(Liquids.cryofluid, 0.08f); hasLiquids = true; diff --git a/core/src/mindustry/content/Fx.java b/core/src/mindustry/content/Fx.java index 5d0c45348d..a046bff46c 100644 --- a/core/src/mindustry/content/Fx.java +++ b/core/src/mindustry/content/Fx.java @@ -1217,7 +1217,15 @@ public class Fx{ randLenVectors(e.id, 7, 25f * e.finpow(), e.rotation, 50f, (x, y) -> { lineAngle(e.x + x, e.y + y, Mathf.angle(x, y), e.fin() * 5f + 2f); }); + }), + thoriumShoot = new Effect(12f, e -> { + color(Color.white, Pal.thoriumPink, e.fin()); + stroke(e.fout() * 1.2f + 0.5f); + + randLenVectors(e.id, 7, 25f * e.finpow(), e.rotation, 50f, (x, y) -> { + lineAngle(e.x + x, e.y + y, Mathf.angle(x, y), e.fin() * 5f + 2f); + }); }), reactorsmoke = new Effect(17, e -> { diff --git a/core/src/mindustry/content/UnitTypes.java b/core/src/mindustry/content/UnitTypes.java index 8036dca51b..f0570cc683 100644 --- a/core/src/mindustry/content/UnitTypes.java +++ b/core/src/mindustry/content/UnitTypes.java @@ -1200,7 +1200,7 @@ public class UnitTypes implements ContentList{ mineTier = 3; health = 500; armor = 5f; - speed = 2.3f; + speed = 2.4f; accel = 0.06f; drag = 0.017f; lowAltitude = true; diff --git a/core/src/mindustry/graphics/Pal.java b/core/src/mindustry/graphics/Pal.java index 8bb3cd9e70..8a6fefa8a4 100644 --- a/core/src/mindustry/graphics/Pal.java +++ b/core/src/mindustry/graphics/Pal.java @@ -5,6 +5,8 @@ import arc.graphics.*; public class Pal{ public static Color + thoriumPink = Color.valueOf("f9a3c7"), + items = Color.valueOf("2ea756"), command = Color.valueOf("eab678"), diff --git a/core/src/mindustry/logic/LExecutor.java b/core/src/mindustry/logic/LExecutor.java index a10cd2d0b2..53c76cfcf1 100644 --- a/core/src/mindustry/logic/LExecutor.java +++ b/core/src/mindustry/logic/LExecutor.java @@ -272,8 +272,9 @@ public class LExecutor{ cache.found = false; exec.setnum(outFound, 0); } - exec.setobj(outFound, res != null && res.build != null && res.build.team == exec.team ? res.build : null); + exec.setobj(outBuild, res != null && res.build != null && res.build.team == exec.team ? res.build : null); }else{ + exec.setobj(outBuild, null); exec.setbool(outFound, cache.found); exec.setnum(outX, cache.x); exec.setnum(outY, cache.y);