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

Minor duct preview optimizations

Browse Source
This commit is contained in:
Anuken
2021-06-06 10:06:33 -04:00
parent 75abe7661d
commit 8d12dbbe70
2 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/src/mindustry/ctype/UnlockableContent.java
View File

@@ -50,8 +50,8 @@ public abstract class UnlockableContent extends MappableContent{
fullIcon = fullIcon =
Core.atlas.find(getContentType().name() + "-" + name + "-full", Core.atlas.find(getContentType().name() + "-" + name + "-full",
Core.atlas.find(name + "-full", Core.atlas.find(name + "-full",
Core.atlas.find(name,
Core.atlas.find(getContentType().name() + "-" + name, Core.atlas.find(getContentType().name() + "-" + name,
Core.atlas.find(name,
Core.atlas.find(name + "1"))))); Core.atlas.find(name + "1")))));
uiIcon = Core.atlas.find(getContentType().name() + "-" + name + "-ui", fullIcon); uiIcon = Core.atlas.find(getContentType().name() + "-" + name + "-ui", fullIcon);

12
core/src/mindustry/world/blocks/distribution/DuctBridge.java
View File

@@ -53,13 +53,13 @@ public class DuctBridge extends Block{
public void drawRequestConfigTop(BuildPlan req, Eachable<BuildPlan> list){ public void drawRequestConfigTop(BuildPlan req, Eachable<BuildPlan> list){
otherReq = null; otherReq = null;
otherDst = range; otherDst = range;
Point2 d = Geometry.d4(req.rotation);
list.each(other -> { list.each(other -> {
if(other.block == this && req != other){ if(other.block == this && req != other && Mathf.clamp(other.x - req.x, -1, 1) == d.x && Mathf.clamp(other.y - req.y, -1, 1) == d.y){
for(int i = 1; i <= range; i++){ int dst = Math.max(Math.abs(other.x - req.x), Math.abs(other.y - req.y));
if(req.x + (Geometry.d4x(req.rotation) * i) == other.x && req.y + (Geometry.d4y(req.rotation) * i) == other.y && i <= otherDst){ if(dst <= otherDst){
otherReq = other; otherReq = other;
otherDst = i; otherDst = dst;
}
} }
} }
}); });