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

Bugfixes / Team access

Browse Source
This commit is contained in:
Anuken 2020-08-13 19:57:45 -04:00
parent c2f71e5788
commit 1d95980066
5 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1171,6 +1171,7 @@ abstract class BuildingComp implements Posc, Teamc, Healthc, Buildingc, Timerc,
public double sense(LAccess sensor){ public double sense(LAccess sensor){
if(sensor == LAccess.x) return x; if(sensor == LAccess.x) return x;
if(sensor == LAccess.y) return y; if(sensor == LAccess.y) return y;
if(sensor == LAccess.team) return team.id;
if(sensor == LAccess.health) return health; if(sensor == LAccess.health) return health;
if(sensor == LAccess.efficiency) return efficiency(); if(sensor == LAccess.efficiency) return efficiency();
if(sensor == LAccess.rotation) return rotation; if(sensor == LAccess.rotation) return rotation;

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

@ -76,6 +76,7 @@ abstract class UnitComp implements Healthc, Physicsc, Hitboxc, Statusc, Teamc, I
if(sensor == LAccess.health) return health; if(sensor == LAccess.health) return health;
if(sensor == LAccess.x) return x; if(sensor == LAccess.x) return x;
if(sensor == LAccess.y) return y; if(sensor == LAccess.y) return y;
if(sensor == LAccess.team) return team.id;
if(sensor == LAccess.shooting) return isShooting() ? 1 : 0; if(sensor == LAccess.shooting) return isShooting() ? 1 : 0;
if(sensor == LAccess.shootX) return aimX(); if(sensor == LAccess.shootX) return aimX();
if(sensor == LAccess.shootY) return aimY(); if(sensor == LAccess.shootY) return aimY();

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

@ -23,10 +23,11 @@ public enum LAccess{
shootX, shootX,
shootY, shootY,
shooting, shooting,
team,
//values with parameters are considered controllable //values with parameters are considered controllable
enabled("to"), //"to" is standard for single parameter access enabled("to"), //"to" is standard for single parameter access
shoot("x", "y", "shoot"); shoot("x", "y", "shoot"),;
public final String[] parameters; public final String[] parameters;

4
core/src/mindustry/world/blocks/logic/LogicBlock.java
View File

@ -125,7 +125,7 @@ public class LogicBlock extends Block{
int bytelen = stream.readInt(); int bytelen = stream.readInt();
byte[] bytes = new byte[bytelen]; byte[] bytes = new byte[bytelen];
stream.read(bytes); stream.readFully(bytes);
int total = stream.readInt(); int total = stream.readInt();
@ -181,7 +181,7 @@ public class LogicBlock extends Block{
int bytelen = stream.readInt(); int bytelen = stream.readInt();
byte[] bytes = new byte[bytelen]; byte[] bytes = new byte[bytelen];
stream.read(bytes); stream.readFully(bytes);
links.clear(); links.clear();

2
gradle.properties
View File

@ -1,3 +1,3 @@
org.gradle.daemon=true org.gradle.daemon=true
org.gradle.jvmargs=-Xms256m -Xmx1024m org.gradle.jvmargs=-Xms256m -Xmx1024m
archash=425860b7f549e36a17bc6fa5b26798af5b291480 archash=a5c0934b3894e9f2fe793800a2adb39606f32cee