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

Notice of explosiveness

Browse Source 
I feel like my changes are getting a *bit* intrusive.
This commit is contained in:
MEEPofFaith
2024-03-15 09:25:10 -07:00
parent e96e312693
commit 24b845e8b1
8 changed files with 57 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
core/src/mindustry/world/consumers/ConsumeItemCharged.java
View File

@@ -1,6 +1,7 @@
package mindustry.world.consumers;
import mindustry.gen.*;
import mindustry.type.*;
import mindustry.world.meta.*;
/** For mods. I don't use this (yet). */
@@ -16,14 +17,13 @@ public class ConsumeItemCharged extends ConsumeItemFilter{
this(0.2f);
}
@Override
public float efficiencyMultiplier(Building build){
var item = getConsumed(build);
return item == null ? 0f : item.charge;
}
@Override
public void display(Stats stats){
stats.add(booster ? Stat.booster : Stat.input, StatValues.itemEffMultiplier(i -> i.charge, filter));
}
@Override
public float itemEfficiencyMultiplier(Item item){
return item.charge;
}
}

12
core/src/mindustry/world/consumers/ConsumeItemExplosive.java
View File

@@ -1,6 +1,7 @@
package mindustry.world.consumers;
import mindustry.gen.*;
import mindustry.type.*;
import mindustry.world.meta.*;
public class ConsumeItemExplosive extends ConsumeItemFilter{
@@ -15,14 +16,13 @@ public class ConsumeItemExplosive extends ConsumeItemFilter{
this(0.2f);
}
@Override
public float efficiencyMultiplier(Building build){
var item = getConsumed(build);
return item == null ? 0f : item.explosiveness;
}
@Override
public void display(Stats stats){
stats.add(booster ? Stat.booster : Stat.input, StatValues.itemEffMultiplier(i -> i.explosiveness, filter));
}
@Override
public float itemEfficiencyMultiplier(Item item){
return item.explosiveness;
}
}

10
core/src/mindustry/world/consumers/ConsumeItemFilter.java
View File

@@ -68,4 +68,14 @@ public class ConsumeItemFilter extends Consume{
public void display(Stats stats){
stats.add(booster ? Stat.booster : Stat.input, stats.timePeriod < 0 ? StatValues.items(filter) : StatValues.items(stats.timePeriod, filter));
}
@Override
public float efficiencyMultiplier(Building build){
var item = getConsumed(build);
return item == null ? 0f : itemEfficiencyMultiplier(item);
}
public float itemEfficiencyMultiplier(Item item){
return 1f;
}
}

12
core/src/mindustry/world/consumers/ConsumeItemFlammable.java
View File

@@ -1,6 +1,7 @@
package mindustry.world.consumers;
import mindustry.gen.*;
import mindustry.type.*;
import mindustry.world.meta.*;
public class ConsumeItemFlammable extends ConsumeItemFilter{
@@ -15,14 +16,13 @@ public class ConsumeItemFlammable extends ConsumeItemFilter{
this(0.2f);
}
@Override
public float efficiencyMultiplier(Building build){
var item = getConsumed(build);
return item == null ? 0f : item.flammability;
}
@Override
public void display(Stats stats){
stats.add(booster ? Stat.booster : Stat.input, StatValues.itemEffMultiplier(i -> i.flammability, filter));
}
@Override
public float itemEfficiencyMultiplier(Item item){
return item.flammability;
}
}

12
core/src/mindustry/world/consumers/ConsumeItemRadioactive.java
View File

@@ -1,6 +1,7 @@
package mindustry.world.consumers;
import mindustry.gen.*;
import mindustry.type.*;
import mindustry.world.meta.*;
public class ConsumeItemRadioactive extends ConsumeItemFilter{
@@ -15,14 +16,13 @@ public class ConsumeItemRadioactive extends ConsumeItemFilter{
this(0.2f);
}
@Override
public float efficiencyMultiplier(Building build){
var item = getConsumed(build);
return item == null ? 0f : item.radioactivity;
}
@Override
public void display(Stats stats){
stats.add(booster ? Stat.booster : Stat.input, StatValues.itemEffMultiplier(i -> i.radioactivity, filter));
}
@Override
public float itemEfficiencyMultiplier(Item item){
return item.radioactivity;
}
}