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.

Sign up for GitHub

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

Jump to bottom

Added itemDurationMultipliers to ConsumeGenerator #9664

Draft
wants to merge 6 commits into
base: master
Choose a base branch
from
Draft

Added itemDurationMultipliers to ConsumeGenerator #9664

Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
91cc6ed
Added itemDurationMultipliers
SomeonesShade Mar 21, 2024
e290778
Bugfix to Item Duration
SomeonesShade Mar 21, 2024
cf9091d
Correct Null Checks
SomeonesShade Mar 21, 2024
1c111bc
Fixes
BalaM314 Mar 21, 2024
64c576b
Merge pull request #1 from BalaM314/ConsumeGenerator-ItemDurationMult…
SomeonesShade Mar 22, 2024
5c50c92
Merge branch 'Anuken:master' into ConsumeGenerator-ItemDurationMultip…
SomeonesShade Mar 30, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
12 changes: 10 additions & 2 deletions core/src/mindustry/world/blocks/power/ConsumeGenerator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
import arc.*;
import arc.graphics.*;
import arc.math.*;
import arc.struct.ObjectFloatMap;
import arc.util.*;
import mindustry.content.*;
import mindustry.entities.*;
Expand All @@ -28,6 +29,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 @@ -76,7 +79,7 @@ public void setStats(){
}

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 +106,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 && 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 +130,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