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/world/blocks/defense/turrets/Turret.java
+1 -3
View File
@@ -503,8 +503,6 @@ public class Turret extends ReloadTurret{
handleBullet(type.create(this, team, bulletX, bulletY, shootAngle, 1f + Mathf.range(velocityInaccuracy), lifeScl), xOffset, yOffset, angleOffset);
//TODO "shoot" and "smoke" should just be MultiEffects there's no reason to have them separate
(shootEffect == Fx.none ? type.shootEffect : shootEffect).at(bulletX, bulletY, rotation, type.hitColor);
(smokeEffect == Fx.none ? type.smokeEffect : smokeEffect).at(bulletX, bulletY, rotation, type.hitColor);
shootSound.at(bulletX, bulletY, Mathf.random(soundPitchMin, soundPitchMax));
@@ -512,7 +510,7 @@ public class Turret extends ReloadTurret{
ammoUseEffect.at(
x - Angles.trnsx(rotation, ammoEjectBack),
y - Angles.trnsy(rotation, ammoEjectBack),
rotation * (shoot.shots == 1 && shoot instanceof ShootAlternate && totalShots % 2 == 1 ? -1f : 1f)
rotation * Mathf.sign(xOffset)
);
if(shootShake > 0){