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

Misc minor fixes

Browse Source
This commit is contained in:
Anuken
2022-07-18 22:14:53 -04:00
parent 2c6b2a6fa9
commit a6ae178b46
7 changed files with 35 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -12,12 +12,13 @@ import arc.struct.*;
import arc.util.*;
import mindustry.*;
import mindustry.content.*;
import mindustry.game.*;
import mindustry.game.EventType.*;
import mindustry.game.*;
import mindustry.gen.*;
import mindustry.input.*;
import mindustry.ui.*;
import mindustry.world.*;
import mindustry.world.blocks.payloads.PayloadBlock.*;
import mindustry.world.meta.*;
import static mindustry.Vars.*;
@@ -38,7 +39,7 @@ public class HintsFragment{
public void build(Group parent){
group.setFillParent(true);
group.touchable = Touchable.childrenOnly;
//TODO hints off for now.
//TODO hints off for now - figure out tutorial system.
group.visibility = () -> !state.isCampaign() && Core.settings.getBool("hints", true) && ui.hudfrag.shown;
group.update(() -> {
if(current != null){
@@ -83,6 +84,11 @@ public class HintsFragment{
events.clear();
});
Events.on(BuildingCommandEvent.class, e -> {
if(e.building instanceof PayloadBlockBuild<?>){
events.add("factorycontrol");
}
});
}
void checkNext(){
@@ -170,6 +176,8 @@ public class HintsFragment{
waveFire(() -> Groups.fire.size() > 0 && Blocks.wave.unlockedNow(), () -> indexer.getFlagged(state.rules.defaultTeam, BlockFlag.extinguisher).size > 0),
generator(() -> control.input.block == Blocks.combustionGenerator, () -> ui.hints.placedBlocks.contains(Blocks.combustionGenerator)),
guardian(() -> state.boss() != null && state.boss().armor >= 4, () -> state.boss() == null),
factoryControl(() -> !(state.isCampaign() && state.rules.sector.preset == SectorPresets.onset) &&
state.rules.defaultTeam.data().getBuildings(Blocks.tankFabricator).size + state.rules.defaultTeam.data().getBuildings(Blocks.groundFactory).size > 0, () -> ui.hints.events.contains("factorycontrol")),
coreUpgrade(() -> state.isCampaign() && Blocks.coreFoundation.unlocked()
&& state.rules.defaultTeam.core() != null
&& state.rules.defaultTeam.core().block == Blocks.coreShard