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

Additional construction fixes

Browse Source
This commit is contained in:
Anuken
2024-04-08 12:22:32 -04:00
parent 3b0fac1ba2
commit ad0d0a7e99
1 changed files with 15 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -341,7 +341,7 @@ public class ConstructBlock extends Block{
int accepting = Math.min(accumulated, core.storageCapacity - core.items.get(requirements[i].item)); int accepting = Math.min(accumulated, core.storageCapacity - core.items.get(requirements[i].item));
//transfer items directly, as this is not production. //transfer items directly, as this is not production.
core.items.add(requirements[i].item, accepting); core.items.add(requirements[i].item, accepting);
itemsLeft[i] -= accepting; itemsLeft[i] += accepting;
accumulator[i] -= accepting; accumulator[i] -= accepting;
}else{ }else{
accumulator[i] -= accumulated; accumulator[i] -= accumulated;
@@ -355,8 +355,11 @@ public class ConstructBlock extends Block{
//add any leftover items that weren't obtained due to rounding errors //add any leftover items that weren't obtained due to rounding errors
if(core != null){ if(core != null){
for(int i = 0; i < itemsLeft.length; i++){ for(int i = 0; i < itemsLeft.length; i++){
core.items.add(current.requirements[i].item, Mathf.clamp(itemsLeft[i], 0, core.storageCapacity - core.items.get(current.requirements[i].item))); int target = Mathf.round(requirements[i].amount * state.rules.buildCostMultiplier * state.rules.deconstructRefundMultiplier);
itemsLeft[i] = 0; int remaining = target - itemsLeft[i];
core.items.add(current.requirements[i].item, Mathf.clamp(remaining, 0, core.storageCapacity - core.items.get(current.requirements[i].item)));
itemsLeft[i] = target;
} }
} }
@@ -439,14 +442,14 @@ public class ConstructBlock extends Block{
this.itemsLeft = new int[previous.requirements.length]; this.itemsLeft = new int[previous.requirements.length];
this.accumulator = new float[previous.requirements.length]; this.accumulator = new float[previous.requirements.length];
this.totalAccumulator = new float[previous.requirements.length]; this.totalAccumulator = new float[previous.requirements.length];
ItemStack[] requirements = current.requirements;
for(int i = 0; i < requirements.length; i++){
this.itemsLeft[i] = Mathf.round(requirements[i].amount * state.rules.buildCostMultiplier * state.rules.deconstructRefundMultiplier);
}
pathfinder.updateTile(tile); pathfinder.updateTile(tile);
} }
@Override
public byte version(){
return 1;
}
@Override @Override
public void write(Writes write){ public void write(Writes write){
super.write(write); super.write(write);
@@ -461,6 +464,7 @@ public class ConstructBlock extends Block{
for(int i = 0; i < accumulator.length; i++){ for(int i = 0; i < accumulator.length; i++){
write.f(accumulator[i]); write.f(accumulator[i]);
write.f(totalAccumulator[i]); write.f(totalAccumulator[i]);
write.i(itemsLeft[i]);
} }
} }
} }
@@ -479,6 +483,9 @@ public class ConstructBlock extends Block{
for(int i = 0; i < acsize; i++){ for(int i = 0; i < acsize; i++){
accumulator[i] = read.f(); accumulator[i] = read.f();
totalAccumulator[i] = read.f(); totalAccumulator[i] = read.f();
if(revision >= 1){
itemsLeft[i] = read.i();
}
} }
} }