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-05 06:06:40 -04:00
parent f1b1009728 dc060d2ce9
commit 5ea9c0c8dc
3 changed files with 14 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
core/src/mindustry/entities/abilities/SpawnDeathAbility.java
View File

@@ -8,15 +8,15 @@ import mindustry.type.*;
/** Spawns a certain amount of units upon death. */ /** Spawns a certain amount of units upon death. */
public class SpawnDeathAbility extends Ability{ public class SpawnDeathAbility extends Ability{
public UnitType type; public UnitType unit;
public int amount = 1, randAmount = 0; public int amount = 1, randAmount = 0;
/** Random spread of units away from the spawned. */ /** Random spread of units away from the spawned. */
public float spread = 8f; public float spread = 8f;
/** If true, units spawned face outwards from the middle. */ /** If true, units spawned face outwards from the middle. */
public boolean faceOutwards = true; public boolean faceOutwards = true;
public SpawnDeathAbility(UnitType type, int amount, float spread){ public SpawnDeathAbility(UnitType unit, int amount, float spread){
this.type = type; this.unit = unit;
this.amount = amount; this.amount = amount;
this.spread = spread; this.spread = spread;
} }
@@ -30,7 +30,7 @@ public class SpawnDeathAbility extends Ability{
int spawned = amount + Mathf.random(randAmount); int spawned = amount + Mathf.random(randAmount);
for(int i = 0; i < spawned; i++){ for(int i = 0; i < spawned; i++){
Tmp.v1.rnd(Mathf.random(spread)); Tmp.v1.rnd(Mathf.random(spread));
var u = type.spawn(unit.team, unit.x + Tmp.v1.x, unit.y + Tmp.v1.y); var u = this.unit.spawn(unit.team, unit.x + Tmp.v1.x, unit.y + Tmp.v1.y);
u.rotation = faceOutwards ? Tmp.v1.angle() : unit.rotation + Mathf.range(5f); u.rotation = faceOutwards ? Tmp.v1.angle() : unit.rotation + Mathf.range(5f);
} }

2
core/src/mindustry/entities/bullet/BasicBulletType.java
View File

@@ -38,6 +38,8 @@ public class BasicBulletType extends BulletType{
@Override @Override
public void load(){ public void load(){
super.load();
backRegion = Core.atlas.find(backSprite == null ? (sprite + "-back") : backSprite); backRegion = Core.atlas.find(backSprite == null ? (sprite + "-back") : backSprite);
frontRegion = Core.atlas.find(sprite); frontRegion = Core.atlas.find(sprite);
} }

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

@@ -301,6 +301,14 @@ public class BulletType extends Content implements Cloneable{
} }
} }
@Override
public void load(){
for(var part : parts){
part.turretShading = false;
part.load(null);
}
}
/** @return estimated damage per shot. this can be very inaccurate. */ /** @return estimated damage per shot. this can be very inaccurate. */
public float estimateDPS(){ public float estimateDPS(){
float sum = damage + splashDamage*0.75f; float sum = damage + splashDamage*0.75f;