Fixed assembler requirements
This commit is contained in:
@@ -217,7 +217,7 @@ public class ErekirTechTree{
|
||||
});
|
||||
});
|
||||
|
||||
node(tankAssembler, Seq.with(new OnSector(four), new Research(constructor), new Research(slagCentrifuge), new Research(Liquids.gallium)), () -> {
|
||||
node(tankAssembler, Seq.with(new OnSector(four), new Research(constructor), new Research(atmosphericConcentrator)), () -> {
|
||||
node(UnitTypes.vanquish, () -> {
|
||||
node(UnitTypes.conquer, Seq.with(tmpNever), () -> {
|
||||
|
||||
|
||||
@@ -179,7 +179,7 @@ public class ErekirPlanetGenerator extends PlanetGenerator{
|
||||
//TODO: yellow regolith biome tweaks
|
||||
//TODO ice biome
|
||||
|
||||
float length = width/3f;
|
||||
float length = width/2.6f;
|
||||
Vec2 trns = Tmp.v1.trns(rand.random(360f), length);
|
||||
int
|
||||
spawnX = (int)(trns.x + width/2f), spawnY = (int)(trns.y + height/2f),
|
||||
|
||||
@@ -88,14 +88,14 @@ public class PlacementFragment extends Fragment{
|
||||
Events.run(Trigger.update, () -> {
|
||||
//disable flow updating on previous building so it doesn't waste CPU
|
||||
if(lastFlowBuild != null && lastFlowBuild != nextFlowBuild){
|
||||
if(lastFlowBuild.items != null) lastFlowBuild.flowItems().stopFlow();
|
||||
if(lastFlowBuild.flowItems() != null) lastFlowBuild.flowItems().stopFlow();
|
||||
if(lastFlowBuild.liquids != null) lastFlowBuild.liquids.stopFlow();
|
||||
}
|
||||
|
||||
lastFlowBuild = nextFlowBuild;
|
||||
|
||||
if(nextFlowBuild != null){
|
||||
if(nextFlowBuild.items != null) nextFlowBuild.flowItems().updateFlow();
|
||||
if(nextFlowBuild.flowItems() != null) nextFlowBuild.flowItems().updateFlow();
|
||||
if(nextFlowBuild.liquids != null) nextFlowBuild.liquids.updateFlow();
|
||||
}
|
||||
});
|
||||
|
||||
@@ -267,6 +267,8 @@ public class UnitAssembler extends PayloadBlock{
|
||||
public void display(Table table){
|
||||
super.display(table);
|
||||
|
||||
if(team != player.team()) return;
|
||||
|
||||
table.row();
|
||||
table.table(t -> {
|
||||
t.left().defaults().left();
|
||||
|
||||
@@ -4,10 +4,10 @@ import arc.util.io.*;
|
||||
import mindustry.gen.*;
|
||||
import mindustry.world.meta.*;
|
||||
|
||||
/** @deprecated why is it a module? literally two booleans, why did I think it was a good idea? yay, more pointers???
|
||||
/**
|
||||
* why is it a module? literally two booleans, why did I think it was a good idea? yay, more pointers???
|
||||
* the braindead java "make everything a separate class" mentality
|
||||
* */
|
||||
@Deprecated
|
||||
public class ConsumeModule extends BlockModule{
|
||||
private final Building build;
|
||||
|
||||
@@ -15,26 +15,38 @@ public class ConsumeModule extends BlockModule{
|
||||
this.build = build;
|
||||
}
|
||||
|
||||
/** @deprecated use build.status() */
|
||||
@Deprecated
|
||||
public BlockStatus status(){
|
||||
return build.status();
|
||||
}
|
||||
|
||||
/** @deprecated use build.updateConsumption() */
|
||||
@Deprecated
|
||||
public void update(){
|
||||
build.updateConsumption();
|
||||
}
|
||||
|
||||
/** @deprecated use build.consume() */
|
||||
@Deprecated
|
||||
public void trigger(){
|
||||
build.consume();
|
||||
}
|
||||
|
||||
/** @deprecated use build.consValid() */
|
||||
@Deprecated
|
||||
public boolean valid(){
|
||||
return build.consValid();
|
||||
}
|
||||
|
||||
/** @deprecated use build.canConsume() */
|
||||
@Deprecated
|
||||
public boolean canConsume(){
|
||||
return build.canConsume();
|
||||
}
|
||||
|
||||
/** @deprecated use build.consOptionalValid() */
|
||||
@Deprecated
|
||||
public boolean optionalValid(){
|
||||
return build.consOptionalValid();
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user