From 9a286800d66efaa63e88e0bd122c4659098249d5 Mon Sep 17 00:00:00 2001 From: Anuken Date: Wed, 3 Oct 2018 13:44:18 -0400 Subject: [PATCH] Ammo type for revenants --- core/src/io/anuke/mindustry/content/AmmoTypes.java | 9 +++++---- .../anuke/mindustry/content/bullets/TurretBullets.java | 2 +- core/src/io/anuke/mindustry/maps/Sectors.java | 4 +++- 3 files changed, 9 insertions(+), 6 deletions(-) diff --git a/core/src/io/anuke/mindustry/content/AmmoTypes.java b/core/src/io/anuke/mindustry/content/AmmoTypes.java index 51372c0e90..cd96e8344b 100644 --- a/core/src/io/anuke/mindustry/content/AmmoTypes.java +++ b/core/src/io/anuke/mindustry/content/AmmoTypes.java @@ -17,7 +17,8 @@ public class AmmoTypes implements ContentList{ flakExplosive, flakPlastic, flakSurge, missileExplosive, missileIncindiary, missileSurge, artilleryDense, artilleryPlastic, artilleryHoming, artilleryIncindiary, artilleryExplosive, unitArtillery, - basicFlame, lancerLaser, lightning, spectreLaser, meltdownLaser, fuseShotgun, oil, water, lava, cryofluid, arc; + basicFlame, lancerLaser, lightning, meltdownLaser, burstLaser, + fuseShotgun, oil, water, lava, cryofluid, arc; @Override public void load(){ @@ -217,7 +218,9 @@ public class AmmoTypes implements ContentList{ //power - lancerLaser = new AmmoType(TurretBullets.lancerLaser){{ + lancerLaser = new AmmoType(TurretBullets.lancerLaser); + + burstLaser = new AmmoType(TurretBullets.burstLaser){{ range = 60f; }}; @@ -225,8 +228,6 @@ public class AmmoTypes implements ContentList{ arc = new AmmoType(TurretBullets.arc); - spectreLaser = new AmmoType(TurretBullets.lancerLaser); - meltdownLaser = new AmmoType(TurretBullets.meltdownLaser); fuseShotgun = new AmmoType(Items.densealloy, TurretBullets.fuseShot, 1f){{ diff --git a/core/src/io/anuke/mindustry/content/bullets/TurretBullets.java b/core/src/io/anuke/mindustry/content/bullets/TurretBullets.java index 73b8b79b46..f4472a8e8e 100644 --- a/core/src/io/anuke/mindustry/content/bullets/TurretBullets.java +++ b/core/src/io/anuke/mindustry/content/bullets/TurretBullets.java @@ -27,7 +27,7 @@ import static io.anuke.mindustry.Vars.content; import static io.anuke.mindustry.Vars.world; public class TurretBullets extends BulletList implements ContentList{ - public static BulletType fireball, basicFlame, lancerLaser, meltdownLaser, fuseShot, waterShot, cryoShot, lavaShot, oilShot, lightning, driverBolt, healBullet, arc; + public static BulletType fireball, basicFlame, lancerLaser, burstLaser, meltdownLaser, fuseShot, waterShot, cryoShot, lavaShot, oilShot, lightning, driverBolt, healBullet, arc; @Override public void load(){ diff --git a/core/src/io/anuke/mindustry/maps/Sectors.java b/core/src/io/anuke/mindustry/maps/Sectors.java index cacda50fb9..11a48a92c9 100644 --- a/core/src/io/anuke/mindustry/maps/Sectors.java +++ b/core/src/io/anuke/mindustry/maps/Sectors.java @@ -249,7 +249,9 @@ public class Sectors{ } } - if(sector.texture == null) createTexture(sector); + if(sector.texture == null){ + threads.runGraphics(() -> createTexture(sector)); + } } public void load(){