Astronand/Mindustry
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Misc tweaks

Browse Source
This commit is contained in:
Anuken
2021-11-12 13:47:22 -05:00
parent 8da4e72e77
commit 757977b7b9
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
core/src/mindustry/content/Blocks.java
View File

@@ -944,6 +944,7 @@ public class Blocks implements ContentList{
}}; }};
heatReactor = new HeatProducer("heat-reactor"){{ heatReactor = new HeatProducer("heat-reactor"){{
//TODO quadvent
requirements(Category.crafting, with(Items.tungsten, 60, Items.graphite, 30)); requirements(Category.crafting, with(Items.tungsten, 60, Items.graphite, 30));
size = 3; size = 3;
consumeTime = 60f * 10f; consumeTime = 60f * 10f;
@@ -964,7 +965,7 @@ public class Blocks implements ContentList{
heatRequirement = 10f; heatRequirement = 10f;
consumes.items(with(Items.tungsten, 1, Items.graphite, 2)); consumes.items(with(Items.tungsten, 2, Items.graphite, 3));
consumes.power(2f); consumes.power(2f);
}}; }};

5
core/src/mindustry/world/draw/DrawCrucible.java
View File

@@ -9,7 +9,6 @@ import arc.util.*;
import mindustry.world.*; import mindustry.world.*;
import mindustry.world.blocks.production.GenericCrafter.*; import mindustry.world.blocks.production.GenericCrafter.*;
//TODO
public class DrawCrucible extends DrawBlock{ public class DrawCrucible extends DrawBlock{
public TextureRegion top, bottom; public TextureRegion top, bottom;
public Color flameColor = Color.valueOf("f58349"), midColor = Color.valueOf("f2d585"); 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 float alpha = 0.5f;
public int particles = 30; 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); public Interp particleInterp = new PowIn(1.5f);
@Override @Override
@@ -41,7 +40,7 @@ public class DrawCrucible extends DrawBlock{
rand.setSeed(build.id); rand.setSeed(build.id);
for(int i = 0; i < particles; i++){ for(int i = 0; i < particles; i++){
float fin = (rand.random(1f) + base) % 1f, fout = 1f - fin; 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); float len = particleRad * particleInterp.apply(fout);
Draw.alpha(a * (1f - Mathf.curve(fin, 1f - fadeMargin))); Draw.alpha(a * (1f - Mathf.curve(fin, 1f - fadeMargin)));
Fill.circle( Fill.circle(