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

Merge pull request #3396 from DeltaNedas/master

Browse Source 
add mining/mineX/mineY sensors
This commit is contained in:
Anuken 2020-11-14 13:37:47 -05:00 committed by GitHub
commit 87050b6c56
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -37,6 +37,7 @@ abstract class UnitComp implements Healthc, Physicsc, Hitboxc, Statusc, Teamc, I
@Import float x, y, rotation, elevation, maxHealth, drag, armor, hitSize, health, ammo, minFormationSpeed;
@Import Team team;
@Import int id;
@Import @Nullable Tile mineTile;
private UnitController controller;
UnitType type;
@ -123,6 +124,9 @@ abstract class UnitComp implements Healthc, Physicsc, Hitboxc, Statusc, Teamc, I
case shooting -> isShooting() ? 1 : 0;
case shootX -> World.conv(aimX());
case shootY -> World.conv(aimY());
case mining -> mining() ? 1 : 0;
case mineX -> mining() ? mineTile.x : -1;
case mineY -> mining() ? mineTile.y : -1;
case flag -> flag;
case controlled -> controller instanceof LogicAI || controller instanceof Player ? 1 : 0;
case payloadCount -> self() instanceof Payloadc pay ? pay.payloads().size : 0;

3
core/src/mindustry/logic/LAccess.java
View File

@ -27,6 +27,9 @@ public enum LAccess{
shootX,
shootY,
shooting,
mineX,
mineY,
mining,
team,
type,
flag,