diff --git a/core/assets-raw/sprites/blocks/turrets/bases/reinforced-block-4.png b/core/assets-raw/sprites/blocks/turrets/bases/reinforced-block-4.png new file mode 100644 index 0000000000..e356019ce1 Binary files /dev/null and b/core/assets-raw/sprites/blocks/turrets/bases/reinforced-block-4.png differ diff --git a/core/assets-raw/sprites/blocks/turrets/cyclone.png b/core/assets-raw/sprites/blocks/turrets/cyclone.png index d508628c50..ba4e16da97 100644 Binary files a/core/assets-raw/sprites/blocks/turrets/cyclone.png and b/core/assets-raw/sprites/blocks/turrets/cyclone.png differ diff --git a/core/assets-raw/sprites/blocks/turrets/fuse.png b/core/assets-raw/sprites/blocks/turrets/fuse.png index 360262bbcc..8c3b6434d7 100644 Binary files a/core/assets-raw/sprites/blocks/turrets/fuse.png and b/core/assets-raw/sprites/blocks/turrets/fuse.png differ diff --git a/core/assets-raw/sprites/blocks/turrets/titan/titan-barrel-heat.png b/core/assets-raw/sprites/blocks/turrets/titan/titan-barrel-heat.png index 3d09180105..01e7d763e0 100644 Binary files a/core/assets-raw/sprites/blocks/turrets/titan/titan-barrel-heat.png and b/core/assets-raw/sprites/blocks/turrets/titan/titan-barrel-heat.png differ diff --git a/core/assets-raw/sprites/blocks/turrets/titan/titan-barrel-heat_full.png b/core/assets-raw/sprites/blocks/turrets/titan/titan-barrel-heat_full.png index fe2f78d50d..bfaf389728 100644 Binary files a/core/assets-raw/sprites/blocks/turrets/titan/titan-barrel-heat_full.png and b/core/assets-raw/sprites/blocks/turrets/titan/titan-barrel-heat_full.png differ diff --git a/core/assets-raw/sprites/blocks/turrets/titan/titan-barrel.png b/core/assets-raw/sprites/blocks/turrets/titan/titan-barrel.png index 5aaa45dc4f..633870819d 100644 Binary files a/core/assets-raw/sprites/blocks/turrets/titan/titan-barrel.png and b/core/assets-raw/sprites/blocks/turrets/titan/titan-barrel.png differ diff --git a/core/assets-raw/sprites/blocks/turrets/titan/titan-side-heat.png b/core/assets-raw/sprites/blocks/turrets/titan/titan-side-heat.png index 2fc10cb5b8..d9607a2e1e 100644 Binary files a/core/assets-raw/sprites/blocks/turrets/titan/titan-side-heat.png and b/core/assets-raw/sprites/blocks/turrets/titan/titan-side-heat.png differ diff --git a/core/assets-raw/sprites/blocks/turrets/titan/titan-side1.png b/core/assets-raw/sprites/blocks/turrets/titan/titan-side1.png index 90eff75c1c..80d2539b5d 100644 Binary files a/core/assets-raw/sprites/blocks/turrets/titan/titan-side1.png and b/core/assets-raw/sprites/blocks/turrets/titan/titan-side1.png differ diff --git a/core/assets-raw/sprites/blocks/turrets/titan/titan-side2.png b/core/assets-raw/sprites/blocks/turrets/titan/titan-side2.png index 394e64f30c..b76cc39f30 100644 Binary files a/core/assets-raw/sprites/blocks/turrets/titan/titan-side2.png and b/core/assets-raw/sprites/blocks/turrets/titan/titan-side2.png differ diff --git a/core/assets-raw/sprites/blocks/turrets/titan/titan.png b/core/assets-raw/sprites/blocks/turrets/titan/titan.png index 74f1fdb72f..da8aa59a6f 100644 Binary files a/core/assets-raw/sprites/blocks/turrets/titan/titan.png and b/core/assets-raw/sprites/blocks/turrets/titan/titan.png differ diff --git a/core/src/mindustry/content/Blocks.java b/core/src/mindustry/content/Blocks.java index a8e6d18c86..386482a2ca 100644 --- a/core/src/mindustry/content/Blocks.java +++ b/core/src/mindustry/content/Blocks.java @@ -2992,38 +2992,37 @@ public class Blocks{ range = 170f; - //TODO unfinished, needs damage + proper mechanics + //TODO multi ammo shootType = new ContinuousFlameBulletType(){{ damage = 4f; length = range; - //pierceMax = 3; }}; shootLength = 7f; size = 3; }}; titan = new ItemTurret("titan"){{ - requirements(Category.turret, with(Items.carbide, 120, Items.surgeAlloy, 80, Items.silicon, 80, Items.beryllium, 120)); + requirements(Category.turret, with(Items.carbide, 250, Items.surgeAlloy, 160, Items.silicon, 300, Items.beryllium, 400)); ammo( //TODO 1 more ammo type, decide on base type - Items.fissileMatter, new ArtilleryBulletType(2.5f, 40, "shell"){{ + Items.fissileMatter, new ArtilleryBulletType(2.5f, 60, "shell"){{ hitEffect = new MultiEffect(Fx.titanExplosion, Fx.titanSmoke); despawnEffect = Fx.none; - knockback = 1.5f; + knockback = 2f; lifetime = 140f; - height = 16f; - width = 14.2f; - splashDamageRadius = 60f; - splashDamage = 100f; - backColor = hitColor = trailColor = Color.valueOf("bb68c3"); + height = 17f; + width = 16f; + splashDamageRadius = 65f; + splashDamage = 150f; + backColor = hitColor = trailColor = Color.valueOf("ea8878").lerp(Color.valueOf("feb380"), 0.5f); frontColor = Color.white; ammoMultiplier = 1f; status = StatusEffects.blasted; trailLength = 32; - trailWidth = 2.64f; + trailWidth = 2.85f; trailSinScl = 2.5f; trailSinMag = 1f; trailEffect = Fx.none; @@ -3050,18 +3049,18 @@ public class Blocks{ draw = new DrawTurret("reinforced-"){{ parts.addAll( new RegionPart("-barrel"){{ - moveY = -5f; + moveY = -5f * 4f / 3f; heatColor = Color.valueOf("f03b0e"); mirror = false; interp = Interp.pow2In; }}, new RegionPart("-side"){{ - moveX = 2f; - moveY = -1f; + moveX = 2f * 4f / 3f; + moveY = -0.5f; rotMove = -40f; useReload = false; under = true; - heatColor = Color.valueOf("768a9a"); + heatColor = Color.red.cpy(); useProgressHeat = true; interp = Interp.pow2Out; }}); @@ -3072,7 +3071,7 @@ public class Blocks{ outlineColor = Pal.darkOutline; - consumes.liquids(LiquidStack.with(Liquids.hydrogen, 1f / 60f)); + consumes.liquids(LiquidStack.with(Liquids.hydrogen, 2f / 60f)); range = 390f; size = 4; diff --git a/core/src/mindustry/world/draw/DrawTurret.java b/core/src/mindustry/world/draw/DrawTurret.java index d1c54930b0..dc8d483119 100644 --- a/core/src/mindustry/world/draw/DrawTurret.java +++ b/core/src/mindustry/world/draw/DrawTurret.java @@ -191,7 +191,7 @@ public class DrawTurret extends DrawBlock{ } if(heat.found()){ - Drawf.additive(heat, heatColor.write(Tmp.c1).a(useProgressHeat ? build.warmup() : build.heat), rx, ry, rot, Layer.turretHeat); + Drawf.additive(heat, heatColor.write(Tmp.c1).a((useProgressHeat ? build.warmup() : build.heat) * heatColor.a), rx, ry, rot, Layer.turretHeat); } Draw.xscl = 1f;