More turret cleanup

This commit is contained in:
Anuken
2021-12-27 16:41:03 -05:00
parent 8021f0082a
commit 4e1dec2399
7 changed files with 17 additions and 18 deletions

View File

@@ -121,7 +121,7 @@ public class Blocks{
duo, scatter, scorch, hail, arc, wave, lancer, swarmer, salvo, fuse, ripple, cyclone, foreshadow, spectre, meltdown, segment, parallax, tsunami,
//turrets - erekir
breach, fracture, horde, sublimate, titan,
breach, sublimate, titan,
//units
commandCenter,
@@ -2897,7 +2897,7 @@ public class Blocks{
Items.beryllium, new BasicBulletType(7f, 90){{
width = 12f;
height = 20f;
shootEffect = Fx.colorSpark;
shootEffect = Fx.colorSparkBig;
smokeEffect = Fx.shootBigSmoke;
ammoMultiplier = 1;
pierce = true;
@@ -2911,7 +2911,7 @@ public class Blocks{
Items.tungsten, new BasicBulletType(7.5f, 160){{
width = 13f;
height = 19f;
shootEffect = Fx.colorSpark;
shootEffect = Fx.colorSparkBig;
smokeEffect = Fx.shootBigSmoke;
ammoMultiplier = 1;
reloadMultiplier = 1f;
@@ -2935,6 +2935,7 @@ public class Blocks{
size = 3;
envEnabled |= Env.space;
reloadTime = 40f;
recoilAmount = 2f;
restitution = 0.03f;
range = 190;
shootCone = 3f;

View File

@@ -168,10 +168,10 @@ public class ErekirTechTree{
});
});
node(fracture, () -> {
//TODO big tech jump here; incomplete turret
node(sublimate, () -> {
//TODO implement
node(sublimate, () -> {
node(titan, () -> {
});
});

View File

@@ -1510,6 +1510,15 @@ public class Fx{
});
}),
colorSparkBig = new Effect(25f, e -> {
color(Color.white, e.color, e.fin());
stroke(e.fout() * 1.3f + 0.5f);
randLenVectors(e.id, 8, 37f * e.fin(), e.rotation, 10f, (x, y) -> {
lineAngle(e.x + x, e.y + y, Mathf.angle(x, y), e.fslope() * 6f + 0.5f);
});
}),
randLifeSpark = new Effect(24f, e -> {
color(Color.white, e.color, e.fin());
stroke(e.fout() * 1.5f + 0.5f);
@@ -1524,16 +1533,6 @@ public class Fx{
}
}),
//TODO just make it properly colored...
tungstenSpark = new Effect(23f, e -> {
color(Color.white, Pal.tungstenShot, e.fin());
stroke(e.fout() * 1.1f + 0.5f);
randLenVectors(e.id, 5, 28f * e.fin(), e.rotation, 10f, (x, y) -> {
lineAngle(e.x + x, e.y + y, Mathf.angle(x, y), e.fslope() * 5f + 0.5f);
});
}),
shootPayloadDriver = new Effect(30f, e -> {
color(Pal.accent);
Lines.stroke(0.5f + 0.5f*e.fout());