Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

ItemDurationMultiplier Implementation and Phase RTG Adjustment #9664

Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions core/assets/bundles/bundle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -970,6 +970,7 @@ stat.booster = Booster
stat.tiles = Required Tiles
stat.affinities = Affinities
stat.opposites = Opposites
stat.durationamplifier = Duration Amplifier
stat.powercapacity = Power Capacity
stat.powershot = Power/Shot
stat.damage = Damage
Expand Down
1 change: 1 addition & 0 deletions core/src/mindustry/content/Blocks.java
Original file line number Diff line number Diff line change
Expand Up @@ -2396,6 +2396,7 @@ public static void load(){
envEnabled = Env.any;
generateEffect = Fx.generatespark;

itemDurationMultipliers.put(Items.phaseFabric, 210f / 14f);
drawer = new DrawMulti(new DrawDefault(), new DrawWarmupRegion());
consume(new ConsumeItemRadioactive());
}};
Expand Down
21 changes: 19 additions & 2 deletions core/src/mindustry/world/blocks/power/ConsumeGenerator.java
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,14 @@
import arc.*;
import arc.graphics.*;
import arc.math.*;
import arc.struct.*;
import arc.util.*;
import mindustry.content.*;
import mindustry.entities.*;
import mindustry.game.EventType.*;
import mindustry.graphics.*;
import mindustry.type.*;
import mindustry.ui.*;
import mindustry.world.consumers.*;
import mindustry.world.meta.*;

Expand All @@ -28,6 +30,8 @@ public class ConsumeGenerator extends PowerGenerator{

public @Nullable ConsumeItemFilter filterItem;
public @Nullable ConsumeLiquidFilter filterLiquid;
/** Multiplies the itemDuration for a given item. */
public ObjectFloatMap<Item> itemDurationMultipliers = new ObjectFloatMap<>();

public ConsumeGenerator(String name){
super(name);
Expand Down Expand Up @@ -73,10 +77,18 @@ public void setStats(){
if(outputLiquid != null){
stats.add(Stat.output, StatValues.liquid(outputLiquid.liquid, outputLiquid.amount * 60f, true));
}

if(itemDurationMultipliers.size > 0){
stats.add(Stat.durationAmplifier, table -> {
for(ObjectFloatMap.Entry<Item> stack : itemDurationMultipliers){
table.add(StatValues.displayItemPercent(stack.key, (int)(stack.value * 100), true)).padRight(5);
}
});
}
}

public class ConsumeGeneratorBuild extends GeneratorBuild{
public float warmup, totalTime, efficiencyMultiplier = 1f;
public float warmup, totalTime, efficiencyMultiplier = 1f, itemDurationMultiplier = 1;

@Override
public void updateEfficiencyMultiplier(){
Expand All @@ -103,6 +115,11 @@ public void updateTile(){
generateEffect.at(x + Mathf.range(generateEffectRange), y + Mathf.range(generateEffectRange));
}

//make sure the multiplier doesn't change when there is nothing to consume while it's still running
if(filterItem != null && valid && itemDurationMultipliers.size > 0 && filterItem.getConsumed(this) != null){
itemDurationMultiplier = itemDurationMultipliers.get(filterItem.getConsumed(this), 1);
}

//take in items periodically
if(hasItems && valid && generateTime <= 0f){
consume();
Expand All @@ -122,7 +139,7 @@ public void updateTile(){
}

//generation time always goes down, but only at the end so consumeTriggerValid doesn't assume fake items
generateTime -= delta() / itemDuration;
generateTime -= delta() / (itemDuration * itemDurationMultiplier);
}

@Override
Expand Down
1 change: 1 addition & 0 deletions core/src/mindustry/world/meta/Stat.java
Original file line number Diff line number Diff line change
Expand Up @@ -93,6 +93,7 @@ public class Stat implements Comparable<Stat>{
moduleTier = new Stat("moduletier", StatCat.function),
unitType = new Stat("unittype", StatCat.function),

durationAmplifier = new Stat("durationAmplifier", StatCat.optional),
booster = new Stat("booster", StatCat.optional),
boostEffect = new Stat("boostEffect", StatCat.optional),
affinities = new Stat("affinities", StatCat.optional),
Expand Down