Merge branch 'master' of https://github.com/Anuken/Mindustry

core/assets/contributors

@@ -143,3 +143,4 @@ BlueWolf
 [Error_27]
 code-explorer786
 KayAyeAre
+SMOLKEYS

core/src/mindustry/entities/bullet/BulletType.java

@@ -184,6 +184,12 @@ public class BulletType extends Content implements Cloneable{
     public Seq<BulletType> spawnBullets = new Seq<>();
     /** Unit spawned _instead of_ this bullet. Useful for missiles. */
     public @Nullable UnitType spawnUnit;
+    /** Unit spawned when this bullet hits something or despawns due to it hitting the end of its lifetime. */
+    public @Nullable UnitType despawnUnit;
+    /** Amount of units spawned when this bullet despawns. */
+    public int despawnUnitCount = 1;
+    /** Random offset distance from the original bullet despawn/hit coordinate. */
+    public float despawnUnitRadius = 0.1f;
 
     /** Color of trail behind bullet. */
     public Color trailColor = Pal.missileYellowBack;
@@ -373,6 +379,7 @@ public class BulletType extends Content implements Cloneable{
         }
         createPuddles(b, x, y);
         createIncend(b, x, y);
+        createUnits(b, x, y);
 
         if(suppressionRange > 0){
             //bullets are pooled, require separate Vec2 instance
@@ -432,11 +439,20 @@ public class BulletType extends Content implements Cloneable{
         }
     }
 
+    public void createUnits(Bullet b, float x, float y){
+        if(despawnUnit != null){
+            for(int i = 0; i < despawnUnitCount; i++){
+                despawnUnit.spawn(b.team, x + Mathf.range(despawnUnitRadius), y + Mathf.range(despawnUnitRadius));
+            }
+        }
+    }
 
     /** Called when the bullet reaches the end of its lifetime or is destroyed by something external. */
     public void despawned(Bullet b){
         if(despawnHit){
             hit(b);
+        }else{
+            createUnits(b, b.x, b.y);
         }
 
         if(!fragOnHit){

core/src/mindustry/game/Rules.java

@@ -94,7 +94,7 @@ public class Rules{
     public float dropZoneRadius = 300f;
     /** Time between waves in ticks. */
     public float waveSpacing = 2 * Time.toMinutes;
-    /** Starting wave spacing; if <0, uses waveSpacing * 2. */
+    /** Starting wave spacing; if <=0, uses waveSpacing * 2. */
     public float initialWaveSpacing = 0f;
     /** Wave after which the player 'wins'. Used in sectors. Use a value <= 0 to disable. */
     public int winWave = 0;

core/src/mindustry/world/blocks/defense/ShieldBreaker.java

@@ -20,7 +20,7 @@ public class ShieldBreaker extends Block{
 
     @Override
     public boolean canBreak(Tile tile){
-        return false;
+        return Vars.state.isEditor();
     }
 
     public class ShieldBreakerBuild extends Building{

core/src/mindustry/world/blocks/storage/CoreBlock.java

@@ -115,7 +115,7 @@ public class CoreBlock extends StorageBlock{
 
     @Override
     public boolean canBreak(Tile tile){
-        return false;
+        return state.isEditor();
     }
 
     @Override