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

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
Anuken
2022-10-27 10:30:32 -04:00
parent c8ebe0cd87 b25820eed7
commit cc79568cbd
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -141,6 +141,8 @@ public class BulletType extends Content implements Cloneable{
public boolean despawnHit = false; public boolean despawnHit = false;
/** If true, this bullet will create bullets when it hits anything, not just when it despawns. */ /** If true, this bullet will create bullets when it hits anything, not just when it despawns. */
public boolean fragOnHit = true; public boolean fragOnHit = true;
/** If false, this bullet will not create fraags when absorbed by a shield. */
public boolean fragOnAbsorb = true;
/** If true, unit armor is ignored in damage calculations. Ignored for building armor. */ /** If true, unit armor is ignored in damage calculations. Ignored for building armor. */
public boolean pierceArmor = false; public boolean pierceArmor = false;
/** Whether status and despawnHit should automatically be set. */ /** Whether status and despawnHit should automatically be set. */
@@ -452,7 +454,7 @@ public class BulletType extends Content implements Cloneable{
} }
public void createFrags(Bullet b, float x, float y){ public void createFrags(Bullet b, float x, float y){
if(fragBullet != null){ if(fragBullet != null && (fragOnAbsorb || !b.absorbed)){
for(int i = 0; i < fragBullets; i++){ for(int i = 0; i < fragBullets; i++){
float len = Mathf.random(1f, 7f); float len = Mathf.random(1f, 7f);
float a = b.rotation() + Mathf.range(fragRandomSpread / 2) + fragAngle + ((i - fragBullets/2) * fragSpread); float a = b.rotation() + Mathf.range(fragRandomSpread / 2) + fragAngle + ((i - fragBullets/2) * fragSpread);