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

Testing liquids/items in tech tree

Browse Source
This commit is contained in:
Anuken
2020-06-20 22:21:43 -04:00
parent 2082976783
commit a0f0640729
4 changed files with 106 additions and 105 deletions
Download Patch File Download Diff File Expand all files Collapse all files

188
core/src/mindustry/content/TechTree.java
View File

@@ -140,63 +140,30 @@ public class TechTree implements ContentList{
}); });
node(mechanicalDrill, () -> { node(mechanicalDrill, () -> {
node(graphitePress, () -> {
node(pneumaticDrill, () -> {
node(cultivator, () -> {
}); node(Liquids.water, () -> {
node(mechanicalPump, () -> {
node(conduit, () -> {
node(liquidJunction, () -> {
node(liquidRouter, () -> {
node(liquidTank);
node(laserDrill, () -> { node(bridgeConduit);
node(blastDrill, () -> {
}); node(pulseConduit, () -> {
node(phaseConduit, () -> {
node(waterExtractor, () -> { });
node(oilExtractor, () -> {
}); node(platedConduit, () -> {
});
});
});
node(pyratiteMixer, () -> {
node(blastMixer, () -> {
});
});
node(siliconSmelter, () -> {
node(sporePress, () -> {
node(coalCentrifuge, () -> {
});
node(multiPress, () -> {
});
node(plastaniumCompressor, () -> {
node(phaseWeaver, () -> {
});
});
});
node(kiln, () -> {
node(incinerator, () -> {
node(melter, () -> {
node(surgeSmelter, () -> {
});
node(separator, () -> {
node(pulverizer, () -> {
}); });
}); });
node(cryofluidMixer, () -> { node(rotaryPump, () -> {
node(thermalPump, () -> {
});
}); });
}); });
}); });
@@ -204,84 +171,121 @@ public class TechTree implements ContentList{
}); });
}); });
node(Items.coal, () -> {
node(graphitePress, () -> {
node(pneumaticDrill, () -> {
node(cultivator, () -> {
node(mechanicalPump, () -> { });
node(conduit, () -> {
node(liquidJunction, () -> {
node(liquidRouter, () -> {
node(liquidTank);
node(bridgeConduit); node(laserDrill, () -> {
node(blastDrill, () -> {
node(pulseConduit, () -> { });
node(phaseConduit, () -> {
}); node(waterExtractor, () -> {
node(oilExtractor, () -> {
node(platedConduit, () -> {
}); });
}); });
});
});
node(rotaryPump, () -> { node(pyratiteMixer, () -> {
node(thermalPump, () -> { node(blastMixer, () -> {
});
});
node(siliconSmelter, () -> {
node(sporePress, () -> {
node(coalCentrifuge, () -> {
});
node(multiPress, () -> {
});
node(plastaniumCompressor, () -> {
node(phaseWeaver, () -> {
});
});
});
node(kiln, () -> {
node(incinerator, () -> {
node(melter, () -> {
node(surgeSmelter, () -> {
});
node(separator, () -> {
node(pulverizer, () -> {
});
});
node(cryofluidMixer, () -> {
});
}); });
}); });
}); });
}); });
}); });
});
node(combustionGenerator, () -> { node(combustionGenerator, () -> {
node(powerNode, () -> { node(powerNode, () -> {
node(powerNodeLarge, () -> { node(powerNodeLarge, () -> {
node(diode, () -> { node(diode, () -> {
node(surgeTower, () -> { node(surgeTower, () -> {
});
});
});
node(battery, () -> {
node(batteryLarge, () -> {
});
});
node(mender, () -> {
node(mendProjector, () -> {
node(forceProjector, () -> {
node(overdriveProjector, () -> {
}); });
}); });
});
node(repairPoint, () -> { node(battery, () -> {
node(batteryLarge, () -> {
}); });
}); });
});
node(turbineGenerator, () -> { node(mender, () -> {
node(thermalGenerator, () -> { node(mendProjector, () -> {
node(differentialGenerator, () -> { node(forceProjector, () -> {
node(thoriumReactor, () -> { node(overdriveProjector, () -> {
node(impactReactor, () -> {
}); });
});
node(rtgGenerator, () -> { node(repairPoint, () -> {
});
});
});
node(turbineGenerator, () -> {
node(thermalGenerator, () -> {
node(differentialGenerator, () -> {
node(thoriumReactor, () -> {
node(impactReactor, () -> {
});
node(rtgGenerator, () -> {
});
}); });
}); });
}); });
}); });
});
node(solarPanel, () -> { node(solarPanel, () -> {
node(largeSolarPanel, () -> { node(largeSolarPanel, () -> {
});
}); });
}); });
}); });

2
core/src/mindustry/content/Weathers.java
View File

@@ -112,6 +112,7 @@ public class Weathers implements ContentList{
Tmp.r1.grow(padding); Tmp.r1.grow(padding);
Core.camera.bounds(Tmp.r2); Core.camera.bounds(Tmp.r2);
int total = (int)(Tmp.r1.area() / density * state.intensity()) / 2; int total = (int)(Tmp.r1.area() / density * state.intensity()) / 2;
Lines.stroke(0.75f);
float t = Time.time() / 22f; float t = Time.time() / 22f;
@@ -141,7 +142,6 @@ public class Weathers implements ContentList{
Draw.color(Color.royal, Color.white, 0.3f); Draw.color(Color.royal, Color.white, 0.3f);
Draw.alpha(Mathf.slope(life) * state.opacity()); Draw.alpha(Mathf.slope(life) * state.opacity());
Lines.stroke(1f);
float space = 45f; float space = 45f;
for(int j : new int[]{-1, 1}){ for(int j : new int[]{-1, 1}){
Tmp.v1.trns(90f + j*space, 1f + 5f * life); Tmp.v1.trns(90f + j*space, 1f + 5f * life);

6
core/src/mindustry/mod/Mods.java
View File

@@ -480,13 +480,11 @@ public class Mods implements Loadable{
}catch(Throwable e){ }catch(Throwable e){
Core.app.post(() -> { Core.app.post(() -> {
Log.err("Error loading main script @ for mod @.", main.name(), mod.meta.name); Log.err("Error loading main script @ for mod @.", main.name(), mod.meta.name);
e.printStackTrace(); Log.err(e);
}); });
} }
}else{ }else{
Core.app.post(() -> { Core.app.post(() -> Log.err("No main.js found for mod @.", mod.meta.name));
Log.err("No main.js found for mod @.", mod.meta.name);
});
} }
} }
}); });

15
core/src/mindustry/world/blocks/production/Drill.java
View File

@@ -206,15 +206,14 @@ public class Drill extends Block{
} }
public class DrillEntity extends TileEntity{ public class DrillEntity extends TileEntity{
float progress; public float progress;
int index; public int index;
float warmup; public float warmup;
float timeDrilled; public float timeDrilled;
float lastDrillSpeed; public float lastDrillSpeed;
int dominantItems;
Item dominantItem;
public int dominantItems;
public Item dominantItem;
@Override @Override
public boolean shouldConsume(){ public boolean shouldConsume(){