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

Merge branch 'balancing_burst-drill-optional-multiplier' of https://github.com/SomeonesShade/Mindustry into SomeonesShade-balancing_burst-drill-optional-multiplier

Browse Source
This commit is contained in:
Anuken
2025-02-10 15:51:47 -05:00
parent 084e97ceab 1579a3b068
commit fec91eb157
3 changed files with 30 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
core/src/mindustry/content/Blocks.java
View File

@@ -2882,17 +2882,19 @@ public class Blocks{
blockedItem = Items.thorium;
researchCostMultiplier = 0.5f;
drillMultipliers.put(Items.beryllium, 2.5f);
drillMultipliers.put(Items.beryllium, 1.95f);
liquidBoostIntensity = 1.75f;
fogRadius = 4;
consumePower(160f / 60f);
consumeLiquid(Liquids.water, 10f/60f);
consumeLiquid(Liquids.ozone, 3f / 60f).boost();
}};
eruptionDrill = new BurstDrill("eruption-drill"){{
requirements(Category.production, with(Items.silicon, 200, Items.oxide, 20, Items.tungsten, 200, Items.thorium, 120));
drillTime = 60f * 6f;
requirements(Category.production, with(Items.silicon, 300, Items.oxide, 20, Items.tungsten, 250, Items.thorium, 150));
drillTime = 281.25f;
size = 5;
hasPower = true;
tier = 7;
@@ -2904,18 +2906,20 @@ public class Blocks{
Fx.mineImpactWave.wrap(Liquids.hydrogen.color, 45f)
);
shake = 4f;
itemCapacity = 50;
itemCapacity = 60;
arrowOffset = 2f;
arrowSpacing = 5f;
arrows = 2;
glowColor.a = 0.6f;
fogRadius = 5;
drillMultipliers.put(Items.beryllium, 2.5f);
drillMultipliers.put(Items.beryllium, 1.35f);
liquidBoostIntensity = 2f;
//TODO different requirements
consumePower(6f);
consumeLiquids(LiquidStack.with(Liquids.hydrogen, 4f / 60f));
consumeLiquid(Liquids.hydrogen, 4f / 60f);
consumeLiquid(Liquids.cyanogen, 3f / 60f).boost();
}};
//endregion

19
core/src/mindustry/world/blocks/production/BurstDrill.java
View File

@@ -11,6 +11,8 @@ import mindustry.entities.*;
import mindustry.gen.*;
import mindustry.graphics.*;
import mindustry.type.*;
import mindustry.world.consumers.*;
import mindustry.world.meta.*;
public class BurstDrill extends Drill{
public float shake = 2f;
@@ -35,7 +37,6 @@ public class BurstDrill extends Drill{
//does not drill in the traditional sense, so this is not even used
hardnessDrillMultiplier = 0f;
liquidBoostIntensity = 1f;
//generally at center
drillEffectRnd = 0f;
drillEffect = Fx.shockwave;
@@ -53,6 +54,20 @@ public class BurstDrill extends Drill{
return drillTime / drillMultipliers.get(item, 1f);
}
@Override
public void setStats(){
super.setStats();
if(liquidBoostIntensity != 1 && findConsumer(f -> f instanceof ConsumeLiquidBase && f.booster) instanceof ConsumeLiquidBase consBase){
stats.remove(Stat.booster);
stats.add(Stat.booster,
StatValues.speedBoosters("{0}" + StatUnit.timesSpeed.localized(),
consBase.amount, liquidBoostIntensity, false,
l -> (consumesLiquid(l) && (findConsumer(f -> f instanceof ConsumeLiquid).booster || ((ConsumeLiquid)findConsumer(f -> f instanceof ConsumeLiquid)).liquid != l)))
);
}
}
public class BurstDrillBuild extends DrillBuild{
//used so the lights don't fade out immediately
public float smoothProgress = 0f;
@@ -77,7 +92,7 @@ public class BurstDrill extends Drill{
if(items.total() <= itemCapacity - dominantItems && dominantItems > 0 && efficiency > 0){
warmup = Mathf.approachDelta(warmup, progress / drillTime, 0.01f);
float speed = efficiency;
float speed = Mathf.lerp(1f, liquidBoostIntensity, optionalEfficiency) * efficiency;
timeDrilled += speedCurve.apply(progress / drillTime) * speed;