diff --git a/core/src/mindustry/content/Blocks.java b/core/src/mindustry/content/Blocks.java index 060b58589e..df0c1cb334 100644 --- a/core/src/mindustry/content/Blocks.java +++ b/core/src/mindustry/content/Blocks.java @@ -2840,7 +2840,7 @@ public class Blocks{ range = 180; shootCone = 3f; health = 300 * size * size; - rotateSpeed = 1.8f; + rotateSpeed = 1.6f; limitRange(); }}; @@ -2947,7 +2947,7 @@ public class Blocks{ ammo( //TODO ammo types to be defined later - Items.fissileMatter, new ArtilleryBulletType(2f, 40, "shell"){{ + Items.fissileMatter, new ArtilleryBulletType(2.5f, 40, "shell"){{ //TODO FX; smoke, shockwave, not green bomb hitEffect = new MultiEffect(Fx.titanExplosion, Fx.titanSmoke); despawnEffect = Fx.none; @@ -2955,11 +2955,11 @@ public class Blocks{ lifetime = 140f; height = 16f; width = 14.2f; - ammoMultiplier = 4f; splashDamageRadius = 60f; splashDamage = 100f; backColor = hitColor = trailColor = Pal.berylShot; frontColor = Color.valueOf("f0ffde"); + ammoMultiplier = 1f; status = StatusEffects.blasted; diff --git a/core/src/mindustry/content/Fx.java b/core/src/mindustry/content/Fx.java index 6deb1ec7de..6c28dc1ff9 100644 --- a/core/src/mindustry/content/Fx.java +++ b/core/src/mindustry/content/Fx.java @@ -344,7 +344,13 @@ public class Fx{ stroke(e.fout() * 3f); float circleRad = 6f + e.finpow() * 60f; Lines.circle(e.x, e.y, circleRad); - Lines.spikes(e.x, e.y, circleRad + 6f, 32f * e.foutpow(), 10); + + rand.setSeed(e.id); + for(int i = 0; i < 16; i++){ + float angle = rand.random(360f); + float lenRand = rand.random(0.5f, 1f); + Lines.lineAngle(e.x, e.y, angle, e.foutpow() * 50f * rand.random(1f, 0.6f) + 2f, e.finpow() * 70f * lenRand + 6f); + } }), titanSmoke = new Effect(300f, 300f, b -> { diff --git a/core/src/mindustry/maps/planet/ErekirPlanetGenerator.java b/core/src/mindustry/maps/planet/ErekirPlanetGenerator.java index 22f1c0cee2..c854cf27e8 100644 --- a/core/src/mindustry/maps/planet/ErekirPlanetGenerator.java +++ b/core/src/mindustry/maps/planet/ErekirPlanetGenerator.java @@ -186,7 +186,7 @@ public class ErekirPlanetGenerator extends PlanetGenerator{ if(nearAir(x, y)){ if(block == Blocks.carbonWall && noise(x + 78, y, 4, 0.7f, 33f, 1f) > 0.59f){ block = Blocks.graphiticWall; - }else if(block != Blocks.carbonWall && noise(x + 782, y, 4, 0.8f, 37f, 1f) > 0.68f){ + }else if(block != Blocks.carbonWall && noise(x + 782, y, 4, 0.8f, 36f, 1f) > 0.66f){ ore = Blocks.wallOreBeryl; } //TODO generate tungsten, or not? diff --git a/gradle.properties b/gradle.properties index b6d9a4be8e..0564908d49 100644 --- a/gradle.properties +++ b/gradle.properties @@ -24,4 +24,4 @@ android.useAndroidX=true #used for slow jitpack builds; TODO see if this actually works org.gradle.internal.http.socketTimeout=100000 org.gradle.internal.http.connectionTimeout=100000 -archash=f9abed08 +archash=ed2c6c1e