mirrors/Mindustry
1
0
Fork 0
mirror of https://github.com/Anuken/Mindustry.git synced 2025-07-16 02:38:37 +07:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2877 from genNAowl/pierce-cap

Browse Source 
Adds a Pierce Cap Variable
This commit is contained in:
Anuken
2020-10-09 09:59:53 -04:00
committed by GitHub
parent ecd152a114 e73a813d69
commit 1d34b8474b
2 changed files with 10 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
core/src/mindustry/entities/bullet/BulletType.java
View File

@ -25,6 +25,7 @@ public abstract class BulletType extends Content{
public float drawSize = 40f; public float drawSize = 40f;
public float drag = 0f; public float drag = 0f;
public boolean pierce, pierceBuilding; public boolean pierce, pierceBuilding;
public int pierceCap = -1;
public Effect hitEffect, despawnEffect; public Effect hitEffect, despawnEffect;
/** Effect created when shooting. */ /** Effect created when shooting. */
@ -235,6 +236,11 @@ public abstract class BulletType extends Content{
} }
public void init(Bullet b){ public void init(Bullet b){
if(pierceCap >= 1) {
pierce = true;
pierceBuilding = true;
}
if(killShooter && b.owner() instanceof Healthc){ if(killShooter && b.owner() instanceof Healthc){
((Healthc)b.owner()).kill(); ((Healthc)b.owner()).kill();
} }

4
core/src/mindustry/entities/comp/BulletComp.java
View File

@ -144,6 +144,10 @@ abstract class BulletComp implements Timedc, Damagec, Hitboxc, Teamc, Posc, Draw
return false; return false;
}); });
} }
if(type.pierceCap != -1 && collided.size >= type.pierceCap) {
remove();
}
} }
@Override @Override