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

RailBulletType improvements

Browse Source
This commit is contained in:
Anuken
2022-02-25 13:24:18 -05:00
parent 28dab2fa05
commit 7245364a55
10 changed files with 74 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/src/mindustry/content/Fx.java
-7
View File
@@ -331,13 +331,6 @@ public class Fx{
Lines.poly(e.x, e.y, 4, 5f + e.fin() * 60f);
}),
vtolHover = new Effect(40f, e -> {
float len = e.finpow() * 10f;
float ang = e.rotation + Mathf.randomSeedRange(e.id, 30f);
color(Pal.lightFlame, Pal.lightOrange, e.fin());
Fill.circle(e.x + trnsx(ang, len), e.y + trnsy(ang, len), 2f * e.fout());
}),
breakProp = new Effect(23, e -> {
float scl = Math.max(e.rotation, 1);
color(Tmp.c1.set(e.color).mul(1.1f));
core/src/mindustry/content/UnitTypes.java
+34 -22
View File
@@ -1789,9 +1789,9 @@ public class UnitTypes{
bullet = new RailBulletType(){{
shootEffect = Fx.railShoot;
length = 500;
updateEffectSeg = 60f;
pointEffectSpace = 60f;
pierceEffect = Fx.railHit;
updateEffect = Fx.railTrail;
pointEffect = Fx.railTrail;
hitEffect = Fx.massiveExplosion;
smokeEffect = Fx.shootBig2;
damage = 1250;
@@ -2484,8 +2484,8 @@ public class UnitTypes{
weapons.add(new Weapon("locus-weapon"){{
layerOffset = 0.0001f;
reload = 30f;
shootY = 9.3f;
reload = 12f;
shootY = 10f;
recoil = 1f;
rotate = true;
rotateSpeed = 1.4f;
@@ -2499,19 +2499,29 @@ public class UnitTypes{
spread = 3.5f;
}};
bullet = new BasicBulletType(5f, 50){{
sprite = "missile-large";
bullet = new RailBulletType(){{
length = 140f;
damage = 40f;
hitColor = Color.valueOf("feb380");
hitEffect = endEffect = Fx.hitBulletColor;
shootEffect = Fx.shootBig;
smokeEffect = Fx.shootBigSmoke;
shootEffect = Fx.shootBigColor;
width = 5f;
height = 7f;
lifetime = 40f;
hitSize = 4f;
hitColor = backColor = trailColor = Color.valueOf("feb380");
frontColor = Color.white;
trailWidth = 1.7f;
trailLength = 5;
despawnEffect = hitEffect = Fx.hitBulletColor;
pierceDamageFactor = 0.8f;
lineEffect = new Effect(14f, e -> {
if(!(e.data instanceof Vec2 v)) return;
stroke(e.fout() * 1.5f);
color(e.color);
Lines.line(e.x, e.y, v.x, v.y);
});
pointEffectSpace = 8f;
if(false)
pointEffect = new Effect(20, e -> {
color(e.color);
Fill.poly(e.x, e.y, 3, 4f * e.fout(), e.rotation);
}).layer(Layer.bullet - 0.001f);
}};
}});
}};
@@ -2926,12 +2936,14 @@ public class UnitTypes{
layerOffset = -0.001f;
heatColor = Pal.techBlue;
heatProgress = PartProgress.heat.add(0.2f).min(PartProgress.warmup);
progress = PartProgress.warmup.blend(PartProgress.reload, 0.2f);
x = 11 / 4f;
y = 10f / 4f;
moveY = 1f - fi * 3f;
moveX = fi * 0.5f;
moveRot = -30f - fi * 15f;
progress = PartProgress.warmup.blend(PartProgress.reload, 0.1f);
x = 13.5f / 4f;
y = 10f / 4f - fi * 2f;
moveY = 1f - fi * 1f;
moveX = fi * 0.3f;
moveRot = -45f - fi * 17f;
moves.add(new PartMove(PartProgress.reload.inv().mul(1.8f).inv().curve(fi / 5f, 0.2f), 0f, 0f, 40f));
}});
}