diff --git a/core/assets-raw/sprites/blocks/turrets/breach-heat.png b/core/assets-raw/sprites/blocks/turrets/breach-heat.png new file mode 100644 index 0000000000..43e9a698d8 Binary files /dev/null and b/core/assets-raw/sprites/blocks/turrets/breach-heat.png differ diff --git a/core/assets-raw/sprites/blocks/turrets/breach.png b/core/assets-raw/sprites/blocks/turrets/breach.png index affd6b4599..c3d6e83a44 100644 Binary files a/core/assets-raw/sprites/blocks/turrets/breach.png and b/core/assets-raw/sprites/blocks/turrets/breach.png differ diff --git a/core/assets/icons/icons.properties b/core/assets/icons/icons.properties index 0346ad6892..919fee1809 100755 --- a/core/assets/icons/icons.properties +++ b/core/assets/icons/icons.properties @@ -406,7 +406,6 @@ 63302=dormant-cyst|item-dormant-cyst-ui 63301=neoplasm|liquid-neoplasm-ui 63300=scuttler|unit-scuttler-ui -63299=breach|block-breach-ui 63297=plasma-bore|block-plasma-bore-ui 63296=steam-vent|block-steam-vent-ui 63295=pressure-turbine|block-pressure-turbine-ui @@ -474,7 +473,6 @@ 63232=wall-ore-tungsten|block-wall-ore-tungsten-ui 63231=regen-projector|block-regen-projector-ui 63230=titan|block-titan-ui -63229=horde|block-horde-ui 63228=small-deconstructor|block-small-deconstructor-ui 63227=barrier-projector|block-barrier-projector-ui 63226=eletric-heater|block-eletric-heater-ui @@ -492,3 +490,4 @@ 63214=beryllium-wall|block-beryllium-wall-ui 63213=beryllium-wall-large|block-beryllium-wall-large-ui 63212=quell|unit-quell-ui +63211=breach|block-breach-ui diff --git a/core/assets/logicids.dat b/core/assets/logicids.dat index e61fa09a6d..19cccf8173 100644 Binary files a/core/assets/logicids.dat and b/core/assets/logicids.dat differ diff --git a/core/src/mindustry/content/Blocks.java b/core/src/mindustry/content/Blocks.java index acfd862c1b..a042773325 100644 --- a/core/src/mindustry/content/Blocks.java +++ b/core/src/mindustry/content/Blocks.java @@ -121,7 +121,7 @@ public class Blocks{ duo, scatter, scorch, hail, arc, wave, lancer, swarmer, salvo, fuse, ripple, cyclone, foreshadow, spectre, meltdown, segment, parallax, tsunami, //turrets - erekir - breach, fracture, horde, sublimate, titan, + breach, sublimate, titan, //units commandCenter, @@ -2897,7 +2897,7 @@ public class Blocks{ Items.beryllium, new BasicBulletType(7f, 90){{ width = 12f; height = 20f; - shootEffect = Fx.colorSpark; + shootEffect = Fx.colorSparkBig; smokeEffect = Fx.shootBigSmoke; ammoMultiplier = 1; pierce = true; @@ -2911,7 +2911,7 @@ public class Blocks{ Items.tungsten, new BasicBulletType(7.5f, 160){{ width = 13f; height = 19f; - shootEffect = Fx.colorSpark; + shootEffect = Fx.colorSparkBig; smokeEffect = Fx.shootBigSmoke; ammoMultiplier = 1; reloadMultiplier = 1f; @@ -2935,6 +2935,7 @@ public class Blocks{ size = 3; envEnabled |= Env.space; reloadTime = 40f; + recoilAmount = 2f; restitution = 0.03f; range = 190; shootCone = 3f; diff --git a/core/src/mindustry/content/ErekirTechTree.java b/core/src/mindustry/content/ErekirTechTree.java index 34a2d33cdf..9e490643a4 100644 --- a/core/src/mindustry/content/ErekirTechTree.java +++ b/core/src/mindustry/content/ErekirTechTree.java @@ -168,10 +168,10 @@ public class ErekirTechTree{ }); }); - node(fracture, () -> { - //TODO big tech jump here; incomplete turret - node(sublimate, () -> { + //TODO implement + node(sublimate, () -> { + node(titan, () -> { }); }); diff --git a/core/src/mindustry/content/Fx.java b/core/src/mindustry/content/Fx.java index fb2973e277..0ec83205d4 100644 --- a/core/src/mindustry/content/Fx.java +++ b/core/src/mindustry/content/Fx.java @@ -1510,6 +1510,15 @@ public class Fx{ }); }), + colorSparkBig = new Effect(25f, e -> { + color(Color.white, e.color, e.fin()); + stroke(e.fout() * 1.3f + 0.5f); + + randLenVectors(e.id, 8, 37f * e.fin(), e.rotation, 10f, (x, y) -> { + lineAngle(e.x + x, e.y + y, Mathf.angle(x, y), e.fslope() * 6f + 0.5f); + }); + }), + randLifeSpark = new Effect(24f, e -> { color(Color.white, e.color, e.fin()); stroke(e.fout() * 1.5f + 0.5f); @@ -1524,16 +1533,6 @@ public class Fx{ } }), - //TODO just make it properly colored... - tungstenSpark = new Effect(23f, e -> { - color(Color.white, Pal.tungstenShot, e.fin()); - stroke(e.fout() * 1.1f + 0.5f); - - randLenVectors(e.id, 5, 28f * e.fin(), e.rotation, 10f, (x, y) -> { - lineAngle(e.x + x, e.y + y, Mathf.angle(x, y), e.fslope() * 5f + 0.5f); - }); - }), - shootPayloadDriver = new Effect(30f, e -> { color(Pal.accent); Lines.stroke(0.5f + 0.5f*e.fout());