mirrors/Mindustry
1
Fork 0
mirror of https://github.com/Anuken/Mindustry.git synced 2026-01-26 14:32:06 -08:00
Code Issues Projects Releases Wiki Activity

Fixed #9049

Browse source
This commit is contained in:
Anuken 2023-09-11 20:00:20 -04:00
parent 3b2ac61dd0
commit 34ba2cfd41
2 changed files with 14 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

20
core/src/mindustry/entities/comp/BuildingComp.java
View file

@ -377,13 +377,9 @@ abstract class BuildingComp implements Posc, Teamc, Healthc, Buildingc, Timerc,
float heat = 0f;
for(var edge : block.getEdges()){
Building build = nearby(edge.x, edge.y);
for(var build : proximity){
if(build != null && build.team == team && build instanceof HeatBlock heater){
//massive hack but I don't really care anymore
if(heater instanceof HeatConductorBuild cond){
cond.updateHeat();
}
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
@ -391,8 +387,13 @@ abstract class BuildingComp implements Posc, Teamc, Healthc, Buildingc, Timerc,
//if there's a cycle, ignore its heat
if(!(build instanceof HeatConductorBuild hc && hc.cameFrom.contains(id()))){
//x/y coordinate difference across point of contact
int diff = Math.min(Math.abs(build.tileX() - tileX()), Math.abs(build.tileY() - tileY()));
//number of points that this block had contact with
int contactPoints = Math.min(Math.max(build.block.size, block.size) - diff, Math.min(build.block.size, block.size));
//heat is distributed across building size
float add = heater.heat() / build.block.size;
float add = heater.heat() / build.block.size * contactPoints;
if(split){
//heat routers split heat across 3 surfaces
add /= 3f;
@ -409,6 +410,11 @@ abstract class BuildingComp implements Posc, Teamc, Healthc, Buildingc, Timerc,
cameFrom.addAll(hc.cameFrom);
}
}
//massive hack but I don't really care anymore
if(heater instanceof HeatConductorBuild cond){
cond.updateHeat();
}
}
}
}

2
gradle.properties
View file

@ -25,4 +25,4 @@ org.gradle.caching=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=152e49944a
archash=867271d6a4