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

#3121

Browse Source
This commit is contained in:
Anuken
2020-10-26 09:56:56 -04:00
parent 526b1add26
commit 23b9556105
2 changed files with 10 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
core/src/mindustry/maps/SectorDamage.java
View File

@@ -27,8 +27,12 @@ public class SectorDamage{
/** @return calculated capture progress of the enemy */ /** @return calculated capture progress of the enemy */
public static float getDamage(SectorInfo info){ public static float getDamage(SectorInfo info){
return getDamage(info, info.wavesPassed);
}
/** @return calculated capture progress of the enemy */
public static float getDamage(SectorInfo info, int wavesPassed){
float health = info.sumHealth; float health = info.sumHealth;
int wavesPassed = info.wavesPassed;
int wave = info.wave; int wave = info.wave;
float waveSpace = info.waveSpacing; float waveSpace = info.waveSpacing;

9
core/src/mindustry/world/meta/Stats.java
View File

@@ -5,7 +5,7 @@ import arc.struct.*;
import arc.util.*; import arc.util.*;
import mindustry.*; import mindustry.*;
import mindustry.type.*; import mindustry.type.*;
import mindustry.world.*; import mindustry.world.blocks.environment.*;
import mindustry.world.meta.values.*; import mindustry.world.meta.values.*;
/** Hold and organizes a list of block stats. */ /** Hold and organizes a list of block stats. */
@@ -67,9 +67,10 @@ public class Stats{
} }
public void add(Stat stat, Attribute attr, boolean floating, float scale){ public void add(Stat stat, Attribute attr, boolean floating, float scale){
for(Block block : Vars.content.blocks()){ for(var block : Vars.content.blocks()
if(!block.isFloor() || block.asFloor().attributes.get(attr) == 0 || (block.asFloor().isLiquid && !floating)) continue; .select(block -> block instanceof Floor f && f.attributes.get(attr) != 0 && !(f.isLiquid && !floating))
add(stat, new FloorEfficiencyValue(block.asFloor(), block.asFloor().attributes.get(attr) * scale)); .<Floor>as().with(s -> s.sort(f -> f.attributes.get(attr)))){
add(stat, new FloorEfficiencyValue(block, block.attributes.get(attr) * scale));
} }
} }