diff --git a/core/src/mindustry/content/Blocks.java b/core/src/mindustry/content/Blocks.java index d8738ed451..20db635424 100644 --- a/core/src/mindustry/content/Blocks.java +++ b/core/src/mindustry/content/Blocks.java @@ -532,7 +532,7 @@ public class Blocks implements ContentList{ hasLiquids = false; flameColor = Color.valueOf("ffef99"); - consumes.items(new ItemStack(Items.coal, 1), new ItemStack(Items.sand, 2)); + consumes.items(with(Items.coal, 1, Items.sand, 2)); consumes.power(0.50f); }}; @@ -548,7 +548,7 @@ public class Blocks implements ContentList{ itemCapacity = 30; boostScale = 0.15f; - consumes.items(new ItemStack(Items.coal, 4), new ItemStack(Items.sand, 6), new ItemStack(Items.pyratite, 1)); + consumes.items(with(Items.coal, 4, Items.sand, 6, Items.pyratite, 1)); consumes.power(4f); }}; @@ -561,7 +561,7 @@ public class Blocks implements ContentList{ hasPower = hasItems = true; flameColor = Color.valueOf("ffc099"); - consumes.items(new ItemStack(Items.lead, 1), new ItemStack(Items.sand, 1)); + consumes.items(with(Items.lead, 1, Items.sand, 1)); consumes.power(0.60f); }}; @@ -592,7 +592,7 @@ public class Blocks implements ContentList{ hasPower = true; drawer = new DrawWeave(); - consumes.items(new ItemStack(Items.thorium, 4), new ItemStack(Items.sand, 10)); + consumes.items(with(Items.thorium, 4, Items.sand, 10)); consumes.power(5f); itemCapacity = 20; }}; @@ -606,7 +606,7 @@ public class Blocks implements ContentList{ hasPower = true; consumes.power(4f); - consumes.items(new ItemStack(Items.copper, 3), new ItemStack(Items.lead, 4), new ItemStack(Items.titanium, 2), new ItemStack(Items.silicon, 3)); + consumes.items(with(Items.copper, 3, Items.lead, 4, Items.titanium, 2, Items.silicon, 3)); }}; cryofluidMixer = new LiquidConverter("cryofluid-mixer"){{ @@ -637,7 +637,7 @@ public class Blocks implements ContentList{ size = 2; consumes.power(0.20f); - consumes.items(new ItemStack(Items.coal, 1), new ItemStack(Items.lead, 2), new ItemStack(Items.sand, 2)); + consumes.items(with(Items.coal, 1, Items.lead, 2, Items.sand, 2)); }}; blastMixer = new GenericCrafter("blast-mixer"){{ @@ -647,7 +647,7 @@ public class Blocks implements ContentList{ outputItem = new ItemStack(Items.blastCompound, 1); size = 2; - consumes.items(new ItemStack(Items.pyratite, 1), new ItemStack(Items.sporePod, 1)); + consumes.items(with(Items.pyratite, 1, Items.sporePod, 1)); consumes.power(0.40f); }}; diff --git a/core/src/mindustry/entities/bullet/ContinuousLaserBulletType.java b/core/src/mindustry/entities/bullet/ContinuousLaserBulletType.java index 4c52105b26..172877be42 100644 --- a/core/src/mindustry/entities/bullet/ContinuousLaserBulletType.java +++ b/core/src/mindustry/entities/bullet/ContinuousLaserBulletType.java @@ -13,6 +13,8 @@ public class ContinuousLaserBulletType extends BulletType{ public float length = 220f; public float shake = 1f; public float fadeTime = 16f; + public float lightStroke = 40f; + public float spaceMag = 35f; public Color[] colors = {Color.valueOf("ec745855"), Color.valueOf("ec7458aa"), Color.valueOf("ff9c5a"), Color.white}; public float[] tscales = {1f, 0.7f, 0.5f, 0.2f}; public float[] strokes = {2f, 1.5f, 1f, 0.3f}; @@ -85,7 +87,7 @@ public class ContinuousLaserBulletType extends BulletType{ for(int s = 0; s < colors.length; s++){ Draw.color(Tmp.c1.set(colors[s]).mul(1f + Mathf.absin(Time.time(), 1f, 0.1f))); for(int i = 0; i < tscales.length; i++){ - Tmp.v1.trns(b.rotation() + 180f, (lenscales[i] - 1f) * 35f); + Tmp.v1.trns(b.rotation() + 180f, (lenscales[i] - 1f) * spaceMag); Lines.stroke((width + Mathf.absin(Time.time(), oscScl, oscMag)) * fout * strokes[s] * tscales[i]); Lines.lineAngle(b.x + Tmp.v1.x, b.y + Tmp.v1.y, b.rotation(), baseLen * lenscales[i], false); } @@ -93,7 +95,7 @@ public class ContinuousLaserBulletType extends BulletType{ Tmp.v1.trns(b.rotation(), baseLen * 1.1f); - Drawf.light(b.team, b.x, b.y, b.x + Tmp.v1.x, b.y + Tmp.v1.y, 40, lightColor, 0.7f); + Drawf.light(b.team, b.x, b.y, b.x + Tmp.v1.x, b.y + Tmp.v1.y, lightStroke, lightColor, 0.7f); Draw.reset(); }