diff --git a/core/src/io/anuke/mindustry/content/blocks/TurretBlocks.java b/core/src/io/anuke/mindustry/content/blocks/TurretBlocks.java index 5cd0e11d93..36be5fdc71 100644 --- a/core/src/io/anuke/mindustry/content/blocks/TurretBlocks.java +++ b/core/src/io/anuke/mindustry/content/blocks/TurretBlocks.java @@ -245,8 +245,8 @@ public class TurretBlocks extends BlockList implements ContentList{ powerCapacity = 120f; range = 160f; reload = 200f; - firingMoveFract = 0.25f; - shootDuration = 180f; + firingMoveFract = 0.1f; + shootDuration = 220f; health = 165 * size * size; }}; diff --git a/core/src/io/anuke/mindustry/content/bullets/TurretBullets.java b/core/src/io/anuke/mindustry/content/bullets/TurretBullets.java index 04c93a0512..f64f81a2b9 100644 --- a/core/src/io/anuke/mindustry/content/bullets/TurretBullets.java +++ b/core/src/io/anuke/mindustry/content/bullets/TurretBullets.java @@ -158,7 +158,7 @@ public class TurretBullets extends BulletList implements ContentList{ } }; - meltdownLaser = new BulletType(0.001f, 20){ + meltdownLaser = new BulletType(0.001f, 26){ Color tmpColor = new Color(); Color[] colors = {Color.valueOf("ec745855"), Color.valueOf("ec7458aa"), Color.valueOf("ff9c5a"), Color.WHITE}; float[] tscales = {1f, 0.7f, 0.5f, 0.2f}; @@ -187,7 +187,7 @@ public class TurretBullets extends BulletList implements ContentList{ public void hit(Bullet b, float hitx, float hity){ Effects.effect(hiteffect, colors[2], hitx, hity); if(Mathf.chance(0.4)){ - Fire.create(world.tileWorld(hitx, hity)); + Fire.create(world.tileWorld(hitx+Mathf.range(5f), hity+Mathf.range(5f))); } } diff --git a/core/src/io/anuke/mindustry/editor/MapEditorDialog.java b/core/src/io/anuke/mindustry/editor/MapEditorDialog.java index 7dcb5d81ee..472167176d 100644 --- a/core/src/io/anuke/mindustry/editor/MapEditorDialog.java +++ b/core/src/io/anuke/mindustry/editor/MapEditorDialog.java @@ -572,10 +572,6 @@ public class MapEditorDialog extends Dialog implements Disposable{ continue; } - if(Recipe.getByResult(block) != null){ - continue; - } - if(Recipe.getByResult(block) != null && Recipe.getByResult(block).desktopOnly && mobile){ continue; } diff --git a/core/src/io/anuke/mindustry/maps/generation/WorldGenerator.java b/core/src/io/anuke/mindustry/maps/generation/WorldGenerator.java index 12f14fca34..1fd7c30ead 100644 --- a/core/src/io/anuke/mindustry/maps/generation/WorldGenerator.java +++ b/core/src/io/anuke/mindustry/maps/generation/WorldGenerator.java @@ -99,7 +99,7 @@ public class WorldGenerator{ int pos = multiblocks.get(i); int x = pos % tiles.length; - int y = pos / tiles[0].length; + int y = pos / tiles.length; Block result = tiles[x][y].block(); Team team = tiles[x][y].getTeam();