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
2026-02-28 00:05:32 -05:00
parent d0005aea7f f9fa92afc1
commit 1c2a3eb2e5
2 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/src/mindustry/content/UnitTypes.java
View File

@@ -2561,6 +2561,7 @@ public class UnitTypes{
lifetime = 60f;
buildingDamageMultiplier = 0.01f;
homingPower = 0.02f;
}};
}});
}};
@@ -2611,6 +2612,7 @@ public class UnitTypes{
lifetime = 60f;
buildingDamageMultiplier = 0.01f;
homingPower = 0.03f;
}};
}});
}};

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

@@ -764,6 +764,8 @@ public class LogicBlock extends Block{
write.s(waitIndices.get(i));
write.f(waitValues.get(i));
}
write.f(accumulator);
}
@Override
@@ -823,6 +825,8 @@ public class LogicBlock extends Block{
waitIndices.add(index);
waitValues.add(value);
}
accumulator = read.f();
}
loadBlock = () -> updateCode(code, false, asm -> {
@@ -843,7 +847,7 @@ public class LogicBlock extends Block{
}
}
//wait times can only be applied once the instructions are loaded an exist
//wait times can only be applied once the instructions are loaded and exist
for(int i = 0; i < waitIndices.size; i++){
int waitIndex = waitIndices.get(i);
if(waitIndex >= 0 && waitIndex < asm.instructions.length && asm.instructions[waitIndex] instanceof WaitI wait){