diff --git a/core/src/io/anuke/mindustry/content/Recipes.java b/core/src/io/anuke/mindustry/content/Recipes.java index 88e7fda454..b8e4a87c42 100644 --- a/core/src/io/anuke/mindustry/content/Recipes.java +++ b/core/src/io/anuke/mindustry/content/Recipes.java @@ -133,8 +133,6 @@ public class Recipes implements ContentList{ new Recipe(units, UpgradeBlocks.deltaFactory, new ItemStack(Items.lead, 350), new ItemStack(Items.densealloy, 350), new ItemStack(Items.copper, 400), new ItemStack(Items.silicon, 450), new ItemStack(Items.thorium, 300)); new Recipe(units, UpgradeBlocks.omegaFactory, new ItemStack(Items.lead, 450), new ItemStack(Items.densealloy, 550), new ItemStack(Items.silicon, 650), new ItemStack(Items.thorium, 600), new ItemStack(Items.surgealloy, 240)); - //new Recipe(units, UpgradeBlocks.deltaFactory, new ItemStack(Items.copper, 30), new ItemStack(Items.lead, 50), new ItemStack(Items.silicon, 30)); - //actual unit related stuff new Recipe(units, UnitBlocks.dronePad, new ItemStack(Items.copper, 70), new ItemStack(Items.lead, 110), new ItemStack(Items.silicon, 130)); new Recipe(units, UnitBlocks.fabricatorPad, new ItemStack(Items.densealloy, 90), new ItemStack(Items.thorium, 80), new ItemStack(Items.lead, 110), new ItemStack(Items.silicon, 210)); diff --git a/core/src/io/anuke/mindustry/core/ContentLoader.java b/core/src/io/anuke/mindustry/core/ContentLoader.java index e28b68f943..ba117646e5 100644 --- a/core/src/io/anuke/mindustry/core/ContentLoader.java +++ b/core/src/io/anuke/mindustry/core/ContentLoader.java @@ -13,6 +13,7 @@ import io.anuke.mindustry.entities.bullet.Bullet; import io.anuke.mindustry.entities.bullet.BulletType; import io.anuke.mindustry.entities.effect.Fire; import io.anuke.mindustry.entities.effect.ItemDrop; +import io.anuke.mindustry.entities.effect.Lightning; import io.anuke.mindustry.entities.effect.Puddle; import io.anuke.mindustry.entities.traits.TypeTrait; import io.anuke.mindustry.entities.units.UnitType; @@ -170,5 +171,6 @@ public class ContentLoader{ TypeTrait.registerType(Fire.class, Fire::new); TypeTrait.registerType(Puddle.class, Puddle::new); TypeTrait.registerType(Bullet.class, Bullet::new); + TypeTrait.registerType(Lightning.class, Lightning::new); } } diff --git a/core/src/io/anuke/mindustry/entities/effect/Lightning.java b/core/src/io/anuke/mindustry/entities/effect/Lightning.java index fe8fcb5999..0ce57680e8 100644 --- a/core/src/io/anuke/mindustry/entities/effect/Lightning.java +++ b/core/src/io/anuke/mindustry/entities/effect/Lightning.java @@ -9,6 +9,7 @@ import io.anuke.annotations.Annotations.Loc; import io.anuke.annotations.Annotations.Remote; import io.anuke.mindustry.content.StatusEffects; import io.anuke.mindustry.entities.Units; +import io.anuke.mindustry.entities.traits.SyncTrait; import io.anuke.mindustry.game.Team; import io.anuke.mindustry.gen.Call; import io.anuke.mindustry.graphics.Palette; @@ -26,11 +27,15 @@ import io.anuke.ucore.util.Mathf; import io.anuke.ucore.util.Pooling; import io.anuke.ucore.util.SeedRandom; +import java.io.DataInput; +import java.io.DataOutput; +import java.io.IOException; + import static io.anuke.mindustry.Vars.bulletGroup; import static io.anuke.mindustry.Vars.world; //TODO utterly broken -public class Lightning extends TimedEntity implements Poolable, DrawTrait{ +public class Lightning extends TimedEntity implements Poolable, DrawTrait, SyncTrait{ private static Array entities = new Array<>(); private static Rectangle rect = new Rectangle(); private static Rectangle hitrect = new Rectangle(); @@ -125,6 +130,21 @@ public class Lightning extends TimedEntity implements Poolable, DrawTrait{ l.add(); } + @Override + public boolean isSyncing(){ + return false; + } + + @Override + public void write(DataOutput data) throws IOException{ + + } + + @Override + public void read(DataInput data, long time) throws IOException{ + + } + @Override public float lifetime(){ return 10;