From 757977b7b9222c2138ac8658af1af3caf57731b3 Mon Sep 17 00:00:00 2001 From: Anuken Date: Fri, 12 Nov 2021 13:47:22 -0500 Subject: [PATCH] Misc tweaks --- core/src/mindustry/content/Blocks.java | 3 ++- core/src/mindustry/world/draw/DrawCrucible.java | 5 ++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/core/src/mindustry/content/Blocks.java b/core/src/mindustry/content/Blocks.java index c06e4f3b90..83314fe9ec 100644 --- a/core/src/mindustry/content/Blocks.java +++ b/core/src/mindustry/content/Blocks.java @@ -944,6 +944,7 @@ public class Blocks implements ContentList{ }}; heatReactor = new HeatProducer("heat-reactor"){{ + //TODO quadvent requirements(Category.crafting, with(Items.tungsten, 60, Items.graphite, 30)); size = 3; consumeTime = 60f * 10f; @@ -964,7 +965,7 @@ public class Blocks implements ContentList{ heatRequirement = 10f; - consumes.items(with(Items.tungsten, 1, Items.graphite, 2)); + consumes.items(with(Items.tungsten, 2, Items.graphite, 3)); consumes.power(2f); }}; diff --git a/core/src/mindustry/world/draw/DrawCrucible.java b/core/src/mindustry/world/draw/DrawCrucible.java index 83eabcaf4c..4cfe196e06 100644 --- a/core/src/mindustry/world/draw/DrawCrucible.java +++ b/core/src/mindustry/world/draw/DrawCrucible.java @@ -9,7 +9,6 @@ import arc.util.*; import mindustry.world.*; import mindustry.world.blocks.production.GenericCrafter.*; -//TODO public class DrawCrucible extends DrawBlock{ public TextureRegion top, bottom; public Color flameColor = Color.valueOf("f58349"), midColor = Color.valueOf("f2d585"); @@ -17,7 +16,7 @@ public class DrawCrucible extends DrawBlock{ public float alpha = 0.5f; public int particles = 30; - public float particleLife = 70f, particleRad = 7f, particleSize = 3f, fadeMargin = 0.4f; + public float particleLife = 70f, particleRad = 7f, particleSize = 3f, fadeMargin = 0.4f, rotateScl = 1.5f; public Interp particleInterp = new PowIn(1.5f); @Override @@ -41,7 +40,7 @@ public class DrawCrucible extends DrawBlock{ rand.setSeed(build.id); for(int i = 0; i < particles; i++){ float fin = (rand.random(1f) + base) % 1f, fout = 1f - fin; - float angle = rand.random(360f); + float angle = rand.random(360f) + (Time.time / rotateScl) % 360f; float len = particleRad * particleInterp.apply(fout); Draw.alpha(a * (1f - Mathf.curve(fin, 1f - fadeMargin))); Fill.circle(