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

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

@@ -176,7 +176,8 @@ public class UnitTypes{
bullet = new ArtilleryBulletType(2f, 20, "shell"){{ bullet = new ArtilleryBulletType(2f, 20, "shell"){{
hitEffect = Fx.blastExplosion; hitEffect = Fx.blastExplosion;
knockback = 0.8f; knockback = 0.8f;
lifetime = 120f; lifetime = 120f - 35f / 2f;
rangeOverride = 240f;
width = height = 14f; width = height = 14f;
collides = true; collides = true;
collidesTiles = true; collidesTiles = true;
@@ -1676,7 +1677,7 @@ public class UnitTypes{
ejectEffect = Fx.casing1; ejectEffect = Fx.casing1;
shootSound = Sounds.shootDuo; shootSound = Sounds.shootDuo;
bullet = new FlakBulletType(4.2f, 3){{ bullet = new FlakBulletType(4.2f, 3){{
lifetime = 60f; lifetime = 52.5f;
ammoMultiplier = 4f; ammoMultiplier = 4f;
shootEffect = Fx.shootSmall; shootEffect = Fx.shootSmall;
width = 6f; width = 6f;
@@ -1700,7 +1701,7 @@ public class UnitTypes{
bullet = new ArtilleryBulletType(3f, 20, "shell"){{ bullet = new ArtilleryBulletType(3f, 20, "shell"){{
hitEffect = Fx.flakExplosion; hitEffect = Fx.flakExplosion;
knockback = 0.8f; knockback = 0.8f;
lifetime = 80f; lifetime = 73.5f;
width = height = 11f; width = height = 11f;
collidesTiles = false; collidesTiles = false;
splashDamageRadius = 30f * 0.75f; splashDamageRadius = 30f * 0.75f;

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); 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(); 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); phaseHeat = Mathf.lerpDelta(phaseHeat, optionalEfficiency, 0.1f);
if(optionalEfficiency > 0 && timer(timerUse, useTime) && canHeal){ if(optionalEfficiency > 0 && timer(timerUse, useTime / timeScale) && canHeal){
consume(); 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()); anyTargets = targets.contains(b -> b.damaged());
if(efficiency > 0){ if(efficiency > 0){
if((optionalTimer += Time.delta * optionalEfficiency) >= optionalUseTime){ if((optionalTimer += edelta() * optionalEfficiency) >= optionalUseTime){
consume(); consume();
optionalTimer = 0f; 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); }, 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(); consume();
} }