mirrors/Mindustry
1
Fork 0
mirror of https://github.com/Anuken/Mindustry.git synced 2026-01-25 05:51:47 -08:00
Code Issues Projects Releases Wiki Activity

Fixed #4385

Browse source
This commit is contained in:
Anuken 2021-01-20 09:11:32 -05:00
parent c4ea5a8256
commit f64cb3ad9a
3 changed files with 4 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

2
core/src/mindustry/content/Blocks.java
View file

@ -1537,7 +1537,7 @@ public class Blocks implements ContentList{
shootSound = Sounds.laser;
shootType = new LaserBulletType(140){{
colors = new Color[]{Pal.lancerLaser.cpy().mul(1f, 1f, 1f, 0.4f), Pal.lancerLaser, Color.white};
colors = new Color[]{Pal.lancerLaser.cpy().a(0.4f), Pal.lancerLaser, Color.white};
hitEffect = Fx.hitLancer;
despawnEffect = Fx.none;
hitSize = 4;

3
core/src/mindustry/entities/bullet/BulletType.java
View file

@ -189,6 +189,7 @@ public abstract class BulletType extends Content{
}
public void hit(Bullet b, float x, float y){
b.hit = true;
hitEffect.at(x, y, b.rotation(), hitColor);
hitSound.at(x, y, hitSoundPitch, hitSoundVolume);
@ -245,7 +246,7 @@ public abstract class BulletType extends Content{
Effect.shake(despawnShake, despawnShake, b);
if(fragBullet != null || splashDamageRadius > 0 || lightning > 0){
if(!b.hit && (fragBullet != null || splashDamageRadius > 0 || lightning > 0)){
hit(b);
}
}

2
core/src/mindustry/entities/comp/BulletComp.java
View file

@ -30,7 +30,7 @@ abstract class BulletComp implements Timedc, Damagec, Hitboxc, Teamc, Posc, Draw
Object data;
BulletType type;
float fdata;
transient boolean absorbed;
transient boolean absorbed, hit;
@Override
public void getCollisions(Cons<QuadTree> consumer){