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

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
Anuken
2025-02-05 19:44:31 -05:00
parent 2e19fbf417 108b101669
commit 0377ef3a08
13 changed files with 787 additions and 699 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
core/src/mindustry/world/blocks/payloads/PayloadBlock.java
View File

@@ -6,6 +6,7 @@ import arc.math.*;
import arc.math.geom.*;
import arc.util.*;
import arc.util.io.*;
import mindustry.ctype.*;
import mindustry.gen.*;
import mindustry.graphics.*;
import mindustry.world.*;
@@ -251,6 +252,13 @@ public class PayloadBlock extends Block{
}
}
@Override
public double sense(Content content){
if(payload instanceof UnitPayload up) return up.unit.type == content ? 1 : 0;
if(payload instanceof BuildPayload bp) return bp.build.block == content ? 1 : 0;
return super.sense(content);
}
@Override
public void write(Writes write){
super.write(write);

8
core/src/mindustry/world/blocks/payloads/PayloadDeconstructor.java
View File

@@ -5,6 +5,7 @@ import arc.math.*;
import arc.util.*;
import arc.util.io.*;
import mindustry.content.*;
import mindustry.ctype.*;
import mindustry.entities.*;
import mindustry.gen.*;
import mindustry.graphics.*;
@@ -201,6 +202,13 @@ public class PayloadDeconstructor extends PayloadBlock{
}
}
@Override
public double sense(Content content){
if(deconstructing instanceof UnitPayload up) return up.unit.type == content ? 1 : 0;
if(deconstructing instanceof BuildPayload bp) return bp.build.block == content ? 1 : 0;
return super.sense(content);
}
@Override
public double sense(LAccess sensor){
if(sensor == LAccess.progress) return progress;