diff --git a/core/src/io/anuke/mindustry/content/AmmoTypes.java b/core/src/io/anuke/mindustry/content/AmmoTypes.java index cd96e8344b..6420c70daa 100644 --- a/core/src/io/anuke/mindustry/content/AmmoTypes.java +++ b/core/src/io/anuke/mindustry/content/AmmoTypes.java @@ -14,7 +14,7 @@ public class AmmoTypes implements ContentList{ bulletDenseBig, bulletPyratiteBig, bulletThoriumBig, shock, bombExplosive, bombIncendiary, bombOil, shellCarbide, flamerThermite, weaponMissile, weaponMissileSwarm, bulletMech, healBlaster, bulletGlaive, - flakExplosive, flakPlastic, flakSurge, + /*flakCopper, */flakExplosive, flakPlastic, flakSurge, missileExplosive, missileIncindiary, missileSurge, artilleryDense, artilleryPlastic, artilleryHoming, artilleryIncindiary, artilleryExplosive, unitArtillery, basicFlame, lancerLaser, lightning, meltdownLaser, burstLaser, diff --git a/core/src/io/anuke/mindustry/content/blocks/TurretBlocks.java b/core/src/io/anuke/mindustry/content/blocks/TurretBlocks.java index 8d16feb64a..7853db554f 100644 --- a/core/src/io/anuke/mindustry/content/blocks/TurretBlocks.java +++ b/core/src/io/anuke/mindustry/content/blocks/TurretBlocks.java @@ -39,6 +39,17 @@ public class TurretBlocks extends BlockList implements ContentList{ shootCone = 10f; health = 120; }}; +/* + scatter = new BurstTurret("scatter"){{ + ammoTypes = new AmmoType[]{AmmoTypes.flakCopper}; + reload = 70f; + recoil = 2f; + shots = 3; + range = 220f; + inaccuracy = 2f; + shootCone = 40f; + health = 120; + }};*/ scorch = new LiquidTurret("scorch"){ protected TextureRegion shootRegion; @@ -105,7 +116,7 @@ public class TurretBlocks extends BlockList implements ContentList{ arc = new PowerTurret("arc"){{ shootType = AmmoTypes.arc; - reload = 40f; + reload = 34f; shootShake = 1f; powerUsed = 5f; powerCapacity = 30f; diff --git a/core/src/io/anuke/mindustry/content/bullets/TurretBullets.java b/core/src/io/anuke/mindustry/content/bullets/TurretBullets.java index f4472a8e8e..2ee175ae96 100644 --- a/core/src/io/anuke/mindustry/content/bullets/TurretBullets.java +++ b/core/src/io/anuke/mindustry/content/bullets/TurretBullets.java @@ -306,7 +306,7 @@ public class TurretBullets extends BulletList implements ContentList{ @Override public void init(Bullet b){ - Lightning.create(b.getTeam(), hiteffect, Palette.lancerLaser, damage, b.x, b.y, b.angle(), 25); + Lightning.create(b.getTeam(), hiteffect, Palette.lancerLaser, damage, b.x, b.y, b.angle(), 28); } }; diff --git a/core/src/io/anuke/mindustry/core/World.java b/core/src/io/anuke/mindustry/core/World.java index b1b607eb14..931bf6d6a5 100644 --- a/core/src/io/anuke/mindustry/core/World.java +++ b/core/src/io/anuke/mindustry/core/World.java @@ -77,11 +77,6 @@ public class World extends Module{ return !wallSolid(x, y - 1) || !wallSolid(x, y + 1) || !wallSolid(x - 1, y) || !wallSolid(x + 1, y); } - public boolean floorBlends(int x, int y, Block block){ - Tile tile = tile(x, y); - return tile == null || tile.floor().id <= block.id; - } - public Map getMap(){ return currentMap; } diff --git a/core/src/io/anuke/mindustry/entities/effect/Lightning.java b/core/src/io/anuke/mindustry/entities/effect/Lightning.java index 49df3eef97..3c4b5ef532 100644 --- a/core/src/io/anuke/mindustry/entities/effect/Lightning.java +++ b/core/src/io/anuke/mindustry/entities/effect/Lightning.java @@ -228,8 +228,17 @@ public class Lightning extends SolidEntity implements Poolable, DrawTrait, SyncT Draw.color(color, Color.WHITE, fin()); for(int i = 0; i < lines.size; i++){ Vector2 v = lines.get(i); + Lines.stroke(fout() * 3f * (1.5f - (float) i / lines.size)); + + Lines.stroke(Lines.getStroke() * 4f); + Draw.alpha(0.3f); Lines.line(lx, ly, v.x, v.y); + + Lines.stroke(Lines.getStroke()/4f); + Draw.alpha(1f); + Lines.line(lx, ly, v.x, v.y); + lx = v.x; ly = v.y; }