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

Fixed #2799 / Fixed #2797

Browse Source
This commit is contained in:
Anuken
2020-10-02 09:54:08 -04:00
parent 215cfaa42f
commit 138434d029
14 changed files with 15 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
core/src/mindustry/world/blocks/defense/ForceProjector.java
View File

@@ -33,8 +33,8 @@ public class ForceProjector extends Block{
public @Load("@-top") TextureRegion topRegion;
static ForceBuild paramEntity;
static final Cons<Shielderc> shieldConsumer = trait -> {
if(trait.team() != paramEntity.team && Intersector.isInsideHexagon(paramEntity.x, paramEntity.y, paramEntity.realRadius() * 2f, trait.x(), trait.y())){
static final Cons<Bullet> shieldConsumer = trait -> {
if(trait.team != paramEntity.team && trait.type.absorbable && Intersector.isInsideHexagon(paramEntity.x, paramEntity.y, paramEntity.realRadius() * 2f, trait.x(), trait.y())){
trait.absorb();
Fx.absorb.at(trait);
paramEntity.hit = 1f;

2
core/src/mindustry/world/blocks/production/Separator.java
View File

@@ -105,7 +105,7 @@ public class Separator extends Block{
int count = 0;
Item item = null;
//TODO guaranteed desync since items are random
//guaranteed desync since items are random - won't be fixed and probably isn't too important
for(ItemStack stack : results){
if(i >= count && i < count + stack.amount){
item = stack.item;

2
core/src/mindustry/world/blocks/units/RepairPoint.java
View File

@@ -70,7 +70,7 @@ public class RepairPoint extends Block{
Draw.rect(baseRegion, x, y);
Draw.z(Layer.turret);
Drawf.shadow(region, x - (size / 2), y - (size / 2), rotation - 90);
Drawf.shadow(region, x - (size / 2f), y - (size / 2f), rotation - 90);
Draw.rect(region, x, y, rotation - 90);
if(target != null && Angles.angleDist(angleTo(target), rotation) < 30f){