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
2023-03-09 05:25:41 -05:00
parent bae3884d96 515a6f9c8d
commit ca2b51d4fe
47 changed files with 1050 additions and 963 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
core/src/mindustry/entities/abilities/ForceFieldAbility.java
View File

@@ -93,13 +93,13 @@ public class ForceFieldAbility extends Ability{
checkRadius(unit);
if(unit.shield > 0){
Draw.z(Layer.shields);
Draw.color(unit.team.color, Color.white, Mathf.clamp(alpha));
if(Vars.renderer.animateShields){
Draw.z(Layer.shields + 0.001f * alpha);
Fill.poly(unit.x, unit.y, sides, realRad, rotation);
}else{
Draw.z(Layer.shields);
Lines.stroke(1.5f);
Draw.alpha(0.09f);
Fill.poly(unit.x, unit.y, sides, radius, rotation);

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

@@ -177,6 +177,8 @@ public class BulletType extends Content implements Cloneable{
public float intervalSpread = 0f;
/** Angle offset for interval bullets. */
public float intervalAngle = 0f;
/** Use a negative value to disable interval bullet delay. */
public float intervalDelay = -1f;
/** Color used for hit/despawn effects. */
public Color hitColor = Color.white;
@@ -557,7 +559,7 @@ public class BulletType extends Content implements Cloneable{
}
public void updateBulletInterval(Bullet b){
if(intervalBullet != null && b.timer.get(2, bulletInterval)){
if(intervalBullet != null && b.time >= intervalDelay && b.timer.get(2, bulletInterval)){
float ang = b.rotation();
for(int i = 0; i < intervalBullets; i++){
intervalBullet.create(b, b.x, b.y, ang + Mathf.range(intervalRandomSpread) + intervalAngle + ((i - (intervalBullets - 1f)/2f) * intervalSpread));