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

Conflicts: core/assets/icons/icons.properties core/assets/sprites/block_colors.png core/assets/sprites/fallback/sprites.atlas core/assets/sprites/fallback/sprites3.png core/assets/sprites/fallback/sprites4.png core/assets/sprites/fallback/sprites5.png core/assets/sprites/fallback/sprites7.png core/assets/sprites/fallback/sprites8.png core/assets/sprites/sprites.atlas core/assets/sprites/sprites.png core/assets/sprites/sprites2.png core/assets/sprites/sprites4.png core/assets/sprites/sprites5.png core/src/mindustry/content/Blocks.java
2020-09-30 09:48:18 +03:00
parent fb53abe593 3c3c15dcf4
commit d4402ee3bb
33 changed files with 13791 additions and 13571 deletions
--- a/core/src/mindustry/content/Blocks.java
+++ b/core/src/mindustry/content/Blocks.java
@@ -74,7 +74,7 @@ public class Blocks implements ContentList{
    coreShard, coreFoundation, coreNucleus, vault, container, unloader,

    //turrets
-    duo, scatter, scorch, hail, arc, wave, lancer, swarmer, salvo, fuse, ripple, cyclone, spectre, meltdown, segment, parallax, tsunami,
+    duo, scatter, scorch, hail, arc, wave, lancer, swarmer, salvo, fuse, ripple, cyclone, foreshadow, spectre, meltdown, segment, parallax, tsunami

    //units
    commandCenter,
@@ -1582,7 +1582,7 @@ public class Blocks implements ContentList{
            health = 250 * size * size;
            range = 140f;
            hasPower = true;
-            consumes.power(8f);
+            consumes.powerCond(8f, (PointDefenseBuild b) -> b.target != null);
            size = 2;
            shootLength = 5f;
            bulletDamage = 25f;
@@ -1685,6 +1685,48 @@ public class Blocks implements ContentList{
            health = 145 * size * size;
        }};

+        foreshadow = new ItemTurret("foreshadow"){{
+            float brange = range = 500f;
+
+            requirements(Category.turret, with(Items.copper, 1000, Items.metaglass, 600, Items.surgealloy, 300, Items.plastanium, 175, Items.thorium, 350));
+            ammo(
+            Items.surgealloy, new PointBulletType(){{
+                shootEffect = Fx.instShoot;
+                hitEffect = Fx.instHit;
+                smokeEffect = Fx.smokeCloud;
+                trailEffect = Fx.instTrail;
+                despawnEffect = Fx.instBomb;
+                trailSpacing = 20f;
+                damage = 1300;
+                tileDamageMultiplier = 0.5f;
+                speed = brange;
+                hitShake = 6f;
+                ammoMultiplier = 1f;
+            }}
+            );
+
+            rotateSpeed = 2.5f;
+            reloadTime = 200f;
+            restitution = 0.2f;
+            ammoUseEffect = Fx.shellEjectBig;
+            recoilAmount = 5f;
+            restitution = 0.009f;
+            cooldown = 0.009f;
+            shootShake = 4f;
+            shots = 1;
+            size = 4;
+            shootCone = 2f;
+            shootSound = Sounds.shootBig;
+            unitSort = (u, x, y) -> -u.maxHealth;
+
+            coolantMultiplier = 0.09f;
+
+            health = 150 * size * size;
+            consumes.add(new ConsumeLiquidFilter(liquid -> liquid.temperature <= 0.5f && liquid.flammability < 0.1f, 2f)).update(false).optional(true, true);
+
+            consumes.powerCond(10f, (TurretBuild entity) -> entity.target != null || (entity.logicControlled() && entity.logicShooting));
+        }};
+
        spectre = new ItemTurret("spectre"){{
            requirements(Category.turret, with(Items.copper, 900, Items.graphite, 300, Items.surgealloy, 250, Items.plastanium, 175, Items.thorium, 250));
            ammo(
@@ -1707,7 +1749,7 @@ public class Blocks implements ContentList{
            shootCone = 24f;
            shootSound = Sounds.shootBig;

-            health = 155 * size * size;
+            health = 160 * size * size;
            consumes.add(new ConsumeLiquidFilter(liquid -> liquid.temperature <= 0.5f && liquid.flammability < 0.1f, 2f)).update(false).optional(true, true);
        }};

--- a/core/src/mindustry/content/Fx.java
+++ b/core/src/mindustry/content/Fx.java
@@ -455,6 +455,79 @@ public class Fx{

    }),

+    instBomb = new Effect(15f, 100f, e -> {
+        color(Pal.bulletYellowBack);
+        stroke(e.fout() * 4f);
+        Lines.circle(e.x, e.y, 4f + e.finpow() * 20f);
+
+        for(int i = 0; i < 4; i++){
+            Drawf.tri(e.x, e.y, 6f, 80f * e.fout(), i*90 + 45);
+        }
+
+        color();
+        for(int i = 0; i < 4; i++){
+            Drawf.tri(e.x, e.y, 3f, 30f * e.fout(), i*90 + 45);
+        }
+    }),
+
+    instTrail = new Effect(30, e -> {
+        for(int i = 0; i < 2; i++){
+            color(i == 0 ? Pal.bulletYellowBack : Pal.bulletYellow);
+
+            float m = i == 0 ? 1f : 0.5f;
+
+            float rot = e.rotation + 180f;
+            float w = 15f * e.fout() * m;
+            Drawf.tri(e.x, e.y, w, (30f + Mathf.randomSeedRange(e.id, 15f)) * m, rot);
+            Drawf.tri(e.x, e.y, w, 10f * m, rot + 180f);
+        }
+    }),
+
+    instShoot = new Effect(24f, e -> {
+        e.scaled(10f, b -> {
+            color(Color.white, Pal.bulletYellowBack, b.fin());
+            stroke(b.fout() * 3f + 0.2f);
+            Lines.circle(b.x, b.y, b.fin() * 50f);
+        });
+
+        color(Pal.bulletYellowBack);
+
+        for(int i : Mathf.signs){
+            Drawf.tri(e.x, e.y, 13f * e.fout(), 85f, e.rotation + 90f * i);
+            Drawf.tri(e.x, e.y, 13f * e.fout(), 50f, e.rotation + 20f * i);
+        }
+    }),
+
+    instHit = new Effect(20f, 200f, e -> {
+        color(Pal.bulletYellowBack);
+
+        for(int i = 0; i < 2; i++){
+            color(i == 0 ? Pal.bulletYellowBack : Pal.bulletYellow);
+
+            float m = i == 0 ? 1f : 0.5f;
+
+            for(int j = 0; j < 5; j++){
+                float rot = e.rotation + Mathf.randomSeedRange(e.id + j, 50f);
+                float w = 23f * e.fout() * m;
+                Drawf.tri(e.x, e.y, w, (80f + Mathf.randomSeedRange(e.id + j, 40f)) * m, rot);
+                Drawf.tri(e.x, e.y, w, 20f * m, rot + 180f);
+            }
+        }
+
+        e.scaled(10f, c -> {
+            color(Pal.bulletYellow);
+            stroke(c.fout() * 2f + 0.2f);
+            Lines.circle(e.x, e.y, c.fin() * 30f);
+        });
+
+        e.scaled(12f, c -> {
+            color(Pal.bulletYellowBack);
+            randLenVectors(e.id, 25, 5f + e.fin() * 80f, e.rotation, 60f, (x, y) -> {
+                Fill.square(e.x + x, e.y + y, c.fout() * 3f, 45f);
+            });
+        });
+    }),
+
    hitLaser = new Effect(8, e -> {
        color(Color.white, Pal.heal, e.fin());
        stroke(0.5f + e.fout());
@@ -1074,28 +1147,11 @@ public class Fx{
    }),

    railHit = new Effect(18f, 200f, e -> {
-        if(true){
-            color(Pal.orangeSpark);
+        color(Pal.orangeSpark);

-            for(int i : Mathf.signs){
-                Drawf.tri(e.x, e.y, 10f * e.fout(), 60f, e.rotation + 140f * i);
-            }
-        }else{
-            e.scaled(7f, b -> {
-                color(Color.white, Color.lightGray, b.fin());
-                stroke(b.fout() * 2f + 0.2f);
-                Lines.circle(b.x, b.y, b.fin() * 28f);
-            });
-
-            color(Pal.orangeSpark);
-            float rot = e.rotation + Mathf.randomSeedRange(e.id, 20f);
-            float w = 9f * e.fout();
-
-            Drawf.tri(e.x, e.y, w, 100f, rot);
-            Drawf.tri(e.x, e.y, w, 10f, rot + 180f);
+        for(int i : Mathf.signs){
+            Drawf.tri(e.x, e.y, 10f * e.fout(), 60f, e.rotation + 140f * i);
        }
-
-
    }),

    lancerLaserShoot = new Effect(21f, e -> {
@@ -1109,7 +1165,7 @@ public class Fx{

    lancerLaserShootSmoke = new Effect(26f, e -> {
        color(Color.white);
-        float length = e.data == null || !(e.data instanceof Float) ? 70f : (Float)e.data;
+        float length = !(e.data instanceof Float) ? 70f : (Float)e.data;

        randLenVectors(e.id, 7, length, e.rotation, 0f, (x, y) -> {
            lineAngle(e.x + x, e.y + y, Mathf.angle(x, y), e.fout() * 9f);
--- a/core/src/mindustry/content/TechTree.java
+++ b/core/src/mindustry/content/TechTree.java
@@ -109,6 +109,9 @@ public class TechTree implements ContentList{

                node(Items.coal, with(Items.lead, 3000), () -> {
                    node(Items.graphite, with(Items.coal, 1000), () -> {
+                        node(illuminator, () -> {
+                        });
+
                        node(graphitePress, () -> {
                            node(Items.titanium, with(Items.graphite, 6000, Items.copper, 10000, Items.lead, 10000), () -> {
                                node(pneumaticDrill, () -> {
@@ -351,8 +354,10 @@ public class TechTree implements ContentList{
                        });

                        node(lancer, () -> {
-                            node(meltdown, () -> {
+                            node(foreshadow, () -> {
+                                node(meltdown, () -> {

+                                });
                            });

                            node(shockMine, () -> {
--- a/core/src/mindustry/content/UnitTypes.java
+++ b/core/src/mindustry/content/UnitTypes.java
@@ -446,7 +446,7 @@ public class UnitTypes implements ContentList{
            mineTier = 1;
            hitSize = 29f;
            itemCapacity = 80;
-            health = 19000f;
+            health = 18000f;
            buildSpeed = 1.7f;
            armor = 9f;
            landShake = 1.5f;
@@ -488,7 +488,7 @@ public class UnitTypes implements ContentList{
                firstShotDelay = Fx.greenLaserCharge.lifetime;

                bullet = new LaserBulletType(){{
-                    length = 500f;
+                    length = 460f;
                    damage = 550f;
                    width = 75f;