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

Merge branch 'master' of https://github.com/Anuken/Mindustry into maps

Browse Source
This commit is contained in:
Epowerj
2022-07-11 23:08:33 -04:00
parent b29b6b38e7 fc5e40a857
commit 352fa4e18f
3 changed files with 12 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/src/mindustry/ai/RtsAI.java
View File

@@ -174,7 +174,7 @@ public class RtsAI{
//defend when close, or this is the only squad defending //defend when close, or this is the only squad defending
//TODO will always rush to defense no matter what //TODO will always rush to defense no matter what
if(best instanceof CoreBuild || units.size >= data.team.rules().rtsMinSquad || best.within(ax, ay, 500f)){ if(best != null && (best instanceof CoreBuild || units.size >= data.team.rules().rtsMinSquad || best.within(ax, ay, 500f))){
defend = best; defend = best;
if(debug){ if(debug){

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

@@ -2479,9 +2479,7 @@ public class Blocks{
ambientSoundVolume = 0.06f; ambientSoundVolume = 0.06f;
}}; }};
//TODO cooler name?
pyrolysisGenerator = new ConsumeGenerator("pyrolysis-generator"){{ pyrolysisGenerator = new ConsumeGenerator("pyrolysis-generator"){{
//TODO requirements
requirements(Category.power, with(Items.graphite, 50, Items.carbide, 50, Items.oxide, 60f, Items.silicon, 50)); requirements(Category.power, with(Items.graphite, 50, Items.carbide, 50, Items.oxide, 60f, Items.silicon, 50));
powerProduction = 27f; powerProduction = 27f;
@@ -2502,7 +2500,7 @@ public class Blocks{
liquidCapacity = 30f * 5; liquidCapacity = 30f * 5;
liquidOutput = new LiquidStack(Liquids.water, 20f / 60f); outputLiquid = new LiquidStack(Liquids.water, 20f / 60f);
generateEffect = Fx.none; generateEffect = Fx.none;

20
core/src/mindustry/world/blocks/power/ConsumeGenerator.java
View File

@@ -20,7 +20,7 @@ public class ConsumeGenerator extends PowerGenerator{
public Effect generateEffect = Fx.none, consumeEffect = Fx.none; public Effect generateEffect = Fx.none, consumeEffect = Fx.none;
public float generateEffectRange = 3f; public float generateEffectRange = 3f;
public @Nullable LiquidStack liquidOutput; public @Nullable LiquidStack outputLiquid;
public @Nullable ConsumeItemFilter filterItem; public @Nullable ConsumeItemFilter filterItem;
public @Nullable ConsumeLiquidFilter filterLiquid; public @Nullable ConsumeLiquidFilter filterLiquid;
@@ -33,8 +33,8 @@ public class ConsumeGenerator extends PowerGenerator{
public void setBars(){ public void setBars(){
super.setBars(); super.setBars();
if(liquidOutput != null){ if(outputLiquid != null){
addLiquidBar(liquidOutput.liquid); addLiquidBar(outputLiquid.liquid);
} }
} }
@@ -43,7 +43,7 @@ public class ConsumeGenerator extends PowerGenerator{
filterItem = findConsumer(c -> c instanceof ConsumeItemFilter); filterItem = findConsumer(c -> c instanceof ConsumeItemFilter);
filterLiquid = findConsumer(c -> c instanceof ConsumeLiquidFilter); filterLiquid = findConsumer(c -> c instanceof ConsumeLiquidFilter);
if(liquidOutput != null){ if(outputLiquid != null){
outputsLiquid = true; outputsLiquid = true;
hasLiquids = true; hasLiquids = true;
} }
@@ -62,8 +62,8 @@ public class ConsumeGenerator extends PowerGenerator{
stats.add(Stat.productionTime, itemDuration / 60f, StatUnit.seconds); stats.add(Stat.productionTime, itemDuration / 60f, StatUnit.seconds);
} }
if(liquidOutput != null){ if(outputLiquid != null){
stats.add(Stat.output, StatValues.liquid(liquidOutput.liquid, liquidOutput.amount * 60f, true)); stats.add(Stat.output, StatValues.liquid(outputLiquid.liquid, outputLiquid.amount * 60f, true));
} }
} }
@@ -102,10 +102,10 @@ public class ConsumeGenerator extends PowerGenerator{
generateTime = 1f; generateTime = 1f;
} }
if(liquidOutput != null){ if(outputLiquid != null){
float added = Math.min(productionEfficiency * delta() * liquidOutput.amount, liquidCapacity - liquids.get(liquidOutput.liquid)); float added = Math.min(productionEfficiency * delta() * outputLiquid.amount, liquidCapacity - liquids.get(outputLiquid.liquid));
liquids.add(liquidOutput.liquid, added); liquids.add(outputLiquid.liquid, added);
dumpLiquid(liquidOutput.liquid); dumpLiquid(outputLiquid.liquid);
} }
//generation time always goes down, but only at the end so consumeTriggerValid doesn't assume fake items //generation time always goes down, but only at the end so consumeTriggerValid doesn't assume fake items