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

Implementation of #7325

Browse Source
This commit is contained in:
Anuken
2022-10-04 12:06:00 -04:00
parent 12e5dbf287
commit be5eac5335
14 changed files with 67 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
core/src/mindustry/ai/RtsAI.java
View File

@@ -153,6 +153,7 @@ public class RtsAI{
}
Building defend = null;
boolean defendingCore = false;
//there is something to defend, see if it's worth the time
if(damaged.size > 0){
@@ -182,6 +183,10 @@ public class RtsAI{
if(debug){
Vars.ui.showLabel("Defend, dst = " + (int)(best.dst(ax, ay)), 8f, best.x, best.y);
}
if(best instanceof CoreBuild){
defendingCore = true;
}
}
}
@@ -241,7 +246,9 @@ public class RtsAI{
}
//assign a flag, so it will be "mobilized" more easily later
unit.flag = 1;
if(!defendingCore){
unit.flag = 1;
}
}
}
}

13
core/src/mindustry/content/Blocks.java
View File

@@ -73,7 +73,7 @@ public class Blocks{
melter, separator, disassembler, sporePress, pulverizer, incinerator, coalCentrifuge,
//crafting - erekir
siliconArcFurnace, electrolyzer, oxidationChamber, atmosphericConcentrator, electricHeater, slagHeater, phaseHeater, heatRedirector, slagIncinerator,
siliconArcFurnace, electrolyzer, oxidationChamber, atmosphericConcentrator, electricHeater, slagHeater, phaseHeater, heatRedirector, heatRouter, slagIncinerator,
carbideCrucible, slagCentrifuge, surgeCrucible, cyanogenSynthesizer, phaseSynthesizer, heatReactor,
//sandbox
@@ -1316,6 +1316,17 @@ public class Blocks{
regionRotated1 = 1;
}};
heatRouter = new HeatConductor("heat-router"){{
requirements(Category.crafting, with(Items.tungsten, 10, Items.graphite, 10));
researchCostMultiplier = 10f;
size = 3;
drawer = new DrawMulti(new DrawDefault(), new DrawHeatOutput(-1, false), new DrawHeatOutput(), new DrawHeatOutput(1, false), new DrawHeatInput("-heat"));
regionRotated1 = 1;
splitHeat = true;
}};
slagIncinerator = new ItemIncinerator("slag-incinerator"){{
requirements(Category.crafting, with(Items.tungsten, 15));
size = 1;

4
core/src/mindustry/content/ErekirTechTree.java
View File

@@ -220,6 +220,10 @@ public class ErekirTechTree{
});
});
});
node(heatRouter, () -> {
});
});
});
});

36
core/src/mindustry/entities/comp/BuildingComp.java
View File

