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

Merge branch 'master' of https://github.com/Anuken/Mindustry into 7.0-features

Browse Source 
 Conflicts:
	core/assets/bundles/bundle_ko.properties
	core/src/mindustry/type/UnitType.java
This commit is contained in:
Anuken
2021-11-22 10:12:48 -05:00
parent 6edf0a27a4 25f98fdeb0
commit 65f36faf71
42 changed files with 8369 additions and 1504 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
core/src/mindustry/entities/abilities/EnergyFieldAbility.java
View File

@@ -30,7 +30,7 @@ public class EnergyFieldAbility extends Ability{
public int maxTargets = 25;
public float healPercent = 2.5f;
public float layer = Layer.bullet - 0.001f, blinkScl = 20f;
public float layer = Layer.bullet - 0.001f, blinkScl = 20f, blinkSize = 0.1f;
public float effectRadius = 5f, sectorRad = 0.14f, rotateSpeed = 0.5f;
public int sectors = 5;
public Color color = Pal.heal;
@@ -60,7 +60,7 @@ public class EnergyFieldAbility extends Ability{
Draw.color(color);
Tmp.v1.trns(unit.rotation - 90, x, y).add(unit.x, unit.y);
float rx = Tmp.v1.x, ry = Tmp.v1.y;
float orbRadius = effectRadius * (1f + Mathf.absin(blinkScl, 0.1f));
float orbRadius = effectRadius * (1f + Mathf.absin(blinkScl, blinkSize));
Fill.circle(rx, ry, orbRadius);
Draw.color();

4
core/src/mindustry/entities/comp/BuildingComp.java
View File

@@ -474,6 +474,10 @@ abstract class BuildingComp implements Posc, Teamc, Healthc, Buildingc, Timerc,
return block.unloadable;
}
public boolean canResupply(){
return block.allowResupply;
}
public boolean payloadCheck(int conveyorRotation){
return block.rotate && (rotation + 2) % 4 == conveyorRotation;
}