diff --git a/core/src/mindustry/content/Blocks.java b/core/src/mindustry/content/Blocks.java index 0736673a1a..e3d9ad3b44 100644 --- a/core/src/mindustry/content/Blocks.java +++ b/core/src/mindustry/content/Blocks.java @@ -1401,7 +1401,7 @@ public class Blocks{ //TODO bad name, and there's no use for phase yet... phaseSynthesizer = new HeatCrafter("phase-synthesizer"){{ - requirements(Category.crafting, with(Items.surgeAlloy, 70, Items.carbide, 90, Items.silicon, 100, Items.thorium, 100, Items.beryllium, 200)); + requirements(Category.crafting, with(Items.carbide, 90, Items.silicon, 100, Items.thorium, 100, Items.tungsten, 200)); size = 3; @@ -4249,13 +4249,13 @@ public class Blocks{ }}; advancedReconstructor = new Reconstructor("advanced-reconstructor"){{ - requirements(Category.units, with(Items.beryllium, 250, Items.oxide, 200, Items.tungsten, 200, Items.silicon, 400)); + requirements(Category.units, with(Items.thorium, 250, Items.oxide, 200, Items.tungsten, 200, Items.silicon, 400)); regionSuffix = "-dark"; size = 5; consumePower(5f); consumeLiquid(Liquids.nitrogen, 10f / 60f); - consumeItems(with(Items.oxide, 20, Items.tungsten, 100)); + consumeItems(with(Items.thorium, 80, Items.silicon, 100)); constructTime = 60f * 60f; diff --git a/core/src/mindustry/entities/bullet/BulletType.java b/core/src/mindustry/entities/bullet/BulletType.java index 55be83a834..8be65f63c1 100644 --- a/core/src/mindustry/entities/bullet/BulletType.java +++ b/core/src/mindustry/entities/bullet/BulletType.java @@ -142,16 +142,17 @@ public class BulletType extends Content implements Cloneable{ public boolean fragOnHit = true; /** If true, unit armor is ignored in damage calculations. Ignored for building armor. */ public boolean pierceArmor = false; - - //additional effects - /** Whether status and despawnHit should automatically be set. */ public boolean setDefaults = true; - + /** Degree spread range of fragmentation bullets. */ public float fragRandomSpread = 360f; + /** Uniform spread between each frag bullet in degrees. */ public float fragSpread = 0f; + /** Angle offset of fragmentation bullets. */ public float fragAngle = 0f; + /** Number of fragmentation bullets created. */ public int fragBullets = 9; + public float fragVelocityMin = 0.2f, fragVelocityMax = 1f, fragLifeMin = 1f, fragLifeMax = 1f; public @Nullable BulletType fragBullet = null; public float bulletInterval = 20f;