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

Updated Steam meta / Fixed #3673

Browse Source
This commit is contained in:
Anuken
2020-11-30 17:12:29 -05:00
parent af122a76a4
commit 9870098457
5 changed files with 60 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
core/src/mindustry/game/SectorInfo.java
View File

@@ -227,7 +227,11 @@ public class SectorInfo{
updateDelta(item, production, coreDeltas);
updateDelta(item, rawProduction, productionDeltas);
//cap production/export by production
production.get(item).mean = Math.min(production.get(item).mean, rawProduction.get(item).mean);
if(export.containsKey(item)){
export.get(item).mean = Math.min(export.get(item).mean, rawProduction.get(item).mean);
}
}
Arrays.fill(coreDeltas, 0);

5
core/src/mindustry/io/TypeIO.java
View File

@@ -166,10 +166,13 @@ public class TypeIO{
}
public static void writeUnit(Writes write, Unit unit){
write.b(unit.isNull() ? 0 : unit instanceof BlockUnitc ? 1 : 2);
write.b(unit == null || unit.isNull() ? 0 : unit instanceof BlockUnitc ? 1 : 2);
//block units are special
if(unit instanceof BlockUnitc){
write.i(((BlockUnitc)unit).tile().pos());
}else if(unit == null){
write.i(0);
}else{
write.i(unit.id);
}

2
core/src/mindustry/ui/fragments/HintsFragment.java
View File

@@ -38,7 +38,7 @@ public class HintsFragment extends Fragment{
public void build(Group parent){
group.setFillParent(true);
group.touchable = Touchable.childrenOnly;
group.visibility = () -> Core.settings.getBool("hints", true);
group.visibility = () -> Core.settings.getBool("hints", true) && ui.hudfrag.shown;
group.update(() -> {
if(current != null){
//current got completed