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

Fixed wave simulation estimation

Browse Source
This commit is contained in:
Anuken
2022-05-07 10:45:43 -04:00
parent 8fae99e780
commit 8f2e1163dd
3 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/src/mindustry/entities/bullet/BulletType.java
View File

@@ -217,7 +217,7 @@ public class BulletType extends Content implements Cloneable{
/** Use a negative value to disable homing delay. */ /** Use a negative value to disable homing delay. */
public float homingDelay = -1f; public float homingDelay = -1f;
/** Range of healing bock suppression effect. */ /** Range of healing block suppression effect. */
public float suppressionRange = -1f; public float suppressionRange = -1f;
/** Duration of healing block suppression effect. */ /** Duration of healing block suppression effect. */
public float suppressionDuration = 60f * 8f; public float suppressionDuration = 60f * 8f;

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

@@ -281,10 +281,10 @@ public class SectorDamage{
float avgHealth = totalPathBuild <= 1 ? sumHealth : sumHealth / totalPathBuild; float avgHealth = totalPathBuild <= 1 ? sumHealth : sumHealth / totalPathBuild;
//block dps + regen + extra health/shields //block dps + regen + extra health/shields
for(Building build : Groups.build){ for(Building build : state.rules.defaultTeam.data().buildings){
float e = build.efficiency; float e = build.potentialEfficiency;
if(e > 0.08f){ if(e > 0.08f){
if(build.team == state.rules.defaultTeam && build instanceof Ranged ranged && sparse.contains(t -> t.within(build, ranged.range() + 4*tilesize))){ if(build instanceof Ranged ranged && sparse.contains(t -> t.within(build, ranged.range() + 4*tilesize))){
//TODO make sure power turret network supports the turrets? //TODO make sure power turret network supports the turrets?
if(build instanceof TurretBuild b && b.hasAmmo()){ if(build instanceof TurretBuild b && b.hasAmmo()){
sumDps += b.estimateDps(); sumDps += b.estimateDps();
@@ -296,7 +296,7 @@ public class SectorDamage{
//point defense turrets act as flat health right now //point defense turrets act as flat health right now
if(build.block instanceof PointDefenseTurret){ if(build.block instanceof PointDefenseTurret){
sumHealth += 150f * build.timeScale() * build.efficiency; sumHealth += 150f * build.timeScale() * build.potentialEfficiency;
} }
if(build.block instanceof ForceProjector f){ if(build.block instanceof ForceProjector f){

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

@@ -183,7 +183,7 @@ public class Turret extends ReloadTurret{
public float estimateDps(){ public float estimateDps(){
if(!hasAmmo()) return 0f; if(!hasAmmo()) return 0f;
return shoot.shots / reload * 60f * peekAmmo().estimateDPS() * efficiency * timeScale; return shoot.shots / reload * 60f * peekAmmo().estimateDPS() * potentialEfficiency * timeScale;
} }
@Override @Override