mirrors/Mindustry
1
0
Fork 0
mirror of https://github.com/Anuken/Mindustry.git synced 2025-02-19 03:03:59 +07:00
Code Issues Packages Projects Releases Wiki Activity

Fixed #7213

Browse Source
This commit is contained in:
Anuken 2022-07-21 07:56:09 -04:00
parent 5f4f07a10a
commit 1476c4dacd
4 changed files with 15 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
core/assets-raw/sprites/editor/pack.json
View File

@ -2,8 +2,8 @@
duplicatePadding: true, duplicatePadding: true,
combineSubdirectories: true, combineSubdirectories: true,
flattenPaths: true, flattenPaths: true,
maxWidth: 4096, maxWidth: 2048,
maxHeight: 4096, maxHeight: 2048,
fast: true, fast: true,
stripWhitespaceCenter: true stripWhitespaceCenter: true
} }

4
core/assets-raw/sprites/ui/pack.json
View File

@ -2,8 +2,8 @@
duplicatePadding: true, duplicatePadding: true,
combineSubdirectories: true, combineSubdirectories: true,
flattenPaths: true, flattenPaths: true,
maxWidth: 4096, maxWidth: 2048,
maxHeight: 4096, maxHeight: 2048,
fast: true, fast: true,
stripWhitespaceCenter: true stripWhitespaceCenter: true
} }

3
core/src/mindustry/entities/comp/BuilderComp.java
View File

@ -258,7 +258,8 @@ abstract class BuilderComp implements Posc, Statusc, Teamc, Rotc{
boolean activelyBuilding(){ boolean activelyBuilding(){
//not actively building when not near the build plan //not actively building when not near the build plan
if(isBuilding()){ if(isBuilding()){
if(!state.isEditor() && !within(buildPlan(), state.rules.infiniteResources ? Float.MAX_VALUE : type.buildRange)){ var plan = buildPlan();
if(!state.isEditor() && plan != null && !within(plan, state.rules.infiniteResources ? Float.MAX_VALUE : type.buildRange)){
return false; return false;
} }
} }

9
core/src/mindustry/world/blocks/distribution/ArmoredConveyor.java
View File

@ -1,5 +1,6 @@
package mindustry.world.blocks.distribution; package mindustry.world.blocks.distribution;
import arc.math.geom.*;
import mindustry.gen.*; import mindustry.gen.*;
import mindustry.type.*; import mindustry.type.*;
import mindustry.world.*; import mindustry.world.*;
@ -17,6 +18,14 @@ public class ArmoredConveyor extends Conveyor{
(lookingAt(tile, rotation, otherx, othery, otherblock) && otherblock.hasItems); (lookingAt(tile, rotation, otherx, othery, otherblock) && otherblock.hasItems);
} }
@Override
public boolean blendsArmored(Tile tile, int rotation, int otherx, int othery, int otherrot, Block otherblock){
return Point2.equals(tile.x + Geometry.d4(rotation).x, tile.y + Geometry.d4(rotation).y, otherx, othery)
|| ((!otherblock.rotatedOutput(otherx, othery) && Edges.getFacingEdge(otherblock, otherx, othery, tile) != null &&
Edges.getFacingEdge(otherblock, otherx, othery, tile).relativeTo(tile) == rotation) ||
(otherblock instanceof Conveyor && otherblock.rotatedOutput(otherx, othery) && Point2.equals(otherx + Geometry.d4(otherrot).x, othery + Geometry.d4(otherrot).y, tile.x, tile.y)));
}
public class ArmoredConveyorBuild extends ConveyorBuild{ public class ArmoredConveyorBuild extends ConveyorBuild{
@Override @Override
public boolean acceptItem(Building source, Item item){ public boolean acceptItem(Building source, Item item){