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

Minor cleanup / Tick reset fix

Browse Source
This commit is contained in:
Anuken
2022-02-13 16:58:02 -05:00
parent 7cc0cbb132
commit 03d99cb05a
25 changed files with 200 additions and 194 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
core/src/mindustry/world/CachedTile.java
View File

@@ -28,9 +28,8 @@ public class CachedTile extends Tile{
if(block.hasBuilding()){
Building n = entityprov.get();
n.cons(new ConsumeModule(build));
n.tile(this);
n.block(block);
n.block = block;
if(block.hasItems) n.items = new ItemModule();
if(block.hasLiquids) n.liquids(new LiquidModule());
if(block.hasPower) n.power(new PowerModule());

4
core/src/mindustry/world/blocks/defense/MendProjector.java
View File

@@ -82,9 +82,9 @@ public class MendProjector extends Block{
heat = Mathf.lerpDelta(heat, consValid() && canHeal ? 1f : 0f, 0.08f);
charge += heat * delta();
phaseHeat = Mathf.lerpDelta(phaseHeat, Mathf.num(cons.optionalValid()), 0.1f);
phaseHeat = Mathf.lerpDelta(phaseHeat, Mathf.num(consOptionalValid()), 0.1f);
if(cons.optionalValid() && timer(timerUse, useTime) && efficiency() > 0 && canHeal){
if(consOptionalValid() && timer(timerUse, useTime) && efficiency() > 0 && canHeal){
consume();
}

2
core/src/mindustry/world/blocks/defense/OverdriveProjector.java
View File

@@ -102,7 +102,7 @@ public class OverdriveProjector extends Block{
charge += heat * Time.delta;
if(hasBoost){
phaseHeat = Mathf.lerpDelta(phaseHeat, Mathf.num(cons.optionalValid()), 0.1f);
phaseHeat = Mathf.lerpDelta(phaseHeat, Mathf.num(consOptionalValid()), 0.1f);
}
if(charge >= reload){

6
core/src/mindustry/world/blocks/defense/RegenProjector.java
View File

@@ -122,12 +122,12 @@ public class RegenProjector extends Block{
}
if(consValid()){
if(cons.optionalValid() && (optionalTimer += Time.delta) >= optionalUseTime){
cons.trigger();
if(consOptionalValid() && (optionalTimer += Time.delta) >= optionalUseTime){
consume();
optionalUseTime = 0f;
}
float healAmount = (cons.optionalValid() ? optionalMultiplier : 1f) * healPercent;
float healAmount = (consOptionalValid() ? optionalMultiplier : 1f) * healPercent;
//use Math.max to prevent stacking
for(var build : targets){

4
core/src/mindustry/world/blocks/defense/turrets/ContinuousTurret.java
View File

@@ -48,7 +48,7 @@ public class ContinuousTurret extends Turret{
@Override
public boolean hasAmmo(){
//TODO update ammo in unit so it corresponds to liquids
return cons.canConsume();
return canConsume();
}
@Override
@@ -109,7 +109,7 @@ public class ContinuousTurret extends Turret{
return;
}
if(cons.canConsume() && !charging && shootWarmup >= minWarmup){
if(canConsume() && !charging && shootWarmup >= minWarmup){
shoot(peekAmmo());
}
}

4
core/src/mindustry/world/blocks/defense/turrets/Turret.java
View File

@@ -337,7 +337,7 @@ public class Turret extends ReloadTurret{
public void updateTile(){
if(!validateTarget()) target = null;
float warmupTarget = isShooting() && cons.canConsume() ? 1f : 0f;
float warmupTarget = isShooting() && canConsume() ? 1f : 0f;
if(linearWarmup){
shootWarmup = Mathf.approachDelta(shootWarmup, warmupTarget, shootWarmupSpeed);
}else{
@@ -474,7 +474,7 @@ public class Turret extends ReloadTurret{
/** @return whether the turret has ammo. */
public boolean hasAmmo(){
//used for "side-ammo" like gas in some turrets
if(!cons.canConsume()) return false;
if(!canConsume()) return false;
//skip first entry if it has less than the required amount of ammo
if(ammo.size >= 2 && ammo.peek().amount < ammoPerShot && ammo.get(ammo.size - 2).amount >= ammoPerShot){

2
core/src/mindustry/world/blocks/payloads/PayloadVoid.java
View File

@@ -56,7 +56,7 @@ public class PayloadVoid extends PayloadBlock{
@Override
public void updateTile(){
super.updateTile();
if(moveInPayload(false) && cons.valid()){
if(moveInPayload(false) && consValid()){
payload = null;
incinerateEffect.at(this);
incinerateSound.at(this);

2
core/src/mindustry/world/blocks/production/BeamDrill.java
View File

@@ -251,7 +251,7 @@ public class BeamDrill extends Block{
float multiplier = 1f;
if(cons.optionalValid()){
if(consOptionalValid()){
boostWarmup = Mathf.lerpDelta(boostWarmup, 1f, 0.1f);
multiplier *= optionalBoostIntensity;
}else{

2
core/src/mindustry/world/blocks/production/Drill.java
View File

@@ -277,7 +277,7 @@ public class Drill extends Block{
float speed = 1f;
if(cons.optionalValid()){
if(consOptionalValid()){
speed = liquidBoostIntensity;
}

2
core/src/mindustry/world/blocks/production/GenericCrafter.java
View File

@@ -288,7 +288,7 @@ public class GenericCrafter extends Block{
@Override
public boolean shouldAmbientSound(){
return cons.valid();
return consValid();
}
@Override

4
core/src/mindustry/world/blocks/production/LiquidConverter.java
View File

@@ -46,7 +46,7 @@ public class LiquidConverter extends GenericCrafter{
public void updateTile(){
ConsumeLiquid cl = consumes.get(ConsumeType.liquid);
if(cons.valid()){
if(consValid()){
if(Mathf.chanceDelta(updateEffectChance)){
updateEffect.at(x + Mathf.range(size * 4f), y + Mathf.range(size * 4));
}
@@ -65,7 +65,7 @@ public class LiquidConverter extends GenericCrafter{
}
}else{
//warmup is still 1 even if not consuming
warmup = Mathf.lerp(warmup, cons.canConsume() ? 1f : 0f, 0.02f);
warmup = Mathf.lerp(warmup, canConsume() ? 1f : 0f, 0.02f);
}
dumpLiquid(outputLiquid.liquid);

2
core/src/mindustry/world/blocks/production/Separator.java
View File

@@ -56,7 +56,7 @@ public class Separator extends Block{
@Override
public boolean shouldAmbientSound(){
return cons.valid();
return consValid();
}
@Override

2
core/src/mindustry/world/blocks/production/SolidPump.java
View File

@@ -121,7 +121,7 @@ public class SolidPump extends Pump{
public void updateTile(){
float fraction = Math.max(validTiles + boost + (attribute == null ? 0 : attribute.env()), 0);
if(cons.valid() && typeLiquid() < liquidCapacity - 0.001f){
if(consValid() && typeLiquid() < liquidCapacity - 0.001f){
float maxPump = Math.min(liquidCapacity - typeLiquid(), pumpAmount * delta() * fraction * efficiency());
liquids.add(result, maxPump);
lastPump = maxPump / Time.delta;

5
core/src/mindustry/world/blocks/sandbox/ItemVoid.java
View File

@@ -24,11 +24,6 @@ public class ItemVoid extends Block{
return flowItems;
}
@Override
public void updateTile(){
flowItems.update(updateFlow);
}
@Override
public void handleItem(Building source, Item item){
flowItems.handleFlow(item, 1);

2
core/src/mindustry/world/blocks/units/RepairPoint.java
View File

@@ -210,7 +210,7 @@ public class RepairPoint extends Block{
@Override
public BlockStatus status(){
return Mathf.equal(efficiency(), 0f, 0.01f) ? BlockStatus.noInput : cons.status();
return Mathf.equal(efficiency(), 0f, 0.01f) ? BlockStatus.noInput : super.status();
}
@Override

68
core/src/mindustry/world/modules/ConsumeModule.java
View File

@@ -2,89 +2,49 @@ package mindustry.world.modules;
import arc.util.io.*;
import mindustry.gen.*;
import mindustry.world.consumers.*;
import mindustry.world.meta.*;
/** @deprecated why is it a module? literally two booleans, why did I think it was a good idea? yay, more pointers???
* the braindead java "make everything a separate class" mentality
* */
@Deprecated
public class ConsumeModule extends BlockModule{
private boolean valid, optionalValid;
private final Building entity;
private final Building build;
public ConsumeModule(Building entity){
this.entity = entity;
public ConsumeModule(Building build){
this.build = build;
}
public BlockStatus status(){
if(entity.enabledControlTime > 0 && !entity.enabled){
return BlockStatus.logicDisable;
}
if(!entity.shouldConsume()){
return BlockStatus.noOutput;
}
if(!valid || !entity.productionValid()){
return BlockStatus.noInput;
}
return BlockStatus.active;
return build.status();
}
public void update(){
//everything is valid when cheating
if(entity.cheating()){
valid = optionalValid = true;
return;
}
boolean prevValid = valid();
valid = true;
optionalValid = true;
boolean docons = entity.shouldConsume() && entity.productionValid();
for(Consume cons : entity.block.consumes.all){
if(cons.isOptional()) continue;
if(docons && cons.isUpdate() && prevValid && cons.valid(entity)){
cons.update(entity);
}
valid &= cons.valid(entity);
}
for(Consume cons : entity.block.consumes.optionals){
if(docons && cons.isUpdate() && prevValid && cons.valid(entity)){
cons.update(entity);
}
optionalValid &= cons.valid(entity);
}
build.updateConsumption();
}
public void trigger(){
for(Consume cons : entity.block.consumes.all){
cons.trigger(entity);
}
build.consume();
}
public boolean valid(){
return valid && entity.shouldConsume() && entity.enabled;
return build.consValid();
}
public boolean canConsume(){
return valid && entity.enabled;
return build.canConsume();
}
public boolean optionalValid(){
return valid() && optionalValid && entity.enabled;
return build.consOptionalValid();
}
//hahahahahahahahahaha
@Override
public void write(Writes write){
write.bool(valid);
}
@Override
public void read(Reads read){
valid = read.bool();
}
}

68
core/src/mindustry/world/modules/ItemModule.java
View File

@@ -39,51 +39,51 @@ public class ItemModule extends BlockModule{
System.arraycopy(other.items, 0, items, 0, items.length);
}
public void update(boolean showFlow){
if(showFlow){
//update the flow at 30fps at most
if(flowTimer.get(1, pollScl)){
public void updateFlow(){
//update the flow at N fps at most
if(flowTimer.get(1, pollScl)){
if(flow == null){
if(cacheFlow == null || cacheFlow.length != items.length){
cacheFlow = new WindowedMean[items.length];
for(int i = 0; i < items.length; i++){
cacheFlow[i] = new WindowedMean(windowSize);
}
cacheSums = new float[items.length];
displayFlow = new float[items.length];
}else{
for(int i = 0; i < items.length; i++){
cacheFlow[i].reset();
}
Arrays.fill(cacheSums, 0);
cacheBits.clear();
if(flow == null){
if(cacheFlow == null || cacheFlow.length != items.length){
cacheFlow = new WindowedMean[items.length];
for(int i = 0; i < items.length; i++){
cacheFlow[i] = new WindowedMean(windowSize);
}
Arrays.fill(displayFlow, -1);
flow = cacheFlow;
cacheSums = new float[items.length];
displayFlow = new float[items.length];
}else{
for(int i = 0; i < items.length; i++){
cacheFlow[i].reset();
}
Arrays.fill(cacheSums, 0);
cacheBits.clear();
}
boolean updateFlow = flowTimer.get(30);
Arrays.fill(displayFlow, -1);
for(int i = 0; i < items.length; i++){
flow[i].add(cacheSums[i]);
if(cacheSums[i] > 0){
cacheBits.set(i);
}
cacheSums[i] = 0;
flow = cacheFlow;
}
if(updateFlow){
displayFlow[i] = flow[i].hasEnoughData() ? flow[i].mean() / pollScl : -1;
}
boolean updateFlow = flowTimer.get(30);
for(int i = 0; i < items.length; i++){
flow[i].add(cacheSums[i]);
if(cacheSums[i] > 0){
cacheBits.set(i);
}
cacheSums[i] = 0;
if(updateFlow){
displayFlow[i] = flow[i].hasEnoughData() ? flow[i].mean() / pollScl : -1;
}
}
}else{
flow = null;
}
}
public void stopFlow(){
flow = null;
}
public int length(){
return items.length;
}

76
core/src/mindustry/world/modules/LiquidModule.java
View File

@@ -22,57 +22,53 @@ public class LiquidModule extends BlockModule{
private float[] liquids = new float[content.liquids().size];
private Liquid current = content.liquid(0);
private float total, smoothLiquid;
private float total;
private @Nullable WindowedMean[] flow;
public void update(boolean showFlow){
smoothLiquid = Mathf.lerpDelta(smoothLiquid, currentAmount(), 0.1f);
if(showFlow){
if(flowTimer.get(1, pollScl)){
if(flow == null){
if(cacheFlow == null || cacheFlow.length != liquids.length){
cacheFlow = new WindowedMean[liquids.length];
for(int i = 0; i < liquids.length; i++){
cacheFlow[i] = new WindowedMean(windowSize);
}
cacheSums = new float[liquids.length];
displayFlow = new float[liquids.length];
}else{
for(int i = 0; i < liquids.length; i++){
cacheFlow[i].reset();
}
Arrays.fill(cacheSums, 0);
cacheBits.clear();
public void updateFlow(){
if(flowTimer.get(1, pollScl)){
if(flow == null){
if(cacheFlow == null || cacheFlow.length != liquids.length){
cacheFlow = new WindowedMean[liquids.length];
for(int i = 0; i < liquids.length; i++){
cacheFlow[i] = new WindowedMean(windowSize);
}
Arrays.fill(displayFlow, -1);
flow = cacheFlow;
cacheSums = new float[liquids.length];
displayFlow = new float[liquids.length];
}else{
for(int i = 0; i < liquids.length; i++){
cacheFlow[i].reset();
}
Arrays.fill(cacheSums, 0);
cacheBits.clear();
}
boolean updateFlow = flowTimer.get(30);
Arrays.fill(displayFlow, -1);
for(int i = 0; i < liquids.length; i++){
flow[i].add(cacheSums[i]);
if(cacheSums[i] > 0){
cacheBits.set(i);
}
cacheSums[i] = 0;
flow = cacheFlow;
}
if(updateFlow){
displayFlow[i] = flow[i].hasEnoughData() ? flow[i].mean() / pollScl : -1;
}
boolean updateFlow = flowTimer.get(30);
for(int i = 0; i < liquids.length; i++){
flow[i].add(cacheSums[i]);
if(cacheSums[i] > 0){
cacheBits.set(i);
}
cacheSums[i] = 0;
if(updateFlow){
displayFlow[i] = flow[i].hasEnoughData() ? flow[i].mean() / pollScl : -1;
}
}
}else{
flow = null;
}
}
public void stopFlow(){
flow = null;
}
/** @return current liquid's flow rate in u/s; any value < 0 means 'not ready'. */
public float getFlowRate(Liquid liquid){
return flow == null ? -1f : displayFlow[liquid.id] * 60;
@@ -82,10 +78,6 @@ public class LiquidModule extends BlockModule{
return flow != null && cacheBits.get(liquid.id);
}
public float smoothAmount(){
return smoothLiquid;
}
/**
* @deprecated There is no good reason to check the total amount of liquids of a block.
* Use of this method is almost certainly a bug; currentAmount() is probably what you want instead.