Merge remote-tracking branch 'origin/master'

This commit is contained in:
Anuken
2022-07-15 10:35:57 -04:00
4 changed files with 285 additions and 271 deletions

View File

@@ -592,7 +592,7 @@ abstract class UnitComp implements Healthc, Physicsc, Hitboxc, Statusc, Teamc, I
}
//if this unit crash landed (was flying), damage stuff in a radius
if(type.flying && !spawnedByCore && !type.createWreck){
if(type.flying && !spawnedByCore && type.createWreck){
Damage.damage(team, x, y, Mathf.pow(hitSize, 0.94f) * 1.25f, Mathf.pow(hitSize, 0.75f) * type.crashDamageMultiplier * 5f, true, false, true);
}

View File

@@ -58,7 +58,7 @@ public class ShockwaveTower extends Block{
Drawf.dashCircle(x * tilesize + offset, y * tilesize + offset, range, waveColor);
}
public class ShockwaveTowerBuild extends Building{
public float reloadCounter = Mathf.random(reload);
public float heat = 0f;
@@ -115,5 +115,10 @@ public class ShockwaveTower extends Block{
Fill.poly(x, y, shapeSides, shapeRadius * potentialEfficiency, Time.time * shapeRotateSpeed);
Draw.color();
}
@Override
public void drawSelect(){
Drawf.dashCircle(x, y, range, waveColor);
}
}
}
}