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

Better builder detection for ConstructBlock

Browse Source
This commit is contained in:
Anuken
2020-10-11 14:20:53 -04:00
parent f1ec26f82b
commit 2f6f205dc7
2 changed files with 15 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
core/src/mindustry/graphics/OverlayRenderer.java
View File

@ -153,7 +153,6 @@ public class OverlayRenderer{
input.drawOverSelect(); input.drawOverSelect();
if(ui.hudfrag.blockfrag.hover() instanceof Unit unit && unit.controller() instanceof LogicAI ai && ai.controller instanceof Building build){ if(ui.hudfrag.blockfrag.hover() instanceof Unit unit && unit.controller() instanceof LogicAI ai && ai.controller instanceof Building build){
Draw.z(Layer.overlayUI);
Drawf.square(build.x, build.y, build.block.size * tilesize/2f + 2f); Drawf.square(build.x, build.y, build.block.size * tilesize/2f + 2f);
if(!unit.within(build, unit.hitSize * 2f)){ if(!unit.within(build, unit.hitSize * 2f)){
Drawf.arrow(unit.x, unit.y, build.x, build.y, unit.hitSize *2f, 4f); Drawf.arrow(unit.x, unit.y, build.x, build.y, unit.hitSize *2f, 4f);

17
core/src/mindustry/world/blocks/ConstructBlock.java
View File

@ -146,6 +146,9 @@ public class ConstructBlock extends Block{
public Block previous; public Block previous;
public Object lastConfig; public Object lastConfig;
@Nullable
public Unit lastBuilder;
private float[] accumulator; private float[] accumulator;
private float[] totalAccumulator; private float[] totalAccumulator;
@ -218,6 +221,10 @@ public class ConstructBlock extends Block{
return; return;
} }
if(builder.isPlayer()){
lastBuilder = builder;
}
lastConfig = config; lastConfig = config;
if(cblock.requirements.length != accumulator.length || totalAccumulator.length != cblock.requirements.length){ if(cblock.requirements.length != accumulator.length || totalAccumulator.length != cblock.requirements.length){
@ -237,13 +244,18 @@ public class ConstructBlock extends Block{
progress = Mathf.clamp(progress + maxProgress); progress = Mathf.clamp(progress + maxProgress);
if(progress >= 1f || state.rules.infiniteResources){ if(progress >= 1f || state.rules.infiniteResources){
constructed(tile, cblock, builder, (byte)rotation, builder.team, config); if(lastBuilder == null) lastBuilder = builder;
constructed(tile, cblock, lastBuilder, (byte)rotation, builder.team, config);
} }
} }
public void deconstruct(Unit builder, @Nullable Building core, float amount){ public void deconstruct(Unit builder, @Nullable Building core, float amount){
float deconstructMultiplier = state.rules.deconstructRefundMultiplier; float deconstructMultiplier = state.rules.deconstructRefundMultiplier;
if(builder.isPlayer()){
lastBuilder = builder;
}
if(cblock != null){ if(cblock != null){
ItemStack[] requirements = cblock.requirements; ItemStack[] requirements = cblock.requirements;
if(requirements.length != accumulator.length || totalAccumulator.length != requirements.length){ if(requirements.length != accumulator.length || totalAccumulator.length != requirements.length){
@ -275,7 +287,8 @@ public class ConstructBlock extends Block{
progress = Mathf.clamp(progress - amount); progress = Mathf.clamp(progress - amount);
if(progress <= 0 || state.rules.infiniteResources){ if(progress <= 0 || state.rules.infiniteResources){
Call.deconstructFinish(tile, this.cblock == null ? previous : this.cblock, builder); if(lastBuilder == null) lastBuilder = builder;
Call.deconstructFinish(tile, this.cblock == null ? previous : this.cblock, lastBuilder);
} }
} }