mirrors/Mindustry
1
0
Fork 0
mirror of https://github.com/Anuken/Mindustry.git synced 2025-03-06 07:30:35 +07:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
Anuken 2021-09-04 09:55:28 -04:00
commit 6984be2172
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
core/src/mindustry/world/blocks/power/ItemLiquidGenerator.java
View File

@ -29,6 +29,7 @@ public class ItemLiquidGenerator extends PowerGenerator{
public float maxLiquidGenerate = 0.4f;
public Effect generateEffect = Fx.generatespark;
public float generateEffectRnd = 3f;
public Effect explodeEffect = Fx.generatespark;
public Color heatColor = Color.valueOf("ff9b59");
public @Load("@-top") TextureRegion topRegion;
@ -128,12 +129,12 @@ public class ItemLiquidGenerator extends PowerGenerator{
productionEfficiency = baseLiquidEfficiency * used / maximumPossible;
if(used > 0.001f && Mathf.chance(0.05 * delta())){
generateEffect.at(x + Mathf.range(3f), y + Mathf.range(3f));
generateEffect.at(x + Mathf.range(generateEffectRnd), y + Mathf.range(generateEffectRnd));
}
}else if(hasItems){
// No liquids accepted or none supplied, try using items if accepted
if(generateTime <= 0f && items.total() > 0){
generateEffect.at(x + Mathf.range(3f), y + Mathf.range(3f));
generateEffect.at(x + Mathf.range(generateEffectRnd), y + Mathf.range(generateEffectRnd));
Item item = items.take();
productionEfficiency = getItemEfficiency(item);
explosiveness = item.explosiveness;

5
core/src/mindustry/world/blocks/power/SingleTypeGenerator.java
View File

@ -3,6 +3,7 @@ package mindustry.world.blocks.power;
import mindustry.type.*;
public class SingleTypeGenerator extends ItemLiquidGenerator{
public boolean useItems = true;
public SingleTypeGenerator(String name){
super(name);
@ -11,11 +12,11 @@ public class SingleTypeGenerator extends ItemLiquidGenerator{
@Override
protected float getItemEfficiency(Item item){
return 1f;
return useItems ? 1f : 0f;
}
@Override
protected float getLiquidEfficiency(Liquid liquid){
return 0f;
return useItems ? 0f : 1f;
}
}