Merge remote-tracking branch 'origin/master'

This commit is contained in:
Anuken
2020-05-08 09:30:48 -04:00
2 changed files with 34 additions and 33 deletions

View File

@@ -64,6 +64,7 @@ public abstract class BulletType extends Content{
//additional effects
public float fragCone = 360f;
public int fragBullets = 9;
public float fragVelocityMin = 0.2f, fragVelocityMax = 1f;
public BulletType fragBullet = null;
@@ -117,7 +118,7 @@ public abstract class BulletType extends Content{
if(fragBullet != null){
for(int i = 0; i < fragBullets; i++){
float len = Mathf.random(1f, 7f);
float a = Mathf.random(360f);
float a = b.rotation() + Mathf.range(fragCone/2);
fragBullet.create(b, x + Angles.trnsx(a, len), y + Angles.trnsy(a, len), a, Mathf.random(fragVelocityMin, fragVelocityMax));
}
}