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

Dynamic resupply check (#6338)

Browse Source
This commit is contained in:
Matthew Peng
2021-11-15 06:27:22 -08:00
committed by GitHub
parent d23813f328
commit 4a7774fe5a
2 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

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

2
core/src/mindustry/type/ammo/ItemAmmoType.java
View File

@@ -46,7 +46,7 @@ public class ItemAmmoType implements AmmoType{
float range = unit.hitSize + this.range; float range = unit.hitSize + this.range;
Building build = Units.closestBuilding(unit.team, unit.x, unit.y, range, u -> u.block.allowResupply && u.items.has(item)); Building build = Units.closestBuilding(unit.team, unit.x, unit.y, range, u -> u.canResupply() && u.items.has(item));
if(build != null){ if(build != null){
Fx.itemTransfer.at(build.x, build.y, ammoPerItem / 2f, item.color, unit); Fx.itemTransfer.at(build.x, build.y, ammoPerItem / 2f, item.color, unit);