Misc cleanup

This commit is contained in:
Anuken
2021-01-19 19:55:21 -05:00
parent c53a6a7c04
commit fa8d43bbc9
7 changed files with 17 additions and 8 deletions

Binary file not shown.

Before

Width:  |  Height:  |  Size: 611 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.3 KiB

View File

@@ -1838,6 +1838,7 @@ public class Blocks implements ContentList{
shootType = new ContinuousLaserBulletType(70){{ shootType = new ContinuousLaserBulletType(70){{
length = 200f; length = 200f;
hitEffect = Fx.hitMeltdown; hitEffect = Fx.hitMeltdown;
hitColor = Pal.meltdownHit;
drawSize = 420f; drawSize = 420f;
incendChance = 0.4f; incendChance = 0.4f;

View File

@@ -235,9 +235,9 @@ public class Bullets implements ContentList{
fragExplosive = new FlakBulletType(4f, 5){{ fragExplosive = new FlakBulletType(4f, 5){{
shootEffect = Fx.shootBig; shootEffect = Fx.shootBig;
ammoMultiplier = 4f; ammoMultiplier = 5f;
splashDamage = 18f; splashDamage = 26f;
splashDamageRadius = 55f; splashDamageRadius = 60f;
collidesGround = true; collidesGround = true;
status = StatusEffects.blasted; status = StatusEffects.blasted;
@@ -245,9 +245,9 @@ public class Bullets implements ContentList{
}}; }};
fragSurge = new FlakBulletType(4.5f, 13){{ fragSurge = new FlakBulletType(4.5f, 13){{
ammoMultiplier = 4f; ammoMultiplier = 5f;
splashDamage = 50f; splashDamage = 50f;
splashDamageRadius = 40f; splashDamageRadius = 38f;
lightning = 2; lightning = 2;
lightningLength = 7; lightningLength = 7;
shootEffect = Fx.shootBig; shootEffect = Fx.shootBig;

View File

@@ -277,8 +277,7 @@ public abstract class BulletType extends Content{
} }
if(weaveMag > 0){ if(weaveMag > 0){
float scl = Mathf.randomSeed(id, 0.9f, 1.1f); b.vel.rotate(Mathf.sin(b.time + Mathf.PI * weaveScale/2f, weaveScale, weaveMag * (Mathf.randomSeed(b.id, 0, 1) == 1 ? -1 : 1)) * Time.delta);
b.vel.rotate(Mathf.sin(b.time + Mathf.PI * weaveScale/2f * scl, weaveScale * scl, weaveMag) * Time.delta);
} }
if(trailChance > 0){ if(trailChance > 0){

View File

@@ -90,7 +90,7 @@ public class OverlayRenderer{
} }
for(int i = 0; i < 4; i++){ for(int i = 0; i < 4; i++){
float rot = i * 90f + 45f + (-Time.time / 1.5f) % 360f; float rot = i * 90f + 45f + (-Time.time) % 360f;
float length = select.hitSize() * 1.5f + (unitFade * 2.5f); float length = select.hitSize() * 1.5f + (unitFade * 2.5f);
Draw.rect("select-arrow", select.x + Angles.trnsx(rot, length), select.y + Angles.trnsy(rot, length), length / 1.9f, length / 1.9f, rot - 135f); Draw.rect("select-arrow", select.x + Angles.trnsx(rot, length), select.y + Angles.trnsy(rot, length), length / 1.9f, length / 1.9f, rot - 135f);
} }

View File

@@ -18,6 +18,7 @@ import mindustry.world.blocks.*;
import mindustry.world.blocks.payloads.*; import mindustry.world.blocks.payloads.*;
import mindustry.world.blocks.production.*; import mindustry.world.blocks.production.*;
import mindustry.world.consumers.*; import mindustry.world.consumers.*;
import mindustry.world.meta.*;
import static mindustry.Vars.*; import static mindustry.Vars.*;
@@ -56,6 +57,14 @@ public class BlockForge extends PayloadAcceptor{
bars.add("progress", (BlockForgeBuild entity) -> new Bar("bar.progress", Pal.ammo, () -> entity.recipe == null ? 0f : (entity.progress / entity.recipe.buildCost))); bars.add("progress", (BlockForgeBuild entity) -> new Bar("bar.progress", Pal.ammo, () -> entity.recipe == null ? 0f : (entity.progress / entity.recipe.buildCost)));
} }
@Override
public void setStats(){
super.setStats();
stats.add(Stat.output, "@x@ ~ @x@", minBlockSize, minBlockSize, maxBlockSize, maxBlockSize);
}
@Override @Override
public void drawRequestRegion(BuildPlan req, Eachable<BuildPlan> list){ public void drawRequestRegion(BuildPlan req, Eachable<BuildPlan> list){
Draw.rect(region, req.drawx(), req.drawy()); Draw.rect(region, req.drawx(), req.drawy());