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

Fixed pyratite mixer glitchy animation / Fixed block select flashing

Browse Source
This commit is contained in:
Anuken
2018-07-02 21:35:21 -04:00
parent 11b979e408
commit 9130302c93
4 changed files with 15 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
core/src/io/anuke/mindustry/content/blocks/CraftingBlocks.java
View File

@@ -129,6 +129,7 @@ public class CraftingBlocks extends BlockList implements ContentList {
}};
pyratiteMixer = new PowerSmelter("pyratite-mixer") {{
flameColor = Color.CLEAR;
itemCapacity = 20;
hasItems = true;
hasPower = true;

2
core/src/io/anuke/mindustry/ui/fragments/BlocksFragment.java
View File

@@ -1,5 +1,6 @@
package io.anuke.mindustry.ui.fragments;
import com.badlogic.gdx.Gdx;
import com.badlogic.gdx.graphics.Color;
import com.badlogic.gdx.graphics.g2d.TextureRegion;
import com.badlogic.gdx.math.Interpolation;
@@ -148,6 +149,7 @@ public class BlocksFragment extends Fragment{
input.recipe = null;
}
lastCategory = cat;
stack.act(Gdx.graphics.getDeltaTime());
}).growX().height(54).group(group)
.name("sectionbutton" + cat.name()).get();

13
core/src/io/anuke/mindustry/world/blocks/production/PowerSmelter.java
View File

@@ -1,6 +1,7 @@
package io.anuke.mindustry.world.blocks.production;
import com.badlogic.gdx.graphics.Color;
import com.badlogic.gdx.graphics.g2d.TextureRegion;
import io.anuke.mindustry.content.fx.BlockFx;
import io.anuke.mindustry.entities.TileEntity;
import io.anuke.mindustry.type.Item;
@@ -48,6 +49,8 @@ public class PowerSmelter extends PowerBlock {
burnEffect = BlockFx.fuelburn;
protected Color flameColor = Color.valueOf("ffc999");
protected TextureRegion topRegion;
public PowerSmelter(String name) {
super(name);
hasItems = true;
@@ -56,6 +59,12 @@ public class PowerSmelter extends PowerBlock {
itemCapacity = 20;
}
@Override
public void load() {
super.load();
topRegion = Draw.region(name + "-top");
}
@Override
public void setBars(){
super.setBars();
@@ -169,7 +178,7 @@ public class PowerSmelter extends PowerBlock {
PowerSmelterEntity entity = tile.entity();
//draw glowing center
if(entity.heat > 0f){
if(entity.heat > 0f && flameColor.a > 0.001f){
float g = 0.3f;
float r = 0.06f;
float cr = Mathf.random(0.1f);
@@ -179,7 +188,7 @@ public class PowerSmelter extends PowerBlock {
Draw.tint(flameColor);
Fill.circle(tile.drawx(), tile.drawy(), 3f + Mathf.absin(Timers.time(), 5f, 2f) + cr);
Draw.color(1f, 1f, 1f, entity.heat);
Draw.rect(name + "-top", tile.drawx(), tile.drawy());
Draw.rect(topRegion, tile.drawx(), tile.drawy());
Fill.circle(tile.drawx(), tile.drawy(), 1.9f + Mathf.absin(Timers.time(), 5f, 1f) + cr);
Draw.color();