@@ -351,7 +351,6 @@ abstract class BuildingComp implements Posc, Teamc, Healthc, Buildingc, Timerc,
return calculateHeat(sideHeat, null);
}
//TODO can cameFrom be an IntSet?
public float calculateHeat(float[] sideHeat, @Nullable IntSet cameFrom){
Arrays.fill(sideHeat, 0f);
if(cameFrom != null) cameFrom.clear();
@@ -360,22 +359,31 @@ abstract class BuildingComp implements Posc, Teamc, Healthc, Buildingc, Timerc,
for(var edge : block.getEdges()){
Building build = nearby(edge.x, edge.y);
if(build != null && build.team == team && build instanceof HeatBlock heater && (!build.block.rotate || (relativeTo(build) + 2) % 4 == build.rotation)){ //TODO hacky
if(build != null && build.team == team && build instanceof HeatBlock heater){
//if there's a cycle, ignore its heat
if(!(build instanceof HeatConductorBuild hc && hc.cameFrom.contains(id()))){
//heat is distributed across building size
float add = heater.heat() / build.block.size;
boolean split = build.block instanceof HeatConductor cond && cond.splitHeat;
// non-routers must face us, routers must face away - next to a redirector, they're forced to face away due to cycles anyway
if(!build.block.rotate || (!split && (relativeTo(build) + 2) % 4 == build.rotation) || (split && relativeTo(build) != build.rotation)){ //TODO hacky
sideHeat[Mathf.mod(relativeTo(build), 4)] += add;
heat += add;
}
//if there's a cycle, ignore its heat
if(!(build instanceof HeatConductorBuild hc && hc.cameFrom.contains(id()))){
//heat is distributed across building size
float add = heater.heat() / build.block.size;
if(split){
//heat routers split heat across 3 surfaces
add /= 3f;
}
//register traversed cycles
if(cameFrom != null){
cameFrom.add(build.id);
if(build instanceof HeatConductorBuild hc){
cameFrom.addAll(hc.cameFrom);
sideHeat[Mathf.mod(relativeTo(build), 4)] += add;
heat += add;
}
//register traversed cycles
if(cameFrom != null){
cameFrom.add(build.id);
if(build instanceof HeatConductorBuild hc){
cameFrom.addAll(hc.cameFrom);
}
}
}
}

3
core/src/mindustry/world/blocks/heat/HeatConductor.java
View File

@@ -14,6 +14,7 @@ import mindustry.world.draw.*;
public class HeatConductor extends Block{
public float visualMaxHeat = 15f;
public DrawBlock drawer = new DrawDefault();
public boolean splitHeat = false;
public HeatConductor(String name){
super(name);
@@ -90,7 +91,7 @@ public class HeatConductor extends Block{
@Override
public float heatFrac(){
return heat / visualMaxHeat;
return (heat / visualMaxHeat) / (splitHeat ? 3f : 1);
}
}
}

21
core/src/mindustry/world/draw/DrawHeatOutput.java
View File

@@ -17,17 +17,28 @@ public class DrawHeatOutput extends DrawBlock{
public Color heatColor = new Color(1f, 0.22f, 0.22f, 0.8f);
public float heatPulse = 0.3f, heatPulseScl = 10f, glowMult = 1.2f;
public int rotOffset = 0;
public boolean drawGlow = true;
public DrawHeatOutput(){}
public DrawHeatOutput(int rotOffset, boolean drawGlow){
this.rotOffset = rotOffset;
this.drawGlow = drawGlow;
}
@Override
public void draw(Building build){
Draw.rect(build.rotation > 1 ? top2 : top1, build.x, build.y, build.rotdeg());
float rotdeg = (build.rotation + rotOffset) * 90;
Draw.rect(Mathf.mod((build.rotation + rotOffset), 4) > 1 ? top2 : top1, build.x, build.y, rotdeg);
if(build instanceof HeatBlock heater && heater.heat() > 0){
Draw.z(Layer.blockAdditive);
Draw.blend(Blending.additive);
Draw.color(heatColor, heater.heatFrac() * (heatColor.a * (1f - heatPulse + Mathf.absin(heatPulseScl, heatPulse))));
if(heat.found()) Draw.rect(heat, build.x, build.y, build.rotdeg());
if(heat.found()) Draw.rect(heat, build.x, build.y, rotdeg);
Draw.color(Draw.getColor().mul(glowMult));
if(glow.found()) Draw.rect(glow, build.x, build.y);
if(drawGlow && glow.found()) Draw.rect(glow, build.x, build.y);
Draw.blend();
Draw.color();
}
@@ -35,7 +46,7 @@ public class DrawHeatOutput extends DrawBlock{
@Override
public void drawPlan(Block block, BuildPlan plan, Eachable<BuildPlan> list){
Draw.rect(plan.rotation > 1 ? top2 : top1, plan.drawx(), plan.drawy(), plan.rotation * 90);
Draw.rect(Mathf.mod((plan.rotation + rotOffset), 4) > 1 ? top2 : top1, plan.drawx(), plan.drawy(), (plan.rotation + rotOffset) * 90);
}
@Override
@@ -48,4 +59,4 @@ public class DrawHeatOutput extends DrawBlock{
//TODO currently no icons due to concerns with rotation
}
}