Ser-pew-lo Turret Animations (#8562)

* Scatter animations

* Do the same thing to salvo

Like, the exact same thing.

Corporate wants you to tell the difference between these two pictures.
They're the same picture.

* Faster salvo barrel recoil

* Move entire scatter midsection

* Cyclone barrel animations
This commit is contained in:
MEEPofFaith
2023-05-10 09:52:54 -07:00
committed by GitHub
parent 4f845202f8
commit 31bed37976
16 changed files with 39 additions and 5 deletions

Binary file not shown.

After

Width:  |  Height:  |  Size: 230 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 221 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 220 B

View File

Before

Width:  |  Height:  |  Size: 1.4 KiB

After

Width:  |  Height:  |  Size: 1.4 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.1 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 517 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 501 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 383 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 203 B

View File

Before

Width:  |  Height:  |  Size: 1.0 KiB

After

Width:  |  Height:  |  Size: 1.0 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 864 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 853 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 499 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 779 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 547 B

View File

@@ -3055,7 +3055,7 @@ public class Blocks{
progress = PartProgress.recoil; progress = PartProgress.recoil;
recoilIndex = f; recoilIndex = f;
under = true; under = true;
moves.add(new PartMove(PartProgress.recoil, 0f, -1.5f, 0f)); moveY = -1.5f;
}}); }});
} }
}}; }};
@@ -3122,6 +3122,15 @@ public class Blocks{
}}; }};
}} }}
); );
drawer = new DrawTurret(){{
parts.add(new RegionPart("-mid"){{
progress = PartProgress.recoil;
under = true;
moveY = -1f;
}});
}};
reload = 18f; reload = 18f;
range = 220f; range = 220f;
size = 2; size = 2;
@@ -3130,7 +3139,7 @@ public class Blocks{
shoot.shotDelay = 5f; shoot.shotDelay = 5f;
shoot.shots = 2; shoot.shots = 2;
recoil = 2f; recoil = 1f;
rotateSpeed = 15f; rotateSpeed = 15f;
inaccuracy = 17f; inaccuracy = 17f;
shootCone = 35f; shootCone = 35f;
@@ -3479,12 +3488,21 @@ public class Blocks{
}} }}
); );
drawer = new DrawTurret(){{
parts.add(new RegionPart("-barrel"){{
progress = PartProgress.recoil.delay(0.5f); //Since recoil is 1-0, cut from the start instead of the end.
under = true;
turretHeatLayer = Layer.turret - 0.0001f;
moveY = -1.5f;
}});
}};
size = 2; size = 2;
range = 190f; range = 190f;
reload = 31f; reload = 31f;
consumeAmmoOnce = false; consumeAmmoOnce = false;
ammoEjectBack = 3f; ammoEjectBack = 3f;
recoil = 3f; recoil = 2f;
shake = 1f; shake = 1f;
shoot.shots = 4; shoot.shots = 4;
shoot.shotDelay = 3f; shoot.shotDelay = 3f;
@@ -3776,7 +3794,8 @@ public class Blocks{
explodeRange = 20f; explodeRange = 20f;
}} }}
); );
shootY = 8.75f; shootY = 10f;
shoot = new ShootBarrel(){{ shoot = new ShootBarrel(){{
barrels = new float[]{ barrels = new float[]{
0f, 1f, 0f, 0f, 1f, 0f,
@@ -3784,10 +3803,25 @@ public class Blocks{
-3f, 0f, 0f, -3f, 0f, 0f,
}; };
}}; }};
recoils = 3;
drawer = new DrawTurret(){{
for(int i = 3; i > 0; i--){
int f = i;
parts.add(new RegionPart("-barrel-" + i){{
progress = PartProgress.recoil;
recoilIndex = f - 1;
under = true;
moveY = -2f;
}});
}
}};
reload = 8f; reload = 8f;
range = 200f; range = 200f;
size = 3; size = 3;
recoil = 3f; recoil = 1.5f;
recoilTime = 10;
rotateSpeed = 10f; rotateSpeed = 10f;
inaccuracy = 10f; inaccuracy = 10f;
shootCone = 30f; shootCone = 30f;