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 map_4

Browse Source
This commit is contained in:
Anuken
2022-09-29 17:20:54 -04:00
parent df6ff248a4 a8fa6da787
commit f1604a4f5b
2 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
core/src/mindustry/ai/types/CommandAI.java
View File

@@ -184,6 +184,9 @@ public class CommandAI extends AIController{
}else if(target != null){ }else if(target != null){
faceTarget(); faceTarget();
} }
//boosting control is not supported, so just don't.
unit.updateBoosting(false);
} }
@Override @Override
@@ -236,8 +239,6 @@ public class CommandAI extends AIController{
pathId = Vars.controlPath.nextTargetId(); pathId = Vars.controlPath.nextTargetId();
} }
/* /*
//TODO ひどい //TODO ひどい

9
core/src/mindustry/world/blocks/production/GenericCrafter.java
View File

@@ -240,14 +240,17 @@ public class GenericCrafter extends Block{
@Override @Override
public float getProgressIncrease(float baseTime){ public float getProgressIncrease(float baseTime){
//limit progress increase by maximum amount of liquid it can produce //limit progress increase by maximum amount of liquid it can produce
float scaling = 1f; float scaling = 1f, max = 0f;
if(outputLiquids != null){ if(outputLiquids != null){
for(var s : outputLiquids){ for(var s : outputLiquids){
scaling = Math.min(scaling, (liquidCapacity - liquids.get(s.liquid)) / (s.amount * edelta())); float value = (liquidCapacity - liquids.get(s.liquid)) / (s.amount * edelta());
scaling = Math.min(scaling, value);
max = Math.max(max, value);
} }
} }
return super.getProgressIncrease(baseTime) * scaling; //when dumping excess take the maximum value instead of the minimum.
return super.getProgressIncrease(baseTime) * (dumpExtraLiquid ? Math.min(max, 1f) : scaling);
} }
public float warmupTarget(){ public float warmupTarget(){