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-12-31 11:15:35 -05:00
parent d6619b9055 d368a73464
commit 87e2dc69a2
5 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/src/mindustry/world/blocks/defense/ForceProjector.java
View File

@@ -207,7 +207,7 @@ public class ForceProjector extends Block{
phaseHeat = Mathf.lerpDelta(phaseHeat, Mathf.num(phaseValid), 0.1f);
if(phaseValid && !broken && timer(timerUse, phaseUseTime) && efficiency > 0){
if(phaseValid && !broken && timer(timerUse, phaseUseTime / timeScale) && efficiency > 0){
consume();
}

2
core/src/mindustry/world/blocks/defense/MendProjector.java
View File

@@ -98,7 +98,7 @@ public class MendProjector extends Block{
phaseHeat = Mathf.lerpDelta(phaseHeat, optionalEfficiency, 0.1f);
if(optionalEfficiency > 0 && timer(timerUse, useTime) && canHeal){
if(optionalEfficiency > 0 && timer(timerUse, useTime / timeScale) && canHeal){
consume();
}

2
core/src/mindustry/world/blocks/defense/RegenProjector.java
View File

@@ -139,7 +139,7 @@ public class RegenProjector extends Block{
anyTargets = targets.contains(b -> b.damaged());
if(efficiency > 0){
if((optionalTimer += Time.delta * optionalEfficiency) >= optionalUseTime){
if((optionalTimer += edelta() * optionalEfficiency) >= optionalUseTime){
consume();
optionalTimer = 0f;
}

2
core/src/mindustry/world/blocks/production/WallCrafter.java
View File

@@ -204,7 +204,7 @@ public class WallCrafter extends Block{
}
}, null) * Mathf.lerp(1f, liquidBoostIntensity, hasLiquidBooster ? optionalEfficiency : 0f) * (itemValid ? itemBoostIntensity : 1f);
if(itemValid && eff * efficiency > 0 && timer(timerUse, boostItemUseTime)){
if(itemValid && eff * efficiency > 0 && timer(timerUse, boostItemUseTime / timeScale)){
consume();
}