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

Draw reconstructor in region during placement & unconnected (#4143)

Browse Source 
* Draw reconstructor in region during placement & unconnected

* Same as the previous commit, but for block loaders & unloaders
This commit is contained in:
Patrick 'Quezler' Mounier
2020-12-28 12:23:06 -05:00
committed by GitHub
parent d84a36b8ee
commit 0e1e399788
2 changed files with 8 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/src/mindustry/world/blocks/experimental/BlockLoader.java
+4
View File
@@ -53,6 +53,7 @@ public class BlockLoader extends PayloadAcceptor{
@Override @Override
public void drawRequestRegion(BuildPlan req, Eachable<BuildPlan> list){ public void drawRequestRegion(BuildPlan req, Eachable<BuildPlan> list){
Draw.rect(region, req.drawx(), req.drawy()); Draw.rect(region, req.drawx(), req.drawy());
Draw.rect(inRegion, req.drawx(), req.drawy(), req.rotation * 90);
Draw.rect(outRegion, req.drawx(), req.drawy(), req.rotation * 90); Draw.rect(outRegion, req.drawx(), req.drawy(), req.rotation * 90);
Draw.rect(topRegion, req.drawx(), req.drawy()); Draw.rect(topRegion, req.drawx(), req.drawy());
} }
@@ -77,11 +78,14 @@ public class BlockLoader extends PayloadAcceptor{
Draw.rect(region, x, y); Draw.rect(region, x, y);
//draw input //draw input
boolean fallback = true;
for(int i = 0; i < 4; i++){ for(int i = 0; i < 4; i++){
if(blends(i) && i != rotation){ if(blends(i) && i != rotation){
Draw.rect(inRegion, x, y, (i * 90) - 180); Draw.rect(inRegion, x, y, (i * 90) - 180);
fallback = false;
} }
} }
if(fallback) Draw.rect(inRegion, x, y, rotation * 90);
Draw.rect(outRegion, x, y, rotdeg()); Draw.rect(outRegion, x, y, rotdeg());
core/src/mindustry/world/blocks/units/Reconstructor.java
+4
View File
@@ -33,6 +33,7 @@ public class Reconstructor extends UnitBlock{
@Override @Override
public void drawRequestRegion(BuildPlan req, Eachable<BuildPlan> list){ public void drawRequestRegion(BuildPlan req, Eachable<BuildPlan> list){
Draw.rect(region, req.drawx(), req.drawy()); Draw.rect(region, req.drawx(), req.drawy());
Draw.rect(inRegion, req.drawx(), req.drawy(), req.rotation * 90);
Draw.rect(outRegion, req.drawx(), req.drawy(), req.rotation * 90); Draw.rect(outRegion, req.drawx(), req.drawy(), req.rotation * 90);
Draw.rect(topRegion, req.drawx(), req.drawy()); Draw.rect(topRegion, req.drawx(), req.drawy());
} }
@@ -127,11 +128,14 @@ public class Reconstructor extends UnitBlock{
Draw.rect(region, x, y); Draw.rect(region, x, y);
//draw input //draw input
boolean fallback = true;
for(int i = 0; i < 4; i++){ for(int i = 0; i < 4; i++){
if(blends(i) && i != rotation){ if(blends(i) && i != rotation){
Draw.rect(inRegion, x, y, (i * 90) - 180); Draw.rect(inRegion, x, y, (i * 90) - 180);
fallback = false;
} }
} }
if(fallback) Draw.rect(inRegion, x, y, rotation * 90);
Draw.rect(outRegion, x, y, rotdeg()); Draw.rect(outRegion, x, y, rotdeg());