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

Merge remote-tracking branch 'origin/master'

Browse Source 
# Conflicts:
#	core/src/mindustry/entities/Damage.java
This commit is contained in:
Anuken
2021-08-28 14:17:29 -04:00
parent 9a7324ce54 d254d971a9
commit 48d568978b
6 changed files with 16 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/src/mindustry/world/blocks/payloads/UnitPayload.java
View File

@@ -94,7 +94,7 @@ public class UnitPayload implements Payload{
if(solid.solid(tx, ty)) return false;
}
//cannnot dump when there's a lot of overlap going on
//cannot dump when there's a lot of overlap going on
if(!unit.type.flying && Units.count(unit.x, unit.y, unit.physicSize(), o -> o.isGrounded() && (o.type.allowLegStep == unit.type.allowLegStep)) > 0){
return false;
}

5
core/src/mindustry/world/draw/DrawRotator.java
View File

@@ -9,14 +9,15 @@ import mindustry.world.blocks.production.GenericCrafter.*;
public class DrawRotator extends DrawBlock{
public TextureRegion rotator, top;
public boolean drawSpinSprite = false;
public float spinSpeed = 2f;
@Override
public void draw(GenericCrafterBuild build){
Draw.rect(build.block.region, build.x, build.y);
if(drawSpinSprite){
Drawf.spinSprite(rotator, build.x, build.y, build.totalProgress * 2f);
Drawf.spinSprite(rotator, build.x, build.y, build.totalProgress * spinSpeed);
}else{
Draw.rect(rotator, build.x, build.y, build.totalProgress * 2f);
Draw.rect(rotator, build.x, build.y, build.totalProgress * spinSpeed);
}
if(top.found()) Draw.rect(top, build.x, build.y);
}