mirror of
https://github.com/Anuken/Mindustry.git
synced 2024-09-11 08:15:35 +03:00
Erekir tech fixes
This commit is contained in:
parent
e4595b6831
commit
feba0cf207
@ -130,7 +130,7 @@ public abstract class BaseProcessor extends AbstractProcessor{
|
||||
Seq<String> result = new Seq<>();
|
||||
for(String s : rawSource.split("\n", -1)){
|
||||
result.add(s);
|
||||
if (s.startsWith("package ")){
|
||||
if(s.startsWith("package ")){
|
||||
result.add("");
|
||||
for (String i : imports){
|
||||
result.add(i);
|
||||
|
@ -53,7 +53,7 @@ public class ErekirTechTree{
|
||||
});
|
||||
});
|
||||
|
||||
//TODO further in? no use for these without units.
|
||||
//TODO should only be unlocked in unit sector
|
||||
node(constructor, Seq.with(new Research(siliconArcFurnace), erekirSector.first()), () -> {
|
||||
node(payloadLoader, () -> {
|
||||
node(payloadUnloader, () -> {
|
||||
@ -110,9 +110,9 @@ public class ErekirTechTree{
|
||||
});
|
||||
|
||||
node(reinforcedConduit, () -> {
|
||||
//TODO so should this be *on* or *complete*?
|
||||
node(reinforcedPump, Seq.with(new OnSector(aware)), () -> {
|
||||
//TODO T2 pump
|
||||
//TODO maybe should be even later
|
||||
node(reinforcedPump, Seq.with(new SectorComplete(aware)), () -> {
|
||||
//TODO T2 pump, consume cyanogen or similar
|
||||
});
|
||||
|
||||
node(reinforcedLiquidJunction, () -> {
|
||||
@ -122,7 +122,7 @@ public class ErekirTechTree{
|
||||
|
||||
node(reinforcedLiquidRouter, () -> {
|
||||
node(reinforcedLiquidContainer, () -> {
|
||||
node(reinforcedLiquidTank, () -> {
|
||||
node(reinforcedLiquidTank, Seq.with(new SectorComplete(aware)), () -> {
|
||||
|
||||
});
|
||||
});
|
||||
@ -132,7 +132,8 @@ public class ErekirTechTree{
|
||||
|
||||
node(siliconArcFurnace, () -> {
|
||||
node(cliffCrusher, () -> {
|
||||
node(electrolyzer, () -> {
|
||||
//TODO should be gated on landing of 3rd sector, not complete?
|
||||
node(electrolyzer, Seq.with(new SectorComplete(aware)), () -> {
|
||||
node(oxidationChamber, () -> {
|
||||
node(electricHeater, () -> {
|
||||
node(heatRedirector, () -> {
|
||||
|
@ -1301,7 +1301,7 @@ public abstract class InputHandler implements InputProcessor, GestureListener{
|
||||
}
|
||||
if(points.size > 1 && end instanceof ChainedBuilding){
|
||||
Point2 secondToLast = points.get(points.size - 2);
|
||||
if (!(world.build(secondToLast.x, secondToLast.y) instanceof ChainedBuilding)){
|
||||
if(!(world.build(secondToLast.x, secondToLast.y) instanceof ChainedBuilding)){
|
||||
endRotation = end.rotation;
|
||||
}
|
||||
}
|
||||
|
@ -24,4 +24,4 @@ android.useAndroidX=true
|
||||
#used for slow jitpack builds; TODO see if this actually works
|
||||
org.gradle.internal.http.socketTimeout=100000
|
||||
org.gradle.internal.http.connectionTimeout=100000
|
||||
archash=e62237bfb1
|
||||
archash=a066e32504
|
||||
|
@ -584,7 +584,7 @@ public class ServerControl implements ApplicationListener{
|
||||
if(arg.length == 1){
|
||||
info("'@' is currently @.", c.name(), c.get());
|
||||
}else{
|
||||
if (arg[1].equals("default")){
|
||||
if(arg[1].equals("default")){
|
||||
c.set(c.defaultValue);
|
||||
}else if(c.isBool()){
|
||||
c.set(arg[1].equals("on") || arg[1].equals("true"));
|
||||
|
Loading…
Reference in New Issue
Block a user