From de02061b5e48fa18a9a37c3c54f8b1a5be73778f Mon Sep 17 00:00:00 2001 From: Anuken Date: Mon, 7 Jan 2019 12:25:54 -0500 Subject: [PATCH 1/6] Removed dependency on old BulletEntity/BaseBulletType classes --- .gitignore | 2 - .../src/io/anuke/mindustry/content/Mechs.java | 8 +- .../content/bullets/ArtilleryBullets.java | 14 +- .../content/bullets/FlakBullets.java | 2 +- .../content/bullets/MissileBullets.java | 22 +-- .../content/bullets/StandardBullets.java | 2 +- .../content/bullets/TurretBullets.java | 93 ++++++----- .../content/bullets/WeaponBullets.java | 8 +- .../io/anuke/mindustry/core/NetClient.java | 2 +- .../io/anuke/mindustry/core/NetServer.java | 2 +- .../io/anuke/mindustry/entities/Damage.java | 6 +- .../io/anuke/mindustry/entities/Player.java | 16 +- .../anuke/mindustry/entities/TileEntity.java | 2 +- .../src/io/anuke/mindustry/entities/Unit.java | 12 +- .../io/anuke/mindustry/entities/Units.java | 4 +- .../entities/bullet/ArtilleryBulletType.java | 4 +- .../entities/bullet/BasicBulletType.java | 6 +- .../mindustry/entities/bullet/Bullet.java | 149 +++++++++++++----- .../mindustry/entities/bullet/BulletType.java | 82 +++------- .../entities/bullet/FlakBulletType.java | 2 +- .../entities/bullet/LiquidBulletType.java | 6 +- .../mindustry/entities/effect/Puddle.java | 8 +- .../entities/traits/AbsorbTrait.java | 2 +- .../entities/traits/TargetTrait.java | 4 +- .../mindustry/entities/units/BaseUnit.java | 10 +- .../io/anuke/mindustry/input/MobileInput.java | 2 +- .../io/anuke/mindustry/type/AmmoEntry.java | 3 +- core/src/io/anuke/mindustry/type/Weapon.java | 2 +- core/src/io/anuke/mindustry/world/Block.java | 2 +- core/src/io/anuke/mindustry/world/Tile.java | 2 +- .../world/blocks/defense/DeflectorWall.java | 10 +- .../world/blocks/defense/SurgeWall.java | 2 +- .../blocks/defense/turrets/LaserTurret.java | 4 +- .../world/blocks/distribution/Conveyor.java | 2 +- .../world/blocks/units/UnitFactory.java | 2 +- 35 files changed, 268 insertions(+), 231 deletions(-) diff --git a/.gitignore b/.gitignore index 62ef5bbfad..b33484f175 100644 --- a/.gitignore +++ b/.gitignore @@ -1,5 +1,3 @@ -##Packr, build stuff - logs/ /core/assets/mindustry-saves/ /core/assets/mindustry-maps/ diff --git a/core/src/io/anuke/mindustry/content/Mechs.java b/core/src/io/anuke/mindustry/content/Mechs.java index bb3f266f65..5ec66db65c 100644 --- a/core/src/io/anuke/mindustry/content/Mechs.java +++ b/core/src/io/anuke/mindustry/content/Mechs.java @@ -160,7 +160,7 @@ public class Mechs implements ContentList{ @Override public void updateAlt(Player player){ float scl = 1f - player.shootHeat/2f; - player.getVelocity().scl(scl); + player.velocity().scl(scl); } @Override @@ -230,7 +230,7 @@ public class Mechs implements ContentList{ if(Mathf.chance(Time.delta() * (0.15*scl))){ Effects.effect(BulletFx.hitLancer, Palette.lancerLaser, player.x, player.y); Lightning.create(player.getTeam(), Palette.lancerLaser, 10f, - player.x + player.getVelocity().x, player.y + player.getVelocity().y, player.rotation, 14); + player.x + player.velocity().x, player.y + player.velocity().y, player.rotation, 14); } } @@ -251,7 +251,7 @@ public class Mechs implements ContentList{ } float scld(Player player){ - return Mathf.clamp((player.getVelocity().len() - minV) / (maxV - minV)); + return Mathf.clamp((player.velocity().len() - minV) / (maxV - minV)); } }; @@ -271,7 +271,7 @@ public class Mechs implements ContentList{ @Override public boolean canShoot(Player player){ - return player.getVelocity().len() > 1.2f; + return player.velocity().len() > 1.2f; } }; diff --git a/core/src/io/anuke/mindustry/content/bullets/ArtilleryBullets.java b/core/src/io/anuke/mindustry/content/bullets/ArtilleryBullets.java index 0bb8857f22..92b3b242ca 100644 --- a/core/src/io/anuke/mindustry/content/bullets/ArtilleryBullets.java +++ b/core/src/io/anuke/mindustry/content/bullets/ArtilleryBullets.java @@ -16,7 +16,7 @@ public class ArtilleryBullets extends BulletList implements ContentList{ dense = new ArtilleryBulletType(3f, 0, "shell"){ { - hiteffect = BulletFx.flakExplosion; + hitEffect = BulletFx.flakExplosion; knockback = 0.8f; lifetime = 50f; bulletWidth = bulletHeight = 11f; @@ -34,13 +34,13 @@ public class ArtilleryBullets extends BulletList implements ContentList{ lifetime = 15f; backColor = Palette.plastaniumBack; frontColor = Palette.plastaniumFront; - despawneffect = Fx.none; + despawnEffect = Fx.none; } }; plastic = new ArtilleryBulletType(3.3f, 0, "shell"){ { - hiteffect = BulletFx.plasticExplosion; + hitEffect = BulletFx.plasticExplosion; knockback = 1f; lifetime = 55f; bulletWidth = bulletHeight = 13f; @@ -56,7 +56,7 @@ public class ArtilleryBullets extends BulletList implements ContentList{ homing = new ArtilleryBulletType(3f, 0, "shell"){ { - hiteffect = BulletFx.flakExplosion; + hitEffect = BulletFx.flakExplosion; knockback = 0.8f; lifetime = 45f; bulletWidth = bulletHeight = 11f; @@ -70,7 +70,7 @@ public class ArtilleryBullets extends BulletList implements ContentList{ incindiary = new ArtilleryBulletType(3f, 0, "shell"){ { - hiteffect = BulletFx.blastExplosion; + hitEffect = BulletFx.blastExplosion; knockback = 0.8f; lifetime = 60f; bulletWidth = bulletHeight = 13f; @@ -87,7 +87,7 @@ public class ArtilleryBullets extends BulletList implements ContentList{ explosive = new ArtilleryBulletType(2f, 0, "shell"){ { - hiteffect = BulletFx.blastExplosion; + hitEffect = BulletFx.blastExplosion; knockback = 0.8f; lifetime = 70f; bulletWidth = bulletHeight = 14f; @@ -101,7 +101,7 @@ public class ArtilleryBullets extends BulletList implements ContentList{ unit = new ArtilleryBulletType(2f, 0, "shell"){ { - hiteffect = BulletFx.blastExplosion; + hitEffect = BulletFx.blastExplosion; knockback = 0.8f; lifetime = 90f; bulletWidth = bulletHeight = 14f; diff --git a/core/src/io/anuke/mindustry/content/bullets/FlakBullets.java b/core/src/io/anuke/mindustry/content/bullets/FlakBullets.java index c13a5b8409..d312640e35 100644 --- a/core/src/io/anuke/mindustry/content/bullets/FlakBullets.java +++ b/core/src/io/anuke/mindustry/content/bullets/FlakBullets.java @@ -21,7 +21,7 @@ public class FlakBullets extends BulletList implements ContentList{ splashDamageRadius = 40f; fragBullet = ArtilleryBullets.plasticFrag; fragBullets = 4; - hiteffect = BulletFx.plasticExplosion; + hitEffect = BulletFx.plasticExplosion; frontColor = Palette.plastaniumFront; backColor = Palette.plastaniumBack; } diff --git a/core/src/io/anuke/mindustry/content/bullets/MissileBullets.java b/core/src/io/anuke/mindustry/content/bullets/MissileBullets.java index a61a98c401..f3a3d9092c 100644 --- a/core/src/io/anuke/mindustry/content/bullets/MissileBullets.java +++ b/core/src/io/anuke/mindustry/content/bullets/MissileBullets.java @@ -26,8 +26,8 @@ public class MissileBullets extends BulletList implements ContentList{ splashDamageRadius = 30f; splashDamage = 30f; lifetime = 150f; - hiteffect = BulletFx.blastExplosion; - despawneffect = BulletFx.blastExplosion; + hitEffect = BulletFx.blastExplosion; + despawnEffect = BulletFx.blastExplosion; } }; @@ -43,7 +43,7 @@ public class MissileBullets extends BulletList implements ContentList{ splashDamageRadius = 10f; splashDamage = 10f; lifetime = 160f; - hiteffect = BulletFx.blastExplosion; + hitEffect = BulletFx.blastExplosion; incendSpread = 10f; incendAmount = 3; } @@ -58,8 +58,8 @@ public class MissileBullets extends BulletList implements ContentList{ splashDamageRadius = 30f; splashDamage = 22f; lifetime = 150f; - hiteffect = BulletFx.blastExplosion; - despawneffect = BulletFx.blastExplosion; + hitEffect = BulletFx.blastExplosion; + despawnEffect = BulletFx.blastExplosion; } @Override @@ -83,8 +83,8 @@ public class MissileBullets extends BulletList implements ContentList{ splashDamage = 1f; lifetime = 90f; trailColor = Color.valueOf("b6c6fd"); - hiteffect = BulletFx.blastExplosion; - despawneffect = BulletFx.blastExplosion; + hitEffect = BulletFx.blastExplosion; + despawnEffect = BulletFx.blastExplosion; backColor = Palette.bulletYellowBack; frontColor = Palette.bulletYellow; } @@ -92,7 +92,7 @@ public class MissileBullets extends BulletList implements ContentList{ @Override public void update(Bullet b){ super.update(b); - b.getVelocity().rotate(Mathf.sin(Time.time() + b.id * 4422, 8f, 2f)); + b.velocity().rotate(Mathf.sin(Time.time() + b.id * 4422, 8f, 2f)); } }; @@ -110,14 +110,14 @@ public class MissileBullets extends BulletList implements ContentList{ trailColor = Color.GRAY; backColor = Palette.bulletYellowBack; frontColor = Palette.bulletYellow; - hiteffect = BulletFx.blastExplosion; - despawneffect = BulletFx.blastExplosion; + hitEffect = BulletFx.blastExplosion; + despawnEffect = BulletFx.blastExplosion; } @Override public void update(Bullet b){ super.update(b); - b.getVelocity().rotate(Mathf.sin(Time.time() + b.id * 4422, 8f, 2f)); + b.velocity().rotate(Mathf.sin(Time.time() + b.id * 4422, 8f, 2f)); } }; } diff --git a/core/src/io/anuke/mindustry/content/bullets/StandardBullets.java b/core/src/io/anuke/mindustry/content/bullets/StandardBullets.java index b67425b83e..fa6559fb10 100644 --- a/core/src/io/anuke/mindustry/content/bullets/StandardBullets.java +++ b/core/src/io/anuke/mindustry/content/bullets/StandardBullets.java @@ -73,7 +73,7 @@ public class StandardBullets extends BulletList implements ContentList{ bulletWidth = 11f; bulletHeight = 14f; lifetime = 40f; - despawneffect = BulletFx.hitBulletSmall; + despawnEffect = BulletFx.hitBulletSmall; } }; diff --git a/core/src/io/anuke/mindustry/content/bullets/TurretBullets.java b/core/src/io/anuke/mindustry/content/bullets/TurretBullets.java index 1bce07f371..bbc3d6336d 100644 --- a/core/src/io/anuke/mindustry/content/bullets/TurretBullets.java +++ b/core/src/io/anuke/mindustry/content/bullets/TurretBullets.java @@ -9,6 +9,7 @@ import io.anuke.arc.graphics.g2d.Lines; import io.anuke.arc.math.Angles; import io.anuke.arc.math.Mathf; import io.anuke.arc.util.Time; +import io.anuke.arc.util.Tmp; import io.anuke.mindustry.content.Liquids; import io.anuke.mindustry.content.StatusEffects; import io.anuke.mindustry.content.fx.BlockFx; @@ -41,8 +42,8 @@ public class TurretBullets extends BulletList implements ContentList{ damageLightning = new BulletType(0.0001f, 0f){ { lifetime = Lightning.lifetime; - hiteffect = BulletFx.hitLancer; - despawneffect = Fx.none; + hitEffect = BulletFx.hitLancer; + despawnEffect = Fx.none; status = StatusEffects.shocked; statusIntensity = 1f; } @@ -52,8 +53,8 @@ public class TurretBullets extends BulletList implements ContentList{ float healPercent = 3f; { - hiteffect = BulletFx.hitLaser; - despawneffect = BulletFx.hitLaser; + hitEffect = BulletFx.hitLaser; + despawnEffect = BulletFx.hitLaser; collidesTeam = true; } @@ -66,9 +67,9 @@ public class TurretBullets extends BulletList implements ContentList{ public void draw(Bullet b){ Draw.color(Palette.heal); Lines.stroke(2f); - Lines.lineAngleCenter(b.x, b.y, b.angle(), 7f); + Lines.lineAngleCenter(b.x, b.y, b.rot(), 7f); Draw.color(Color.WHITE); - Lines.lineAngleCenter(b.x, b.y, b.angle(), 3f); + Lines.lineAngleCenter(b.x, b.y, b.rot(), 3f); Draw.reset(); } @@ -91,12 +92,12 @@ public class TurretBullets extends BulletList implements ContentList{ collides = false; collidesTiles = false; drag = 0.03f; - hiteffect = despawneffect = Fx.none; + hitEffect = despawnEffect = Fx.none; } @Override public void init(Bullet b){ - b.getVelocity().setLength(0.6f + Mathf.random(2f)); + b.velocity().setLength(0.6f + Mathf.random(2f)); } @Override @@ -128,12 +129,12 @@ public class TurretBullets extends BulletList implements ContentList{ basicFlame = new BulletType(2.3f, 5){ { - hitsize = 7f; + hitSize = 7f; lifetime = 35f; pierce = true; drag = 0.05f; - hiteffect = BulletFx.hitFlameSmall; - despawneffect = Fx.none; + hitEffect = BulletFx.hitFlameSmall; + despawnEffect = Fx.none; status = StatusEffects.burning; } @@ -149,16 +150,16 @@ public class TurretBullets extends BulletList implements ContentList{ float length = 100f; { - hiteffect = BulletFx.hitLancer; - despawneffect = Fx.none; - hitsize = 4; + hitEffect = BulletFx.hitLancer; + despawnEffect = Fx.none; + hitSize = 4; lifetime = 16f; pierce = true; } @Override public void init(Bullet b){ - Damage.collideLine(b, b.getTeam(), hiteffect, b.x, b.y, b.angle(), length); + Damage.collideLine(b, b.getTeam(), hitEffect, b.x, b.y, b.rot(), length); } @Override @@ -166,12 +167,12 @@ public class TurretBullets extends BulletList implements ContentList{ float f = Mathf.curve(b.fin(), 0f, 0.2f); float baseLen = length * f; - Lines.lineAngle(b.x, b.y, b.angle(), baseLen); + Lines.lineAngle(b.x, b.y, b.rot(), baseLen); for(int s = 0; s < 3; s++){ Draw.color(colors[s]); for(int i = 0; i < tscales.length; i++){ Lines.stroke(7f * b.fout() * (s == 0 ? 1.5f : s == 1 ? 1f : 0.3f) * tscales[i]); - Lines.lineAngle(b.x, b.y, b.angle(), baseLen * lenscales[i]); + Lines.lineAngle(b.x, b.y, b.rot(), baseLen * lenscales[i]); } } Draw.reset(); @@ -187,9 +188,9 @@ public class TurretBullets extends BulletList implements ContentList{ float length = 200f; { - hiteffect = BulletFx.hitMeltdown; - despawneffect = Fx.none; - hitsize = 4; + hitEffect = BulletFx.hitMeltdown; + despawnEffect = Fx.none; + hitSize = 4; drawSize = 420f; lifetime = 16f; pierce = true; @@ -198,14 +199,14 @@ public class TurretBullets extends BulletList implements ContentList{ @Override public void update(Bullet b){ if(b.timer.get(1, 5f)){ - Damage.collideLine(b, b.getTeam(), hiteffect, b.x, b.y, b.angle(), length); + Damage.collideLine(b, b.getTeam(), hitEffect, b.x, b.y, b.rot(), length); } Effects.shake(1f, 1f, b.x, b.y); } @Override public void hit(Bullet b, float hitx, float hity){ - Effects.effect(hiteffect, colors[2], hitx, hity); + Effects.effect(hitEffect, colors[2], hitx, hity); if(Mathf.chance(0.4)){ Fire.create(world.tileWorld(hitx+Mathf.range(5f), hity+Mathf.range(5f))); } @@ -215,13 +216,13 @@ public class TurretBullets extends BulletList implements ContentList{ public void draw(Bullet b){ float baseLen = (length) * b.fout(); - Lines.lineAngle(b.x, b.y, b.angle(), baseLen); + Lines.lineAngle(b.x, b.y, b.rot(), baseLen); for(int s = 0; s < colors.length; s++){ Draw.color(tmpColor.set(colors[s]).mul(1f + Mathf.absin(Time.time(), 1f, 0.1f))); for(int i = 0; i < tscales.length; i++){ - vector.trns(b.angle() + 180f, (lenscales[i] - 1f) * 35f); + Tmp.v1.trns(b.rot() + 180f, (lenscales[i] - 1f) * 35f); Lines.stroke((9f + Mathf.absin(Time.time(), 0.8f, 1.5f)) * b.fout() * strokes[s] * tscales[i]); - Lines.lineAngle(b.x + vector.x, b.y + vector.y, b.angle(), baseLen * lenscales[i], CapStyle.none); + Lines.lineAngle(b.x + Tmp.v1.x, b.y + Tmp.v1.y, b.rot(), baseLen * lenscales[i], CapStyle.none); } } Draw.reset(); @@ -233,18 +234,16 @@ public class TurretBullets extends BulletList implements ContentList{ float raySpace = 2f; float rayLength = 80f; { - hiteffect = BulletFx.hitFuse; + hitEffect = BulletFx.hitFuse; lifetime = 13f; - despawneffect = Fx.none; + despawnEffect = Fx.none; pierce = true; } @Override public void init(Bullet b) { for (int i = 0; i < rays; i++) { - float offset = (i-rays/2)*raySpace; - vector.trns(b.angle(), 0.01f, offset); - Damage.collideLine(b, b.getTeam(), hiteffect, b.x, b.y, b.angle(), rayLength - Math.abs(i - (rays/2))*20f); + Damage.collideLine(b, b.getTeam(), hitEffect, b.x, b.y, b.rot(), rayLength - Math.abs(i - (rays/2))*20f); } } @@ -253,17 +252,15 @@ public class TurretBullets extends BulletList implements ContentList{ super.draw(b); Draw.color(Color.WHITE, Palette.surge, b.fin()); for(int i = 0; i < 7; i++){ - vector.trns(b.angle(), i * 8f); + Tmp.v1.trns(b.rot(), i * 8f); float sl = Mathf.clamp(b.fout()-0.5f) * (80f - i *10); - Shapes.tri(b.x + vector.x, b.y + vector.y, 4f, sl, b.angle() + 90); - Shapes.tri(b.x + vector.x, b.y + vector.y, 4f, sl, b.angle() - 90); + Shapes.tri(b.x + Tmp.v1.x, b.y + Tmp.v1.y, 4f, sl, b.rot() + 90); + Shapes.tri(b.x + Tmp.v1.x, b.y + Tmp.v1.y, 4f, sl, b.rot() - 90); } - Shapes.tri(b.x, b.y, 13f, (rayLength+50) * b.fout(), b.angle()); - Shapes.tri(b.x, b.y, 13f, 10f * b.fout(), b.angle() + 180f); + Shapes.tri(b.x, b.y, 13f, (rayLength+50) * b.fout(), b.rot()); + Shapes.tri(b.x, b.y, 13f, 10f * b.fout(), b.rot() + 180f); Draw.reset(); } - - //TODO }; waterShot = new LiquidBulletType(Liquids.water){ @@ -300,8 +297,8 @@ public class TurretBullets extends BulletList implements ContentList{ lightning = new BulletType(0.001f, 12f){ { lifetime = 1f; - despawneffect = Fx.none; - hiteffect = BulletFx.hitLancer; + despawnEffect = Fx.none; + hitEffect = BulletFx.hitLancer; keepVelocity = false; } @@ -311,15 +308,15 @@ public class TurretBullets extends BulletList implements ContentList{ @Override public void init(Bullet b){ - Lightning.create(b.getTeam(), Palette.lancerLaser, damage, b.x, b.y, b.angle(), 30); + Lightning.create(b.getTeam(), Palette.lancerLaser, damage, b.x, b.y, b.rot(), 30); } }; arc = new BulletType(0.001f, 26){ { lifetime = 1; - despawneffect = Fx.none; - hiteffect = BulletFx.hitLancer; + despawnEffect = Fx.none; + hitEffect = BulletFx.hitLancer; } @Override @@ -328,7 +325,7 @@ public class TurretBullets extends BulletList implements ContentList{ @Override public void init(Bullet b){ - Lightning.create(b.getTeam(), Palette.lancerLaser, damage, b.x, b.y, b.angle(), 36); + Lightning.create(b.getTeam(), Palette.lancerLaser, damage, b.x, b.y, b.rot(), 36); } }; @@ -336,8 +333,8 @@ public class TurretBullets extends BulletList implements ContentList{ { collidesTiles = false; lifetime = 200f; - despawneffect = BlockFx.smeltsmoke; - hiteffect = BulletFx.hitBulletBig; + despawnEffect = BlockFx.smeltsmoke; + hitEffect = BulletFx.hitBulletBig; drag = 0.005f; } @@ -346,10 +343,10 @@ public class TurretBullets extends BulletList implements ContentList{ float w = 11f, h = 13f; Draw.color(Palette.bulletYellowBack); - Draw.rect("shell-back", b.x, b.y, w, h, b.angle() + 90); + Draw.rect("shell-back", b.x, b.y, w, h, b.rot() + 90); Draw.color(Palette.bulletYellow); - Draw.rect("shell", b.x, b.y, w, h, b.angle() + 90); + Draw.rect("shell", b.x, b.y, w, h, b.rot() + 90); Draw.reset(); } @@ -412,7 +409,7 @@ public class TurretBullets extends BulletList implements ContentList{ for(int i = 0; i < data.items.length; i++){ int amountDropped = Mathf.random(0, data.items[i]); if(amountDropped > 0){ - float angle = b.angle() + Mathf.range(100f); + float angle = b.rot() + Mathf.range(100f); Effects.effect(EnvironmentFx.dropItem, Color.WHITE, b.x, b.y, angle, content.item(i)); } } diff --git a/core/src/io/anuke/mindustry/content/bullets/WeaponBullets.java b/core/src/io/anuke/mindustry/content/bullets/WeaponBullets.java index 86adce6b55..6052ee1b6b 100644 --- a/core/src/io/anuke/mindustry/content/bullets/WeaponBullets.java +++ b/core/src/io/anuke/mindustry/content/bullets/WeaponBullets.java @@ -35,7 +35,7 @@ public class WeaponBullets extends BulletList{ { bulletWidth = 9f; bulletHeight = 13f; - hiteffect = BulletFx.flakExplosion; + hitEffect = BulletFx.flakExplosion; } }; @@ -43,7 +43,7 @@ public class WeaponBullets extends BulletList{ { bulletWidth = 8f; bulletHeight = 12f; - hiteffect = BulletFx.flakExplosion; + hitEffect = BulletFx.flakExplosion; backColor = Palette.lightOrange; frontColor = Palette.lightishOrange; } @@ -67,7 +67,7 @@ public class WeaponBullets extends BulletList{ { bulletWidth = 8f; bulletHeight = 12f; - hiteffect = BlockFx.pulverize; + hitEffect = BlockFx.pulverize; backColor = new Color(0x4f4f4fff); frontColor = Color.GRAY; } @@ -91,7 +91,7 @@ public class WeaponBullets extends BulletList{ lifetime = 40f; drag = 0.025f; fragBullets = 5; - hiteffect = BulletFx.flakExplosion; + hitEffect = BulletFx.flakExplosion; fragBullet = tungstenShotgun; } }; diff --git a/core/src/io/anuke/mindustry/core/NetClient.java b/core/src/io/anuke/mindustry/core/NetClient.java index e3e70da110..71c8d9caef 100644 --- a/core/src/io/anuke/mindustry/core/NetClient.java +++ b/core/src/io/anuke/mindustry/core/NetClient.java @@ -347,7 +347,7 @@ public class NetClient implements ApplicationListener{ Call.onClientShapshot(lastSent++, Time.millis(), player.x, player.y, player.pointerX, player.pointerY, player.rotation, player.baseRotation, - player.getVelocity().x, player.getVelocity().y, + player.velocity().x, player.velocity().y, player.getMineTile(), player.isBoosting, player.isShooting, requests, Core.camera.position.x, Core.camera.position.y, diff --git a/core/src/io/anuke/mindustry/core/NetServer.java b/core/src/io/anuke/mindustry/core/NetServer.java index 4987df27c4..16f0b1185c 100644 --- a/core/src/io/anuke/mindustry/core/NetServer.java +++ b/core/src/io/anuke/mindustry/core/NetServer.java @@ -329,7 +329,7 @@ public class NetServer implements ApplicationListener{ //set interpolator target to *new* position so it moves toward it player.getInterpolator().read(player.x, player.y, newx, newy, sent, rotation, baseRotation); - player.getVelocity().set(xVelocity, yVelocity); //only for visual calculation purposes, doesn't actually update the player + player.velocity().set(xVelocity, yVelocity); //only for visual calculation purposes, doesn't actually update the player connection.lastRecievedClientSnapshot = snapshotID; connection.lastRecievedClientTime = Time.millis(); diff --git a/core/src/io/anuke/mindustry/entities/Damage.java b/core/src/io/anuke/mindustry/entities/Damage.java index 7df2455bc6..27713c81ea 100644 --- a/core/src/io/anuke/mindustry/entities/Damage.java +++ b/core/src/io/anuke/mindustry/entities/Damage.java @@ -110,7 +110,7 @@ public class Damage{ rect.height += expand * 2; Consumer cons = e -> { - e.getHitbox(hitrect); + e.hitbox(hitrect); Rectangle other = hitrect; other.y -= expand; other.x -= expand; @@ -134,7 +134,7 @@ public class Damage{ Consumer cons = entity -> { if(!predicate.test(entity)) return; - entity.getHitbox(hitrect); + entity.hitbox(hitrect); if(!hitrect.overlaps(rect)){ return; } @@ -165,7 +165,7 @@ public class Damage{ entity.damage(amount); //TODO better velocity displacement float dst = tr.set(entity.x - x, entity.y - y).len(); - entity.getVelocity().add(tr.setLength((1f - dst / radius) * 2f)); + entity.velocity().add(tr.setLength((1f - dst / radius) * 2f)); }; rect.setSize(radius * 2).setCenter(x, y); diff --git a/core/src/io/anuke/mindustry/entities/Player.java b/core/src/io/anuke/mindustry/entities/Player.java index a6c073c61e..7380ae0ea9 100644 --- a/core/src/io/anuke/mindustry/entities/Player.java +++ b/core/src/io/anuke/mindustry/entities/Player.java @@ -100,17 +100,17 @@ public class Player extends Unit implements BuilderTrait, CarryTrait, ShooterTra } @Override - public void getHitbox(Rectangle rectangle){ + public void hitbox(Rectangle rectangle){ rectangle.setSize(mech.hitsize).setCenter(x, y); } @Override - public void getHitboxTile(Rectangle rectangle){ + public void hitboxTile(Rectangle rectangle){ rectangle.setSize(mech.hitsize * 2f / 3f).setCenter(x, y); } @Override - public float getDrag(){ + public float drag(){ return mech.drag; } @@ -208,7 +208,7 @@ public class Player extends Unit implements BuilderTrait, CarryTrait, ShooterTra } @Override - public float getMass(){ + public float mass(){ return mech.mass; } @@ -241,7 +241,7 @@ public class Player extends Unit implements BuilderTrait, CarryTrait, ShooterTra } @Override - public float getMaxVelocity(){ + public float maxVelocity(){ return mech.maxSpeed; } @@ -571,7 +571,7 @@ public class Player extends Unit implements BuilderTrait, CarryTrait, ShooterTra }else if(getCarry() != null){ dropCarry(); }else{ - Unit unit = Units.getClosest(team, x, y, 8f, u -> !u.isFlying() && u.getMass() <= mech.carryWeight); + Unit unit = Units.getClosest(team, x, y, 8f, u -> !u.isFlying() && u.mass() <= mech.carryWeight); if(unit != null){ carry(unit); @@ -675,7 +675,7 @@ public class Player extends Unit implements BuilderTrait, CarryTrait, ShooterTra float expansion = 3f; - getHitbox(rect); + hitbox(rect); rect.x -= expansion; rect.y -= expansion; rect.width += expansion * 2f; @@ -732,7 +732,7 @@ public class Player extends Unit implements BuilderTrait, CarryTrait, ShooterTra } Vector2 intercept = - Predict.intercept(x, y, target.getX(), target.getY(), target.getVelocity().x - velocity.x, target.getVelocity().y - velocity.y, getWeapon().getAmmo().bullet.speed); + Predict.intercept(x, y, target.getX(), target.getY(), target.velocity().x - velocity.x, target.velocity().y - velocity.y, getWeapon().getAmmo().bullet.speed); pointerX = intercept.x; pointerY = intercept.y; diff --git a/core/src/io/anuke/mindustry/entities/TileEntity.java b/core/src/io/anuke/mindustry/entities/TileEntity.java index c3dc293f95..a48defd085 100644 --- a/core/src/io/anuke/mindustry/entities/TileEntity.java +++ b/core/src/io/anuke/mindustry/entities/TileEntity.java @@ -257,7 +257,7 @@ public class TileEntity extends BaseEntity implements TargetTrait, HealthTrait{ } @Override - public Vector2 getVelocity(){ + public Vector2 velocity(){ return Vector2.ZERO; } diff --git a/core/src/io/anuke/mindustry/entities/Unit.java b/core/src/io/anuke/mindustry/entities/Unit.java index 1c3d4c6660..de4427b37a 100644 --- a/core/src/io/anuke/mindustry/entities/Unit.java +++ b/core/src/io/anuke/mindustry/entities/Unit.java @@ -124,7 +124,7 @@ public abstract class Unit extends DestructibleEntity implements SaveTrait, Targ } @Override - public Vector2 getVelocity(){ + public Vector2 velocity(){ return velocity; } @@ -190,7 +190,7 @@ public abstract class Unit extends DestructibleEntity implements SaveTrait, Targ } public void avoidOthers(float scaling){ - getHitbox(queryRect); + hitbox(queryRect); queryRect.setSize(queryRect.getWidth() * scaling); Units.getNearby(queryRect, t -> { @@ -228,7 +228,7 @@ public abstract class Unit extends DestructibleEntity implements SaveTrait, Targ if(isCarried()){ //carried units do not take into account velocity normally set(carrier.getX(), carrier.getY()); - velocity.set(carrier.getVelocity()); + velocity.set(carrier.velocity()); return; } @@ -236,7 +236,7 @@ public abstract class Unit extends DestructibleEntity implements SaveTrait, Targ status.update(this); - velocity.limit(getMaxVelocity()).scl(1f + (status.getSpeedMultiplier()-1f) * Time.delta()); + velocity.limit(maxVelocity()).scl(1f + (status.getSpeedMultiplier()-1f) * Time.delta()); if(isFlying()){ x += velocity.x * Time.delta(); @@ -289,7 +289,7 @@ public abstract class Unit extends DestructibleEntity implements SaveTrait, Targ if(Math.abs(py - y) <= 0.0001f) velocity.y = 0f; } - velocity.scl(Mathf.clamp(1f - getDrag() * (isFlying() ? 1f : floor.dragMultiplier) * Time.delta())); + velocity.scl(Mathf.clamp(1f - drag() * (isFlying() ? 1f : floor.dragMultiplier) * Time.delta())); } public void applyEffect(StatusEffect effect, float intensity){ @@ -355,7 +355,7 @@ public abstract class Unit extends DestructibleEntity implements SaveTrait, Targ public abstract float getArmor(); - public abstract float getMass(); + public abstract float mass(); public abstract boolean isFlying(); diff --git a/core/src/io/anuke/mindustry/entities/Units.java b/core/src/io/anuke/mindustry/entities/Units.java index 95e16842da..4b2e984f42 100644 --- a/core/src/io/anuke/mindustry/entities/Units.java +++ b/core/src/io/anuke/mindustry/entities/Units.java @@ -67,7 +67,7 @@ public class Units{ Units.getNearby(rect, unit -> { if(boolResult) return; if(!unit.isFlying()){ - unit.getHitbox(hitrect); + unit.hitbox(hitrect); if(hitrect.overlaps(rect)){ boolResult = true; @@ -89,7 +89,7 @@ public class Units{ Units.getNearby(rect, unit -> { if(value[0] || !pred.test(unit) || unit.isDead()) return; if(!unit.isFlying()){ - unit.getHitbox(hitrect); + unit.hitbox(hitrect); if(hitrect.overlaps(rect)){ value[0] = true; diff --git a/core/src/io/anuke/mindustry/entities/bullet/ArtilleryBulletType.java b/core/src/io/anuke/mindustry/entities/bullet/ArtilleryBulletType.java index 6a317f0882..ed25df2f5d 100644 --- a/core/src/io/anuke/mindustry/entities/bullet/ArtilleryBulletType.java +++ b/core/src/io/anuke/mindustry/entities/bullet/ArtilleryBulletType.java @@ -34,9 +34,9 @@ public class ArtilleryBulletType extends BasicBulletType{ float height = bulletHeight * ((1f - bulletShrink) + bulletShrink * b.fout()); Draw.color(backColor); - Draw.rect(backRegion, b.x, b.y, bulletWidth * scale, height * scale, b.angle() - 90); + Draw.rect(backRegion, b.x, b.y, bulletWidth * scale, height * scale, b.rot() - 90); Draw.color(frontColor); - Draw.rect(frontRegion, b.x, b.y, bulletWidth * scale, height * scale, b.angle() - 90); + Draw.rect(frontRegion, b.x, b.y, bulletWidth * scale, height * scale, b.rot() - 90); Draw.color(); } } diff --git a/core/src/io/anuke/mindustry/entities/bullet/BasicBulletType.java b/core/src/io/anuke/mindustry/entities/bullet/BasicBulletType.java index 7f3ca88aeb..8264736a92 100644 --- a/core/src/io/anuke/mindustry/entities/bullet/BasicBulletType.java +++ b/core/src/io/anuke/mindustry/entities/bullet/BasicBulletType.java @@ -57,9 +57,9 @@ public class BasicBulletType extends BulletType{ float height = bulletHeight * ((1f - bulletShrink) + bulletShrink * b.fout()); Draw.color(backColor); - Draw.rect(backRegion, b.x, b.y, bulletWidth, height, b.angle() - 90); + Draw.rect(backRegion, b.x, b.y, bulletWidth, height, b.rot() - 90); Draw.color(frontColor); - Draw.rect(frontRegion, b.x, b.y, bulletWidth, height, b.angle() - 90); + Draw.rect(frontRegion, b.x, b.y, bulletWidth, height, b.rot() - 90); Draw.color(); } @@ -70,7 +70,7 @@ public class BasicBulletType extends BulletType{ if(homingPower > 0.0001f){ TargetTrait target = Units.getClosestTarget(b.getTeam(), b.x, b.y, homingRange); if(target != null){ - b.getVelocity().setAngle(Angles.moveToward(b.getVelocity().angle(), b.angleTo(target), homingPower * Time.delta())); + b.velocity().setAngle(Angles.moveToward(b.velocity().angle(), b.angleTo(target), homingPower * Time.delta())); } } } diff --git a/core/src/io/anuke/mindustry/entities/bullet/Bullet.java b/core/src/io/anuke/mindustry/entities/bullet/Bullet.java index b2d10aeac6..3bd1fe6ad7 100644 --- a/core/src/io/anuke/mindustry/entities/bullet/Bullet.java +++ b/core/src/io/anuke/mindustry/entities/bullet/Bullet.java @@ -3,14 +3,15 @@ package io.anuke.mindustry.entities.bullet; import io.anuke.annotations.Annotations.Loc; import io.anuke.annotations.Annotations.Remote; import io.anuke.arc.entities.EntityGroup; -import io.anuke.arc.entities.impl.BulletEntity; -import io.anuke.arc.entities.trait.Entity; -import io.anuke.arc.entities.trait.SolidTrait; -import io.anuke.arc.entities.trait.VelocityTrait; +import io.anuke.arc.entities.impl.SolidEntity; +import io.anuke.arc.entities.trait.*; import io.anuke.arc.math.Mathf; +import io.anuke.arc.math.geom.Rectangle; import io.anuke.arc.math.geom.Vector2; import io.anuke.arc.util.Interval; import io.anuke.arc.util.Time; +import io.anuke.arc.util.Tmp; +import io.anuke.arc.util.pooling.Pool.Poolable; import io.anuke.arc.util.pooling.Pools; import io.anuke.mindustry.entities.Unit; import io.anuke.mindustry.entities.effect.Lightning; @@ -26,14 +27,18 @@ import java.io.IOException; import static io.anuke.mindustry.Vars.*; -public class Bullet extends BulletEntity implements TeamTrait, SyncTrait, AbsorbTrait{ - private static Vector2 vector = new Vector2(); +public class Bullet extends SolidEntity implements DamageTrait, ScaleTrait, Poolable, DrawTrait, VelocityTrait, TimeTrait, TeamTrait, SyncTrait, AbsorbTrait{ public Interval timer = new Interval(3); + private float lifeScl; private Team team; private Object data; private boolean supressCollision, supressOnce, initialized; + protected BulletType type; + protected Entity owner; + protected float time; + /**Internal use only!*/ public Bullet(){ } @@ -62,7 +67,7 @@ public class Bullet extends BulletEntity implements TeamTrait, SyncT bullet.velocity.set(0, type.speed).setAngle(angle).scl(velocityScl); if(type.keepVelocity){ - bullet.velocity.add(owner instanceof VelocityTrait ? ((VelocityTrait) owner).getVelocity() : Vector2.ZERO); + bullet.velocity.add(owner instanceof VelocityTrait ? ((VelocityTrait) owner).velocity() : Vector2.ZERO); } bullet.team = team; @@ -83,6 +88,7 @@ public class Bullet extends BulletEntity implements TeamTrait, SyncT return create(type, parent.owner, parent.team, x, y, angle, velocityScl); } + /**Internal use only.*/ @Remote(called = Loc.server) public static void createBullet(BulletType type, float x, float y, float angle){ create(type, null, Team.none, x, y, angle); @@ -97,12 +103,6 @@ public class Bullet extends BulletEntity implements TeamTrait, SyncT supressOnce = true; } - @Override - public void absorb(){ - supressCollision = true; - remove(); - } - public BulletType getBulletType(){ return type; } @@ -124,22 +124,29 @@ public class Bullet extends BulletEntity implements TeamTrait, SyncT this.data = data; } + @Override + public void absorb(){ + supressCollision = true; + remove(); + } + @Override public float drawSize(){ return type.drawSize; } @Override - public float getDamage(){ + public float damage(){ + //todo hacky way to get damage, refactor if(owner instanceof Unit){ - return super.getDamage() * ((Unit) owner).getDamageMultipler(); + return type.damage * ((Unit) owner).getDamageMultipler(); } if(owner instanceof Lightning && data instanceof Float){ return (Float)data; } - return super.getDamage(); + return type.damage; } @Override @@ -172,35 +179,44 @@ public class Bullet extends BulletEntity implements TeamTrait, SyncT return team; } - @Override - public void draw(){ - type.draw(this); - } - @Override public float getShieldDamage(){ - return Math.max(getDamage(), type.splashDamage); + return Math.max(damage(), type.splashDamage); } @Override public boolean collides(SolidTrait other){ - return type.collides && super.collides(other) && !supressCollision && !(other instanceof Unit && ((Unit) other).isFlying() && !type.collidesAir); + return type.collides && (other != owner && !(other instanceof DamageTrait)) && !supressCollision && !(other instanceof Unit && ((Unit) other).isFlying() && !type.collidesAir); } @Override public void collision(SolidTrait other, float x, float y){ - super.collision(other, x, y); + if(!type.pierce) remove(); + type.hit(this, x, y); if(other instanceof Unit){ Unit unit = (Unit) other; - unit.getVelocity().add(vector.set(other.getX(), other.getY()).sub(x, y).setLength(type.knockback / unit.getMass())); + unit.velocity().add(Tmp.v3.set(other.getX(), other.getY()).sub(x, y).setLength(type.knockback / unit.mass())); unit.applyEffect(type.status, type.statusIntensity); } } @Override public void update(){ - super.update(); + type.update(this); + + x += velocity.x * Time.delta(); + y += velocity.y * Time.delta(); + + velocity.scl(Mathf.clamp(1f - type.drag * Time.delta())); + + time += Time.delta() * 1f/(lifeScl); + time = Mathf.clamp(time, 0, type.lifetime); + + if(time >= type.lifetime){ + if(!supressCollision) type.despawned(this); + remove(); + } if(type.hitTiles && collidesTiles() && !supressCollision && initialized){ world.raycastEach(world.toTile(lastPosition().x), world.toTile(lastPosition().y), world.toTile(x), world.toTile(y), (x, y) -> { @@ -234,20 +250,12 @@ public class Bullet extends BulletEntity implements TeamTrait, SyncT initialized = true; } - @Override - protected void updateLife(){ - time += Time.delta() * 1f/(lifeScl); - time = Mathf.clamp(time, 0, type.lifetime()); - - if(time >= type.lifetime){ - if(!supressCollision) type.despawned(this); - remove(); - } - } - @Override public void reset(){ - super.reset(); + type = null; + owner = null; + velocity.setZero(); + time = 0f; timer.clear(); lifeScl = 1f; team = null; @@ -257,6 +265,31 @@ public class Bullet extends BulletEntity implements TeamTrait, SyncT initialized = false; } + @Override + public void hitbox(Rectangle rectangle){ + rectangle.setSize(type.hitSize).setCenter(x, y); + } + + @Override + public void hitboxTile(Rectangle rectangle){ + rectangle.setSize(type.hitSize).setCenter(x, y); + } + + @Override + public float lifetime(){ + return type.lifetime; + } + + @Override + public void time(float time){ + this.time = time; + } + + @Override + public float time(){ + return time; + } + @Override public void removed(){ Pools.free(this); @@ -266,4 +299,44 @@ public class Bullet extends BulletEntity implements TeamTrait, SyncT public EntityGroup targetGroup(){ return bulletGroup; } + + @Override + public void added(){ + type.init(this); + } + + @Override + public void draw(){ + type.draw(this); + } + + @Override + public float fin(){ + return time / type.lifetime; + } + + @Override + public Vector2 velocity(){ + return velocity; + } + + public void velocity(float speed, float angle){ + velocity.set(0, speed).setAngle(angle); + } + + public void limit(float f){ + velocity.limit(f); + } + + /** Sets the bullet's rotation in degrees.*/ + public void rot(float angle){ + velocity.setAngle(angle); + } + + /** @return the bullet's rotation.*/ + public float rot(){ + float angle = Mathf.atan2(velocity.x, velocity.y) * Mathf.radiansToDegrees; + if(angle < 0) angle += 360; + return angle; + } } diff --git a/core/src/io/anuke/mindustry/entities/bullet/BulletType.java b/core/src/io/anuke/mindustry/entities/bullet/BulletType.java index 0c2cbc7c94..69adf8d54e 100644 --- a/core/src/io/anuke/mindustry/entities/bullet/BulletType.java +++ b/core/src/io/anuke/mindustry/entities/bullet/BulletType.java @@ -2,24 +2,28 @@ package io.anuke.mindustry.entities.bullet; import io.anuke.arc.entities.Effects; import io.anuke.arc.entities.Effects.Effect; -import io.anuke.arc.entities.impl.BaseBulletType; -import io.anuke.arc.math.geom.Vector2; import io.anuke.mindustry.content.StatusEffects; import io.anuke.mindustry.content.fx.BulletFx; +import io.anuke.mindustry.content.fx.Fx; import io.anuke.mindustry.game.Content; import io.anuke.mindustry.type.ContentType; import io.anuke.mindustry.type.StatusEffect; import io.anuke.mindustry.world.Tile; -public abstract class BulletType extends Content implements BaseBulletType{ +public abstract class BulletType extends Content{ public float lifetime; public float speed; public float damage; - public float hitsize = 4; - public float drawSize = 20f; + public float hitSize = 4; + public float drawSize = 40f; public float drag = 0f; public boolean pierce; - public Effect hiteffect, despawneffect; + public Effect hitEffect, despawnEffect; + + /**Effect created when shooting.*/ + public Effect shootEffect = Fx.none; + /**Extra smoke effect created when shooting.*/ + public Effect smokeEffect = Fx.none; public float splashDamage = 0f; /**Knockback in velocity.*/ @@ -45,14 +49,12 @@ public abstract class BulletType extends Content implements BaseBulletType { if(unit.isFlying()) return; - unit.getHitbox(rect2); + unit.hitbox(rect2); if(!rect.overlaps(rect2)) return; unit.applyEffect(liquid.effect, 0.5f); - if(unit.getVelocity().len() > 0.1){ + if(unit.velocity().len() > 0.1){ Effects.effect(BlockFx.ripple, liquid.color, unit.x, unit.y); } }); diff --git a/core/src/io/anuke/mindustry/entities/traits/AbsorbTrait.java b/core/src/io/anuke/mindustry/entities/traits/AbsorbTrait.java index 7c6520364c..dedffc5203 100644 --- a/core/src/io/anuke/mindustry/entities/traits/AbsorbTrait.java +++ b/core/src/io/anuke/mindustry/entities/traits/AbsorbTrait.java @@ -11,6 +11,6 @@ public interface AbsorbTrait extends Entity, TeamTrait, DamageTrait{ } default float getShieldDamage(){ - return getDamage(); + return damage(); } } diff --git a/core/src/io/anuke/mindustry/entities/traits/TargetTrait.java b/core/src/io/anuke/mindustry/entities/traits/TargetTrait.java index 68eac61412..f59ed37091 100644 --- a/core/src/io/anuke/mindustry/entities/traits/TargetTrait.java +++ b/core/src/io/anuke/mindustry/entities/traits/TargetTrait.java @@ -18,14 +18,14 @@ public interface TargetTrait extends Position, VelocityTrait{ if(this instanceof SolidTrait){ return ((SolidTrait) this).getDeltaX(); } - return getVelocity().x; + return velocity().x; } default float getTargetVelocityY(){ if(this instanceof SolidTrait){ return ((SolidTrait) this).getDeltaY(); } - return getVelocity().y; + return velocity().y; } /** diff --git a/core/src/io/anuke/mindustry/entities/units/BaseUnit.java b/core/src/io/anuke/mindustry/entities/units/BaseUnit.java index 840aaf19de..c139aedf4b 100644 --- a/core/src/io/anuke/mindustry/entities/units/BaseUnit.java +++ b/core/src/io/anuke/mindustry/entities/units/BaseUnit.java @@ -85,7 +85,7 @@ public abstract class BaseUnit extends Unit implements ShooterTrait{ } @Override - public float getDrag(){ + public float drag(){ return type.drag; } @@ -275,7 +275,7 @@ public abstract class BaseUnit extends Unit implements ShooterTrait{ } @Override - public float getMass(){ + public float mass(){ return type.mass; } @@ -326,7 +326,7 @@ public abstract class BaseUnit extends Unit implements ShooterTrait{ } @Override - public float getMaxVelocity(){ + public float maxVelocity(){ return type.maxVelocity; } @@ -357,12 +357,12 @@ public abstract class BaseUnit extends Unit implements ShooterTrait{ } @Override - public void getHitbox(Rectangle rectangle){ + public void hitbox(Rectangle rectangle){ rectangle.setSize(type.hitsize).setCenter(x, y); } @Override - public void getHitboxTile(Rectangle rectangle){ + public void hitboxTile(Rectangle rectangle){ rectangle.setSize(type.hitsizeTile).setCenter(x, y); } diff --git a/core/src/io/anuke/mindustry/input/MobileInput.java b/core/src/io/anuke/mindustry/input/MobileInput.java index 4ac8d2f761..b613415c2f 100644 --- a/core/src/io/anuke/mindustry/input/MobileInput.java +++ b/core/src/io/anuke/mindustry/input/MobileInput.java @@ -559,7 +559,7 @@ public class MobileInput extends InputHandler implements GestureListener{ consumed = true; player.dropCarry(); //drop off unit }else{ - Unit unit = Units.getClosest(player.getTeam(), Core.input.mouseWorld(x, y).x, Core.input.mouseWorld(x, y).y, 4f, u -> !u.isFlying() && u.getMass() <= player.mech.carryWeight); + Unit unit = Units.getClosest(player.getTeam(), Core.input.mouseWorld(x, y).x, Core.input.mouseWorld(x, y).y, 4f, u -> !u.isFlying() && u.mass() <= player.mech.carryWeight); if(unit != null){ consumed = true; diff --git a/core/src/io/anuke/mindustry/type/AmmoEntry.java b/core/src/io/anuke/mindustry/type/AmmoEntry.java index d92c7963e5..f0ef1c0c6d 100644 --- a/core/src/io/anuke/mindustry/type/AmmoEntry.java +++ b/core/src/io/anuke/mindustry/type/AmmoEntry.java @@ -1,6 +1,7 @@ package io.anuke.mindustry.type; -/**Used to store ammo amounts in turrets.*/ +/**Used to store ammo amounts in turrets. + * TODO move inside turret class?*/ public class AmmoEntry{ public AmmoType type; public int amount; diff --git a/core/src/io/anuke/mindustry/type/Weapon.java b/core/src/io/anuke/mindustry/type/Weapon.java index d15ef9a3ae..107946661f 100644 --- a/core/src/io/anuke/mindustry/type/Weapon.java +++ b/core/src/io/anuke/mindustry/type/Weapon.java @@ -85,7 +85,7 @@ public class Weapon extends Content{ weapon.tr.trns(rotation + 180f, ammo.recoil); - shooter.getVelocity().add(weapon.tr); + shooter.velocity().add(weapon.tr); weapon.tr.trns(rotation, 3f); diff --git a/core/src/io/anuke/mindustry/world/Block.java b/core/src/io/anuke/mindustry/world/Block.java index 561eb9e90e..2070fff452 100644 --- a/core/src/io/anuke/mindustry/world/Block.java +++ b/core/src/io/anuke/mindustry/world/Block.java @@ -352,7 +352,7 @@ public class Block extends BaseBlock { } public void handleBulletHit(TileEntity entity, Bullet bullet){ - entity.damage(bullet.getDamage()); + entity.damage(bullet.damage()); } public void update(Tile tile){ diff --git a/core/src/io/anuke/mindustry/world/Tile.java b/core/src/io/anuke/mindustry/world/Tile.java index f579d3b683..976b0f0310 100644 --- a/core/src/io/anuke/mindustry/world/Tile.java +++ b/core/src/io/anuke/mindustry/world/Tile.java @@ -421,7 +421,7 @@ public class Tile implements Position, TargetTrait{ } @Override - public Vector2 getVelocity(){ + public Vector2 velocity(){ return Vector2.ZERO; } diff --git a/core/src/io/anuke/mindustry/world/blocks/defense/DeflectorWall.java b/core/src/io/anuke/mindustry/world/blocks/defense/DeflectorWall.java index 5a857f18e9..08392d7d32 100644 --- a/core/src/io/anuke/mindustry/world/blocks/defense/DeflectorWall.java +++ b/core/src/io/anuke/mindustry/world/blocks/defense/DeflectorWall.java @@ -49,13 +49,13 @@ public class DeflectorWall extends Wall{ super.handleBulletHit(entity, bullet); //doesn't reflect powerful bullets - if(bullet.getDamage() > maxDamageDeflect) return; + if(bullet.damage() > maxDamageDeflect) return; float penX = Math.abs(entity.x - bullet.x), penY = Math.abs(entity.y - bullet.y); - bullet.getHitbox(rect2); + bullet.hitbox(rect2); - Vector2 position = Geometry.raycastRect(bullet.x, bullet.y, bullet.x + bullet.getVelocity().x, bullet.y + bullet.getVelocity().y, + Vector2 position = Geometry.raycastRect(bullet.x, bullet.y, bullet.x + bullet.velocity().x, bullet.y + bullet.velocity().y, rect.setCenter(entity.x, entity.y).setSize(size * tilesize + rect2.width + rect2.height)); if(position != null){ @@ -63,9 +63,9 @@ public class DeflectorWall extends Wall{ } if(penX > penY){ - bullet.getVelocity().x *= -1; + bullet.velocity().x *= -1; }else{ - bullet.getVelocity().y *= -1; + bullet.velocity().y *= -1; } bullet.updateVelocity(); diff --git a/core/src/io/anuke/mindustry/world/blocks/defense/SurgeWall.java b/core/src/io/anuke/mindustry/world/blocks/defense/SurgeWall.java index 307afd4425..5316227bfc 100644 --- a/core/src/io/anuke/mindustry/world/blocks/defense/SurgeWall.java +++ b/core/src/io/anuke/mindustry/world/blocks/defense/SurgeWall.java @@ -19,7 +19,7 @@ public class SurgeWall extends Wall{ public void handleBulletHit(TileEntity entity, Bullet bullet){ super.handleBulletHit(entity, bullet); if(Mathf.chance(lightningChance)){ - Lightning.create(entity.getTeam(), Palette.surge, lightningDamage, bullet.x, bullet.y, bullet.angle() + 180f, lightningLength); + Lightning.create(entity.getTeam(), Palette.surge, lightningDamage, bullet.x, bullet.y, bullet.rot() + 180f, lightningLength); } } } diff --git a/core/src/io/anuke/mindustry/world/blocks/defense/turrets/LaserTurret.java b/core/src/io/anuke/mindustry/world/blocks/defense/turrets/LaserTurret.java index 938b9e3eb8..295208554c 100644 --- a/core/src/io/anuke/mindustry/world/blocks/defense/turrets/LaserTurret.java +++ b/core/src/io/anuke/mindustry/world/blocks/defense/turrets/LaserTurret.java @@ -33,8 +33,8 @@ public class LaserTurret extends PowerTurret{ LaserTurretEntity entity = tile.entity(); if(entity.bulletLife > 0 && entity.bullet != null){ - tr.trns(entity.rotation, size * tilesize / 2, 0f); - entity.bullet.setRotation(entity.rotation); + tr.trns(entity.rotation, size * tilesize / 2f, 0f); + entity.bullet.rot(entity.rotation); entity.bullet.set(tile.drawx() + tr.x, tile.drawy() + tr.y); entity.bullet.time(0f); entity.heat = 1f; diff --git a/core/src/io/anuke/mindustry/world/blocks/distribution/Conveyor.java b/core/src/io/anuke/mindustry/world/blocks/distribution/Conveyor.java index cb639260c4..8af44e10c7 100644 --- a/core/src/io/anuke/mindustry/world/blocks/distribution/Conveyor.java +++ b/core/src/io/anuke/mindustry/world/blocks/distribution/Conveyor.java @@ -177,7 +177,7 @@ public class Conveyor extends Block{ } if(entity.convey.size * itemSpace < 0.9f){ - unit.getVelocity().add((tx * speed + centerx) * entity.delta(), (ty * speed + centery) * entity.delta()); + unit.velocity().add((tx * speed + centerx) * entity.delta(), (ty * speed + centery) * entity.delta()); } } diff --git a/core/src/io/anuke/mindustry/world/blocks/units/UnitFactory.java b/core/src/io/anuke/mindustry/world/blocks/units/UnitFactory.java index 72fa6e0939..b29ecab1b0 100644 --- a/core/src/io/anuke/mindustry/world/blocks/units/UnitFactory.java +++ b/core/src/io/anuke/mindustry/world/blocks/units/UnitFactory.java @@ -71,7 +71,7 @@ public class UnitFactory extends Block{ unit.setSpawner(tile); unit.set(tile.drawx() + Mathf.range(4), tile.drawy() + Mathf.range(4)); unit.add(); - unit.getVelocity().y = factory.launchVelocity; + unit.velocity().y = factory.launchVelocity; } } From 5743d3085189848c297193bef6d7f040d9795608 Mon Sep 17 00:00:00 2001 From: Anuken Date: Mon, 7 Jan 2019 16:01:27 -0500 Subject: [PATCH 2/6] Removed AmmoType class completely --- .../io/anuke/mindustry/content/AmmoTypes.java | 254 ------------------ .../io/anuke/mindustry/content/Bullets.java | 17 ++ .../io/anuke/mindustry/content/Weapons.java | 45 ++-- .../content/blocks/TurretBlocks.java | 158 ++++++----- .../content/bullets/ArtilleryBullets.java | 182 ++++++------- .../content/bullets/StandardBullets.java | 159 ++++++----- .../anuke/mindustry/core/ContentLoader.java | 4 - .../io/anuke/mindustry/entities/Player.java | 10 +- .../io/anuke/mindustry/entities/Units.java | 2 +- .../entities/bullet/BasicBulletType.java | 4 +- .../mindustry/entities/bullet/BulletType.java | 19 +- .../mindustry/entities/units/BaseUnit.java | 2 +- .../mindustry/entities/units/FlyingUnit.java | 10 +- .../mindustry/entities/units/GroundUnit.java | 12 +- core/src/io/anuke/mindustry/io/TypeIO.java | 10 - .../maps/generation/FortressGenerator.java | 10 +- .../io/anuke/mindustry/type/AmmoEntry.java | 13 - .../src/io/anuke/mindustry/type/AmmoType.java | 75 ------ .../io/anuke/mindustry/type/ContentType.java | 1 - core/src/io/anuke/mindustry/type/Weapon.java | 11 +- .../defense/turrets/ArtilleryTurret.java | 14 +- .../blocks/defense/turrets/BurstTurret.java | 10 +- .../blocks/defense/turrets/ChargeTurret.java | 14 +- .../blocks/defense/turrets/DoubleTurret.java | 8 +- .../blocks/defense/turrets/ItemTurret.java | 81 ++++-- .../blocks/defense/turrets/LaserTurret.java | 11 +- .../blocks/defense/turrets/LiquidTurret.java | 93 ++++--- .../blocks/defense/turrets/PowerTurret.java | 8 +- .../world/blocks/defense/turrets/Turret.java | 54 ++-- 29 files changed, 480 insertions(+), 811 deletions(-) delete mode 100644 core/src/io/anuke/mindustry/content/AmmoTypes.java create mode 100644 core/src/io/anuke/mindustry/content/Bullets.java delete mode 100644 core/src/io/anuke/mindustry/type/AmmoEntry.java delete mode 100644 core/src/io/anuke/mindustry/type/AmmoType.java diff --git a/core/src/io/anuke/mindustry/content/AmmoTypes.java b/core/src/io/anuke/mindustry/content/AmmoTypes.java deleted file mode 100644 index cd96e8344b..0000000000 --- a/core/src/io/anuke/mindustry/content/AmmoTypes.java +++ /dev/null @@ -1,254 +0,0 @@ -package io.anuke.mindustry.content; - -import io.anuke.mindustry.content.bullets.*; -import io.anuke.mindustry.content.fx.BulletFx; -import io.anuke.mindustry.content.fx.Fx; -import io.anuke.mindustry.content.fx.ShootFx; -import io.anuke.mindustry.game.ContentList; -import io.anuke.mindustry.type.AmmoType; -import io.anuke.mindustry.type.ContentType; - -public class AmmoTypes implements ContentList{ - public static AmmoType - bulletCopper, bulletDense, bulletThorium, bulletSilicon, bulletPyratite, - bulletDenseBig, bulletPyratiteBig, bulletThoriumBig, - shock, bombExplosive, bombIncendiary, bombOil, shellCarbide, flamerThermite, weaponMissile, weaponMissileSwarm, bulletMech, - healBlaster, bulletGlaive, - flakExplosive, flakPlastic, flakSurge, - missileExplosive, missileIncindiary, missileSurge, - artilleryDense, artilleryPlastic, artilleryHoming, artilleryIncindiary, artilleryExplosive, unitArtillery, - basicFlame, lancerLaser, lightning, meltdownLaser, burstLaser, - fuseShotgun, oil, water, lava, cryofluid, arc; - - @Override - public void load(){ - - //weapon specific - - bulletMech = new AmmoType(StandardBullets.mechSmall){{ - shootEffect = ShootFx.shootSmall; - smokeEffect = ShootFx.shootSmallSmoke; - reloadMultiplier = 1f; - inaccuracy = 5f; - }}; - - bulletGlaive = new AmmoType(Items.pyratite, StandardBullets.glaive, 3){{ - shootEffect = ShootFx.shootSmall; - smokeEffect = ShootFx.shootSmallSmoke; - inaccuracy = 3f; - }}; - - healBlaster = new AmmoType(TurretBullets.healBullet){{ - shootEffect = ShootFx.shootHeal; - smokeEffect = BulletFx.hitLaser; - reloadMultiplier = 1f; - inaccuracy = 2f; - }}; - - shock = new AmmoType(TurretBullets.lightning){{ - shootEffect = BulletFx.hitLancer; - smokeEffect = Fx.none; - }}; - - shellCarbide = new AmmoType(WeaponBullets.shellCarbide){{ - shootEffect = ShootFx.shootBig; - smokeEffect = ShootFx.shootBigSmoke; - }}; - - bombExplosive = new AmmoType(WeaponBullets.bombExplosive){{ - shootEffect = Fx.none; - smokeEffect = Fx.none; - }}; - - bombIncendiary = new AmmoType(WeaponBullets.bombIncendiary){{ - shootEffect = Fx.none; - smokeEffect = Fx.none; - }}; - - bombOil = new AmmoType(WeaponBullets.bombOil){{ - shootEffect = Fx.none; - smokeEffect = Fx.none; - }}; - - flamerThermite = new AmmoType(TurretBullets.basicFlame){{ - shootEffect = ShootFx.shootSmallFlame; - }}; - - weaponMissile = new AmmoType(MissileBullets.javelin){{ - shootEffect = BulletFx.hitBulletSmall; - smokeEffect = Fx.none; - reloadMultiplier = 1.2f; - }}; - - weaponMissileSwarm = new AmmoType(MissileBullets.swarm){{ - shootEffect = BulletFx.hitBulletSmall; - smokeEffect = ShootFx.shootSmallSmoke; - reloadMultiplier = 1.2f; - }}; - - //bullets - - bulletCopper = new AmmoType(Items.copper, StandardBullets.copper, 5){{ - shootEffect = ShootFx.shootSmall; - smokeEffect = ShootFx.shootSmallSmoke; - reloadMultiplier = 1f; - inaccuracy = 5f; - }}; - - bulletDense = new AmmoType(Items.densealloy, StandardBullets.dense, 2){{ - shootEffect = ShootFx.shootSmall; - smokeEffect = ShootFx.shootSmallSmoke; - reloadMultiplier = 0.6f; - }}; - - bulletThorium = new AmmoType(Items.thorium, StandardBullets.thorium, 2){{ - shootEffect = ShootFx.shootBig; - smokeEffect = ShootFx.shootBigSmoke; - }}; - - bulletSilicon = new AmmoType(Items.silicon, StandardBullets.homing, 5){{ - shootEffect = ShootFx.shootSmall; - smokeEffect = ShootFx.shootSmallSmoke; - reloadMultiplier = 1.4f; - }}; - - bulletPyratite = new AmmoType(Items.pyratite, StandardBullets.tracer, 3){{ - shootEffect = ShootFx.shootSmall; - smokeEffect = ShootFx.shootSmallSmoke; - inaccuracy = 3f; - }}; - - bulletDenseBig = new AmmoType(Items.densealloy, StandardBullets.denseBig, 1){{ - shootEffect = ShootFx.shootBig; - smokeEffect = ShootFx.shootBigSmoke; - }}; - - bulletThoriumBig = new AmmoType(Items.thorium, StandardBullets.thoriumBig, 1){{ - shootEffect = ShootFx.shootBig; - smokeEffect = ShootFx.shootBigSmoke; - }}; - - bulletPyratiteBig = new AmmoType(Items.pyratite, StandardBullets.tracerBig, 2){{ - shootEffect = ShootFx.shootBig; - smokeEffect = ShootFx.shootBigSmoke; - inaccuracy = 3f; - }}; - - //flak - - flakExplosive = new AmmoType(Items.blastCompound, FlakBullets.explosive, 5){{ - shootEffect = ShootFx.shootBig; - smokeEffect = ShootFx.shootBigSmoke; - }}; - - flakPlastic = new AmmoType(Items.plastanium, FlakBullets.plastic, 5){{ - shootEffect = ShootFx.shootBig; - smokeEffect = ShootFx.shootBigSmoke; - }}; - - flakSurge = new AmmoType(Items.surgealloy, FlakBullets.surge, 5){{ - shootEffect = ShootFx.shootBig; - smokeEffect = ShootFx.shootBigSmoke; - reloadMultiplier = 1/2f; - }}; - - //missiles - - missileExplosive = new AmmoType(Items.blastCompound, MissileBullets.explosive, 1){{ - shootEffect = ShootFx.shootBig2; - smokeEffect = ShootFx.shootBigSmoke2; - reloadMultiplier = 1.2f; - }}; - - missileIncindiary = new AmmoType(Items.pyratite, MissileBullets.incindiary, 1){{ - shootEffect = ShootFx.shootBig2; - smokeEffect = ShootFx.shootBigSmoke2; - reloadMultiplier = 1.0f; - }}; - - missileSurge = new AmmoType(Items.surgealloy, MissileBullets.surge, 1){{ - shootEffect = ShootFx.shootBig2; - smokeEffect = ShootFx.shootBigSmoke2; - reloadMultiplier = 1.1f; - }}; - - //artillery - - artilleryDense = new AmmoType(Items.densealloy, ArtilleryBullets.dense, 2){{ - shootEffect = ShootFx.shootBig2; - smokeEffect = ShootFx.shootBigSmoke2; - }}; - - artilleryPlastic = new AmmoType(Items.plastanium, ArtilleryBullets.plastic, 2){{ - shootEffect = ShootFx.shootBig2; - smokeEffect = ShootFx.shootBigSmoke2; - reloadMultiplier = 1.4f; - }}; - - artilleryHoming = new AmmoType(Items.silicon, ArtilleryBullets.homing, 1){{ - shootEffect = ShootFx.shootBig2; - smokeEffect = ShootFx.shootBigSmoke2; - reloadMultiplier = 0.9f; - }}; - - artilleryIncindiary = new AmmoType(Items.pyratite, ArtilleryBullets.incindiary, 2){{ - shootEffect = ShootFx.shootBig2; - smokeEffect = ShootFx.shootBigSmoke2; - reloadMultiplier = 1.2f; - }}; - - artilleryExplosive = new AmmoType(Items.blastCompound, ArtilleryBullets.explosive, 1){{ - shootEffect = ShootFx.shootBig2; - smokeEffect = ShootFx.shootBigSmoke2; - reloadMultiplier = 1.6f; - }}; - - unitArtillery = new AmmoType(Items.blastCompound, ArtilleryBullets.unit, 1){{ - shootEffect = ShootFx.shootBig2; - smokeEffect = ShootFx.shootBigSmoke2; - reloadMultiplier = 1.6f; - }}; - - - //flame - - basicFlame = new AmmoType(Liquids.oil, TurretBullets.basicFlame, 0.3f){{ - shootEffect = ShootFx.shootSmallFlame; - }}; - - //power - - lancerLaser = new AmmoType(TurretBullets.lancerLaser); - - burstLaser = new AmmoType(TurretBullets.burstLaser){{ - range = 60f; - }}; - - lightning = new AmmoType(TurretBullets.lightning); - - arc = new AmmoType(TurretBullets.arc); - - meltdownLaser = new AmmoType(TurretBullets.meltdownLaser); - - fuseShotgun = new AmmoType(Items.densealloy, TurretBullets.fuseShot, 1f){{ - shootEffect = Fx.none; - smokeEffect = ShootFx.shootBigSmoke2; - }}; - - //liquid - - oil = new AmmoType(Liquids.oil, TurretBullets.oilShot, 0.3f); - - water = new AmmoType(Liquids.water, TurretBullets.waterShot, 0.3f); - - lava = new AmmoType(Liquids.lava, TurretBullets.lavaShot, 0.3f); - - cryofluid = new AmmoType(Liquids.cryofluid, TurretBullets.cryoShot, 0.3f); - - } - - @Override - public ContentType type(){ - return ContentType.ammo; - } -} diff --git a/core/src/io/anuke/mindustry/content/Bullets.java b/core/src/io/anuke/mindustry/content/Bullets.java new file mode 100644 index 0000000000..6e5137a433 --- /dev/null +++ b/core/src/io/anuke/mindustry/content/Bullets.java @@ -0,0 +1,17 @@ +package io.anuke.mindustry.content; + +import io.anuke.mindustry.game.ContentList; +import io.anuke.mindustry.type.ContentType; + +public class Bullets implements ContentList{ + + @Override + public void load(){ + + } + + @Override + public ContentType type(){ + return ContentType.bullet; + } +} diff --git a/core/src/io/anuke/mindustry/content/Weapons.java b/core/src/io/anuke/mindustry/content/Weapons.java index 480c8988bf..f979f23cb6 100644 --- a/core/src/io/anuke/mindustry/content/Weapons.java +++ b/core/src/io/anuke/mindustry/content/Weapons.java @@ -1,5 +1,6 @@ package io.anuke.mindustry.content; +import io.anuke.mindustry.content.bullets.*; import io.anuke.mindustry.content.fx.Fx; import io.anuke.mindustry.content.fx.ShootFx; import io.anuke.mindustry.game.ContentList; @@ -8,7 +9,7 @@ import io.anuke.mindustry.type.Weapon; public class Weapons implements ContentList{ public static Weapon blaster, blasterSmall, glaiveBlaster, droneBlaster, healBlaster, healBlasterDrone, chainBlaster, shockgun, - sapper, swarmer, bomber, bomberTrident, flakgun, flamethrower, missiles, artillery, laserBurster, healBlasterDrone2; + swarmer, bomber, bomberTrident, flakgun, flamethrower, missiles, artillery, laserBurster, healBlasterDrone2; @Override public void load(){ @@ -18,7 +19,7 @@ public class Weapons implements ContentList{ reload = 14f; roundrobin = true; ejectEffect = ShootFx.shellEjectSmall; - ammo = AmmoTypes.bulletMech; + ammo = StandardBullets.mechSmall; }}; blasterSmall = new Weapon("blaster"){{ @@ -26,7 +27,7 @@ public class Weapons implements ContentList{ reload = 15f; roundrobin = true; ejectEffect = ShootFx.shellEjectSmall; - ammo = AmmoTypes.bulletCopper; + ammo = StandardBullets.copper; }}; glaiveBlaster = new Weapon("bomber"){{ @@ -34,7 +35,7 @@ public class Weapons implements ContentList{ reload = 10f; roundrobin = true; ejectEffect = ShootFx.shellEjectSmall; - ammo = AmmoTypes.bulletGlaive; + ammo = StandardBullets.glaive; }}; droneBlaster = new Weapon("blaster"){{ @@ -43,7 +44,7 @@ public class Weapons implements ContentList{ width = 1f; roundrobin = true; ejectEffect = ShootFx.shellEjectSmall; - ammo = AmmoTypes.bulletCopper; + ammo = StandardBullets.copper; }}; healBlaster = new Weapon("heal-blaster"){{ @@ -52,7 +53,7 @@ public class Weapons implements ContentList{ roundrobin = false; ejectEffect = Fx.none; recoil = 2f; - ammo = AmmoTypes.healBlaster; + ammo = TurretBullets.healBullet; }}; missiles = new Weapon("missiles"){{ @@ -64,7 +65,7 @@ public class Weapons implements ContentList{ ejectEffect = Fx.none; velocityRnd = 0.2f; spacing = 1f; - ammo = AmmoTypes.weaponMissile; + ammo = MissileBullets.javelin; }}; swarmer = new Weapon("swarmer"){{ @@ -77,7 +78,7 @@ public class Weapons implements ContentList{ roundrobin = true; ejectEffect = Fx.none; shake = 3f; - ammo = AmmoTypes.weaponMissileSwarm; + ammo = MissileBullets.swarm; }}; chainBlaster = new Weapon("chain-blaster"){{ @@ -85,7 +86,7 @@ public class Weapons implements ContentList{ reload = 28f; roundrobin = true; ejectEffect = ShootFx.shellEjectSmall; - ammo = AmmoTypes.bulletCopper; + ammo = StandardBullets.copper; }}; shockgun = new Weapon("shockgun"){{ @@ -96,7 +97,7 @@ public class Weapons implements ContentList{ inaccuracy = 0f; velocityRnd = 0.2f; ejectEffect = Fx.none; - ammo = AmmoTypes.shock; + ammo = TurretBullets.lightning; }}; flakgun = new Weapon("flakgun"){{ @@ -108,7 +109,7 @@ public class Weapons implements ContentList{ recoil = 3f; velocityRnd = 0.1f; ejectEffect = ShootFx.shellEjectMedium; - ammo = AmmoTypes.shellCarbide; + ammo = ArtilleryBullets.dense; }}; flamethrower = new Weapon("flamethrower"){{ @@ -117,7 +118,7 @@ public class Weapons implements ContentList{ roundrobin = true; recoil = 1f; ejectEffect = Fx.none; - ammo = AmmoTypes.flamerThermite; + ammo = TurretBullets.basicFlame; }}; artillery = new Weapon("artillery"){{ @@ -127,15 +128,7 @@ public class Weapons implements ContentList{ recoil = 5f; shake = 2f; ejectEffect = ShootFx.shellEjectMedium; - ammo = AmmoTypes.unitArtillery; - }}; - - sapper = new Weapon("sapper"){{ - length = 1.5f; - reload = 12f; - roundrobin = true; - ejectEffect = ShootFx.shellEjectSmall; - ammo = AmmoTypes.bulletDense; + ammo = ArtilleryBullets.unit; }}; bomber = new Weapon("bomber"){{ @@ -146,7 +139,7 @@ public class Weapons implements ContentList{ ejectEffect = Fx.none; velocityRnd = 1f; inaccuracy = 40f; - ammo = AmmoTypes.bombExplosive; + ammo = WeaponBullets.bombExplosive; }}; bomberTrident = new Weapon("bomber"){{ @@ -158,7 +151,7 @@ public class Weapons implements ContentList{ ejectEffect = Fx.none; velocityRnd = 1f; inaccuracy = 40f; - ammo = AmmoTypes.bombExplosive; + ammo = WeaponBullets.bombExplosive; }}; laserBurster = new Weapon("bomber"){{ @@ -167,7 +160,7 @@ public class Weapons implements ContentList{ width = 0f; roundrobin = true; ejectEffect = Fx.none; - ammo = AmmoTypes.lancerLaser; + ammo = TurretBullets.lancerLaser; }}; healBlasterDrone = new Weapon("heal-blaster"){{ @@ -177,7 +170,7 @@ public class Weapons implements ContentList{ roundrobin = true; ejectEffect = Fx.none; recoil = 2f; - ammo = AmmoTypes.healBlaster; + ammo = TurretBullets.healBullet; }}; healBlasterDrone2 = new Weapon("heal-blaster"){{ @@ -187,7 +180,7 @@ public class Weapons implements ContentList{ roundrobin = true; ejectEffect = Fx.none; recoil = 2f; - ammo = AmmoTypes.healBlaster; + ammo = TurretBullets.healBullet; }}; } diff --git a/core/src/io/anuke/mindustry/content/blocks/TurretBlocks.java b/core/src/io/anuke/mindustry/content/blocks/TurretBlocks.java index 1652a4bff6..813f7624b0 100644 --- a/core/src/io/anuke/mindustry/content/blocks/TurretBlocks.java +++ b/core/src/io/anuke/mindustry/content/blocks/TurretBlocks.java @@ -1,17 +1,14 @@ package io.anuke.mindustry.content.blocks; -import io.anuke.arc.Core; import io.anuke.arc.graphics.Color; -import io.anuke.arc.graphics.g2d.TextureRegion; -import io.anuke.mindustry.content.AmmoTypes; +import io.anuke.arc.graphics.g2d.Draw; +import io.anuke.mindustry.content.Items; +import io.anuke.mindustry.content.Liquids; +import io.anuke.mindustry.content.bullets.*; import io.anuke.mindustry.content.fx.ShootFx; -import io.anuke.mindustry.type.AmmoType; import io.anuke.mindustry.game.ContentList; import io.anuke.mindustry.world.Block; import io.anuke.mindustry.world.blocks.defense.turrets.*; -import io.anuke.arc.graphics.g2d.Draw; -import io.anuke.arc.math.Angles; -import io.anuke.arc.math.Mathf; public class TurretBlocks extends BlockList implements ContentList{ public static Block duo, /*scatter,*/ @@ -20,7 +17,12 @@ public class TurretBlocks extends BlockList implements ContentList{ @Override public void load(){ duo = new DoubleTurret("duo"){{ - ammoTypes = new AmmoType[]{AmmoTypes.bulletCopper, AmmoTypes.bulletDense, AmmoTypes.bulletPyratite, AmmoTypes.bulletSilicon}; + ammo( + Items.copper, StandardBullets.copper, + Items.densealloy, StandardBullets.dense, + Items.pyratite, StandardBullets.tracer, + Items.silicon, StandardBullets.homing + ); reload = 25f; restitution = 0.03f; range = 90f; @@ -32,7 +34,11 @@ public class TurretBlocks extends BlockList implements ContentList{ }}; hail = new ArtilleryTurret("hail"){{ - ammoTypes = new AmmoType[]{AmmoTypes.artilleryDense, AmmoTypes.artilleryHoming, AmmoTypes.artilleryIncindiary}; + ammo( + Items.densealloy, ArtilleryBullets.dense, + Items.silicon, ArtilleryBullets.homing, + Items.pyratite, ArtilleryBullets.incendiary + ); reload = 60f; recoil = 2f; range = 230f; @@ -41,29 +47,22 @@ public class TurretBlocks extends BlockList implements ContentList{ health = 120; }}; - scorch = new LiquidTurret("scorch"){ - protected TextureRegion shootRegion; - - @Override - public void load(){ - super.load(); - shootRegion = Core.atlas.find(name + "-shoot"); - } - - { - ammoTypes = new AmmoType[]{AmmoTypes.basicFlame}; - recoil = 0f; - reload = 4f; - shootCone = 50f; - ammoUseEffect = ShootFx.shellEjectSmall; - health = 160; - - drawer = (tile, entity) -> Draw.rect(entity.target != null ? shootRegion : region, tile.drawx() + tr2.x, tile.drawy() + tr2.y, entity.rotation - 90); - } - }; + scorch = new LiquidTurret("scorch"){{ + ammo(Liquids.oil, TurretBullets.basicFlame); + recoil = 0f; + reload = 4f; + shootCone = 50f; + ammoUseEffect = ShootFx.shellEjectSmall; + health = 160; + }}; wave = new LiquidTurret("wave"){{ - ammoTypes = new AmmoType[]{AmmoTypes.water, AmmoTypes.lava, AmmoTypes.cryofluid, AmmoTypes.oil}; + ammo( + Liquids.water, TurretBullets.waterShot, + Liquids.lava, TurretBullets.lavaShot, + Liquids.cryofluid, TurretBullets.cryoShot, + Liquids.oil, TurretBullets.oilShot + ); size = 2; recoil = 0f; reload = 4f; @@ -88,7 +87,7 @@ public class TurretBlocks extends BlockList implements ContentList{ chargeTime = 60f; chargeMaxDelay = 30f; chargeEffects = 7; - shootType = AmmoTypes.lancerLaser; + shootType = TurretBullets.lancerLaser; recoil = 2f; reload = 100f; cooldown = 0.03f; @@ -106,7 +105,7 @@ public class TurretBlocks extends BlockList implements ContentList{ }}; arc = new PowerTurret("arc"){{ - shootType = AmmoTypes.arc; + shootType = TurretBullets.arc; reload = 85f; shootShake = 1f; shootCone = 40f; @@ -121,7 +120,11 @@ public class TurretBlocks extends BlockList implements ContentList{ }}; swarmer = new BurstTurret("swarmer"){{ - ammoTypes = new AmmoType[]{AmmoTypes.missileExplosive, AmmoTypes.missileIncindiary, AmmoTypes.missileSurge}; + ammo( + Items.blastCompound, MissileBullets.explosive, + Items.pyratite, MissileBullets.incindiary, + Items.surgealloy, MissileBullets.surge + ); reload = 50f; shots = 4; burstSpacing = 5; @@ -132,54 +135,37 @@ public class TurretBlocks extends BlockList implements ContentList{ health = 380; }}; - salvo = new BurstTurret("salvo"){ - TextureRegion[] panels = new TextureRegion[2]; + salvo = new BurstTurret("salvo"){{ + ammo( + Items.copper, StandardBullets.copper, + Items.densealloy, StandardBullets.dense, + Items.pyratite, StandardBullets.tracer, + Items.silicon, StandardBullets.homing, + Items.thorium, StandardBullets.thorium + ); - @Override - public void load() { - super.load(); - panels[0] = Core.atlas.find(name + "-panel-left"); - panels[1] = Core.atlas.find(name + "-panel-right"); - } - - { - size = 2; - range = 120f; - ammoTypes = new AmmoType[]{AmmoTypes.bulletCopper, AmmoTypes.bulletDense, AmmoTypes.bulletPyratite, AmmoTypes.bulletThorium, AmmoTypes.bulletSilicon}; - reload = 35f; - restitution = 0.03f; - ammoEjectBack = 3f; - cooldown = 0.03f; - recoil = 3f; - shootShake = 2f; - burstSpacing = 4; - shots = 3; - ammoUseEffect = ShootFx.shellEjectBig; - - drawer = (tile, entity) -> { - Draw.rect(region, tile.drawx() + tr2.x, tile.drawy() + tr2.y, entity.rotation - 90); - float offsetx = (int) (abscurve(Mathf.curve(entity.reload / reload, 0.3f, 0.2f)) * 3f); - float offsety = -(int) (abscurve(Mathf.curve(entity.reload / reload, 0.3f, 0.2f)) * 2f); - - for(int i : Mathf.signs){ - float rot = entity.rotation + 90 * i; - Draw.rect(panels[i == -1 ? 0 : 1], - tile.drawx() + tr2.x + Angles.trnsx(rot, offsetx, offsety), - tile.drawy() + tr2.y + Angles.trnsy(rot, -offsetx, offsety), entity.rotation - 90); - } - }; - - health = 360; - } - - /** Converts a value range from 0-1 to a value range 0-1-0. */ - float abscurve(float f){ - return 1f - Math.abs(f - 0.5f) * 2f; - } - }; + size = 2; + range = 120f; + reload = 35f; + restitution = 0.03f; + ammoEjectBack = 3f; + cooldown = 0.03f; + recoil = 3f; + shootShake = 2f; + burstSpacing = 4; + shots = 3; + ammoUseEffect = ShootFx.shellEjectBig; + health = 360; + }}; ripple = new ArtilleryTurret("ripple"){{ - ammoTypes = new AmmoType[]{AmmoTypes.artilleryDense, AmmoTypes.artilleryHoming, AmmoTypes.artilleryIncindiary, AmmoTypes.artilleryExplosive, AmmoTypes.artilleryPlastic}; + ammo( + Items.densealloy, ArtilleryBullets.dense, + Items.silicon, ArtilleryBullets.homing, + Items.pyratite, ArtilleryBullets.incendiary, + Items.blastCompound, ArtilleryBullets.explosive, + Items.plastanium, ArtilleryBullets.plastic + ); size = 3; shots = 4; inaccuracy = 12f; @@ -197,7 +183,11 @@ public class TurretBlocks extends BlockList implements ContentList{ }}; cyclone = new ItemTurret("cyclone"){{ - ammoTypes = new AmmoType[]{AmmoTypes.flakExplosive, AmmoTypes.flakPlastic, AmmoTypes.flakSurge}; + ammo( + Items.blastCompound, FlakBullets.explosive, + Items.plastanium, FlakBullets.plastic, + Items.surgealloy, FlakBullets.surge + ); xRand = 4f; reload = 8f; range = 145f; @@ -211,7 +201,7 @@ public class TurretBlocks extends BlockList implements ContentList{ }}; fuse = new ItemTurret("fuse"){{ - ammoTypes = new AmmoType[]{AmmoTypes.fuseShotgun}; + ammo(Items.densealloy, TurretBullets.fuseShot); reload = 50f; shootShake = 4f; range = 80f; @@ -223,7 +213,11 @@ public class TurretBlocks extends BlockList implements ContentList{ }}; spectre = new DoubleTurret("spectre"){{ - ammoTypes = new AmmoType[]{AmmoTypes.bulletDenseBig, AmmoTypes.bulletPyratiteBig, AmmoTypes.bulletThoriumBig}; + ammo( + Items.densealloy, StandardBullets.denseBig, + Items.pyratite, StandardBullets.tracerBig, + Items.thorium, StandardBullets.thoriumBig + ); reload = 6f; coolantMultiplier = 0.5f; maxCoolantUsed = 1.5f; @@ -243,7 +237,7 @@ public class TurretBlocks extends BlockList implements ContentList{ }}; meltdown = new LaserTurret("meltdown"){{ - shootType = AmmoTypes.meltdownLaser; + shootType = TurretBullets.meltdownLaser; shootEffect = ShootFx.shootBigSmoke2; shootCone = 40f; recoil = 4f; diff --git a/core/src/io/anuke/mindustry/content/bullets/ArtilleryBullets.java b/core/src/io/anuke/mindustry/content/bullets/ArtilleryBullets.java index 92b3b242ca..25169fca0f 100644 --- a/core/src/io/anuke/mindustry/content/bullets/ArtilleryBullets.java +++ b/core/src/io/anuke/mindustry/content/bullets/ArtilleryBullets.java @@ -9,115 +9,99 @@ import io.anuke.mindustry.graphics.Palette; import io.anuke.mindustry.game.ContentList; public class ArtilleryBullets extends BulletList implements ContentList{ - public static BulletType dense, plastic, plasticFrag, homing, incindiary, explosive, surge, unit; + public static BulletType dense, plastic, plasticFrag, homing, incendiary, explosive, surge, unit; @Override public void load(){ - dense = new ArtilleryBulletType(3f, 0, "shell"){ - { - hitEffect = BulletFx.flakExplosion; - knockback = 0.8f; - lifetime = 50f; - bulletWidth = bulletHeight = 11f; - collidesTiles = false; - splashDamageRadius = 25f; - splashDamage = 33f; - } - }; + dense = new ArtilleryBulletType(3f, 0, "shell"){{ + hitEffect = BulletFx.flakExplosion; + knockback = 0.8f; + lifetime = 50f; + bulletWidth = bulletHeight = 11f; + collidesTiles = false; + splashDamageRadius = 25f; + splashDamage = 33f; + }}; - plasticFrag = new BasicBulletType(2.5f, 6, "bullet"){ - { - bulletWidth = 10f; - bulletHeight = 12f; - bulletShrink = 1f; - lifetime = 15f; - backColor = Palette.plastaniumBack; - frontColor = Palette.plastaniumFront; - despawnEffect = Fx.none; - } - }; + plasticFrag = new BasicBulletType(2.5f, 6, "bullet"){{ + bulletWidth = 10f; + bulletHeight = 12f; + bulletShrink = 1f; + lifetime = 15f; + backColor = Palette.plastaniumBack; + frontColor = Palette.plastaniumFront; + despawnEffect = Fx.none; + }}; - plastic = new ArtilleryBulletType(3.3f, 0, "shell"){ - { - hitEffect = BulletFx.plasticExplosion; - knockback = 1f; - lifetime = 55f; - bulletWidth = bulletHeight = 13f; - collidesTiles = false; - splashDamageRadius = 35f; - splashDamage = 35f; - fragBullet = plasticFrag; - fragBullets = 9; - backColor = Palette.plastaniumBack; - frontColor = Palette.plastaniumFront; - } - }; + plastic = new ArtilleryBulletType(3.3f, 0, "shell"){{ + hitEffect = BulletFx.plasticExplosion; + knockback = 1f; + lifetime = 55f; + bulletWidth = bulletHeight = 13f; + collidesTiles = false; + splashDamageRadius = 35f; + splashDamage = 35f; + fragBullet = plasticFrag; + fragBullets = 9; + backColor = Palette.plastaniumBack; + frontColor = Palette.plastaniumFront; + }}; - homing = new ArtilleryBulletType(3f, 0, "shell"){ - { - hitEffect = BulletFx.flakExplosion; - knockback = 0.8f; - lifetime = 45f; - bulletWidth = bulletHeight = 11f; - collidesTiles = false; - splashDamageRadius = 25f; - splashDamage = 33f; - homingPower = 2f; - homingRange = 50f; - } - }; + homing = new ArtilleryBulletType(3f, 0, "shell"){{ + hitEffect = BulletFx.flakExplosion; + knockback = 0.8f; + lifetime = 45f; + bulletWidth = bulletHeight = 11f; + collidesTiles = false; + splashDamageRadius = 25f; + splashDamage = 33f; + homingPower = 2f; + homingRange = 50f; + }}; - incindiary = new ArtilleryBulletType(3f, 0, "shell"){ - { - hitEffect = BulletFx.blastExplosion; - knockback = 0.8f; - lifetime = 60f; - bulletWidth = bulletHeight = 13f; - collidesTiles = false; - splashDamageRadius = 25f; - splashDamage = 30f; - incendAmount = 4; - incendSpread = 11f; - frontColor = Palette.lightishOrange; - backColor = Palette.lightOrange; - trailEffect = BulletFx.incendTrail; - } - }; + incendiary = new ArtilleryBulletType(3f, 0, "shell"){{ + hitEffect = BulletFx.blastExplosion; + knockback = 0.8f; + lifetime = 60f; + bulletWidth = bulletHeight = 13f; + collidesTiles = false; + splashDamageRadius = 25f; + splashDamage = 30f; + incendAmount = 4; + incendSpread = 11f; + frontColor = Palette.lightishOrange; + backColor = Palette.lightOrange; + trailEffect = BulletFx.incendTrail; + }}; - explosive = new ArtilleryBulletType(2f, 0, "shell"){ - { - hitEffect = BulletFx.blastExplosion; - knockback = 0.8f; - lifetime = 70f; - bulletWidth = bulletHeight = 14f; - collidesTiles = false; - splashDamageRadius = 45f; - splashDamage = 50f; - backColor = Palette.missileYellowBack; - frontColor = Palette.missileYellow; - } - }; + explosive = new ArtilleryBulletType(2f, 0, "shell"){{ + hitEffect = BulletFx.blastExplosion; + knockback = 0.8f; + lifetime = 70f; + bulletWidth = bulletHeight = 14f; + collidesTiles = false; + splashDamageRadius = 45f; + splashDamage = 50f; + backColor = Palette.missileYellowBack; + frontColor = Palette.missileYellow; + }}; - unit = new ArtilleryBulletType(2f, 0, "shell"){ - { - hitEffect = BulletFx.blastExplosion; - knockback = 0.8f; - lifetime = 90f; - bulletWidth = bulletHeight = 14f; - collides = true; - collidesTiles = true; - splashDamageRadius = 45f; - splashDamage = 50f; - backColor = Palette.bulletYellowBack; - frontColor = Palette.bulletYellow; - } - }; + unit = new ArtilleryBulletType(2f, 0, "shell"){{ + hitEffect = BulletFx.blastExplosion; + knockback = 0.8f; + lifetime = 90f; + bulletWidth = bulletHeight = 14f; + collides = true; + collidesTiles = true; + splashDamageRadius = 45f; + splashDamage = 50f; + backColor = Palette.bulletYellowBack; + frontColor = Palette.bulletYellow; + }}; - surge = new ArtilleryBulletType(3f, 0, "shell"){ - { - //TODO - } - }; + surge = new ArtilleryBulletType(3f, 0, "shell"){{ + //TODO + }}; } } diff --git a/core/src/io/anuke/mindustry/content/bullets/StandardBullets.java b/core/src/io/anuke/mindustry/content/bullets/StandardBullets.java index fa6559fb10..54670e3484 100644 --- a/core/src/io/anuke/mindustry/content/bullets/StandardBullets.java +++ b/core/src/io/anuke/mindustry/content/bullets/StandardBullets.java @@ -2,10 +2,11 @@ package io.anuke.mindustry.content.bullets; import io.anuke.arc.graphics.Color; import io.anuke.mindustry.content.fx.BulletFx; +import io.anuke.mindustry.content.fx.ShootFx; import io.anuke.mindustry.entities.bullet.BasicBulletType; import io.anuke.mindustry.entities.bullet.BulletType; -import io.anuke.mindustry.graphics.Palette; import io.anuke.mindustry.game.ContentList; +import io.anuke.mindustry.graphics.Palette; public class StandardBullets extends BulletList implements ContentList{ public static BulletType copper, dense, thorium, homing, tracer, mechSmall, glaive, denseBig, thoriumBig, tracerBig; @@ -13,96 +14,88 @@ public class StandardBullets extends BulletList implements ContentList{ @Override public void load(){ - copper = new BasicBulletType(2.5f, 7, "bullet"){ - { - bulletWidth = 7f; - bulletHeight = 9f; - } - }; + copper = new BasicBulletType(2.5f, 7, "bullet"){{ + bulletWidth = 7f; + bulletHeight = 9f; + shootEffect = ShootFx.shootSmall; + smokeEffect = ShootFx.shootSmallSmoke; + ammoMultiplier = 5; + }}; - dense = new BasicBulletType(3.5f, 18, "bullet"){ - { - bulletWidth = 9f; - bulletHeight = 12f; - armorPierce = 0.2f; - } - }; + dense = new BasicBulletType(3.5f, 18, "bullet"){{ + bulletWidth = 9f; + bulletHeight = 12f; + armorPierce = 0.2f; + reloadMultiplier = 0.6f; + ammoMultiplier = 2; + }}; - thorium = new BasicBulletType(4f, 29, "bullet"){ - { - bulletWidth = 10f; - bulletHeight = 13f; - armorPierce = 0.5f; - } - }; + thorium = new BasicBulletType(4f, 29, "bullet"){{ + bulletWidth = 10f; + bulletHeight = 13f; + armorPierce = 0.5f; + shootEffect = ShootFx.shootBig; + smokeEffect = ShootFx.shootBigSmoke; + ammoMultiplier = 2; + }}; - homing = new BasicBulletType(3f, 9, "bullet"){ - { - bulletWidth = 7f; - bulletHeight = 9f; - homingPower = 5f; - } - }; + homing = new BasicBulletType(3f, 9, "bullet"){{ + bulletWidth = 7f; + bulletHeight = 9f; + homingPower = 5f; + reloadMultiplier = 1.4f; + ammoMultiplier = 5; + }}; - tracer = new BasicBulletType(3.2f, 11, "bullet"){ - { - bulletWidth = 10f; - bulletHeight = 12f; - frontColor = Palette.lightishOrange; - backColor = Palette.lightOrange; - incendSpread = 3f; - incendAmount = 1; - incendChance = 0.3f; - } - }; + tracer = new BasicBulletType(3.2f, 11, "bullet"){{ + bulletWidth = 10f; + bulletHeight = 12f; + frontColor = Palette.lightishOrange; + backColor = Palette.lightOrange; + incendSpread = 3f; + incendAmount = 1; + incendChance = 0.3f; + inaccuracy = 3f; + }}; - glaive = new BasicBulletType(4f, 7.5f, "bullet"){ - { - bulletWidth = 10f; - bulletHeight = 12f; - frontColor = Color.valueOf("feb380"); - backColor = Color.valueOf("ea8878"); - incendSpread = 3f; - incendAmount = 1; - incendChance = 0.3f; - } - }; + glaive = new BasicBulletType(4f, 7.5f, "bullet"){{ + bulletWidth = 10f; + bulletHeight = 12f; + frontColor = Color.valueOf("feb380"); + backColor = Color.valueOf("ea8878"); + incendSpread = 3f; + incendAmount = 1; + incendChance = 0.3f; + }}; - mechSmall = new BasicBulletType(4f, 9, "bullet"){ - { - bulletWidth = 11f; - bulletHeight = 14f; - lifetime = 40f; - despawnEffect = BulletFx.hitBulletSmall; - } - }; + mechSmall = new BasicBulletType(4f, 9, "bullet"){{ + bulletWidth = 11f; + bulletHeight = 14f; + lifetime = 40f; + inaccuracy = 5f; + despawnEffect = BulletFx.hitBulletSmall; + }}; - denseBig = new BasicBulletType(7f, 42, "bullet"){ - { - bulletWidth = 15f; - bulletHeight = 21f; - armorPierce = 0.2f; - } - }; + denseBig = new BasicBulletType(7f, 42, "bullet"){{ + bulletWidth = 15f; + bulletHeight = 21f; + armorPierce = 0.2f; + }}; - thoriumBig = new BasicBulletType(8f, 65, "bullet"){ - { - bulletWidth = 16f; - bulletHeight = 23f; - armorPierce = 0.5f; - } - }; + thoriumBig = new BasicBulletType(8f, 65, "bullet"){{ + bulletWidth = 16f; + bulletHeight = 23f; + armorPierce = 0.5f; + }}; - tracerBig = new BasicBulletType(7f, 38, "bullet"){ - { - bulletWidth = 16f; - bulletHeight = 21f; - frontColor = Palette.lightishOrange; - backColor = Palette.lightOrange; - incendSpread = 3f; - incendAmount = 2; - incendChance = 0.3f; - } - }; + tracerBig = new BasicBulletType(7f, 38, "bullet"){{ + bulletWidth = 16f; + bulletHeight = 21f; + frontColor = Palette.lightishOrange; + backColor = Palette.lightOrange; + incendSpread = 3f; + incendAmount = 2; + incendChance = 0.3f; + }}; } } diff --git a/core/src/io/anuke/mindustry/core/ContentLoader.java b/core/src/io/anuke/mindustry/core/ContentLoader.java index dfd6091b00..8cbb87673c 100644 --- a/core/src/io/anuke/mindustry/core/ContentLoader.java +++ b/core/src/io/anuke/mindustry/core/ContentLoader.java @@ -67,10 +67,6 @@ public class ContentLoader{ new TurretBullets(), new WeaponBullets(), - - //ammotypes - new AmmoTypes(), - //weapons new Weapons(), diff --git a/core/src/io/anuke/mindustry/entities/Player.java b/core/src/io/anuke/mindustry/entities/Player.java index 7380ae0ea9..2410644da8 100644 --- a/core/src/io/anuke/mindustry/entities/Player.java +++ b/core/src/io/anuke/mindustry/entities/Player.java @@ -629,7 +629,7 @@ public class Player extends Unit implements BuilderTrait, CarryTrait, ShooterTra protected void updateFlying(){ if(Units.invalidateTarget(target, this) && !(target instanceof TileEntity && ((TileEntity) target).damaged() && target.getTeam() == team && - mech.canHeal && dst(target) < getWeapon().getAmmo().getRange())){ + mech.canHeal && dst(target) < getWeapon().getAmmo().range())){ target = null; } @@ -709,11 +709,11 @@ public class Player extends Unit implements BuilderTrait, CarryTrait, ShooterTra if(target == null){ isShooting = false; if(Core.settings.getBool("autotarget")){ - target = Units.getClosestTarget(team, x, y, getWeapon().getAmmo().getRange()); + target = Units.getClosestTarget(team, x, y, getWeapon().getAmmo().range()); if(mech.canHeal && target == null){ target = Geometry.findClosest(x, y, world.indexer.getDamaged(Team.blue)); - if(target != null && dst(target) > getWeapon().getAmmo().getRange()){ + if(target != null && dst(target) > getWeapon().getAmmo().range()){ target = null; }else if(target != null){ target = ((Tile) target).entity; @@ -725,14 +725,14 @@ public class Player extends Unit implements BuilderTrait, CarryTrait, ShooterTra } } }else if(target.isValid() || (target instanceof TileEntity && ((TileEntity) target).damaged() && target.getTeam() == team && - mech.canHeal && dst(target) < getWeapon().getAmmo().getRange())){ + mech.canHeal && dst(target) < getWeapon().getAmmo().range())){ //rotate toward and shoot the target if(mech.turnCursor){ rotation = Mathf.slerpDelta(rotation, angleTo(target), 0.2f); } Vector2 intercept = - Predict.intercept(x, y, target.getX(), target.getY(), target.velocity().x - velocity.x, target.velocity().y - velocity.y, getWeapon().getAmmo().bullet.speed); + Predict.intercept(x, y, target.getX(), target.getY(), target.velocity().x - velocity.x, target.velocity().y - velocity.y, getWeapon().getAmmo().speed); pointerX = intercept.x; pointerY = intercept.y; diff --git a/core/src/io/anuke/mindustry/entities/Units.java b/core/src/io/anuke/mindustry/entities/Units.java index 4b2e984f42..a265a9bcd0 100644 --- a/core/src/io/anuke/mindustry/entities/Units.java +++ b/core/src/io/anuke/mindustry/entities/Units.java @@ -48,7 +48,7 @@ public class Units{ /**See {@link #invalidateTarget(TargetTrait, Team, float, float, float)}*/ public static boolean invalidateTarget(TargetTrait target, Unit targeter){ - return invalidateTarget(target, targeter.team, targeter.x, targeter.y, targeter.getWeapon().getAmmo().getRange()); + return invalidateTarget(target, targeter.team, targeter.x, targeter.y, targeter.getWeapon().getAmmo().range()); } /**Returns whether there are any entities on this tile.*/ diff --git a/core/src/io/anuke/mindustry/entities/bullet/BasicBulletType.java b/core/src/io/anuke/mindustry/entities/bullet/BasicBulletType.java index 8264736a92..7f044fbcd5 100644 --- a/core/src/io/anuke/mindustry/entities/bullet/BasicBulletType.java +++ b/core/src/io/anuke/mindustry/entities/bullet/BasicBulletType.java @@ -13,9 +13,7 @@ import io.anuke.mindustry.entities.Units; import io.anuke.mindustry.entities.traits.TargetTrait; import io.anuke.mindustry.graphics.Palette; -/** - * A BulletType for most ammo-based bullets shot from turrets and units. - */ +/**An extended BulletType for most ammo-based bullets shot from turrets and units.*/ public class BasicBulletType extends BulletType{ public Color backColor = Palette.bulletYellowBack, frontColor = Palette.bulletYellow; public float bulletWidth = 5f, bulletHeight = 7f; diff --git a/core/src/io/anuke/mindustry/entities/bullet/BulletType.java b/core/src/io/anuke/mindustry/entities/bullet/BulletType.java index 69adf8d54e..3ac82c565b 100644 --- a/core/src/io/anuke/mindustry/entities/bullet/BulletType.java +++ b/core/src/io/anuke/mindustry/entities/bullet/BulletType.java @@ -4,7 +4,7 @@ import io.anuke.arc.entities.Effects; import io.anuke.arc.entities.Effects.Effect; import io.anuke.mindustry.content.StatusEffects; import io.anuke.mindustry.content.fx.BulletFx; -import io.anuke.mindustry.content.fx.Fx; +import io.anuke.mindustry.content.fx.ShootFx; import io.anuke.mindustry.game.Content; import io.anuke.mindustry.type.ContentType; import io.anuke.mindustry.type.StatusEffect; @@ -21,9 +21,17 @@ public abstract class BulletType extends Content{ public Effect hitEffect, despawnEffect; /**Effect created when shooting.*/ - public Effect shootEffect = Fx.none; + public Effect shootEffect = ShootFx.shootSmall; /**Extra smoke effect created when shooting.*/ - public Effect smokeEffect = Fx.none; + public Effect smokeEffect = ShootFx.shootSmallSmoke; + /**Extra inaccuracy when firing.*/ + public float inaccuracy = 0f; + /**How many bullets get created per ammo item/liquid.*/ + public float ammoMultiplier = 1f; + /**Multiplied by turret reload speed to get final shoot speed.*/ + public float reloadMultiplier = 1f; + /**Recoil from shooter entities.*/ + public float recoil; public float splashDamage = 0f; /**Knockback in velocity.*/ @@ -57,6 +65,11 @@ public abstract class BulletType extends Content{ despawnEffect = BulletFx.hitBulletSmall; } + /**Returns maximum distance the bullet this bullet type has can travel.*/ + public float range(){ + return speed * lifetime; + } + public boolean collides(Bullet bullet, Tile tile){ return true; } diff --git a/core/src/io/anuke/mindustry/entities/units/BaseUnit.java b/core/src/io/anuke/mindustry/entities/units/BaseUnit.java index c139aedf4b..4d5eb7c956 100644 --- a/core/src/io/anuke/mindustry/entities/units/BaseUnit.java +++ b/core/src/io/anuke/mindustry/entities/units/BaseUnit.java @@ -184,7 +184,7 @@ public abstract class BaseUnit extends Unit implements ShooterTrait{ } public void targetClosest(){ - target = Units.getClosestTarget(team, x, y, Math.max(getWeapon().getAmmo().getRange(), type.range), u -> type.targetAir || !u.isFlying()); + target = Units.getClosestTarget(team, x, y, Math.max(getWeapon().getAmmo().range(), type.range), u -> type.targetAir || !u.isFlying()); } public TileEntity getClosestEnemyCore(){ diff --git a/core/src/io/anuke/mindustry/entities/units/FlyingUnit.java b/core/src/io/anuke/mindustry/entities/units/FlyingUnit.java index f2b00660d9..bc46c97b7b 100644 --- a/core/src/io/anuke/mindustry/entities/units/FlyingUnit.java +++ b/core/src/io/anuke/mindustry/entities/units/FlyingUnit.java @@ -8,10 +8,10 @@ import io.anuke.arc.math.geom.Vector2; import io.anuke.arc.util.Time; import io.anuke.mindustry.entities.Predict; import io.anuke.mindustry.entities.Units; +import io.anuke.mindustry.entities.bullet.BulletType; import io.anuke.mindustry.entities.traits.CarriableTrait; import io.anuke.mindustry.entities.traits.CarryTrait; import io.anuke.mindustry.net.Net; -import io.anuke.mindustry.type.AmmoType; import io.anuke.mindustry.world.Tile; import io.anuke.mindustry.world.meta.BlockFlag; @@ -74,11 +74,11 @@ public abstract class FlyingUnit extends BaseUnit implements CarryTrait{ }else{ attack(150f); - if((Angles.near(angleTo(target), rotation, 15f) || !getWeapon().getAmmo().bullet.keepVelocity) //bombers don't care about rotation - && dst(target) < Math.max(getWeapon().getAmmo().getRange(), type.range)){ - AmmoType ammo = getWeapon().getAmmo(); + if((Angles.near(angleTo(target), rotation, 15f) || !getWeapon().getAmmo().keepVelocity) //bombers don't care about rotation + && dst(target) < Math.max(getWeapon().getAmmo().range(), type.range)){ + BulletType ammo = getWeapon().getAmmo(); - Vector2 to = Predict.intercept(FlyingUnit.this, target, ammo.bullet.speed); + Vector2 to = Predict.intercept(FlyingUnit.this, target, ammo.speed); getWeapon().update(FlyingUnit.this, to.x, to.y); } diff --git a/core/src/io/anuke/mindustry/entities/units/GroundUnit.java b/core/src/io/anuke/mindustry/entities/units/GroundUnit.java index ba73b95f43..b330373b8d 100644 --- a/core/src/io/anuke/mindustry/entities/units/GroundUnit.java +++ b/core/src/io/anuke/mindustry/entities/units/GroundUnit.java @@ -10,8 +10,8 @@ import io.anuke.mindustry.Vars; import io.anuke.mindustry.entities.Predict; import io.anuke.mindustry.entities.TileEntity; import io.anuke.mindustry.entities.Units; +import io.anuke.mindustry.entities.bullet.BulletType; import io.anuke.mindustry.game.Team; -import io.anuke.mindustry.type.AmmoType; import io.anuke.mindustry.type.ContentType; import io.anuke.mindustry.type.Weapon; import io.anuke.mindustry.world.Tile; @@ -43,11 +43,11 @@ public abstract class GroundUnit extends BaseUnit{ TileEntity core = getClosestEnemyCore(); float dst = core == null ? 0 : dst(core); - if(core != null && dst < getWeapon().getAmmo().getRange() / 1.1f){ + if(core != null && dst < getWeapon().getAmmo().range() / 1.1f){ target = core; } - if(dst > getWeapon().getAmmo().getRange() * 0.5f){ + if(dst > getWeapon().getAmmo().range() * 0.5f){ moveToCore(); } } @@ -187,13 +187,13 @@ public abstract class GroundUnit extends BaseUnit{ } if(!Units.invalidateTarget(target, this)){ - if(dst(target) < getWeapon().getAmmo().getRange()){ + if(dst(target) < getWeapon().getAmmo().range()){ rotate(angleTo(target)); if(Angles.near(angleTo(target), rotation, 13f)){ - AmmoType ammo = getWeapon().getAmmo(); + BulletType ammo = getWeapon().getAmmo(); - Vector2 to = Predict.intercept(GroundUnit.this, target, ammo.bullet.speed); + Vector2 to = Predict.intercept(GroundUnit.this, target, ammo.speed); getWeapon().update(GroundUnit.this, to.x, to.y); } diff --git a/core/src/io/anuke/mindustry/io/TypeIO.java b/core/src/io/anuke/mindustry/io/TypeIO.java index d2bcbb1270..5ae705a176 100644 --- a/core/src/io/anuke/mindustry/io/TypeIO.java +++ b/core/src/io/anuke/mindustry/io/TypeIO.java @@ -292,16 +292,6 @@ public class TypeIO{ return content.liquid(buffer.get()); } - @WriteClass(AmmoType.class) - public static void writeAmmo(ByteBuffer buffer, AmmoType type){ - buffer.put(type.id); - } - - @ReadClass(AmmoType.class) - public static AmmoType readAmmo(ByteBuffer buffer){ - return content.getByID(ContentType.weapon, buffer.get()); - } - @WriteClass(BulletType.class) public static void writeBulletType(ByteBuffer buffer, BulletType type){ buffer.put(type.id); diff --git a/core/src/io/anuke/mindustry/maps/generation/FortressGenerator.java b/core/src/io/anuke/mindustry/maps/generation/FortressGenerator.java index 0b122d1f36..2c3449ca0e 100644 --- a/core/src/io/anuke/mindustry/maps/generation/FortressGenerator.java +++ b/core/src/io/anuke/mindustry/maps/generation/FortressGenerator.java @@ -13,7 +13,6 @@ import io.anuke.mindustry.content.Items; import io.anuke.mindustry.content.Liquids; import io.anuke.mindustry.content.blocks.*; import io.anuke.mindustry.game.Team; -import io.anuke.mindustry.type.AmmoType; import io.anuke.mindustry.type.Recipe; import io.anuke.mindustry.world.Block; import io.anuke.mindustry.world.Edges; @@ -74,12 +73,14 @@ public class FortressGenerator{ float placeChance = difficultyScl*0.75f+0.25f; IntIntMap ammoPerType = new IntIntMap(); + //todo implement + /* for(Block turret : turrets){ if(!(turret instanceof ItemTurret)) continue; ItemTurret t = (ItemTurret)turret; int size = t.getAmmoTypes().length; ammoPerType.put(t.id, Mathf.clamp((int)(size* difficultyScl) + gen.random.range(1), 0, size - 1)); - } + }*/ TriFunction, Boolean> checker = (current, block, pred) -> { for(Point2 point : Edges.getEdges(block.size)){ @@ -181,11 +182,12 @@ public class FortressGenerator{ if(block instanceof PowerTurret){ tile.entity.power.satisfaction = 1.0f; - }else if(block instanceof ItemTurret){ + //todo implement + /*}else if(block instanceof ItemTurret){ ItemTurret turret = (ItemTurret)block; AmmoType[] type = turret.getAmmoTypes(); int index = ammoPerType.get(block.id, 0); - block.handleStack(type[index].item, block.acceptStack(type[index].item, 1000, tile, null), tile, null); + block.handleStack(type[index].item, block.acceptStack(type[index].item, 1000, tile, null), tile, null);*/ }else if(block instanceof NuclearReactor){ tile.entity.items.add(Items.thorium, 30); }else if(block instanceof LiquidTurret){ diff --git a/core/src/io/anuke/mindustry/type/AmmoEntry.java b/core/src/io/anuke/mindustry/type/AmmoEntry.java deleted file mode 100644 index f0ef1c0c6d..0000000000 --- a/core/src/io/anuke/mindustry/type/AmmoEntry.java +++ /dev/null @@ -1,13 +0,0 @@ -package io.anuke.mindustry.type; - -/**Used to store ammo amounts in turrets. - * TODO move inside turret class?*/ -public class AmmoEntry{ - public AmmoType type; - public int amount; - - public AmmoEntry(AmmoType type, int amount){ - this.type = type; - this.amount = amount; - } -} diff --git a/core/src/io/anuke/mindustry/type/AmmoType.java b/core/src/io/anuke/mindustry/type/AmmoType.java deleted file mode 100644 index 24150b4b14..0000000000 --- a/core/src/io/anuke/mindustry/type/AmmoType.java +++ /dev/null @@ -1,75 +0,0 @@ -package io.anuke.mindustry.type; - -import io.anuke.mindustry.content.fx.Fx; -import io.anuke.mindustry.entities.bullet.BulletType; -import io.anuke.mindustry.game.Content; -import io.anuke.arc.entities.Effects.Effect; - -public class AmmoType extends Content { - /**The item used. Always null if liquid isn't.*/ - public final Item item; - /**The liquid used. Always null if item isn't.*/ - public final Liquid liquid; - /**The resulting bullet. Never null.*/ - public final BulletType bullet; - /** - * For item ammo, this is amount given per ammo item. - * For liquid ammo, this is amount used per shot. - */ - public final float quantityMultiplier; - /**Reload speed multiplier.*/ - public float reloadMultiplier = 1f; - /**Bullet recoil strength.*/ - public float recoil = 0f; - /**Additional inaccuracy in degrees.*/ - public float inaccuracy; - /**Effect created when shooting.*/ - public Effect shootEffect = Fx.none; - /**Extra smoke effect created when shooting.*/ - public Effect smokeEffect = Fx.none; - /**Range. Use a value < 0 to calculate from bullet.*/ - public float range = -1f; - - /** - * Creates an AmmoType with no liquid or item. Used for power-based ammo. - */ - public AmmoType(BulletType result){ - this.item = null; - this.liquid = null; - this.bullet = result; - this.quantityMultiplier = 1f; - this.reloadMultiplier = 1f; - } - - /** - * Creates an AmmoType with an item. - */ - public AmmoType(Item item, BulletType result, float multiplier){ - this.item = item; - this.liquid = null; - this.bullet = result; - this.quantityMultiplier = multiplier; - } - - /** - * Creates an AmmoType with a liquid. - */ - public AmmoType(Liquid liquid, BulletType result, float multiplier){ - this.item = null; - this.liquid = liquid; - this.bullet = result; - this.quantityMultiplier = multiplier; - } - - /** - * Returns maximum distance the bullet this ammo type has can travel. - */ - public float getRange(){ - return range < 0 ? bullet.speed * bullet.lifetime : range; - } - - @Override - public ContentType getContentType(){ - return ContentType.ammo; - } -} diff --git a/core/src/io/anuke/mindustry/type/ContentType.java b/core/src/io/anuke/mindustry/type/ContentType.java index 80ae68252a..139f37836a 100644 --- a/core/src/io/anuke/mindustry/type/ContentType.java +++ b/core/src/io/anuke/mindustry/type/ContentType.java @@ -11,7 +11,6 @@ public enum ContentType { weapon, status, unit, - ammo, weather, effect } diff --git a/core/src/io/anuke/mindustry/type/Weapon.java b/core/src/io/anuke/mindustry/type/Weapon.java index 107946661f..00210b1e71 100644 --- a/core/src/io/anuke/mindustry/type/Weapon.java +++ b/core/src/io/anuke/mindustry/type/Weapon.java @@ -13,6 +13,7 @@ import io.anuke.mindustry.Vars; import io.anuke.mindustry.content.fx.Fx; import io.anuke.mindustry.entities.Player; import io.anuke.mindustry.entities.bullet.Bullet; +import io.anuke.mindustry.entities.bullet.BulletType; import io.anuke.mindustry.entities.traits.ShooterTrait; import io.anuke.mindustry.game.Content; import io.anuke.mindustry.gen.Call; @@ -24,7 +25,7 @@ public class Weapon extends Content{ /**minimum cursor distance from player, fixes 'cross-eyed' shooting.*/ protected static float minPlayerDist = 20f; /**ammo type map. set with setAmmo()*/ - protected AmmoType ammo; + protected BulletType ammo; /**shell ejection effect*/ protected Effect ejectEffect = Fx.none; /**weapon reload in frames*/ @@ -47,7 +48,7 @@ public class Weapon extends Content{ protected float velocityRnd = 0f; /**whether to shoot the weapons in different arms one after another, rather than all at once*/ protected boolean roundrobin = false; - /**translator for vector calulations*/ + /**vector for vector calulations*/ protected Vector2 tr = new Vector2(); public TextureRegion equipRegion, region; @@ -81,7 +82,7 @@ public class Weapon extends Content{ Weapon weapon = shooter.getWeapon(); Angles.shotgun(weapon.shots, weapon.spacing, rotation, f -> weapon.bullet(shooter, x, y, f + Mathf.range(weapon.inaccuracy))); - AmmoType ammo = weapon.ammo; + BulletType ammo = weapon.ammo; weapon.tr.trns(rotation + 180f, ammo.recoil); @@ -109,7 +110,7 @@ public class Weapon extends Content{ return ContentType.weapon; } - public AmmoType getAmmo(){ + public BulletType getAmmo(){ return ammo; } @@ -165,7 +166,7 @@ public class Weapon extends Content{ if(owner == null) return; tr.trns(angle, 3f); - Bullet.create(ammo.bullet, + Bullet.create(ammo, owner, owner.getTeam(), x + tr.x, y + tr.y, angle, (1f - velocityRnd) + Mathf.random(velocityRnd)); } } diff --git a/core/src/io/anuke/mindustry/world/blocks/defense/turrets/ArtilleryTurret.java b/core/src/io/anuke/mindustry/world/blocks/defense/turrets/ArtilleryTurret.java index ba3002ea62..62b2770407 100644 --- a/core/src/io/anuke/mindustry/world/blocks/defense/turrets/ArtilleryTurret.java +++ b/core/src/io/anuke/mindustry/world/blocks/defense/turrets/ArtilleryTurret.java @@ -1,11 +1,11 @@ package io.anuke.mindustry.world.blocks.defense.turrets; +import io.anuke.arc.math.Mathf; import io.anuke.arc.math.geom.Vector2; import io.anuke.mindustry.entities.Predict; import io.anuke.mindustry.entities.bullet.Bullet; -import io.anuke.mindustry.type.AmmoType; +import io.anuke.mindustry.entities.bullet.BulletType; import io.anuke.mindustry.world.Tile; -import io.anuke.arc.math.Mathf; import static io.anuke.mindustry.Vars.tilesize; @@ -21,23 +21,23 @@ public class ArtilleryTurret extends ItemTurret{ } @Override - protected void shoot(Tile tile, AmmoType ammo){ + protected void shoot(Tile tile, BulletType ammo){ TurretEntity entity = tile.entity(); entity.recoil = recoil; entity.heat = 1f; - AmmoType type = peekAmmo(tile); + BulletType type = peekAmmo(tile); tr.trns(entity.rotation, size * tilesize / 2); - Vector2 predict = Predict.intercept(tile, entity.target, type.bullet.speed); + Vector2 predict = Predict.intercept(tile, entity.target, type.speed); float dst = entity.dst(predict.x, predict.y); - float maxTraveled = type.bullet.lifetime * type.bullet.speed; + float maxTraveled = type.lifetime * type.speed; for(int i = 0; i < shots; i++){ - Bullet.create(ammo.bullet, tile.entity, tile.getTeam(), tile.drawx() + tr.x, tile.drawy() + tr.y, + Bullet.create(ammo, tile.entity, tile.getTeam(), tile.drawx() + tr.x, tile.drawy() + tr.y, entity.rotation + Mathf.range(inaccuracy + type.inaccuracy), 1f + Mathf.range(velocityInaccuracy), (dst / maxTraveled)); } diff --git a/core/src/io/anuke/mindustry/world/blocks/defense/turrets/BurstTurret.java b/core/src/io/anuke/mindustry/world/blocks/defense/turrets/BurstTurret.java index fdbe9686b5..dac9df8e98 100644 --- a/core/src/io/anuke/mindustry/world/blocks/defense/turrets/BurstTurret.java +++ b/core/src/io/anuke/mindustry/world/blocks/defense/turrets/BurstTurret.java @@ -1,9 +1,9 @@ package io.anuke.mindustry.world.blocks.defense.turrets; -import io.anuke.mindustry.type.AmmoType; -import io.anuke.mindustry.world.Tile; -import io.anuke.arc.util.Time; import io.anuke.arc.math.Mathf; +import io.anuke.arc.util.Time; +import io.anuke.mindustry.entities.bullet.BulletType; +import io.anuke.mindustry.world.Tile; import static io.anuke.mindustry.Vars.tilesize; @@ -15,7 +15,7 @@ public class BurstTurret extends ItemTurret{ } @Override - protected void shoot(Tile tile, AmmoType ammo){ + protected void shoot(Tile tile, BulletType ammo){ TurretEntity entity = tile.entity(); entity.heat = 1f; @@ -28,7 +28,7 @@ public class BurstTurret extends ItemTurret{ entity.recoil = recoil; tr.trns(entity.rotation, size * tilesize / 2, Mathf.range(xRand)); - bullet(tile, ammo.bullet, entity.rotation + Mathf.range(inaccuracy)); + bullet(tile, ammo, entity.rotation + Mathf.range(inaccuracy)); effects(tile); useAmmo(tile); }); diff --git a/core/src/io/anuke/mindustry/world/blocks/defense/turrets/ChargeTurret.java b/core/src/io/anuke/mindustry/world/blocks/defense/turrets/ChargeTurret.java index 3c5f66a7e5..51a22071b7 100644 --- a/core/src/io/anuke/mindustry/world/blocks/defense/turrets/ChargeTurret.java +++ b/core/src/io/anuke/mindustry/world/blocks/defense/turrets/ChargeTurret.java @@ -1,13 +1,13 @@ package io.anuke.mindustry.world.blocks.defense.turrets; -import io.anuke.mindustry.content.fx.Fx; -import io.anuke.mindustry.entities.TileEntity; -import io.anuke.mindustry.type.AmmoType; -import io.anuke.mindustry.world.Tile; import io.anuke.arc.entities.Effects; import io.anuke.arc.entities.Effects.Effect; -import io.anuke.arc.util.Time; import io.anuke.arc.math.Mathf; +import io.anuke.arc.util.Time; +import io.anuke.mindustry.content.fx.Fx; +import io.anuke.mindustry.entities.TileEntity; +import io.anuke.mindustry.entities.bullet.BulletType; +import io.anuke.mindustry.world.Tile; import static io.anuke.mindustry.Vars.tilesize; @@ -24,7 +24,7 @@ public class ChargeTurret extends PowerTurret{ } @Override - public void shoot(Tile tile, AmmoType ammo){ + public void shoot(Tile tile, BulletType ammo){ LaserTurretEntity entity = tile.entity(); useAmmo(tile); @@ -47,7 +47,7 @@ public class ChargeTurret extends PowerTurret{ tr.trns(entity.rotation, size * tilesize / 2); entity.recoil = recoil; entity.heat = 1f; - bullet(tile, ammo.bullet, entity.rotation + Mathf.range(inaccuracy)); + bullet(tile, ammo, entity.rotation + Mathf.range(inaccuracy)); effects(tile); entity.shooting = false; }); diff --git a/core/src/io/anuke/mindustry/world/blocks/defense/turrets/DoubleTurret.java b/core/src/io/anuke/mindustry/world/blocks/defense/turrets/DoubleTurret.java index 1819857ad7..f8830aaefe 100644 --- a/core/src/io/anuke/mindustry/world/blocks/defense/turrets/DoubleTurret.java +++ b/core/src/io/anuke/mindustry/world/blocks/defense/turrets/DoubleTurret.java @@ -1,8 +1,8 @@ package io.anuke.mindustry.world.blocks.defense.turrets; -import io.anuke.mindustry.type.AmmoType; -import io.anuke.mindustry.world.Tile; import io.anuke.arc.math.Mathf; +import io.anuke.mindustry.entities.bullet.BulletType; +import io.anuke.mindustry.world.Tile; import static io.anuke.mindustry.Vars.tilesize; @@ -15,14 +15,14 @@ public class DoubleTurret extends ItemTurret{ } @Override - protected void shoot(Tile tile, AmmoType ammo){ + protected void shoot(Tile tile, BulletType ammo){ TurretEntity entity = tile.entity(); entity.shots++; int i = Mathf.signs[entity.shots % 2]; tr.trns(entity.rotation - 90, shotWidth * i, size * tilesize / 2); - bullet(tile, ammo.bullet, entity.rotation + Mathf.range(inaccuracy)); + bullet(tile, ammo, entity.rotation + Mathf.range(inaccuracy)); effects(tile); useAmmo(tile); diff --git a/core/src/io/anuke/mindustry/world/blocks/defense/turrets/ItemTurret.java b/core/src/io/anuke/mindustry/world/blocks/defense/turrets/ItemTurret.java index bef0283f4c..47fe135c5a 100644 --- a/core/src/io/anuke/mindustry/world/blocks/defense/turrets/ItemTurret.java +++ b/core/src/io/anuke/mindustry/world/blocks/defense/turrets/ItemTurret.java @@ -1,26 +1,30 @@ package io.anuke.mindustry.world.blocks.defense.turrets; import io.anuke.arc.collection.ObjectMap; +import io.anuke.mindustry.Vars; import io.anuke.mindustry.entities.Unit; -import io.anuke.mindustry.type.AmmoEntry; -import io.anuke.mindustry.type.AmmoType; +import io.anuke.mindustry.entities.bullet.BulletType; import io.anuke.mindustry.type.Item; import io.anuke.mindustry.world.Tile; import io.anuke.mindustry.world.meta.BlockStat; import io.anuke.mindustry.world.meta.values.ItemFilterValue; +import java.io.DataInput; +import java.io.DataOutput; +import java.io.IOException; + public class ItemTurret extends CooledTurret{ protected int maxAmmo = 50; - protected AmmoType[] ammoTypes; - protected ObjectMap ammoMap = new ObjectMap<>(); + protected ObjectMap ammo = new ObjectMap<>(); public ItemTurret(String name){ super(name); hasItems = true; } - public AmmoType[] getAmmoTypes(){ - return ammoTypes; + /**Initializes accepted ammo map. Format: [item1, bullet1, item2, bullet2...]*/ + protected void ammo(Object... objects){ + ammo = ObjectMap.of(objects); } @Override @@ -28,19 +32,18 @@ public class ItemTurret extends CooledTurret{ super.setStats(); stats.remove(BlockStat.itemCapacity); - - stats.add(BlockStat.inputItems, new ItemFilterValue(item -> ammoMap.containsKey(item))); + stats.add(BlockStat.inputItems, new ItemFilterValue(item -> ammo.containsKey(item))); } @Override public int acceptStack(Item item, int amount, Tile tile, Unit source){ TurretEntity entity = tile.entity(); - AmmoType type = ammoMap.get(item); + BulletType type = ammo.get(item); if(type == null) return 0; - return Math.min((int) ((maxAmmo - entity.totalAmmo) / ammoMap.get(item).quantityMultiplier), amount); + return Math.min((int) ((maxAmmo - entity.totalAmmo) / ammo.get(item).ammoMultiplier), amount); } @Override @@ -61,47 +64,67 @@ public class ItemTurret extends CooledTurret{ TurretEntity entity = tile.entity(); if(entity == null) return; - AmmoType type = ammoMap.get(item); - entity.totalAmmo += type.quantityMultiplier; + BulletType type = ammo.get(item); + entity.totalAmmo += type.ammoMultiplier; entity.items.add(item, 1); //find ammo entry by type for(int i = 0; i < entity.ammo.size; i++){ - AmmoEntry entry = entity.ammo.get(i); + ItemEntry entry = (ItemEntry)entity.ammo.get(i); //if found, put it to the right - if(entry.type == type){ - entry.amount += type.quantityMultiplier; + if(entry.item == item){ + entry.amount += type.ammoMultiplier; entity.ammo.swap(i, entity.ammo.size - 1); return; } } //must not be found - AmmoEntry entry = new AmmoEntry(type, (int) type.quantityMultiplier); - entity.ammo.add(entry); + entity.ammo.add(new ItemEntry(item, (int) type.ammoMultiplier)); } @Override public boolean acceptItem(Item item, Tile tile, Tile source){ TurretEntity entity = tile.entity(); - return ammoMap != null && ammoMap.get(item) != null && entity.totalAmmo + ammoMap.get(item).quantityMultiplier <= maxAmmo; + return ammo != null && ammo.get(item) != null && entity.totalAmmo + ammo.get(item).ammoMultiplier <= maxAmmo; } - @Override - public void init(){ - super.init(); + public class ItemTurretEntity extends TurretEntity{ + @Override + public void write(DataOutput stream) throws IOException{ + stream.writeByte(ammo.size); + for(AmmoEntry entry : ammo){ + ItemEntry i = (ItemEntry)entry; + stream.writeByte(i.item.id); + stream.writeShort(i.amount); + } + } - if(ammoTypes != null){ - for(AmmoType type : ammoTypes){ - if(type.item == null) continue; - if(ammoMap.containsKey(type.item)){ - throw new RuntimeException("Turret \"" + name + "\" has two conflicting ammo entries on item type " + type.item + "!"); - }else{ - ammoMap.put(type.item, type); - } + @Override + public void read(DataInput stream) throws IOException{ + byte amount = stream.readByte(); + for(int i = 0; i < amount; i++){ + Item item = Vars.content.item(stream.readByte()); + short a = stream.readShort(); + totalAmmo += a; + ammo.add(new ItemEntry(item, a)); } } } + + class ItemEntry extends AmmoEntry{ + protected Item item; + + ItemEntry(Item item, int amount){ + this.item = item; + this.amount = amount; + } + + @Override + public BulletType type(){ + return ammo.get(item); + } + } } diff --git a/core/src/io/anuke/mindustry/world/blocks/defense/turrets/LaserTurret.java b/core/src/io/anuke/mindustry/world/blocks/defense/turrets/LaserTurret.java index 295208554c..ce6414f4ea 100644 --- a/core/src/io/anuke/mindustry/world/blocks/defense/turrets/LaserTurret.java +++ b/core/src/io/anuke/mindustry/world/blocks/defense/turrets/LaserTurret.java @@ -1,16 +1,15 @@ package io.anuke.mindustry.world.blocks.defense.turrets; +import io.anuke.arc.entities.Effects; +import io.anuke.arc.math.Angles; +import io.anuke.arc.math.Mathf; +import io.anuke.arc.util.Time; import io.anuke.mindustry.entities.TileEntity; import io.anuke.mindustry.entities.bullet.Bullet; import io.anuke.mindustry.entities.bullet.BulletType; -import io.anuke.mindustry.type.AmmoType; import io.anuke.mindustry.type.Liquid; import io.anuke.mindustry.world.Tile; import io.anuke.mindustry.world.consumers.ConsumeLiquidFilter; -import io.anuke.arc.entities.Effects; -import io.anuke.arc.util.Time; -import io.anuke.arc.math.Angles; -import io.anuke.arc.math.Mathf; import static io.anuke.mindustry.Vars.tilesize; @@ -55,7 +54,7 @@ public class LaserTurret extends PowerTurret{ } if(entity.reload >= reload && entity.cons.valid()){ - AmmoType type = peekAmmo(tile); + BulletType type = peekAmmo(tile); shoot(tile, type); diff --git a/core/src/io/anuke/mindustry/world/blocks/defense/turrets/LiquidTurret.java b/core/src/io/anuke/mindustry/world/blocks/defense/turrets/LiquidTurret.java index b96e0b9b0d..e368901395 100644 --- a/core/src/io/anuke/mindustry/world/blocks/defense/turrets/LiquidTurret.java +++ b/core/src/io/anuke/mindustry/world/blocks/defense/turrets/LiquidTurret.java @@ -1,32 +1,41 @@ package io.anuke.mindustry.world.blocks.defense.turrets; import io.anuke.arc.collection.ObjectMap; +import io.anuke.arc.entities.Effects; +import io.anuke.mindustry.Vars; +import io.anuke.mindustry.entities.bullet.BulletType; import io.anuke.mindustry.entities.effect.Fire; -import io.anuke.mindustry.type.AmmoType; import io.anuke.mindustry.type.Item; import io.anuke.mindustry.type.Liquid; import io.anuke.mindustry.world.Tile; import io.anuke.mindustry.world.meta.BlockStat; import io.anuke.mindustry.world.meta.values.LiquidFilterValue; -import io.anuke.arc.entities.Effects; + +import java.io.DataInput; +import java.io.DataOutput; +import java.io.IOException; import static io.anuke.mindustry.Vars.tilesize; import static io.anuke.mindustry.Vars.world; public abstract class LiquidTurret extends Turret{ - protected AmmoType[] ammoTypes; - protected ObjectMap liquidAmmoMap = new ObjectMap<>(); + protected ObjectMap ammo = new ObjectMap<>(); public LiquidTurret(String name){ super(name); hasLiquids = true; } + /**Initializes accepted ammo map. Format: [liquid1, bullet1, liquid2, bullet2...]*/ + protected void ammo(Object... objects){ + ammo = ObjectMap.of(objects); + } + @Override public void setStats(){ super.setStats(); - stats.add(BlockStat.inputLiquid, new LiquidFilterValue(item -> liquidAmmoMap.containsKey(item))); + stats.add(BlockStat.inputLiquid, new LiquidFilterValue(item -> ammo.containsKey(item))); } @Override @@ -58,12 +67,12 @@ public abstract class LiquidTurret extends Turret{ @Override protected void effects(Tile tile){ - AmmoType type = peekAmmo(tile); + BulletType type = peekAmmo(tile); TurretEntity entity = tile.entity(); - Effects.effect(type.shootEffect, type.liquid.color, tile.drawx() + tr.x, tile.drawy() + tr.y, entity.rotation); - Effects.effect(type.smokeEffect, type.liquid.color, tile.drawx() + tr.x, tile.drawy() + tr.y, entity.rotation); + Effects.effect(type.shootEffect, entity.liquids.current().color, tile.drawx() + tr.x, tile.drawy() + tr.y, entity.rotation); + Effects.effect(type.smokeEffect, entity.liquids.current().color, tile.drawx() + tr.x, tile.drawy() + tr.y, entity.rotation); if(shootShake > 0){ Effects.shake(shootShake, shootShake, tile.entity); @@ -73,36 +82,23 @@ public abstract class LiquidTurret extends Turret{ } @Override - public AmmoType useAmmo(Tile tile){ + public BulletType useAmmo(Tile tile){ TurretEntity entity = tile.entity(); - if(tile.isEnemyCheat()) return liquidAmmoMap.get(entity.liquids.current()); - AmmoType type = liquidAmmoMap.get(entity.liquids.current()); - entity.liquids.remove(type.liquid, type.quantityMultiplier); + if(tile.isEnemyCheat()) return ammo.get(entity.liquids.current()); + BulletType type = ammo.get(entity.liquids.current()); + entity.liquids.remove(entity.liquids.current(), type.ammoMultiplier); return type; } @Override - public AmmoType peekAmmo(Tile tile){ - return liquidAmmoMap.get(tile.entity.liquids.current()); + public BulletType peekAmmo(Tile tile){ + return ammo.get(tile.entity.liquids.current()); } @Override public boolean hasAmmo(Tile tile){ TurretEntity entity = tile.entity(); - return liquidAmmoMap.get(entity.liquids.current()) != null && entity.liquids.total() >= liquidAmmoMap.get(entity.liquids.current()).quantityMultiplier; - } - - @Override - public void init(){ - super.init(); - - for(AmmoType type : ammoTypes){ - if(liquidAmmoMap.containsKey(type.liquid)){ - throw new RuntimeException("Turret \"" + name + "\" has two conflicting ammo entries on liquid type " + type.liquid + "!"); - }else{ - liquidAmmoMap.put(type.liquid, type); - } - } + return ammo.get(entity.liquids.current()) != null && entity.liquids.total() >= ammo.get(entity.liquids.current()).ammoMultiplier; } @Override @@ -112,8 +108,45 @@ public abstract class LiquidTurret extends Turret{ @Override public boolean acceptLiquid(Tile tile, Tile source, Liquid liquid, float amount){ - return super.acceptLiquid(tile, source, liquid, amount) && liquidAmmoMap.get(liquid) != null - && (tile.entity.liquids.current() == liquid || (liquidAmmoMap.containsKey(tile.entity.liquids.current()) && tile.entity.liquids.get(tile.entity.liquids.current()) <= liquidAmmoMap.get(tile.entity.liquids.current()).quantityMultiplier + 0.001f)); + return super.acceptLiquid(tile, source, liquid, amount) && ammo.get(liquid) != null + && (tile.entity.liquids.current() == liquid || (ammo.containsKey(tile.entity.liquids.current()) && tile.entity.liquids.get(tile.entity.liquids.current()) <= ammo.get(tile.entity.liquids.current()).ammoMultiplier + 0.001f)); + } + + public class LiquidTurretEntity extends TurretEntity{ + @Override + public void write(DataOutput stream) throws IOException{ + stream.writeByte(ammo.size); + for(AmmoEntry entry : ammo){ + LiquidEntry i = (LiquidEntry)entry; + stream.writeByte(i.liquid.id); + stream.writeShort(i.amount); + } + } + + @Override + public void read(DataInput stream) throws IOException{ + byte amount = stream.readByte(); + for(int i = 0; i < amount; i++){ + Liquid liquid = Vars.content.liquid(stream.readByte()); + short a = stream.readShort(); + totalAmmo += a; + ammo.add(new LiquidEntry(liquid, a)); + } + } + } + + class LiquidEntry extends AmmoEntry{ + protected Liquid liquid; + + LiquidEntry(Liquid liquid, int amount){ + this.liquid = liquid; + this.amount = amount; + } + + @Override + public BulletType type(){ + return ammo.get(liquid); + } } } diff --git a/core/src/io/anuke/mindustry/world/blocks/defense/turrets/PowerTurret.java b/core/src/io/anuke/mindustry/world/blocks/defense/turrets/PowerTurret.java index 3f8f6682fd..f702e0a5b3 100644 --- a/core/src/io/anuke/mindustry/world/blocks/defense/turrets/PowerTurret.java +++ b/core/src/io/anuke/mindustry/world/blocks/defense/turrets/PowerTurret.java @@ -1,6 +1,6 @@ package io.anuke.mindustry.world.blocks.defense.turrets; -import io.anuke.mindustry.type.AmmoType; +import io.anuke.mindustry.entities.bullet.BulletType; import io.anuke.mindustry.world.Tile; import io.anuke.mindustry.world.meta.BlockStat; import io.anuke.mindustry.world.meta.StatUnit; @@ -8,7 +8,7 @@ import io.anuke.mindustry.world.meta.StatUnit; public abstract class PowerTurret extends CooledTurret{ /** The percentage of power which will be used per shot. */ protected float powerUsed = 0.5f; - protected AmmoType shootType; + protected BulletType shootType; public PowerTurret(String name){ super(name); @@ -29,7 +29,7 @@ public abstract class PowerTurret extends CooledTurret{ } @Override - public AmmoType useAmmo(Tile tile){ + public BulletType useAmmo(Tile tile){ if(tile.isEnemyCheat()) return shootType; // Make sure that power can not go negative in case of threading issues or similar tile.entity.power.satisfaction -= Math.min(powerUsed, tile.entity.power.satisfaction); @@ -37,7 +37,7 @@ public abstract class PowerTurret extends CooledTurret{ } @Override - public AmmoType peekAmmo(Tile tile){ + public BulletType peekAmmo(Tile tile){ return shootType; } } diff --git a/core/src/io/anuke/mindustry/world/blocks/defense/turrets/Turret.java b/core/src/io/anuke/mindustry/world/blocks/defense/turrets/Turret.java index 656f48e3aa..080de1cc24 100644 --- a/core/src/io/anuke/mindustry/world/blocks/defense/turrets/Turret.java +++ b/core/src/io/anuke/mindustry/world/blocks/defense/turrets/Turret.java @@ -24,9 +24,6 @@ import io.anuke.mindustry.entities.bullet.BulletType; import io.anuke.mindustry.entities.traits.TargetTrait; import io.anuke.mindustry.graphics.Layer; import io.anuke.mindustry.graphics.Palette; -import io.anuke.mindustry.type.AmmoEntry; -import io.anuke.mindustry.type.AmmoType; -import io.anuke.mindustry.type.ContentType; import io.anuke.mindustry.world.Block; import io.anuke.mindustry.world.Tile; import io.anuke.mindustry.world.meta.BlockFlag; @@ -34,11 +31,6 @@ import io.anuke.mindustry.world.meta.BlockGroup; import io.anuke.mindustry.world.meta.BlockStat; import io.anuke.mindustry.world.meta.StatUnit; -import java.io.DataInput; -import java.io.DataOutput; -import java.io.IOException; - -import static io.anuke.mindustry.Vars.content; import static io.anuke.mindustry.Vars.tilesize; public abstract class Turret extends Block{ @@ -197,8 +189,8 @@ public abstract class Turret extends Block{ if(validateTarget(tile)){ - AmmoType type = peekAmmo(tile); - float speed = type.bullet.speed; + BulletType type = peekAmmo(tile); + float speed = type.speed; if(speed < 0.1f) speed = 9999999f; Vector2 result = Predict.intercept(entity, entity.target, speed); @@ -246,7 +238,7 @@ public abstract class Turret extends Block{ } /**Consume ammo and return a type.*/ - public AmmoType useAmmo(Tile tile){ + public BulletType useAmmo(Tile tile){ if(tile.isEnemyCheat()) return peekAmmo(tile); TurretEntity entity = tile.entity(); @@ -255,15 +247,15 @@ public abstract class Turret extends Block{ if(entry.amount == 0) entity.ammo.pop(); entity.totalAmmo -= ammoPerShot; Time.run(reload / 2f, () -> ejectEffects(tile)); - return entry.type; + return entry.type(); } /** * Get the ammo type that will be returned if useAmmo is called. */ - public AmmoType peekAmmo(Tile tile){ + public BulletType peekAmmo(Tile tile){ TurretEntity entity = tile.entity(); - return entity.ammo.peek().type; + return entity.ammo.peek().type(); } /** @@ -278,7 +270,7 @@ public abstract class Turret extends Block{ TurretEntity entity = tile.entity(); if(entity.reload >= reload){ - AmmoType type = peekAmmo(tile); + BulletType type = peekAmmo(tile); shoot(tile, type); @@ -288,18 +280,16 @@ public abstract class Turret extends Block{ } } - protected void shoot(Tile tile, AmmoType ammo){ + protected void shoot(Tile tile, BulletType type){ TurretEntity entity = tile.entity(); entity.recoil = recoil; entity.heat = 1f; - AmmoType type = peekAmmo(tile); - tr.trns(entity.rotation, size * tilesize / 2f, Mathf.range(xRand)); for(int i = 0; i < shots; i++){ - bullet(tile, ammo.bullet, entity.rotation + Mathf.range(inaccuracy + type.inaccuracy) + (i-shots/2) * spread); + bullet(tile, type, entity.rotation + Mathf.range(inaccuracy + type.inaccuracy) + (i-shots/2) * spread); } effects(tile); @@ -343,6 +333,12 @@ public abstract class Turret extends Block{ return new TurretEntity(); } + public static abstract class AmmoEntry{ + public int amount; + + public abstract BulletType type(); + } + public static class TurretEntity extends TileEntity{ public Array ammo = new Array<>(); public int totalAmmo; @@ -352,25 +348,5 @@ public abstract class Turret extends Block{ public float heat; public int shots; public TargetTrait target; - - @Override - public void write(DataOutput stream) throws IOException{ - stream.writeByte(ammo.size); - for(AmmoEntry entry : ammo){ - stream.writeByte(entry.type.id); - stream.writeShort(entry.amount); - } - } - - @Override - public void read(DataInput stream) throws IOException{ - byte amount = stream.readByte(); - for(int i = 0; i < amount; i++){ - AmmoType type = content.getByID(ContentType.ammo, stream.readByte()); - short ta = stream.readShort(); - ammo.add(new AmmoEntry(type, ta)); - totalAmmo += ta; - } - } } } From ff52fec663051ef833e042817ae86c33a0f30fbf Mon Sep 17 00:00:00 2001 From: Anuken Date: Mon, 7 Jan 2019 16:53:04 -0500 Subject: [PATCH 3/6] Cleanup: all bullet definitions moved into one class --- .../io/anuke/mindustry/content/Bullets.java | 636 ++++++++++++++++++ .../io/anuke/mindustry/content/Weapons.java | 35 +- .../content/blocks/TurretBlocks.java | 76 +-- .../content/bullets/ArtilleryBullets.java | 107 --- .../mindustry/content/bullets/BulletList.java | 12 - .../content/bullets/FlakBullets.java | 51 -- .../content/bullets/MissileBullets.java | 124 ---- .../content/bullets/StandardBullets.java | 101 --- .../content/bullets/TurretBullets.java | 425 ------------ .../content/bullets/WeaponBullets.java | 99 --- .../anuke/mindustry/core/ContentLoader.java | 12 +- .../io/anuke/mindustry/entities/Damage.java | 4 +- .../entities/bullet/BasicBulletType.java | 8 + .../entities/bullet/LiquidBulletType.java | 2 + .../entities/bullet/MassDriverBolt.java | 109 +++ .../entities/bullet/MissileBulletType.java | 7 + .../anuke/mindustry/entities/effect/Fire.java | 4 +- .../mindustry/entities/effect/Lightning.java | 4 +- .../mindustry/entities/effect/Puddle.java | 4 +- .../blocks/defense/turrets/PowerTurret.java | 1 + .../world/blocks/distribution/MassDriver.java | 5 +- 21 files changed, 831 insertions(+), 995 deletions(-) delete mode 100644 core/src/io/anuke/mindustry/content/bullets/ArtilleryBullets.java delete mode 100644 core/src/io/anuke/mindustry/content/bullets/BulletList.java delete mode 100644 core/src/io/anuke/mindustry/content/bullets/FlakBullets.java delete mode 100644 core/src/io/anuke/mindustry/content/bullets/MissileBullets.java delete mode 100644 core/src/io/anuke/mindustry/content/bullets/StandardBullets.java delete mode 100644 core/src/io/anuke/mindustry/content/bullets/TurretBullets.java delete mode 100644 core/src/io/anuke/mindustry/content/bullets/WeaponBullets.java create mode 100644 core/src/io/anuke/mindustry/entities/bullet/MassDriverBolt.java diff --git a/core/src/io/anuke/mindustry/content/Bullets.java b/core/src/io/anuke/mindustry/content/Bullets.java index 6e5137a433..8900001cb6 100644 --- a/core/src/io/anuke/mindustry/content/Bullets.java +++ b/core/src/io/anuke/mindustry/content/Bullets.java @@ -1,13 +1,649 @@ package io.anuke.mindustry.content; +import io.anuke.arc.entities.Effects; +import io.anuke.arc.graphics.Color; +import io.anuke.arc.graphics.g2d.CapStyle; +import io.anuke.arc.graphics.g2d.Draw; +import io.anuke.arc.graphics.g2d.Fill; +import io.anuke.arc.graphics.g2d.Lines; +import io.anuke.arc.math.Mathf; +import io.anuke.arc.util.Time; +import io.anuke.arc.util.Tmp; +import io.anuke.mindustry.content.fx.*; +import io.anuke.mindustry.entities.Damage; +import io.anuke.mindustry.entities.bullet.*; +import io.anuke.mindustry.entities.effect.Fire; +import io.anuke.mindustry.entities.effect.Lightning; +import io.anuke.mindustry.entities.effect.Puddle; import io.anuke.mindustry.game.ContentList; +import io.anuke.mindustry.graphics.Palette; +import io.anuke.mindustry.graphics.Shapes; import io.anuke.mindustry.type.ContentType; +import io.anuke.mindustry.world.Tile; +import io.anuke.mindustry.world.blocks.BuildBlock; + +import static io.anuke.mindustry.Vars.world; public class Bullets implements ContentList{ + public static BulletType + + //artillery + artilleryDense, arilleryPlastic, artilleryPlasticFrag, artilleryHoming, artlleryIncendiary, artilleryExplosive, artilleryUnit, + + //flak + flakPlastic, flakExplosive, flakSurge, + + //missiles + missileExplosive, missileIncendiary, missileSurge, missileJavelin, missileSwarm, + + //standard + standardCopper, standardDense, standardThorium, standardHoming, standardIncendiary, standardMechSmall, + standardGlaive, standardDenseBig, standardThoriumBig, standardIncendiaryBig, + + //electric + lancerLaser, burstLaser, meltdownLaser, lightning, arc, damageLightning, + + //liquid + waterShot, cryoShot, lavaShot, oilShot, + + //environment, misc. + fireball, basicFlame, fuseShot, driverBolt, healBullet, frag, + + //bombs + bombExplosive, bombIncendiary, bombOil; @Override public void load(){ + artilleryDense = new ArtilleryBulletType(3f, 0, "shell"){{ + hitEffect = BulletFx.flakExplosion; + knockback = 0.8f; + lifetime = 50f; + bulletWidth = bulletHeight = 11f; + collidesTiles = false; + splashDamageRadius = 25f; + splashDamage = 33f; + }}; + + artilleryPlasticFrag = new BasicBulletType(2.5f, 6, "bullet"){{ + bulletWidth = 10f; + bulletHeight = 12f; + bulletShrink = 1f; + lifetime = 15f; + backColor = Palette.plastaniumBack; + frontColor = Palette.plastaniumFront; + despawnEffect = Fx.none; + }}; + + arilleryPlastic = new ArtilleryBulletType(3.3f, 0, "shell"){{ + hitEffect = BulletFx.plasticExplosion; + knockback = 1f; + lifetime = 55f; + bulletWidth = bulletHeight = 13f; + collidesTiles = false; + splashDamageRadius = 35f; + splashDamage = 35f; + fragBullet = artilleryPlasticFrag; + fragBullets = 9; + backColor = Palette.plastaniumBack; + frontColor = Palette.plastaniumFront; + }}; + + artilleryHoming = new ArtilleryBulletType(3f, 0, "shell"){{ + hitEffect = BulletFx.flakExplosion; + knockback = 0.8f; + lifetime = 45f; + bulletWidth = bulletHeight = 11f; + collidesTiles = false; + splashDamageRadius = 25f; + splashDamage = 33f; + homingPower = 2f; + homingRange = 50f; + }}; + + artlleryIncendiary = new ArtilleryBulletType(3f, 0, "shell"){{ + hitEffect = BulletFx.blastExplosion; + knockback = 0.8f; + lifetime = 60f; + bulletWidth = bulletHeight = 13f; + collidesTiles = false; + splashDamageRadius = 25f; + splashDamage = 30f; + incendAmount = 4; + incendSpread = 11f; + frontColor = Palette.lightishOrange; + backColor = Palette.lightOrange; + trailEffect = BulletFx.incendTrail; + }}; + + artilleryExplosive = new ArtilleryBulletType(2f, 0, "shell"){{ + hitEffect = BulletFx.blastExplosion; + knockback = 0.8f; + lifetime = 70f; + bulletWidth = bulletHeight = 14f; + collidesTiles = false; + splashDamageRadius = 45f; + splashDamage = 50f; + backColor = Palette.missileYellowBack; + frontColor = Palette.missileYellow; + }}; + + artilleryUnit = new ArtilleryBulletType(2f, 0, "shell"){{ + hitEffect = BulletFx.blastExplosion; + knockback = 0.8f; + lifetime = 90f; + bulletWidth = bulletHeight = 14f; + collides = true; + collidesTiles = true; + splashDamageRadius = 45f; + splashDamage = 50f; + backColor = Palette.bulletYellowBack; + frontColor = Palette.bulletYellow; + }}; + + flakPlastic = new FlakBulletType(4f, 5){{ + splashDamageRadius = 40f; + fragBullet = artilleryPlasticFrag; + fragBullets = 4; + hitEffect = BulletFx.plasticExplosion; + frontColor = Palette.plastaniumFront; + backColor = Palette.plastaniumBack; + }}; + + flakExplosive = new FlakBulletType(4f, 5){{ + //default bullet type, no changes + }}; + + flakSurge = new FlakBulletType(4f, 7){{ + splashDamage = 33f; + lightining = 2; + lightningLength = 12; + }}; + + missileExplosive = new MissileBulletType(1.8f, 10, "missile"){{ + bulletWidth = 8f; + bulletHeight = 8f; + bulletShrink = 0f; + drag = -0.01f; + splashDamageRadius = 30f; + splashDamage = 30f; + lifetime = 150f; + hitEffect = BulletFx.blastExplosion; + despawnEffect = BulletFx.blastExplosion; + }}; + + missileIncendiary = new MissileBulletType(2f, 12, "missile"){{ + frontColor = Palette.lightishOrange; + backColor = Palette.lightOrange; + bulletWidth = 7f; + bulletHeight = 8f; + bulletShrink = 0f; + drag = -0.01f; + homingPower = 7f; + splashDamageRadius = 10f; + splashDamage = 10f; + lifetime = 160f; + hitEffect = BulletFx.blastExplosion; + incendSpread = 10f; + incendAmount = 3; + }}; + + missileSurge = new MissileBulletType(3.5f, 15, "bullet"){{ + bulletWidth = 8f; + bulletHeight = 8f; + bulletShrink = 0f; + drag = -0.01f; + splashDamageRadius = 30f; + splashDamage = 22f; + lifetime = 150f; + hitEffect = BulletFx.blastExplosion; + despawnEffect = BulletFx.blastExplosion; + lightining = 2; + lightningLength = 14; + }}; + + missileJavelin = new MissileBulletType(5f, 10.5f, "missile"){{ + bulletWidth = 8f; + bulletHeight = 8f; + bulletShrink = 0f; + drag = -0.003f; + keepVelocity = false; + splashDamageRadius = 20f; + splashDamage = 1f; + lifetime = 90f; + trailColor = Color.valueOf("b6c6fd"); + hitEffect = BulletFx.blastExplosion; + despawnEffect = BulletFx.blastExplosion; + backColor = Palette.bulletYellowBack; + frontColor = Palette.bulletYellow; + weaveScale = 8f; + weaveMag = 2f; + }}; + + missileSwarm = new MissileBulletType(2.7f, 12, "missile"){{ + bulletWidth = 8f; + bulletHeight = 8f; + bulletShrink = 0f; + drag = -0.003f; + homingRange = 60f; + keepVelocity = false; + splashDamageRadius = 25f; + splashDamage = 10f; + lifetime = 120f; + trailColor = Color.GRAY; + backColor = Palette.bulletYellowBack; + frontColor = Palette.bulletYellow; + hitEffect = BulletFx.blastExplosion; + despawnEffect = BulletFx.blastExplosion; + weaveScale = 8f; + weaveMag = 2f; + }}; + + standardCopper = new BasicBulletType(2.5f, 7, "bullet"){{ + bulletWidth = 7f; + bulletHeight = 9f; + shootEffect = ShootFx.shootSmall; + smokeEffect = ShootFx.shootSmallSmoke; + ammoMultiplier = 5; + }}; + + standardDense = new BasicBulletType(3.5f, 18, "bullet"){{ + bulletWidth = 9f; + bulletHeight = 12f; + armorPierce = 0.2f; + reloadMultiplier = 0.6f; + ammoMultiplier = 2; + }}; + + standardThorium = new BasicBulletType(4f, 29, "bullet"){{ + bulletWidth = 10f; + bulletHeight = 13f; + armorPierce = 0.5f; + shootEffect = ShootFx.shootBig; + smokeEffect = ShootFx.shootBigSmoke; + ammoMultiplier = 2; + }}; + + standardHoming = new BasicBulletType(3f, 9, "bullet"){{ + bulletWidth = 7f; + bulletHeight = 9f; + homingPower = 5f; + reloadMultiplier = 1.4f; + ammoMultiplier = 5; + }}; + + standardIncendiary = new BasicBulletType(3.2f, 11, "bullet"){{ + bulletWidth = 10f; + bulletHeight = 12f; + frontColor = Palette.lightishOrange; + backColor = Palette.lightOrange; + incendSpread = 3f; + incendAmount = 1; + incendChance = 0.3f; + inaccuracy = 3f; + }}; + + standardGlaive = new BasicBulletType(4f, 7.5f, "bullet"){{ + bulletWidth = 10f; + bulletHeight = 12f; + frontColor = Color.valueOf("feb380"); + backColor = Color.valueOf("ea8878"); + incendSpread = 3f; + incendAmount = 1; + incendChance = 0.3f; + }}; + + standardMechSmall = new BasicBulletType(4f, 9, "bullet"){{ + bulletWidth = 11f; + bulletHeight = 14f; + lifetime = 40f; + inaccuracy = 5f; + despawnEffect = BulletFx.hitBulletSmall; + }}; + + standardDenseBig = new BasicBulletType(7f, 42, "bullet"){{ + bulletWidth = 15f; + bulletHeight = 21f; + armorPierce = 0.2f; + }}; + + standardThoriumBig = new BasicBulletType(8f, 65, "bullet"){{ + bulletWidth = 16f; + bulletHeight = 23f; + armorPierce = 0.5f; + }}; + + standardIncendiaryBig = new BasicBulletType(7f, 38, "bullet"){{ + bulletWidth = 16f; + bulletHeight = 21f; + frontColor = Palette.lightishOrange; + backColor = Palette.lightOrange; + incendSpread = 3f; + incendAmount = 2; + incendChance = 0.3f; + }}; + + damageLightning = new BulletType(0.0001f, 0f){ + { + lifetime = Lightning.lifetime; + hitEffect = BulletFx.hitLancer; + despawnEffect = Fx.none; + status = StatusEffects.shocked; + statusIntensity = 1f; + } + }; + + healBullet = new BulletType(5.2f, 13){ + float healPercent = 3f; + + { + hitEffect = BulletFx.hitLaser; + despawnEffect = BulletFx.hitLaser; + collidesTeam = true; + } + + @Override + public boolean collides(Bullet b, Tile tile){ + return tile.getTeam() != b.getTeam() || tile.entity.healthf() < 1f; + } + + @Override + public void draw(Bullet b){ + Draw.color(Palette.heal); + Lines.stroke(2f); + Lines.lineAngleCenter(b.x, b.y, b.rot(), 7f); + Draw.color(Color.WHITE); + Lines.lineAngleCenter(b.x, b.y, b.rot(), 3f); + Draw.reset(); + } + + @Override + public void hitTile(Bullet b, Tile tile){ + super.hit(b); + tile = tile.target(); + + if(tile != null && tile.getTeam() == b.getTeam() && !(tile.block() instanceof BuildBlock)){ + Effects.effect(BlockFx.healBlockFull, Palette.heal, tile.drawx(), tile.drawy(), tile.block().size); + tile.entity.healBy(healPercent / 100f * tile.entity.maxHealth()); + } + } + }; + + fireball = new BulletType(1f, 4){ + { + pierce = true; + hitTiles = false; + collides = false; + collidesTiles = false; + drag = 0.03f; + hitEffect = despawnEffect = Fx.none; + } + + @Override + public void init(Bullet b){ + b.velocity().setLength(0.6f + Mathf.random(2f)); + } + + @Override + public void draw(Bullet b){ + //TODO add color to the bullet depending on the color of the flame it came from + Draw.color(Palette.lightFlame, Palette.darkFlame, Color.GRAY, b.fin()); + Fill.circle(b.x, b.y, 3f * b.fout()); + Draw.reset(); + } + + @Override + public void update(Bullet b){ + if(Mathf.chance(0.04 * Time.delta())){ + Tile tile = world.tileWorld(b.x, b.y); + if(tile != null){ + Fire.create(tile); + } + } + + if(Mathf.chance(0.1 * Time.delta())){ + Effects.effect(EnvironmentFx.fireballsmoke, b.x, b.y); + } + + if(Mathf.chance(0.1 * Time.delta())){ + Effects.effect(EnvironmentFx.ballfire, b.x, b.y); + } + } + }; + + basicFlame = new BulletType(2.3f, 5){ + { + hitSize = 7f; + lifetime = 35f; + pierce = true; + drag = 0.05f; + hitEffect = BulletFx.hitFlameSmall; + despawnEffect = Fx.none; + status = StatusEffects.burning; + } + + @Override + public void draw(Bullet b){ + } + }; + + lancerLaser = new BulletType(0.001f, 140){ + Color[] colors = {Palette.lancerLaser.cpy().mul(1f, 1f, 1f, 0.4f), Palette.lancerLaser, Color.WHITE}; + float[] tscales = {1f, 0.7f, 0.5f, 0.2f}; + float[] lenscales = {1f, 1.1f, 1.13f, 1.14f}; + float length = 100f; + + { + hitEffect = BulletFx.hitLancer; + despawnEffect = Fx.none; + hitSize = 4; + lifetime = 16f; + pierce = true; + } + + @Override + public void init(Bullet b){ + Damage.collideLine(b, b.getTeam(), hitEffect, b.x, b.y, b.rot(), length); + } + + @Override + public void draw(Bullet b){ + float f = Mathf.curve(b.fin(), 0f, 0.2f); + float baseLen = length * f; + + Lines.lineAngle(b.x, b.y, b.rot(), baseLen); + for(int s = 0; s < 3; s++){ + Draw.color(colors[s]); + for(int i = 0; i < tscales.length; i++){ + Lines.stroke(7f * b.fout() * (s == 0 ? 1.5f : s == 1 ? 1f : 0.3f) * tscales[i]); + Lines.lineAngle(b.x, b.y, b.rot(), baseLen * lenscales[i]); + } + } + Draw.reset(); + } + }; + + 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}; + float[] strokes = {2f, 1.5f, 1f, 0.3f}; + float[] lenscales = {1f, 1.12f, 1.15f, 1.17f}; + float length = 200f; + + { + hitEffect = BulletFx.hitMeltdown; + despawnEffect = Fx.none; + hitSize = 4; + drawSize = 420f; + lifetime = 16f; + pierce = true; + } + + @Override + public void update(Bullet b){ + if(b.timer.get(1, 5f)){ + Damage.collideLine(b, b.getTeam(), hitEffect, b.x, b.y, b.rot(), length); + } + Effects.shake(1f, 1f, b.x, b.y); + } + + @Override + 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+Mathf.range(5f), hity+Mathf.range(5f))); + } + } + + @Override + public void draw(Bullet b){ + float baseLen = (length) * b.fout(); + + Lines.lineAngle(b.x, b.y, b.rot(), baseLen); + for(int s = 0; s < colors.length; s++){ + Draw.color(tmpColor.set(colors[s]).mul(1f + Mathf.absin(Time.time(), 1f, 0.1f))); + for(int i = 0; i < tscales.length; i++){ + Tmp.v1.trns(b.rot() + 180f, (lenscales[i] - 1f) * 35f); + Lines.stroke((9f + Mathf.absin(Time.time(), 0.8f, 1.5f)) * b.fout() * strokes[s] * tscales[i]); + Lines.lineAngle(b.x + Tmp.v1.x, b.y + Tmp.v1.y, b.rot(), baseLen * lenscales[i], CapStyle.none); + } + } + Draw.reset(); + } + }; + + fuseShot = new BulletType(0.01f, 70){ + int rays = 3; + float raySpace = 2f; + float rayLength = 80f; + { + hitEffect = BulletFx.hitFuse; + lifetime = 13f; + despawnEffect = Fx.none; + pierce = true; + } + + @Override + public void init(Bullet b) { + for (int i = 0; i < rays; i++) { + Damage.collideLine(b, b.getTeam(), hitEffect, b.x, b.y, b.rot(), rayLength - Math.abs(i - (rays/2))*20f); + } + } + + @Override + public void draw(Bullet b) { + super.draw(b); + Draw.color(Color.WHITE, Palette.surge, b.fin()); + for(int i = 0; i < 7; i++){ + Tmp.v1.trns(b.rot(), i * 8f); + float sl = Mathf.clamp(b.fout()-0.5f) * (80f - i *10); + Shapes.tri(b.x + Tmp.v1.x, b.y + Tmp.v1.y, 4f, sl, b.rot() + 90); + Shapes.tri(b.x + Tmp.v1.x, b.y + Tmp.v1.y, 4f, sl, b.rot() - 90); + } + Shapes.tri(b.x, b.y, 13f, (rayLength+50) * b.fout(), b.rot()); + Shapes.tri(b.x, b.y, 13f, 10f * b.fout(), b.rot() + 180f); + Draw.reset(); + } + }; + + waterShot = new LiquidBulletType(Liquids.water){{ + knockback = 0.65f; + }}; + + cryoShot = new LiquidBulletType(Liquids.cryofluid){{ + + }}; + + lavaShot = new LiquidBulletType(Liquids.lava){{ + damage = 4; + speed = 1.9f; + drag = 0.03f; + }}; + + oilShot = new LiquidBulletType(Liquids.oil){{ + speed = 2f; + drag = 0.03f; + }}; + + lightning = new BulletType(0.001f, 12f){ + { + lifetime = 1f; + despawnEffect = Fx.none; + hitEffect = BulletFx.hitLancer; + keepVelocity = false; + } + + @Override + public void draw(Bullet b){ + } + + @Override + public void init(Bullet b){ + Lightning.create(b.getTeam(), Palette.lancerLaser, damage, b.x, b.y, b.rot(), 30); + } + }; + + arc = new BulletType(0.001f, 26){{ + lifetime = 1; + despawnEffect = Fx.none; + hitEffect = BulletFx.hitLancer; + } + + @Override + public void draw(Bullet b){} + + @Override + public void init(Bullet b){ + Lightning.create(b.getTeam(), Palette.lancerLaser, damage, b.x, b.y, b.rot(), 36); + } + }; + + driverBolt = new MassDriverBolt(); + + frag = new BasicBulletType(5f, 8, "bullet"){{ + bulletWidth = 8f; + bulletHeight = 9f; + bulletShrink = 0.5f; + lifetime = 50f; + drag = 0.04f; + }}; + + bombExplosive = new BombBulletType(10f, 20f, "shell"){{ + bulletWidth = 9f; + bulletHeight = 13f; + hitEffect = BulletFx.flakExplosion; + }}; + + bombIncendiary = new BombBulletType(7f, 10f, "shell"){{ + bulletWidth = 8f; + bulletHeight = 12f; + hitEffect = BulletFx.flakExplosion; + backColor = Palette.lightOrange; + frontColor = Palette.lightishOrange; + incendChance = 1f; + incendAmount = 3; + incendSpread = 10f; + }}; + + bombOil = new BombBulletType(2f, 3f, "shell"){{ + bulletWidth = 8f; + bulletHeight = 12f; + hitEffect = BlockFx.pulverize; + backColor = new Color(0x4f4f4fff); + frontColor = Color.GRAY; + } + + @Override + public void hit(Bullet b, float x, float y){ + super.hit(b, x, y); + + for(int i = 0; i < 3; i++){ + Tile tile = world.tileWorld(x + Mathf.range(8f), y + Mathf.range(8f)); + Puddle.deposit(tile, Liquids.oil, 5f); + } + } + }; } @Override diff --git a/core/src/io/anuke/mindustry/content/Weapons.java b/core/src/io/anuke/mindustry/content/Weapons.java index f979f23cb6..20fa1f5804 100644 --- a/core/src/io/anuke/mindustry/content/Weapons.java +++ b/core/src/io/anuke/mindustry/content/Weapons.java @@ -1,6 +1,5 @@ package io.anuke.mindustry.content; -import io.anuke.mindustry.content.bullets.*; import io.anuke.mindustry.content.fx.Fx; import io.anuke.mindustry.content.fx.ShootFx; import io.anuke.mindustry.game.ContentList; @@ -19,7 +18,7 @@ public class Weapons implements ContentList{ reload = 14f; roundrobin = true; ejectEffect = ShootFx.shellEjectSmall; - ammo = StandardBullets.mechSmall; + ammo = Bullets.standardMechSmall; }}; blasterSmall = new Weapon("blaster"){{ @@ -27,7 +26,7 @@ public class Weapons implements ContentList{ reload = 15f; roundrobin = true; ejectEffect = ShootFx.shellEjectSmall; - ammo = StandardBullets.copper; + ammo = Bullets.standardCopper; }}; glaiveBlaster = new Weapon("bomber"){{ @@ -35,7 +34,7 @@ public class Weapons implements ContentList{ reload = 10f; roundrobin = true; ejectEffect = ShootFx.shellEjectSmall; - ammo = StandardBullets.glaive; + ammo = Bullets.standardGlaive; }}; droneBlaster = new Weapon("blaster"){{ @@ -44,7 +43,7 @@ public class Weapons implements ContentList{ width = 1f; roundrobin = true; ejectEffect = ShootFx.shellEjectSmall; - ammo = StandardBullets.copper; + ammo = Bullets.standardCopper; }}; healBlaster = new Weapon("heal-blaster"){{ @@ -53,7 +52,7 @@ public class Weapons implements ContentList{ roundrobin = false; ejectEffect = Fx.none; recoil = 2f; - ammo = TurretBullets.healBullet; + ammo = Bullets.healBullet; }}; missiles = new Weapon("missiles"){{ @@ -65,7 +64,7 @@ public class Weapons implements ContentList{ ejectEffect = Fx.none; velocityRnd = 0.2f; spacing = 1f; - ammo = MissileBullets.javelin; + ammo = Bullets.missileJavelin; }}; swarmer = new Weapon("swarmer"){{ @@ -78,7 +77,7 @@ public class Weapons implements ContentList{ roundrobin = true; ejectEffect = Fx.none; shake = 3f; - ammo = MissileBullets.swarm; + ammo = Bullets.missileSwarm; }}; chainBlaster = new Weapon("chain-blaster"){{ @@ -86,7 +85,7 @@ public class Weapons implements ContentList{ reload = 28f; roundrobin = true; ejectEffect = ShootFx.shellEjectSmall; - ammo = StandardBullets.copper; + ammo = Bullets.standardCopper; }}; shockgun = new Weapon("shockgun"){{ @@ -97,7 +96,7 @@ public class Weapons implements ContentList{ inaccuracy = 0f; velocityRnd = 0.2f; ejectEffect = Fx.none; - ammo = TurretBullets.lightning; + ammo = Bullets.lightning; }}; flakgun = new Weapon("flakgun"){{ @@ -109,7 +108,7 @@ public class Weapons implements ContentList{ recoil = 3f; velocityRnd = 0.1f; ejectEffect = ShootFx.shellEjectMedium; - ammo = ArtilleryBullets.dense; + ammo = Bullets.artilleryDense; }}; flamethrower = new Weapon("flamethrower"){{ @@ -118,7 +117,7 @@ public class Weapons implements ContentList{ roundrobin = true; recoil = 1f; ejectEffect = Fx.none; - ammo = TurretBullets.basicFlame; + ammo = Bullets.basicFlame; }}; artillery = new Weapon("artillery"){{ @@ -128,7 +127,7 @@ public class Weapons implements ContentList{ recoil = 5f; shake = 2f; ejectEffect = ShootFx.shellEjectMedium; - ammo = ArtilleryBullets.unit; + ammo = Bullets.artilleryUnit; }}; bomber = new Weapon("bomber"){{ @@ -139,7 +138,7 @@ public class Weapons implements ContentList{ ejectEffect = Fx.none; velocityRnd = 1f; inaccuracy = 40f; - ammo = WeaponBullets.bombExplosive; + ammo = Bullets.bombExplosive; }}; bomberTrident = new Weapon("bomber"){{ @@ -151,7 +150,7 @@ public class Weapons implements ContentList{ ejectEffect = Fx.none; velocityRnd = 1f; inaccuracy = 40f; - ammo = WeaponBullets.bombExplosive; + ammo = Bullets.bombExplosive; }}; laserBurster = new Weapon("bomber"){{ @@ -160,7 +159,7 @@ public class Weapons implements ContentList{ width = 0f; roundrobin = true; ejectEffect = Fx.none; - ammo = TurretBullets.lancerLaser; + ammo = Bullets.lancerLaser; }}; healBlasterDrone = new Weapon("heal-blaster"){{ @@ -170,7 +169,7 @@ public class Weapons implements ContentList{ roundrobin = true; ejectEffect = Fx.none; recoil = 2f; - ammo = TurretBullets.healBullet; + ammo = Bullets.healBullet; }}; healBlasterDrone2 = new Weapon("heal-blaster"){{ @@ -180,7 +179,7 @@ public class Weapons implements ContentList{ roundrobin = true; ejectEffect = Fx.none; recoil = 2f; - ammo = TurretBullets.healBullet; + ammo = Bullets.healBullet; }}; } diff --git a/core/src/io/anuke/mindustry/content/blocks/TurretBlocks.java b/core/src/io/anuke/mindustry/content/blocks/TurretBlocks.java index 813f7624b0..f1a7ac794b 100644 --- a/core/src/io/anuke/mindustry/content/blocks/TurretBlocks.java +++ b/core/src/io/anuke/mindustry/content/blocks/TurretBlocks.java @@ -2,26 +2,26 @@ package io.anuke.mindustry.content.blocks; import io.anuke.arc.graphics.Color; import io.anuke.arc.graphics.g2d.Draw; +import io.anuke.mindustry.content.Bullets; import io.anuke.mindustry.content.Items; import io.anuke.mindustry.content.Liquids; -import io.anuke.mindustry.content.bullets.*; import io.anuke.mindustry.content.fx.ShootFx; import io.anuke.mindustry.game.ContentList; import io.anuke.mindustry.world.Block; import io.anuke.mindustry.world.blocks.defense.turrets.*; public class TurretBlocks extends BlockList implements ContentList{ - public static Block duo, /*scatter,*/ - scorch, hail, wave, lancer, arc, swarmer, salvo, fuse, ripple, cyclone, spectre, meltdown; + public static Block duo, scorch, hail, wave, lancer, arc, swarmer, salvo, + fuse, ripple, cyclone, spectre, meltdown; @Override public void load(){ duo = new DoubleTurret("duo"){{ ammo( - Items.copper, StandardBullets.copper, - Items.densealloy, StandardBullets.dense, - Items.pyratite, StandardBullets.tracer, - Items.silicon, StandardBullets.homing + Items.copper, Bullets.standardCopper, + Items.densealloy, Bullets.standardDense, + Items.pyratite, Bullets.standardIncendiary, + Items.silicon, Bullets.standardHoming ); reload = 25f; restitution = 0.03f; @@ -35,9 +35,9 @@ public class TurretBlocks extends BlockList implements ContentList{ hail = new ArtilleryTurret("hail"){{ ammo( - Items.densealloy, ArtilleryBullets.dense, - Items.silicon, ArtilleryBullets.homing, - Items.pyratite, ArtilleryBullets.incendiary + Items.densealloy, Bullets.artilleryDense, + Items.silicon, Bullets.artilleryHoming, + Items.pyratite, Bullets.artlleryIncendiary ); reload = 60f; recoil = 2f; @@ -48,7 +48,7 @@ public class TurretBlocks extends BlockList implements ContentList{ }}; scorch = new LiquidTurret("scorch"){{ - ammo(Liquids.oil, TurretBullets.basicFlame); + ammo(Liquids.oil, Bullets.basicFlame); recoil = 0f; reload = 4f; shootCone = 50f; @@ -58,10 +58,10 @@ public class TurretBlocks extends BlockList implements ContentList{ wave = new LiquidTurret("wave"){{ ammo( - Liquids.water, TurretBullets.waterShot, - Liquids.lava, TurretBullets.lavaShot, - Liquids.cryofluid, TurretBullets.cryoShot, - Liquids.oil, TurretBullets.oilShot + Liquids.water, Bullets.waterShot, + Liquids.lava, Bullets.lavaShot, + Liquids.cryofluid, Bullets.cryoShot, + Liquids.oil, Bullets.oilShot ); size = 2; recoil = 0f; @@ -87,7 +87,7 @@ public class TurretBlocks extends BlockList implements ContentList{ chargeTime = 60f; chargeMaxDelay = 30f; chargeEffects = 7; - shootType = TurretBullets.lancerLaser; + shootType = Bullets.lancerLaser; recoil = 2f; reload = 100f; cooldown = 0.03f; @@ -105,7 +105,7 @@ public class TurretBlocks extends BlockList implements ContentList{ }}; arc = new PowerTurret("arc"){{ - shootType = TurretBullets.arc; + shootType = Bullets.arc; reload = 85f; shootShake = 1f; shootCone = 40f; @@ -121,9 +121,9 @@ public class TurretBlocks extends BlockList implements ContentList{ swarmer = new BurstTurret("swarmer"){{ ammo( - Items.blastCompound, MissileBullets.explosive, - Items.pyratite, MissileBullets.incindiary, - Items.surgealloy, MissileBullets.surge + Items.blastCompound, Bullets.missileExplosive, + Items.pyratite, Bullets.missileIncendiary, + Items.surgealloy, Bullets.missileSurge ); reload = 50f; shots = 4; @@ -137,11 +137,11 @@ public class TurretBlocks extends BlockList implements ContentList{ salvo = new BurstTurret("salvo"){{ ammo( - Items.copper, StandardBullets.copper, - Items.densealloy, StandardBullets.dense, - Items.pyratite, StandardBullets.tracer, - Items.silicon, StandardBullets.homing, - Items.thorium, StandardBullets.thorium + Items.copper, Bullets.standardCopper, + Items.densealloy, Bullets.standardDense, + Items.pyratite, Bullets.standardIncendiary, + Items.silicon, Bullets.standardHoming, + Items.thorium, Bullets.standardThorium ); size = 2; @@ -160,11 +160,11 @@ public class TurretBlocks extends BlockList implements ContentList{ ripple = new ArtilleryTurret("ripple"){{ ammo( - Items.densealloy, ArtilleryBullets.dense, - Items.silicon, ArtilleryBullets.homing, - Items.pyratite, ArtilleryBullets.incendiary, - Items.blastCompound, ArtilleryBullets.explosive, - Items.plastanium, ArtilleryBullets.plastic + Items.densealloy, Bullets.artilleryDense, + Items.silicon, Bullets.artilleryHoming, + Items.pyratite, Bullets.artlleryIncendiary, + Items.blastCompound, Bullets.artilleryExplosive, + Items.plastanium, Bullets.arilleryPlastic ); size = 3; shots = 4; @@ -184,9 +184,9 @@ public class TurretBlocks extends BlockList implements ContentList{ cyclone = new ItemTurret("cyclone"){{ ammo( - Items.blastCompound, FlakBullets.explosive, - Items.plastanium, FlakBullets.plastic, - Items.surgealloy, FlakBullets.surge + Items.blastCompound, Bullets.flakExplosive, + Items.plastanium, Bullets.flakPlastic, + Items.surgealloy, Bullets.flakSurge ); xRand = 4f; reload = 8f; @@ -201,7 +201,7 @@ public class TurretBlocks extends BlockList implements ContentList{ }}; fuse = new ItemTurret("fuse"){{ - ammo(Items.densealloy, TurretBullets.fuseShot); + ammo(Items.densealloy, Bullets.fuseShot); reload = 50f; shootShake = 4f; range = 80f; @@ -214,9 +214,9 @@ public class TurretBlocks extends BlockList implements ContentList{ spectre = new DoubleTurret("spectre"){{ ammo( - Items.densealloy, StandardBullets.denseBig, - Items.pyratite, StandardBullets.tracerBig, - Items.thorium, StandardBullets.thoriumBig + Items.densealloy, Bullets.standardDenseBig, + Items.pyratite, Bullets.standardIncendiaryBig, + Items.thorium, Bullets.standardThoriumBig ); reload = 6f; coolantMultiplier = 0.5f; @@ -237,7 +237,7 @@ public class TurretBlocks extends BlockList implements ContentList{ }}; meltdown = new LaserTurret("meltdown"){{ - shootType = TurretBullets.meltdownLaser; + shootType = Bullets.meltdownLaser; shootEffect = ShootFx.shootBigSmoke2; shootCone = 40f; recoil = 4f; diff --git a/core/src/io/anuke/mindustry/content/bullets/ArtilleryBullets.java b/core/src/io/anuke/mindustry/content/bullets/ArtilleryBullets.java deleted file mode 100644 index 25169fca0f..0000000000 --- a/core/src/io/anuke/mindustry/content/bullets/ArtilleryBullets.java +++ /dev/null @@ -1,107 +0,0 @@ -package io.anuke.mindustry.content.bullets; - -import io.anuke.mindustry.content.fx.BulletFx; -import io.anuke.mindustry.content.fx.Fx; -import io.anuke.mindustry.entities.bullet.ArtilleryBulletType; -import io.anuke.mindustry.entities.bullet.BasicBulletType; -import io.anuke.mindustry.entities.bullet.BulletType; -import io.anuke.mindustry.graphics.Palette; -import io.anuke.mindustry.game.ContentList; - -public class ArtilleryBullets extends BulletList implements ContentList{ - public static BulletType dense, plastic, plasticFrag, homing, incendiary, explosive, surge, unit; - - @Override - public void load(){ - - dense = new ArtilleryBulletType(3f, 0, "shell"){{ - hitEffect = BulletFx.flakExplosion; - knockback = 0.8f; - lifetime = 50f; - bulletWidth = bulletHeight = 11f; - collidesTiles = false; - splashDamageRadius = 25f; - splashDamage = 33f; - }}; - - plasticFrag = new BasicBulletType(2.5f, 6, "bullet"){{ - bulletWidth = 10f; - bulletHeight = 12f; - bulletShrink = 1f; - lifetime = 15f; - backColor = Palette.plastaniumBack; - frontColor = Palette.plastaniumFront; - despawnEffect = Fx.none; - }}; - - plastic = new ArtilleryBulletType(3.3f, 0, "shell"){{ - hitEffect = BulletFx.plasticExplosion; - knockback = 1f; - lifetime = 55f; - bulletWidth = bulletHeight = 13f; - collidesTiles = false; - splashDamageRadius = 35f; - splashDamage = 35f; - fragBullet = plasticFrag; - fragBullets = 9; - backColor = Palette.plastaniumBack; - frontColor = Palette.plastaniumFront; - }}; - - homing = new ArtilleryBulletType(3f, 0, "shell"){{ - hitEffect = BulletFx.flakExplosion; - knockback = 0.8f; - lifetime = 45f; - bulletWidth = bulletHeight = 11f; - collidesTiles = false; - splashDamageRadius = 25f; - splashDamage = 33f; - homingPower = 2f; - homingRange = 50f; - }}; - - incendiary = new ArtilleryBulletType(3f, 0, "shell"){{ - hitEffect = BulletFx.blastExplosion; - knockback = 0.8f; - lifetime = 60f; - bulletWidth = bulletHeight = 13f; - collidesTiles = false; - splashDamageRadius = 25f; - splashDamage = 30f; - incendAmount = 4; - incendSpread = 11f; - frontColor = Palette.lightishOrange; - backColor = Palette.lightOrange; - trailEffect = BulletFx.incendTrail; - }}; - - explosive = new ArtilleryBulletType(2f, 0, "shell"){{ - hitEffect = BulletFx.blastExplosion; - knockback = 0.8f; - lifetime = 70f; - bulletWidth = bulletHeight = 14f; - collidesTiles = false; - splashDamageRadius = 45f; - splashDamage = 50f; - backColor = Palette.missileYellowBack; - frontColor = Palette.missileYellow; - }}; - - unit = new ArtilleryBulletType(2f, 0, "shell"){{ - hitEffect = BulletFx.blastExplosion; - knockback = 0.8f; - lifetime = 90f; - bulletWidth = bulletHeight = 14f; - collides = true; - collidesTiles = true; - splashDamageRadius = 45f; - splashDamage = 50f; - backColor = Palette.bulletYellowBack; - frontColor = Palette.bulletYellow; - }}; - - surge = new ArtilleryBulletType(3f, 0, "shell"){{ - //TODO - }}; - } -} diff --git a/core/src/io/anuke/mindustry/content/bullets/BulletList.java b/core/src/io/anuke/mindustry/content/bullets/BulletList.java deleted file mode 100644 index cfe4921b93..0000000000 --- a/core/src/io/anuke/mindustry/content/bullets/BulletList.java +++ /dev/null @@ -1,12 +0,0 @@ -package io.anuke.mindustry.content.bullets; - -import io.anuke.mindustry.game.ContentList; -import io.anuke.mindustry.type.ContentType; - -public abstract class BulletList implements ContentList{ - - @Override - public ContentType type(){ - return ContentType.bullet; - } -} diff --git a/core/src/io/anuke/mindustry/content/bullets/FlakBullets.java b/core/src/io/anuke/mindustry/content/bullets/FlakBullets.java deleted file mode 100644 index d312640e35..0000000000 --- a/core/src/io/anuke/mindustry/content/bullets/FlakBullets.java +++ /dev/null @@ -1,51 +0,0 @@ -package io.anuke.mindustry.content.bullets; - -import io.anuke.mindustry.content.fx.BulletFx; -import io.anuke.mindustry.entities.bullet.Bullet; -import io.anuke.mindustry.entities.bullet.BulletType; -import io.anuke.mindustry.entities.bullet.FlakBulletType; -import io.anuke.mindustry.entities.effect.Lightning; -import io.anuke.mindustry.graphics.Palette; -import io.anuke.mindustry.game.ContentList; -import io.anuke.arc.math.Mathf; - -public class FlakBullets extends BulletList implements ContentList{ - public static BulletType plastic, explosive, surge; - - @Override - public void load(){ - - - plastic = new FlakBulletType(4f, 5){ - { - splashDamageRadius = 40f; - fragBullet = ArtilleryBullets.plasticFrag; - fragBullets = 4; - hitEffect = BulletFx.plasticExplosion; - frontColor = Palette.plastaniumFront; - backColor = Palette.plastaniumBack; - } - }; - - explosive = new FlakBulletType(4f, 5){ - { - //default bullet type, no changes - } - }; - - surge = new FlakBulletType(4f, 7){ - { - splashDamage = 33f; - } - - @Override - public void despawned(Bullet b) { - super.despawned(b); - - for (int i = 0; i < 2; i++) { - Lightning.create(b.getTeam(), Palette.surge, damage, b.x, b.y, Mathf.random(360f), 12); - } - } - }; - } -} diff --git a/core/src/io/anuke/mindustry/content/bullets/MissileBullets.java b/core/src/io/anuke/mindustry/content/bullets/MissileBullets.java deleted file mode 100644 index f3a3d9092c..0000000000 --- a/core/src/io/anuke/mindustry/content/bullets/MissileBullets.java +++ /dev/null @@ -1,124 +0,0 @@ -package io.anuke.mindustry.content.bullets; - -import io.anuke.arc.graphics.Color; -import io.anuke.mindustry.content.fx.BulletFx; -import io.anuke.mindustry.entities.bullet.Bullet; -import io.anuke.mindustry.entities.bullet.BulletType; -import io.anuke.mindustry.entities.bullet.MissileBulletType; -import io.anuke.mindustry.entities.effect.Lightning; -import io.anuke.mindustry.graphics.Palette; -import io.anuke.mindustry.game.ContentList; -import io.anuke.arc.util.Time; -import io.anuke.arc.math.Mathf; - -public class MissileBullets extends BulletList implements ContentList{ - public static BulletType explosive, incindiary, surge, javelin, swarm; - - @Override - public void load(){ - - explosive = new MissileBulletType(1.8f, 10, "missile"){ - { - bulletWidth = 8f; - bulletHeight = 8f; - bulletShrink = 0f; - drag = -0.01f; - splashDamageRadius = 30f; - splashDamage = 30f; - lifetime = 150f; - hitEffect = BulletFx.blastExplosion; - despawnEffect = BulletFx.blastExplosion; - } - }; - - incindiary = new MissileBulletType(2f, 12, "missile"){ - { - frontColor = Palette.lightishOrange; - backColor = Palette.lightOrange; - bulletWidth = 7f; - bulletHeight = 8f; - bulletShrink = 0f; - drag = -0.01f; - homingPower = 7f; - splashDamageRadius = 10f; - splashDamage = 10f; - lifetime = 160f; - hitEffect = BulletFx.blastExplosion; - incendSpread = 10f; - incendAmount = 3; - } - }; - - surge = new MissileBulletType(3.5f, 15, "bullet"){ - { - bulletWidth = 8f; - bulletHeight = 8f; - bulletShrink = 0f; - drag = -0.01f; - splashDamageRadius = 30f; - splashDamage = 22f; - lifetime = 150f; - hitEffect = BulletFx.blastExplosion; - despawnEffect = BulletFx.blastExplosion; - } - - @Override - public void hit(Bullet b) { - super.hit(b); - - for (int i = 0; i < 2; i++) { - Lightning.create(b.getTeam(), Palette.surge, damage, b.x, b.y, Mathf.random(360f), 14); - } - } - }; - - javelin = new MissileBulletType(5f, 10.5f, "missile"){ - { - bulletWidth = 8f; - bulletHeight = 8f; - bulletShrink = 0f; - drag = -0.003f; - keepVelocity = false; - splashDamageRadius = 20f; - splashDamage = 1f; - lifetime = 90f; - trailColor = Color.valueOf("b6c6fd"); - hitEffect = BulletFx.blastExplosion; - despawnEffect = BulletFx.blastExplosion; - backColor = Palette.bulletYellowBack; - frontColor = Palette.bulletYellow; - } - - @Override - public void update(Bullet b){ - super.update(b); - b.velocity().rotate(Mathf.sin(Time.time() + b.id * 4422, 8f, 2f)); - } - }; - - swarm = new MissileBulletType(2.7f, 12, "missile"){ - { - bulletWidth = 8f; - bulletHeight = 8f; - bulletShrink = 0f; - drag = -0.003f; - homingRange = 60f; - keepVelocity = false; - splashDamageRadius = 25f; - splashDamage = 10f; - lifetime = 120f; - trailColor = Color.GRAY; - backColor = Palette.bulletYellowBack; - frontColor = Palette.bulletYellow; - hitEffect = BulletFx.blastExplosion; - despawnEffect = BulletFx.blastExplosion; - } - - @Override - public void update(Bullet b){ - super.update(b); - b.velocity().rotate(Mathf.sin(Time.time() + b.id * 4422, 8f, 2f)); - } - }; - } -} diff --git a/core/src/io/anuke/mindustry/content/bullets/StandardBullets.java b/core/src/io/anuke/mindustry/content/bullets/StandardBullets.java deleted file mode 100644 index 54670e3484..0000000000 --- a/core/src/io/anuke/mindustry/content/bullets/StandardBullets.java +++ /dev/null @@ -1,101 +0,0 @@ -package io.anuke.mindustry.content.bullets; - -import io.anuke.arc.graphics.Color; -import io.anuke.mindustry.content.fx.BulletFx; -import io.anuke.mindustry.content.fx.ShootFx; -import io.anuke.mindustry.entities.bullet.BasicBulletType; -import io.anuke.mindustry.entities.bullet.BulletType; -import io.anuke.mindustry.game.ContentList; -import io.anuke.mindustry.graphics.Palette; - -public class StandardBullets extends BulletList implements ContentList{ - public static BulletType copper, dense, thorium, homing, tracer, mechSmall, glaive, denseBig, thoriumBig, tracerBig; - - @Override - public void load(){ - - copper = new BasicBulletType(2.5f, 7, "bullet"){{ - bulletWidth = 7f; - bulletHeight = 9f; - shootEffect = ShootFx.shootSmall; - smokeEffect = ShootFx.shootSmallSmoke; - ammoMultiplier = 5; - }}; - - dense = new BasicBulletType(3.5f, 18, "bullet"){{ - bulletWidth = 9f; - bulletHeight = 12f; - armorPierce = 0.2f; - reloadMultiplier = 0.6f; - ammoMultiplier = 2; - }}; - - thorium = new BasicBulletType(4f, 29, "bullet"){{ - bulletWidth = 10f; - bulletHeight = 13f; - armorPierce = 0.5f; - shootEffect = ShootFx.shootBig; - smokeEffect = ShootFx.shootBigSmoke; - ammoMultiplier = 2; - }}; - - homing = new BasicBulletType(3f, 9, "bullet"){{ - bulletWidth = 7f; - bulletHeight = 9f; - homingPower = 5f; - reloadMultiplier = 1.4f; - ammoMultiplier = 5; - }}; - - tracer = new BasicBulletType(3.2f, 11, "bullet"){{ - bulletWidth = 10f; - bulletHeight = 12f; - frontColor = Palette.lightishOrange; - backColor = Palette.lightOrange; - incendSpread = 3f; - incendAmount = 1; - incendChance = 0.3f; - inaccuracy = 3f; - }}; - - glaive = new BasicBulletType(4f, 7.5f, "bullet"){{ - bulletWidth = 10f; - bulletHeight = 12f; - frontColor = Color.valueOf("feb380"); - backColor = Color.valueOf("ea8878"); - incendSpread = 3f; - incendAmount = 1; - incendChance = 0.3f; - }}; - - mechSmall = new BasicBulletType(4f, 9, "bullet"){{ - bulletWidth = 11f; - bulletHeight = 14f; - lifetime = 40f; - inaccuracy = 5f; - despawnEffect = BulletFx.hitBulletSmall; - }}; - - denseBig = new BasicBulletType(7f, 42, "bullet"){{ - bulletWidth = 15f; - bulletHeight = 21f; - armorPierce = 0.2f; - }}; - - thoriumBig = new BasicBulletType(8f, 65, "bullet"){{ - bulletWidth = 16f; - bulletHeight = 23f; - armorPierce = 0.5f; - }}; - - tracerBig = new BasicBulletType(7f, 38, "bullet"){{ - bulletWidth = 16f; - bulletHeight = 21f; - frontColor = Palette.lightishOrange; - backColor = Palette.lightOrange; - incendSpread = 3f; - incendAmount = 2; - incendChance = 0.3f; - }}; - } -} diff --git a/core/src/io/anuke/mindustry/content/bullets/TurretBullets.java b/core/src/io/anuke/mindustry/content/bullets/TurretBullets.java deleted file mode 100644 index bbc3d6336d..0000000000 --- a/core/src/io/anuke/mindustry/content/bullets/TurretBullets.java +++ /dev/null @@ -1,425 +0,0 @@ -package io.anuke.mindustry.content.bullets; - -import io.anuke.arc.entities.Effects; -import io.anuke.arc.graphics.Color; -import io.anuke.arc.graphics.g2d.CapStyle; -import io.anuke.arc.graphics.g2d.Draw; -import io.anuke.arc.graphics.g2d.Fill; -import io.anuke.arc.graphics.g2d.Lines; -import io.anuke.arc.math.Angles; -import io.anuke.arc.math.Mathf; -import io.anuke.arc.util.Time; -import io.anuke.arc.util.Tmp; -import io.anuke.mindustry.content.Liquids; -import io.anuke.mindustry.content.StatusEffects; -import io.anuke.mindustry.content.fx.BlockFx; -import io.anuke.mindustry.content.fx.BulletFx; -import io.anuke.mindustry.content.fx.EnvironmentFx; -import io.anuke.mindustry.content.fx.Fx; -import io.anuke.mindustry.entities.Damage; -import io.anuke.mindustry.entities.bullet.Bullet; -import io.anuke.mindustry.entities.bullet.BulletType; -import io.anuke.mindustry.entities.bullet.LiquidBulletType; -import io.anuke.mindustry.entities.effect.Fire; -import io.anuke.mindustry.entities.effect.Lightning; -import io.anuke.mindustry.game.ContentList; -import io.anuke.mindustry.graphics.Palette; -import io.anuke.mindustry.graphics.Shapes; -import io.anuke.mindustry.world.Tile; -import io.anuke.mindustry.world.blocks.BuildBlock; -import io.anuke.mindustry.world.blocks.distribution.MassDriver.DriverBulletData; - -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, burstLaser, meltdownLaser, - fuseShot, waterShot, cryoShot, lavaShot, oilShot, lightning, driverBolt, healBullet, arc, damageLightning; - - @Override - public void load(){ - - damageLightning = new BulletType(0.0001f, 0f){ - { - lifetime = Lightning.lifetime; - hitEffect = BulletFx.hitLancer; - despawnEffect = Fx.none; - status = StatusEffects.shocked; - statusIntensity = 1f; - } - }; - - healBullet = new BulletType(5.2f, 13){ - float healPercent = 3f; - - { - hitEffect = BulletFx.hitLaser; - despawnEffect = BulletFx.hitLaser; - collidesTeam = true; - } - - @Override - public boolean collides(Bullet b, Tile tile){ - return tile.getTeam() != b.getTeam() || tile.entity.healthf() < 1f; - } - - @Override - public void draw(Bullet b){ - Draw.color(Palette.heal); - Lines.stroke(2f); - Lines.lineAngleCenter(b.x, b.y, b.rot(), 7f); - Draw.color(Color.WHITE); - Lines.lineAngleCenter(b.x, b.y, b.rot(), 3f); - Draw.reset(); - } - - @Override - public void hitTile(Bullet b, Tile tile){ - super.hit(b); - tile = tile.target(); - - if(tile != null && tile.getTeam() == b.getTeam() && !(tile.block() instanceof BuildBlock)){ - Effects.effect(BlockFx.healBlockFull, Palette.heal, tile.drawx(), tile.drawy(), tile.block().size); - tile.entity.healBy(healPercent / 100f * tile.entity.maxHealth()); - } - } - }; - - fireball = new BulletType(1f, 4){ - { - pierce = true; - hitTiles = false; - collides = false; - collidesTiles = false; - drag = 0.03f; - hitEffect = despawnEffect = Fx.none; - } - - @Override - public void init(Bullet b){ - b.velocity().setLength(0.6f + Mathf.random(2f)); - } - - @Override - public void draw(Bullet b){ - //TODO add color to the bullet depending on the color of the flame it came from - Draw.color(Palette.lightFlame, Palette.darkFlame, Color.GRAY, b.fin()); - Fill.circle(b.x, b.y, 3f * b.fout()); - Draw.reset(); - } - - @Override - public void update(Bullet b){ - if(Mathf.chance(0.04 * Time.delta())){ - Tile tile = world.tileWorld(b.x, b.y); - if(tile != null){ - Fire.create(tile); - } - } - - if(Mathf.chance(0.1 * Time.delta())){ - Effects.effect(EnvironmentFx.fireballsmoke, b.x, b.y); - } - - if(Mathf.chance(0.1 * Time.delta())){ - Effects.effect(EnvironmentFx.ballfire, b.x, b.y); - } - } - }; - - basicFlame = new BulletType(2.3f, 5){ - { - hitSize = 7f; - lifetime = 35f; - pierce = true; - drag = 0.05f; - hitEffect = BulletFx.hitFlameSmall; - despawnEffect = Fx.none; - status = StatusEffects.burning; - } - - @Override - public void draw(Bullet b){ - } - }; - - lancerLaser = new BulletType(0.001f, 140){ - Color[] colors = {Palette.lancerLaser.cpy().mul(1f, 1f, 1f, 0.4f), Palette.lancerLaser, Color.WHITE}; - float[] tscales = {1f, 0.7f, 0.5f, 0.2f}; - float[] lenscales = {1f, 1.1f, 1.13f, 1.14f}; - float length = 100f; - - { - hitEffect = BulletFx.hitLancer; - despawnEffect = Fx.none; - hitSize = 4; - lifetime = 16f; - pierce = true; - } - - @Override - public void init(Bullet b){ - Damage.collideLine(b, b.getTeam(), hitEffect, b.x, b.y, b.rot(), length); - } - - @Override - public void draw(Bullet b){ - float f = Mathf.curve(b.fin(), 0f, 0.2f); - float baseLen = length * f; - - Lines.lineAngle(b.x, b.y, b.rot(), baseLen); - for(int s = 0; s < 3; s++){ - Draw.color(colors[s]); - for(int i = 0; i < tscales.length; i++){ - Lines.stroke(7f * b.fout() * (s == 0 ? 1.5f : s == 1 ? 1f : 0.3f) * tscales[i]); - Lines.lineAngle(b.x, b.y, b.rot(), baseLen * lenscales[i]); - } - } - Draw.reset(); - } - }; - - 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}; - float[] strokes = {2f, 1.5f, 1f, 0.3f}; - float[] lenscales = {1f, 1.12f, 1.15f, 1.17f}; - float length = 200f; - - { - hitEffect = BulletFx.hitMeltdown; - despawnEffect = Fx.none; - hitSize = 4; - drawSize = 420f; - lifetime = 16f; - pierce = true; - } - - @Override - public void update(Bullet b){ - if(b.timer.get(1, 5f)){ - Damage.collideLine(b, b.getTeam(), hitEffect, b.x, b.y, b.rot(), length); - } - Effects.shake(1f, 1f, b.x, b.y); - } - - @Override - 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+Mathf.range(5f), hity+Mathf.range(5f))); - } - } - - @Override - public void draw(Bullet b){ - float baseLen = (length) * b.fout(); - - Lines.lineAngle(b.x, b.y, b.rot(), baseLen); - for(int s = 0; s < colors.length; s++){ - Draw.color(tmpColor.set(colors[s]).mul(1f + Mathf.absin(Time.time(), 1f, 0.1f))); - for(int i = 0; i < tscales.length; i++){ - Tmp.v1.trns(b.rot() + 180f, (lenscales[i] - 1f) * 35f); - Lines.stroke((9f + Mathf.absin(Time.time(), 0.8f, 1.5f)) * b.fout() * strokes[s] * tscales[i]); - Lines.lineAngle(b.x + Tmp.v1.x, b.y + Tmp.v1.y, b.rot(), baseLen * lenscales[i], CapStyle.none); - } - } - Draw.reset(); - } - }; - - fuseShot = new BulletType(0.01f, 70){ - int rays = 3; - float raySpace = 2f; - float rayLength = 80f; - { - hitEffect = BulletFx.hitFuse; - lifetime = 13f; - despawnEffect = Fx.none; - pierce = true; - } - - @Override - public void init(Bullet b) { - for (int i = 0; i < rays; i++) { - Damage.collideLine(b, b.getTeam(), hitEffect, b.x, b.y, b.rot(), rayLength - Math.abs(i - (rays/2))*20f); - } - } - - @Override - public void draw(Bullet b) { - super.draw(b); - Draw.color(Color.WHITE, Palette.surge, b.fin()); - for(int i = 0; i < 7; i++){ - Tmp.v1.trns(b.rot(), i * 8f); - float sl = Mathf.clamp(b.fout()-0.5f) * (80f - i *10); - Shapes.tri(b.x + Tmp.v1.x, b.y + Tmp.v1.y, 4f, sl, b.rot() + 90); - Shapes.tri(b.x + Tmp.v1.x, b.y + Tmp.v1.y, 4f, sl, b.rot() - 90); - } - Shapes.tri(b.x, b.y, 13f, (rayLength+50) * b.fout(), b.rot()); - Shapes.tri(b.x, b.y, 13f, 10f * b.fout(), b.rot() + 180f); - Draw.reset(); - } - }; - - waterShot = new LiquidBulletType(Liquids.water){ - { - status = StatusEffects.wet; - statusIntensity = 0.5f; - knockback = 0.65f; - } - }; - cryoShot = new LiquidBulletType(Liquids.cryofluid){ - { - status = StatusEffects.freezing; - statusIntensity = 0.5f; - } - }; - lavaShot = new LiquidBulletType(Liquids.lava){ - { - damage = 4; - speed = 1.9f; - drag = 0.03f; - status = StatusEffects.melting; - statusIntensity = 0.5f; - } - }; - oilShot = new LiquidBulletType(Liquids.oil){ - { - speed = 2f; - drag = 0.03f; - status = StatusEffects.tarred; - statusIntensity = 0.5f; - } - }; - - lightning = new BulletType(0.001f, 12f){ - { - lifetime = 1f; - despawnEffect = Fx.none; - hitEffect = BulletFx.hitLancer; - keepVelocity = false; - } - - @Override - public void draw(Bullet b){ - } - - @Override - public void init(Bullet b){ - Lightning.create(b.getTeam(), Palette.lancerLaser, damage, b.x, b.y, b.rot(), 30); - } - }; - - arc = new BulletType(0.001f, 26){ - { - lifetime = 1; - despawnEffect = Fx.none; - hitEffect = BulletFx.hitLancer; - } - - @Override - public void draw(Bullet b){ - } - - @Override - public void init(Bullet b){ - Lightning.create(b.getTeam(), Palette.lancerLaser, damage, b.x, b.y, b.rot(), 36); - } - }; - - driverBolt = new BulletType(5.3f, 50){ - { - collidesTiles = false; - lifetime = 200f; - despawnEffect = BlockFx.smeltsmoke; - hitEffect = BulletFx.hitBulletBig; - drag = 0.005f; - } - - @Override - public void draw(Bullet b){ - float w = 11f, h = 13f; - - Draw.color(Palette.bulletYellowBack); - Draw.rect("shell-back", b.x, b.y, w, h, b.rot() + 90); - - Draw.color(Palette.bulletYellow); - Draw.rect("shell", b.x, b.y, w, h, b.rot() + 90); - - Draw.reset(); - } - - @Override - public void update(Bullet b){ - //data MUST be an instance of DriverBulletData - if(!(b.getData() instanceof DriverBulletData)){ - hit(b); - return; - } - - float hitDst = 7f; - - DriverBulletData data = (DriverBulletData) b.getData(); - - //if the target is dead, just keep flying until the bullet explodes - if(data.to.isDead()){ - return; - } - - float baseDst = data.from.dst(data.to); - float dst1 = b.dst(data.from); - float dst2 = b.dst(data.to); - - boolean intersect = false; - - //bullet has gone past the destination point: but did it intersect it? - if(dst1 > baseDst){ - float angleTo = b.angleTo(data.to); - float baseAngle = data.to.angleTo(data.from); - - //if angles are nearby, then yes, it did - if(Angles.near(angleTo, baseAngle, 2f)){ - intersect = true; - //snap bullet position back; this is used for low-FPS situations - b.set(data.to.x + Angles.trnsx(baseAngle, hitDst), data.to.y + Angles.trnsy(baseAngle, hitDst)); - } - } - - //if on course and it's in range of the target - if(Math.abs(dst1 + dst2 - baseDst) < 4f && dst2 <= hitDst){ - intersect = true; - } //else, bullet has gone off course, does not get recieved. - - if(intersect){ - data.to.handlePayload(b, data); - } - } - - @Override - public void despawned(Bullet b){ - super.despawned(b); - - if(!(b.getData() instanceof DriverBulletData)) return; - - DriverBulletData data = (DriverBulletData) b.getData(); - data.to.isRecieving = false; - - for(int i = 0; i < data.items.length; i++){ - int amountDropped = Mathf.random(0, data.items[i]); - if(amountDropped > 0){ - float angle = b.rot() + Mathf.range(100f); - Effects.effect(EnvironmentFx.dropItem, Color.WHITE, b.x, b.y, angle, content.item(i)); - } - } - } - - @Override - public void hit(Bullet b, float hitx, float hity){ - super.hit(b, hitx, hity); - despawned(b); - } - }; - } -} diff --git a/core/src/io/anuke/mindustry/content/bullets/WeaponBullets.java b/core/src/io/anuke/mindustry/content/bullets/WeaponBullets.java deleted file mode 100644 index 6052ee1b6b..0000000000 --- a/core/src/io/anuke/mindustry/content/bullets/WeaponBullets.java +++ /dev/null @@ -1,99 +0,0 @@ -package io.anuke.mindustry.content.bullets; - -import io.anuke.arc.graphics.Color; -import io.anuke.mindustry.content.Liquids; -import io.anuke.mindustry.content.fx.BlockFx; -import io.anuke.mindustry.content.fx.BulletFx; -import io.anuke.mindustry.entities.bullet.BasicBulletType; -import io.anuke.mindustry.entities.bullet.BombBulletType; -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.Puddle; -import io.anuke.mindustry.graphics.Palette; -import io.anuke.mindustry.world.Tile; -import io.anuke.arc.math.Mathf; - -import static io.anuke.mindustry.Vars.world; - -public class WeaponBullets extends BulletList{ - public static BulletType tungstenShotgun, bombExplosive, bombIncendiary, bombOil, shellCarbide; - - @Override - public void load(){ - tungstenShotgun = new BasicBulletType(5f, 8, "bullet"){ - { - bulletWidth = 8f; - bulletHeight = 9f; - bulletShrink = 0.5f; - lifetime = 50f; - drag = 0.04f; - } - }; - - bombExplosive = new BombBulletType(10f, 20f, "shell"){ - { - bulletWidth = 9f; - bulletHeight = 13f; - hitEffect = BulletFx.flakExplosion; - } - }; - - bombIncendiary = new BombBulletType(7f, 10f, "shell"){ - { - bulletWidth = 8f; - bulletHeight = 12f; - hitEffect = BulletFx.flakExplosion; - backColor = Palette.lightOrange; - frontColor = Palette.lightishOrange; - } - - @Override - public void hit(Bullet b, float x, float y){ - super.hit(b, x, y); - - for(int i = 0; i < 3; i++){ - float cx = x + Mathf.range(10f); - float cy = y + Mathf.range(10f); - Tile tile = world.tileWorld(cx, cy); - if(tile != null){ - Fire.create(tile); - } - } - } - }; - - bombOil = new BombBulletType(2f, 3f, "shell"){ - { - bulletWidth = 8f; - bulletHeight = 12f; - hitEffect = BlockFx.pulverize; - backColor = new Color(0x4f4f4fff); - frontColor = Color.GRAY; - } - - @Override - public void hit(Bullet b, float x, float y){ - super.hit(b, x, y); - - for(int i = 0; i < 3; i++){ - Tile tile = world.tileWorld(x + Mathf.range(8f), y + Mathf.range(8f)); - Puddle.deposit(tile, Liquids.oil, 5f); - } - } - }; - - shellCarbide = new BasicBulletType(3.4f, 20, "bullet"){ - { - bulletWidth = 10f; - bulletHeight = 12f; - bulletShrink = 0.4f; - lifetime = 40f; - drag = 0.025f; - fragBullets = 5; - hitEffect = BulletFx.flakExplosion; - fragBullet = tungstenShotgun; - } - }; - } -} diff --git a/core/src/io/anuke/mindustry/core/ContentLoader.java b/core/src/io/anuke/mindustry/core/ContentLoader.java index 8cbb87673c..e425e33e21 100644 --- a/core/src/io/anuke/mindustry/core/ContentLoader.java +++ b/core/src/io/anuke/mindustry/core/ContentLoader.java @@ -7,7 +7,6 @@ import io.anuke.arc.function.Consumer; import io.anuke.arc.util.Log; import io.anuke.mindustry.content.*; import io.anuke.mindustry.content.blocks.*; -import io.anuke.mindustry.content.bullets.*; import io.anuke.mindustry.content.fx.*; import io.anuke.mindustry.entities.Player; import io.anuke.mindustry.entities.bullet.Bullet; @@ -60,12 +59,7 @@ public class ContentLoader{ new Liquids(), //bullets - new ArtilleryBullets(), - new FlakBullets(), - new MissileBullets(), - new StandardBullets(), - new TurretBullets(), - new WeaponBullets(), + new Bullets(), //weapons new Weapons(), @@ -275,7 +269,5 @@ public class ContentLoader{ TypeTrait.registerType(Lightning.class, Lightning::new); } - private class ImpendingDoomException extends RuntimeException{ - public ImpendingDoomException(String s){ super(s); } - } + private class ImpendingDoomException extends RuntimeException{ ImpendingDoomException(String s){ super(s); }} } diff --git a/core/src/io/anuke/mindustry/entities/Damage.java b/core/src/io/anuke/mindustry/entities/Damage.java index 27713c81ea..49ad873375 100644 --- a/core/src/io/anuke/mindustry/entities/Damage.java +++ b/core/src/io/anuke/mindustry/entities/Damage.java @@ -10,7 +10,7 @@ import io.anuke.arc.math.geom.Geometry; import io.anuke.arc.math.geom.Rectangle; import io.anuke.arc.math.geom.Vector2; import io.anuke.arc.util.Time; -import io.anuke.mindustry.content.bullets.TurretBullets; +import io.anuke.mindustry.content.Bullets; import io.anuke.mindustry.content.fx.ExplosionFx; import io.anuke.mindustry.entities.bullet.Bullet; import io.anuke.mindustry.entities.effect.Fire; @@ -37,7 +37,7 @@ public class Damage{ } for(int i = 0; i < Mathf.clamp(flammability / 4, 0, 30); i++){ - Time.run(i / 2f, () -> Call.createBullet(TurretBullets.fireball, x, y, Mathf.random(360f))); + Time.run(i / 2f, () -> Call.createBullet(Bullets.fireball, x, y, Mathf.random(360f))); } int waves = Mathf.clamp((int) (explosiveness / 4), 0, 30); diff --git a/core/src/io/anuke/mindustry/entities/bullet/BasicBulletType.java b/core/src/io/anuke/mindustry/entities/bullet/BasicBulletType.java index 7f044fbcd5..6152de43fa 100644 --- a/core/src/io/anuke/mindustry/entities/bullet/BasicBulletType.java +++ b/core/src/io/anuke/mindustry/entities/bullet/BasicBulletType.java @@ -10,6 +10,7 @@ import io.anuke.arc.math.Mathf; import io.anuke.arc.util.Time; import io.anuke.mindustry.entities.Damage; import io.anuke.mindustry.entities.Units; +import io.anuke.mindustry.entities.effect.Lightning; import io.anuke.mindustry.entities.traits.TargetTrait; import io.anuke.mindustry.graphics.Palette; @@ -34,6 +35,9 @@ public class BasicBulletType extends BulletType{ public float homingPower = 0f; public float homingRange = 50f; + public int lightining; + public int lightningLength = 5; + public TextureRegion backRegion; public TextureRegion frontRegion; @@ -102,5 +106,9 @@ public class BasicBulletType extends BulletType{ if(fragBullet != null || splashDamageRadius > 0){ hit(b); } + + for (int i = 0; i < lightining; i++) { + Lightning.create(b.getTeam(), Palette.surge, damage, b.x, b.y, Mathf.random(360f), lightningLength); + } } } diff --git a/core/src/io/anuke/mindustry/entities/bullet/LiquidBulletType.java b/core/src/io/anuke/mindustry/entities/bullet/LiquidBulletType.java index b3877c26de..90a396839d 100644 --- a/core/src/io/anuke/mindustry/entities/bullet/LiquidBulletType.java +++ b/core/src/io/anuke/mindustry/entities/bullet/LiquidBulletType.java @@ -25,6 +25,8 @@ public class LiquidBulletType extends BulletType{ this.liquid = liquid; lifetime = 70f; + status = liquid.effect; + statusIntensity = 0.5f; despawnEffect = Fx.none; hitEffect = BulletFx.hitLiquid; drag = 0.01f; diff --git a/core/src/io/anuke/mindustry/entities/bullet/MassDriverBolt.java b/core/src/io/anuke/mindustry/entities/bullet/MassDriverBolt.java new file mode 100644 index 0000000000..b263b81ab6 --- /dev/null +++ b/core/src/io/anuke/mindustry/entities/bullet/MassDriverBolt.java @@ -0,0 +1,109 @@ +package io.anuke.mindustry.entities.bullet; + +import io.anuke.arc.entities.Effects; +import io.anuke.arc.graphics.Color; +import io.anuke.arc.graphics.g2d.Draw; +import io.anuke.arc.math.Angles; +import io.anuke.arc.math.Mathf; +import io.anuke.mindustry.content.fx.BlockFx; +import io.anuke.mindustry.content.fx.BulletFx; +import io.anuke.mindustry.content.fx.EnvironmentFx; +import io.anuke.mindustry.graphics.Palette; +import io.anuke.mindustry.world.blocks.distribution.MassDriver.DriverBulletData; + +import static io.anuke.mindustry.Vars.content; + +public class MassDriverBolt extends BulletType{ + + public MassDriverBolt(){ + super(5.3f, 50); + collidesTiles = false; + lifetime = 200f; + despawnEffect = BlockFx.smeltsmoke; + hitEffect = BulletFx.hitBulletBig; + drag = 0.005f; + } + + @Override + public void draw(Bullet b){ + float w = 11f, h = 13f; + + Draw.color(Palette.bulletYellowBack); + Draw.rect("shell-back", b.x, b.y, w, h, b.rot() + 90); + + Draw.color(Palette.bulletYellow); + Draw.rect("shell", b.x, b.y, w, h, b.rot() + 90); + + Draw.reset(); + } + + @Override + public void update(Bullet b){ + //data MUST be an instance of DriverBulletData + if(!(b.getData() instanceof DriverBulletData)){ + hit(b); + return; + } + + float hitDst = 7f; + + DriverBulletData data = (DriverBulletData) b.getData(); + + //if the target is dead, just keep flying until the bullet explodes + if(data.to.isDead()){ + return; + } + + float baseDst = data.from.dst(data.to); + float dst1 = b.dst(data.from); + float dst2 = b.dst(data.to); + + boolean intersect = false; + + //bullet has gone past the destination point: but did it intersect it? + if(dst1 > baseDst){ + float angleTo = b.angleTo(data.to); + float baseAngle = data.to.angleTo(data.from); + + //if angles are nearby, then yes, it did + if(Angles.near(angleTo, baseAngle, 2f)){ + intersect = true; + //snap bullet position back; this is used for low-FPS situations + b.set(data.to.x + Angles.trnsx(baseAngle, hitDst), data.to.y + Angles.trnsy(baseAngle, hitDst)); + } + } + + //if on course and it's in range of the target + if(Math.abs(dst1 + dst2 - baseDst) < 4f && dst2 <= hitDst){ + intersect = true; + } //else, bullet has gone off course, does not get recieved. + + if(intersect){ + data.to.handlePayload(b, data); + } + } + + @Override + public void despawned(Bullet b){ + super.despawned(b); + + if(!(b.getData() instanceof DriverBulletData)) return; + + DriverBulletData data = (DriverBulletData) b.getData(); + data.to.isRecieving = false; + + for(int i = 0; i < data.items.length; i++){ + int amountDropped = Mathf.random(0, data.items[i]); + if(amountDropped > 0){ + float angle = b.rot() + Mathf.range(100f); + Effects.effect(EnvironmentFx.dropItem, Color.WHITE, b.x, b.y, angle, content.item(i)); + } + } + } + + @Override + public void hit(Bullet b, float hitx, float hity){ + super.hit(b, hitx, hity); + despawned(b); + } +} diff --git a/core/src/io/anuke/mindustry/entities/bullet/MissileBulletType.java b/core/src/io/anuke/mindustry/entities/bullet/MissileBulletType.java index d27e2f222f..b62b83787a 100644 --- a/core/src/io/anuke/mindustry/entities/bullet/MissileBulletType.java +++ b/core/src/io/anuke/mindustry/entities/bullet/MissileBulletType.java @@ -10,6 +10,9 @@ import io.anuke.arc.math.Mathf; public class MissileBulletType extends BasicBulletType{ protected Color trailColor = Palette.missileYellowBack; + protected float weaveScale = 0f; + protected float weaveMag = -1f; + public MissileBulletType(float speed, float damage, String bulletSprite){ super(speed, damage, bulletSprite); backColor = Palette.missileYellowBack; @@ -24,5 +27,9 @@ public class MissileBulletType extends BasicBulletType{ if(Mathf.chance(Time.delta() * 0.2)){ Effects.effect(BulletFx.missileTrail, trailColor, b.x, b.y, 2f); } + + if(weaveMag > 0){ + b.velocity().rotate(Mathf.sin(Time.time() + b.id * 4422, weaveScale, weaveMag)); + } } } diff --git a/core/src/io/anuke/mindustry/entities/effect/Fire.java b/core/src/io/anuke/mindustry/entities/effect/Fire.java index 36e2f03ac5..359a0b1d09 100644 --- a/core/src/io/anuke/mindustry/entities/effect/Fire.java +++ b/core/src/io/anuke/mindustry/entities/effect/Fire.java @@ -13,8 +13,8 @@ import io.anuke.arc.util.Structs; import io.anuke.arc.util.Time; import io.anuke.arc.util.pooling.Pool.Poolable; import io.anuke.arc.util.pooling.Pools; +import io.anuke.mindustry.content.Bullets; import io.anuke.mindustry.content.StatusEffects; -import io.anuke.mindustry.content.bullets.TurretBullets; import io.anuke.mindustry.content.fx.EnvironmentFx; import io.anuke.mindustry.entities.Damage; import io.anuke.mindustry.entities.TileEntity; @@ -136,7 +136,7 @@ public class Fire extends TimedEntity implements SaveTrait, SyncTrait, Poolable{ create(other); if(Mathf.chance(fireballChance * Time.delta() * Mathf.clamp(flammability / 10f))){ - Call.createBullet(TurretBullets.fireball, x, y, Mathf.random(360f)); + Call.createBullet(Bullets.fireball, x, y, Mathf.random(360f)); } } diff --git a/core/src/io/anuke/mindustry/entities/effect/Lightning.java b/core/src/io/anuke/mindustry/entities/effect/Lightning.java index a26ce41eea..7ee5e771af 100644 --- a/core/src/io/anuke/mindustry/entities/effect/Lightning.java +++ b/core/src/io/anuke/mindustry/entities/effect/Lightning.java @@ -19,7 +19,7 @@ import io.anuke.arc.math.geom.Position; import io.anuke.arc.math.geom.Rectangle; import io.anuke.arc.math.geom.Vector2; import io.anuke.arc.util.pooling.Pools; -import io.anuke.mindustry.content.bullets.TurretBullets; +import io.anuke.mindustry.content.Bullets; import io.anuke.mindustry.entities.Unit; import io.anuke.mindustry.entities.Units; import io.anuke.mindustry.entities.bullet.Bullet; @@ -72,7 +72,7 @@ public class Lightning extends TimedEntity implements DrawTrait, SyncTrait, Time hit.clear(); for (int i = 0; i < length/2; i++) { - Bullet.create(TurretBullets.damageLightning, l, team, x, y, 0f, 1f, 1f, dmg); + Bullet.create(Bullets.damageLightning, l, team, x, y, 0f, 1f, 1f, dmg); l.lines.add(new Vector2(x + Mathf.range(3f), y + Mathf.range(3f))); rect.setSize(hitRange).setCenter(x, y); diff --git a/core/src/io/anuke/mindustry/entities/effect/Puddle.java b/core/src/io/anuke/mindustry/entities/effect/Puddle.java index d88fd53e9f..e134b9a069 100644 --- a/core/src/io/anuke/mindustry/entities/effect/Puddle.java +++ b/core/src/io/anuke/mindustry/entities/effect/Puddle.java @@ -20,7 +20,7 @@ import io.anuke.arc.util.pooling.Pool.Poolable; import io.anuke.arc.util.pooling.Pools; import io.anuke.mindustry.content.Liquids; import io.anuke.mindustry.content.blocks.Blocks; -import io.anuke.mindustry.content.bullets.TurretBullets; +import io.anuke.mindustry.content.Bullets; import io.anuke.mindustry.content.fx.BlockFx; import io.anuke.mindustry.content.fx.EnvironmentFx; import io.anuke.mindustry.entities.Units; @@ -130,7 +130,7 @@ public class Puddle extends SolidEntity implements SaveTrait, Poolable, DrawTrai (liquid.flammability > 0.3f && dest.temperature > 0.7f)){ //flammable liquid + hot liquid Fire.create(tile); if(Mathf.chance(0.006 * amount)){ - Call.createBullet(TurretBullets.fireball, x, y, Mathf.random(360f)); + Call.createBullet(Bullets.fireball, x, y, Mathf.random(360f)); } }else if(dest.temperature > 0.7f && liquid.temperature < 0.55f){ //cold liquid poured onto hot puddle if(Mathf.chance(0.5f * amount)){ diff --git a/core/src/io/anuke/mindustry/world/blocks/defense/turrets/PowerTurret.java b/core/src/io/anuke/mindustry/world/blocks/defense/turrets/PowerTurret.java index f702e0a5b3..7b806c0150 100644 --- a/core/src/io/anuke/mindustry/world/blocks/defense/turrets/PowerTurret.java +++ b/core/src/io/anuke/mindustry/world/blocks/defense/turrets/PowerTurret.java @@ -6,6 +6,7 @@ import io.anuke.mindustry.world.meta.BlockStat; import io.anuke.mindustry.world.meta.StatUnit; public abstract class PowerTurret extends CooledTurret{ + //TODO recode this class, satisfaction must be 100%! /** The percentage of power which will be used per shot. */ protected float powerUsed = 0.5f; protected BulletType shootType; diff --git a/core/src/io/anuke/mindustry/world/blocks/distribution/MassDriver.java b/core/src/io/anuke/mindustry/world/blocks/distribution/MassDriver.java index 13a15f3cad..8339a7c1bd 100644 --- a/core/src/io/anuke/mindustry/world/blocks/distribution/MassDriver.java +++ b/core/src/io/anuke/mindustry/world/blocks/distribution/MassDriver.java @@ -15,7 +15,8 @@ import io.anuke.arc.math.Mathf; import io.anuke.arc.util.Time; import io.anuke.arc.util.pooling.Pool.Poolable; import io.anuke.arc.util.pooling.Pools; -import io.anuke.mindustry.content.bullets.TurretBullets; +import io.anuke.mindustry.content.Bullets; +import io.anuke.mindustry.content.Bullets; import io.anuke.mindustry.content.fx.BlockFx; import io.anuke.mindustry.content.fx.EnvironmentFx; import io.anuke.mindustry.content.fx.ShootFx; @@ -98,7 +99,7 @@ public class MassDriver extends Block{ float angle = tile.angleTo(target); other.isRecieving = true; - Bullet.create(TurretBullets.driverBolt, entity, entity.getTeam(), + Bullet.create(Bullets.driverBolt, entity, entity.getTeam(), tile.drawx() + Angles.trnsx(angle, driver.translation), tile.drawy() + Angles.trnsy(angle, driver.translation), angle, 1f, 1f, data); From a1a69f62e183b37629104514569775c18267f1a9 Mon Sep 17 00:00:00 2001 From: Anuken Date: Mon, 7 Jan 2019 17:11:53 -0500 Subject: [PATCH 4/6] :crab: FX classes are gone :crab: --- .../io/anuke/mindustry/content/Bullets.java | 75 +- core/src/io/anuke/mindustry/content/Fx.java | 814 ++++++++++++++++++ .../src/io/anuke/mindustry/content/Mechs.java | 10 +- .../mindustry/content/StatusEffects.java | 15 +- .../io/anuke/mindustry/content/Weapons.java | 16 +- .../content/blocks/CraftingBlocks.java | 20 +- .../content/blocks/DefenseBlocks.java | 6 +- .../mindustry/content/blocks/PowerBlocks.java | 5 +- .../content/blocks/ProductionBlocks.java | 16 +- .../content/blocks/TurretBlocks.java | 26 +- .../anuke/mindustry/content/fx/BlockFx.java | 330 ------- .../anuke/mindustry/content/fx/BulletFx.java | 281 ------ .../mindustry/content/fx/EnvironmentFx.java | 137 --- .../mindustry/content/fx/ExplosionFx.java | 97 --- .../src/io/anuke/mindustry/content/fx/Fx.java | 69 -- .../io/anuke/mindustry/content/fx/FxList.java | 12 - .../anuke/mindustry/content/fx/ShootFx.java | 225 ----- .../io/anuke/mindustry/content/fx/UnitFx.java | 78 -- .../anuke/mindustry/core/ContentLoader.java | 7 - .../src/io/anuke/mindustry/core/Renderer.java | 2 +- .../io/anuke/mindustry/entities/Damage.java | 10 +- .../io/anuke/mindustry/entities/Player.java | 4 +- .../anuke/mindustry/entities/TileEntity.java | 2 +- .../entities/bullet/ArtilleryBulletType.java | 4 +- .../mindustry/entities/bullet/BulletType.java | 11 +- .../entities/bullet/FlakBulletType.java | 4 +- .../entities/bullet/LiquidBulletType.java | 5 +- .../entities/bullet/MassDriverBolt.java | 10 +- .../entities/bullet/MissileBulletType.java | 4 +- .../anuke/mindustry/entities/effect/Fire.java | 6 +- .../mindustry/entities/effect/Puddle.java | 13 +- .../entities/traits/BuilderTrait.java | 4 +- .../mindustry/entities/traits/CarryTrait.java | 6 +- .../mindustry/entities/units/BaseUnit.java | 4 +- .../anuke/mindustry/input/InputHandler.java | 4 +- .../io/anuke/mindustry/input/MobileInput.java | 2 +- core/src/io/anuke/mindustry/type/Weapon.java | 2 +- .../io/anuke/mindustry/world/BaseBlock.java | 6 +- .../mindustry/world/blocks/BuildBlock.java | 5 +- .../anuke/mindustry/world/blocks/Floor.java | 6 +- .../mindustry/world/blocks/defense/Door.java | 6 +- .../world/blocks/defense/ForceProjector.java | 9 +- .../world/blocks/defense/MendProjector.java | 6 +- .../blocks/defense/OverdriveProjector.java | 6 +- .../blocks/defense/turrets/ChargeTurret.java | 2 +- .../blocks/defense/turrets/CooledTurret.java | 4 +- .../world/blocks/defense/turrets/Turret.java | 2 +- .../world/blocks/distribution/MassDriver.java | 13 +- .../blocks/power/ItemLiquidGenerator.java | 6 +- .../world/blocks/power/NuclearReactor.java | 13 +- .../world/blocks/production/Cultivator.java | 2 +- .../world/blocks/production/Drill.java | 6 +- .../blocks/production/GenericCrafter.java | 5 +- .../world/blocks/production/Incinerator.java | 4 +- .../world/blocks/production/PowerSmelter.java | 6 +- .../world/blocks/production/Smelter.java | 4 +- .../world/blocks/production/SolidPump.java | 2 +- .../world/blocks/storage/CoreBlock.java | 2 +- .../world/blocks/units/CommandCenter.java | 4 +- .../mindustry/world/blocks/units/MechPad.java | 3 +- .../world/blocks/units/Reconstructor.java | 2 +- .../world/blocks/units/UnitFactory.java | 4 +- 62 files changed, 1011 insertions(+), 1453 deletions(-) create mode 100644 core/src/io/anuke/mindustry/content/Fx.java delete mode 100644 core/src/io/anuke/mindustry/content/fx/BlockFx.java delete mode 100644 core/src/io/anuke/mindustry/content/fx/BulletFx.java delete mode 100644 core/src/io/anuke/mindustry/content/fx/EnvironmentFx.java delete mode 100644 core/src/io/anuke/mindustry/content/fx/ExplosionFx.java delete mode 100644 core/src/io/anuke/mindustry/content/fx/Fx.java delete mode 100644 core/src/io/anuke/mindustry/content/fx/FxList.java delete mode 100644 core/src/io/anuke/mindustry/content/fx/ShootFx.java delete mode 100644 core/src/io/anuke/mindustry/content/fx/UnitFx.java diff --git a/core/src/io/anuke/mindustry/content/Bullets.java b/core/src/io/anuke/mindustry/content/Bullets.java index 8900001cb6..e8551c7978 100644 --- a/core/src/io/anuke/mindustry/content/Bullets.java +++ b/core/src/io/anuke/mindustry/content/Bullets.java @@ -9,7 +9,6 @@ import io.anuke.arc.graphics.g2d.Lines; import io.anuke.arc.math.Mathf; import io.anuke.arc.util.Time; import io.anuke.arc.util.Tmp; -import io.anuke.mindustry.content.fx.*; import io.anuke.mindustry.entities.Damage; import io.anuke.mindustry.entities.bullet.*; import io.anuke.mindustry.entities.effect.Fire; @@ -56,7 +55,7 @@ public class Bullets implements ContentList{ public void load(){ artilleryDense = new ArtilleryBulletType(3f, 0, "shell"){{ - hitEffect = BulletFx.flakExplosion; + hitEffect = Fx.flakExplosion; knockback = 0.8f; lifetime = 50f; bulletWidth = bulletHeight = 11f; @@ -76,7 +75,7 @@ public class Bullets implements ContentList{ }}; arilleryPlastic = new ArtilleryBulletType(3.3f, 0, "shell"){{ - hitEffect = BulletFx.plasticExplosion; + hitEffect = Fx.plasticExplosion; knockback = 1f; lifetime = 55f; bulletWidth = bulletHeight = 13f; @@ -90,7 +89,7 @@ public class Bullets implements ContentList{ }}; artilleryHoming = new ArtilleryBulletType(3f, 0, "shell"){{ - hitEffect = BulletFx.flakExplosion; + hitEffect = Fx.flakExplosion; knockback = 0.8f; lifetime = 45f; bulletWidth = bulletHeight = 11f; @@ -102,7 +101,7 @@ public class Bullets implements ContentList{ }}; artlleryIncendiary = new ArtilleryBulletType(3f, 0, "shell"){{ - hitEffect = BulletFx.blastExplosion; + hitEffect = Fx.blastExplosion; knockback = 0.8f; lifetime = 60f; bulletWidth = bulletHeight = 13f; @@ -113,11 +112,11 @@ public class Bullets implements ContentList{ incendSpread = 11f; frontColor = Palette.lightishOrange; backColor = Palette.lightOrange; - trailEffect = BulletFx.incendTrail; + trailEffect = Fx.incendTrail; }}; artilleryExplosive = new ArtilleryBulletType(2f, 0, "shell"){{ - hitEffect = BulletFx.blastExplosion; + hitEffect = Fx.blastExplosion; knockback = 0.8f; lifetime = 70f; bulletWidth = bulletHeight = 14f; @@ -129,7 +128,7 @@ public class Bullets implements ContentList{ }}; artilleryUnit = new ArtilleryBulletType(2f, 0, "shell"){{ - hitEffect = BulletFx.blastExplosion; + hitEffect = Fx.blastExplosion; knockback = 0.8f; lifetime = 90f; bulletWidth = bulletHeight = 14f; @@ -145,7 +144,7 @@ public class Bullets implements ContentList{ splashDamageRadius = 40f; fragBullet = artilleryPlasticFrag; fragBullets = 4; - hitEffect = BulletFx.plasticExplosion; + hitEffect = Fx.plasticExplosion; frontColor = Palette.plastaniumFront; backColor = Palette.plastaniumBack; }}; @@ -168,8 +167,8 @@ public class Bullets implements ContentList{ splashDamageRadius = 30f; splashDamage = 30f; lifetime = 150f; - hitEffect = BulletFx.blastExplosion; - despawnEffect = BulletFx.blastExplosion; + hitEffect = Fx.blastExplosion; + despawnEffect = Fx.blastExplosion; }}; missileIncendiary = new MissileBulletType(2f, 12, "missile"){{ @@ -183,7 +182,7 @@ public class Bullets implements ContentList{ splashDamageRadius = 10f; splashDamage = 10f; lifetime = 160f; - hitEffect = BulletFx.blastExplosion; + hitEffect = Fx.blastExplosion; incendSpread = 10f; incendAmount = 3; }}; @@ -196,8 +195,8 @@ public class Bullets implements ContentList{ splashDamageRadius = 30f; splashDamage = 22f; lifetime = 150f; - hitEffect = BulletFx.blastExplosion; - despawnEffect = BulletFx.blastExplosion; + hitEffect = Fx.blastExplosion; + despawnEffect = Fx.blastExplosion; lightining = 2; lightningLength = 14; }}; @@ -212,8 +211,8 @@ public class Bullets implements ContentList{ splashDamage = 1f; lifetime = 90f; trailColor = Color.valueOf("b6c6fd"); - hitEffect = BulletFx.blastExplosion; - despawnEffect = BulletFx.blastExplosion; + hitEffect = Fx.blastExplosion; + despawnEffect = Fx.blastExplosion; backColor = Palette.bulletYellowBack; frontColor = Palette.bulletYellow; weaveScale = 8f; @@ -233,8 +232,8 @@ public class Bullets implements ContentList{ trailColor = Color.GRAY; backColor = Palette.bulletYellowBack; frontColor = Palette.bulletYellow; - hitEffect = BulletFx.blastExplosion; - despawnEffect = BulletFx.blastExplosion; + hitEffect = Fx.blastExplosion; + despawnEffect = Fx.blastExplosion; weaveScale = 8f; weaveMag = 2f; }}; @@ -242,8 +241,8 @@ public class Bullets implements ContentList{ standardCopper = new BasicBulletType(2.5f, 7, "bullet"){{ bulletWidth = 7f; bulletHeight = 9f; - shootEffect = ShootFx.shootSmall; - smokeEffect = ShootFx.shootSmallSmoke; + shootEffect = Fx.shootSmall; + smokeEffect = Fx.shootSmallSmoke; ammoMultiplier = 5; }}; @@ -259,8 +258,8 @@ public class Bullets implements ContentList{ bulletWidth = 10f; bulletHeight = 13f; armorPierce = 0.5f; - shootEffect = ShootFx.shootBig; - smokeEffect = ShootFx.shootBigSmoke; + shootEffect = Fx.shootBig; + smokeEffect = Fx.shootBigSmoke; ammoMultiplier = 2; }}; @@ -298,7 +297,7 @@ public class Bullets implements ContentList{ bulletHeight = 14f; lifetime = 40f; inaccuracy = 5f; - despawnEffect = BulletFx.hitBulletSmall; + despawnEffect = Fx.hitBulletSmall; }}; standardDenseBig = new BasicBulletType(7f, 42, "bullet"){{ @@ -326,7 +325,7 @@ public class Bullets implements ContentList{ damageLightning = new BulletType(0.0001f, 0f){ { lifetime = Lightning.lifetime; - hitEffect = BulletFx.hitLancer; + hitEffect = Fx.hitLancer; despawnEffect = Fx.none; status = StatusEffects.shocked; statusIntensity = 1f; @@ -337,8 +336,8 @@ public class Bullets implements ContentList{ float healPercent = 3f; { - hitEffect = BulletFx.hitLaser; - despawnEffect = BulletFx.hitLaser; + hitEffect = Fx.hitLaser; + despawnEffect = Fx.hitLaser; collidesTeam = true; } @@ -363,7 +362,7 @@ public class Bullets implements ContentList{ tile = tile.target(); if(tile != null && tile.getTeam() == b.getTeam() && !(tile.block() instanceof BuildBlock)){ - Effects.effect(BlockFx.healBlockFull, Palette.heal, tile.drawx(), tile.drawy(), tile.block().size); + Effects.effect(Fx.healBlockFull, Palette.heal, tile.drawx(), tile.drawy(), tile.block().size); tile.entity.healBy(healPercent / 100f * tile.entity.maxHealth()); } } @@ -402,11 +401,11 @@ public class Bullets implements ContentList{ } if(Mathf.chance(0.1 * Time.delta())){ - Effects.effect(EnvironmentFx.fireballsmoke, b.x, b.y); + Effects.effect(Fx.fireballsmoke, b.x, b.y); } if(Mathf.chance(0.1 * Time.delta())){ - Effects.effect(EnvironmentFx.ballfire, b.x, b.y); + Effects.effect(Fx.ballfire, b.x, b.y); } } }; @@ -417,7 +416,7 @@ public class Bullets implements ContentList{ lifetime = 35f; pierce = true; drag = 0.05f; - hitEffect = BulletFx.hitFlameSmall; + hitEffect = Fx.hitFlameSmall; despawnEffect = Fx.none; status = StatusEffects.burning; } @@ -434,7 +433,7 @@ public class Bullets implements ContentList{ float length = 100f; { - hitEffect = BulletFx.hitLancer; + hitEffect = Fx.hitLancer; despawnEffect = Fx.none; hitSize = 4; lifetime = 16f; @@ -472,7 +471,7 @@ public class Bullets implements ContentList{ float length = 200f; { - hitEffect = BulletFx.hitMeltdown; + hitEffect = Fx.hitMeltdown; despawnEffect = Fx.none; hitSize = 4; drawSize = 420f; @@ -518,7 +517,7 @@ public class Bullets implements ContentList{ float raySpace = 2f; float rayLength = 80f; { - hitEffect = BulletFx.hitFuse; + hitEffect = Fx.hitFuse; lifetime = 13f; despawnEffect = Fx.none; pierce = true; @@ -570,7 +569,7 @@ public class Bullets implements ContentList{ { lifetime = 1f; despawnEffect = Fx.none; - hitEffect = BulletFx.hitLancer; + hitEffect = Fx.hitLancer; keepVelocity = false; } @@ -587,7 +586,7 @@ public class Bullets implements ContentList{ arc = new BulletType(0.001f, 26){{ lifetime = 1; despawnEffect = Fx.none; - hitEffect = BulletFx.hitLancer; + hitEffect = Fx.hitLancer; } @Override @@ -612,13 +611,13 @@ public class Bullets implements ContentList{ bombExplosive = new BombBulletType(10f, 20f, "shell"){{ bulletWidth = 9f; bulletHeight = 13f; - hitEffect = BulletFx.flakExplosion; + hitEffect = Fx.flakExplosion; }}; bombIncendiary = new BombBulletType(7f, 10f, "shell"){{ bulletWidth = 8f; bulletHeight = 12f; - hitEffect = BulletFx.flakExplosion; + hitEffect = Fx.flakExplosion; backColor = Palette.lightOrange; frontColor = Palette.lightishOrange; incendChance = 1f; @@ -629,7 +628,7 @@ public class Bullets implements ContentList{ bombOil = new BombBulletType(2f, 3f, "shell"){{ bulletWidth = 8f; bulletHeight = 12f; - hitEffect = BlockFx.pulverize; + hitEffect = Fx.pulverize; backColor = new Color(0x4f4f4fff); frontColor = Color.GRAY; } diff --git a/core/src/io/anuke/mindustry/content/Fx.java b/core/src/io/anuke/mindustry/content/Fx.java new file mode 100644 index 0000000000..ee3985365e --- /dev/null +++ b/core/src/io/anuke/mindustry/content/Fx.java @@ -0,0 +1,814 @@ +package io.anuke.mindustry.content; + +import io.anuke.arc.Core; +import io.anuke.arc.entities.Effects.Effect; +import io.anuke.arc.graphics.Color; +import io.anuke.arc.graphics.g2d.Draw; +import io.anuke.arc.graphics.g2d.Fill; +import io.anuke.arc.graphics.g2d.Lines; +import io.anuke.arc.math.Angles; +import io.anuke.arc.math.Mathf; +import io.anuke.mindustry.content.Liquids; +import io.anuke.mindustry.entities.effect.GroundEffectEntity.GroundEffect; +import io.anuke.mindustry.game.ContentList; +import io.anuke.mindustry.graphics.Palette; +import io.anuke.mindustry.graphics.Shapes; +import io.anuke.mindustry.type.ContentType; +import io.anuke.mindustry.type.Item; + +import static io.anuke.mindustry.Vars.tilesize; + +public class Fx implements ContentList{ + public static Effect + + none, placeBlock, breakBlock, smoke, spawn, tapBlock, select, + vtolHover, unitDrop, unitPickup, unitLand, pickup, healWave, heal, landShock, reactorsmoke, nuclearsmoke, nuclearcloud, + redgeneratespark, generatespark, fuelburn, plasticburn, pulverize, pulverizeRed, pulverizeRedder, pulverizeSmall, pulverizeMedium, + producesmoke, smeltsmoke, formsmoke, blastsmoke, lava, doorclose, dooropenlarge, doorcloselarge, purify, purifyoil, purifystone, generate, + mine, mineBig, mineHuge, smelt, teleportActivate, teleport, teleportOut, ripple, bubble, commandSend, + healBlock, healBlockFull, healWaveMend, overdriveWave, overdriveBlockFull, shieldBreak, hitBulletSmall, hitFuse, + hitBulletBig, hitFlameSmall, hitLiquid, hitLaser, hitLancer, hitMeltdown, despawn, flakExplosion, blastExplosion, + plasticExplosion, artilleryTrail, incendTrail, missileTrail, absorb, flakExplosionBig, plasticExplosionFlak, burning, fire, + fireSmoke, steam, fireballsmoke, ballfire, freezing, melting, wet, oily, overdriven, dropItem, shockwave, + bigShockwave, nuclearShockwave, explosion, blockExplosion, blockExplosionSmoke, shootSmall, shootHeal, shootSmallSmoke, shootBig, shootBig2, shootBigSmoke, + shootBigSmoke2, shootSmallFlame, shootLiquid, shellEjectSmall, shellEjectMedium, + shellEjectBig, lancerLaserShoot, lancerLaserShootSmoke, lancerLaserCharge, lancerLaserChargeBegin, lightningCharge, lightningShoot; + + @Override + public void load(){ + + none = new Effect(0, 0f, e -> {}); + + placeBlock = new Effect(16, e -> { + Draw.color(Palette.accent); + Lines.stroke(3f - e.fin() * 2f); + Lines.square(e.x, e.y, tilesize / 2f * e.rotation + e.fin() * 3f); + Draw.reset(); + }); + + tapBlock = new Effect(12, e -> { + Draw.color(Palette.accent); + Lines.stroke(3f - e.fin() * 2f); + Lines.circle(e.x, e.y, 4f + (tilesize / 1.5f * e.rotation) * e.fin()); + Draw.reset(); + }); + + breakBlock = new Effect(12, e -> { + Draw.color(Palette.remove); + Lines.stroke(3f - e.fin() * 2f); + Lines.square(e.x, e.y, tilesize / 2f * e.rotation + e.fin() * 3f); + + Angles.randLenVectors(e.id, 3 + (int) (e.rotation * 3), e.rotation * 2f + (tilesize * e.rotation) * e.finpow(), (x, y) -> { + Fill.square(e.x + x, e.y + y, 1f + e.fout() * (3f + e.rotation)); + }); + Draw.reset(); + }); + + select = new Effect(23, e -> { + Draw.color(Palette.accent); + Lines.stroke(e.fout() * 3f); + Lines.circle(e.x, e.y, 3f + e.fin() * 14f); + Draw.reset(); + }); + + smoke = new Effect(100, e -> { + Draw.color(Color.GRAY, Palette.darkishGray, e.fin()); + float size = 7f - e.fin() * 7f; + Draw.rect("circle", e.x, e.y, size, size); + Draw.reset(); + }); + + spawn = new Effect(23, e -> { + Lines.stroke(2f * e.fout()); + Draw.color(Palette.accent); + Lines.poly(e.x, e.y, 4, 3f + e.fin() * 8f); + Draw.reset(); + }); + + vtolHover = new Effect(40f, e -> { + float len = e.finpow() * 10f; + float ang = e.rotation + Mathf.randomSeedRange(e.id, 30f); + Draw.color(Palette.lightFlame, Palette.lightOrange, e.fin()); + Fill.circle(e.x + Angles.trnsx(ang, len), e.y + Angles.trnsy(ang, len), 2f * e.fout()); + Draw.reset(); + }); + + unitDrop = new GroundEffect(30, e -> { + Draw.color(Palette.lightishGray); + Angles.randLenVectors(e.id, 9, 3 + 20f * e.finpow(), (x, y) -> { + Fill.circle(e.x + x, e.y + y, e.fout() * 4f + 0.4f); + }); + Draw.reset(); + }); + + unitLand = new GroundEffect(30, e -> { + Draw.color(Palette.lightishGray, e.color, e.rotation); + Angles.randLenVectors(e.id, 6, 17f * e.finpow(), (x, y) -> { + Fill.circle(e.x + x, e.y + y, e.fout() * 4f + 0.3f); + }); + Draw.reset(); + }); + + unitPickup = new GroundEffect(18, e -> { + Draw.color(Palette.lightishGray); + Lines.stroke(e.fin() * 2f); + Lines.poly(e.x, e.y, 4, 13f * e.fout()); + Draw.reset(); + }); + + landShock = new GroundEffect(12, e -> { + Draw.color(Palette.lancerLaser); + Lines.stroke(e.fout() * 3f); + Lines.poly(e.x, e.y, 12, 20f * e.fout()); + Draw.reset(); + }); + + pickup = new Effect(18, e -> { + Draw.color(Palette.lightishGray); + Lines.stroke(e.fout() * 2f); + Lines.spikes(e.x, e.y, 1f + e.fin() * 6f, e.fout() * 4f, 6); + Draw.reset(); + }); + + healWave = new Effect(22, e -> { + Draw.color(Palette.heal); + Lines.stroke(e.fout() * 2f); + Lines.poly(e.x, e.y, 30, 4f + e.finpow() * 60f); + Draw.color(); + }); + + heal = new Effect(11, e -> { + Draw.color(Palette.heal); + Lines.stroke(e.fout() * 2f); + Lines.poly(e.x, e.y, 10, 2f + e.finpow() * 7f); + Draw.color(); + }); + + + hitBulletSmall = new Effect(14, e -> { + Draw.color(Color.WHITE, Palette.lightOrange, e.fin()); + + e.scaled(7f, s -> { + Lines.stroke(0.5f + s.fout()); + Lines.circle(e.x, e.y, s.fin()*5f); + }); + + + Lines.stroke(0.5f + e.fout()); + + Angles.randLenVectors(e.id, 5, e.fin() * 15f, (x, y) -> { + float ang = Mathf.angle(x, y); + Lines.lineAngle(e.x + x, e.y + y, ang, e.fout() * 3 + 1f); + }); + + Draw.reset(); + }); + + hitFuse = new Effect(14, e -> { + Draw.color(Color.WHITE, Palette.surge, e.fin()); + + e.scaled(7f, s -> { + Lines.stroke(0.5f + s.fout()); + Lines.circle(e.x, e.y, s.fin()*7f); + }); + + + Lines.stroke(0.5f + e.fout()); + + Angles.randLenVectors(e.id, 6, e.fin() * 15f, (x, y) -> { + float ang = Mathf.angle(x, y); + Lines.lineAngle(e.x + x, e.y + y, ang, e.fout() * 3 + 1f); + }); + + Draw.reset(); + }); + + hitBulletBig = new Effect(13, e -> { + Draw.color(Color.WHITE, Palette.lightOrange, e.fin()); + Lines.stroke(0.5f + e.fout() * 1.5f); + + Angles.randLenVectors(e.id, 8, e.finpow() * 30f, e.rotation, 50f, (x, y) -> { + float ang = Mathf.angle(x, y); + Lines.lineAngle(e.x + x, e.y + y, ang, e.fout() * 4 + 1.5f); + }); + + Draw.reset(); + }); + + hitFlameSmall = new Effect(14, e -> { + Draw.color(Palette.lightFlame, Palette.darkFlame, e.fin()); + Lines.stroke(0.5f + e.fout()); + + Angles.randLenVectors(e.id, 5, e.fin() * 15f, e.rotation, 50f, (x, y) -> { + float ang = Mathf.angle(x, y); + Lines.lineAngle(e.x + x, e.y + y, ang, e.fout() * 3 + 1f); + }); + + Draw.reset(); + }); + + hitLiquid = new Effect(16, e -> { + Draw.color(e.color); + + Angles.randLenVectors(e.id, 5, e.fin() * 15f, e.rotation + 180f, 60f, (x, y) -> { + Fill.circle(e.x + x, e.y + y, e.fout() * 2f); + }); + + Draw.reset(); + }); + + hitLancer = new Effect(12, e -> { + Draw.color(Color.WHITE); + Lines.stroke(e.fout() * 1.5f); + + Angles.randLenVectors(e.id, 8, e.finpow() * 17f, e.rotation, 360f, (x, y) -> { + float ang = Mathf.angle(x, y); + Lines.lineAngle(e.x + x, e.y + y, ang, e.fout() * 4 + 1f); + }); + + Draw.reset(); + }); + + hitMeltdown = new Effect(12, e -> { + Draw.color(Palette.meltdownHit); + Lines.stroke(e.fout() * 2f); + + Angles.randLenVectors(e.id, 6, e.finpow() * 18f, e.rotation, 360f, (x, y) -> { + float ang = Mathf.angle(x, y); + Lines.lineAngle(e.x + x, e.y + y, ang, e.fout() * 4 + 1f); + }); + + Draw.reset(); + }); + + hitLaser = new Effect(8, e -> { + Draw.color(Color.WHITE, Palette.heal, e.fin()); + Lines.stroke(0.5f + e.fout()); + Lines.circle(e.x, e.y, e.fin()*5f); + Draw.reset(); + }); + + despawn = new Effect(12, e -> { + Draw.color(Palette.lighterOrange, Color.GRAY, e.fin()); + Lines.stroke(e.fout()); + + Angles.randLenVectors(e.id, 7, e.fin() * 7f, e.rotation, 40f, (x, y) -> { + float ang = Mathf.angle(x, y); + Lines.lineAngle(e.x + x, e.y + y, ang, e.fout() * 2 + 1f); + }); + + Draw.reset(); + }); + + flakExplosion = new Effect(20, e -> { + + Draw.color(Palette.bulletYellow); + e.scaled(6, i -> { + Lines.stroke(3f * i.fout()); + Lines.circle(e.x, e.y, 3f + i.fin() * 10f); + }); + + Draw.color(Color.GRAY); + + Angles.randLenVectors(e.id, 5, 2f + 23f * e.finpow(), (x, y) -> { + Fill.circle(e.x + x, e.y + y, e.fout() * 3f + 0.5f); + }); + + Draw.color(Palette.lighterOrange); + Lines.stroke(1f * e.fout()); + + Angles.randLenVectors(e.id + 1, 4, 1f + 23f * e.finpow(), (x, y) -> { + Lines.lineAngle(e.x + x, e.y + y, Mathf.angle(x, y), 1f + e.fout() * 3f); + }); + + Draw.reset(); + }); + + plasticExplosion = new Effect(24, e -> { + + Draw.color(Palette.plastaniumFront); + e.scaled(7, i -> { + Lines.stroke(3f * i.fout()); + Lines.circle(e.x, e.y, 3f + i.fin() * 24f); + }); + + Draw.color(Color.GRAY); + + Angles.randLenVectors(e.id, 7, 2f + 28f * e.finpow(), (x, y) -> { + Fill.circle(e.x + x, e.y + y, e.fout() * 4f + 0.5f); + }); + + Draw.color(Palette.plastaniumBack); + Lines.stroke(1f * e.fout()); + + Angles.randLenVectors(e.id + 1, 4, 1f + 25f * e.finpow(), (x, y) -> { + Lines.lineAngle(e.x + x, e.y + y, Mathf.angle(x, y), 1f + e.fout() * 3f); + }); + + Draw.reset(); + }); + + plasticExplosionFlak = new Effect(28, e -> { + + Draw.color(Palette.plastaniumFront); + e.scaled(7, i -> { + Lines.stroke(3f * i.fout()); + Lines.circle(e.x, e.y, 3f + i.fin() * 34f); + }); + + Draw.color(Color.GRAY); + + Angles.randLenVectors(e.id, 7, 2f + 30f * e.finpow(), (x, y) -> { + Fill.circle(e.x + x, e.y + y, e.fout() * 4f + 0.5f); + }); + + Draw.color(Palette.plastaniumBack); + Lines.stroke(1f * e.fout()); + + Angles.randLenVectors(e.id + 1, 4, 1f + 30f * e.finpow(), (x, y) -> { + Lines.lineAngle(e.x + x, e.y + y, Mathf.angle(x, y), 1f + e.fout() * 3f); + }); + + Draw.reset(); + }); + + blastExplosion = new Effect(22, e -> { + + Draw.color(Palette.missileYellow); + e.scaled(6, i -> { + Lines.stroke(3f * i.fout()); + Lines.circle(e.x, e.y, 3f + i.fin() * 15f); + }); + + Draw.color(Color.GRAY); + + Angles.randLenVectors(e.id, 5, 2f + 23f * e.finpow(), (x, y) -> { + Fill.circle(e.x + x, e.y + y, e.fout() * 4f + 0.5f); + }); + + Draw.color(Palette.missileYellowBack); + Lines.stroke(1f * e.fout()); + + Angles.randLenVectors(e.id + 1, 4, 1f + 23f * e.finpow(), (x, y) -> { + Lines.lineAngle(e.x + x, e.y + y, Mathf.angle(x, y), 1f + e.fout() * 3f); + }); + + Draw.reset(); + }); + + artilleryTrail = new Effect(50, e -> { + Draw.color(e.color); + Fill.circle(e.x, e.y, e.rotation * e.fout()); + Draw.reset(); + }); + + incendTrail = new Effect(50, e -> { + Draw.color(Palette.lightOrange); + Fill.circle(e.x, e.y, e.rotation * e.fout()); + Draw.reset(); + }); + + missileTrail = new Effect(50, e -> { + Draw.color(e.color); + Fill.circle(e.x, e.y, e.rotation * e.fout()); + Draw.reset(); + }); + + absorb = new Effect(12, e -> { + Draw.color(Palette.accent); + Lines.stroke(2f * e.fout()); + Lines.circle(e.x, e.y, 5f * e.fout()); + Draw.reset(); + }); + + flakExplosionBig = new Effect(30, e -> { + + Draw.color(Palette.bulletYellowBack); + e.scaled(6, i -> { + Lines.stroke(3f * i.fout()); + Lines.circle(e.x, e.y, 3f + i.fin() * 25f); + }); + + Draw.color(Color.GRAY); + + Angles.randLenVectors(e.id, 6, 2f + 23f * e.finpow(), (x, y) -> { + Fill.circle(e.x + x, e.y + y, e.fout() * 4f + 0.5f); + }); + + Draw.color(Palette.bulletYellow); + Lines.stroke(1f * e.fout()); + + Angles.randLenVectors(e.id + 1, 4, 1f + 23f * e.finpow(), (x, y) -> { + Lines.lineAngle(e.x + x, e.y + y, Mathf.angle(x, y), 1f + e.fout() * 3f); + }); + + Draw.reset(); + }); + + + burning = new Effect(35f, e -> { + Draw.color(Palette.lightFlame, Palette.darkFlame, e.fin()); + + Angles.randLenVectors(e.id, 3, 2f + e.fin() * 7f, (x, y) -> { + Fill.circle(e.x + x, e.y + y, 0.1f + e.fout() * 1.4f); + }); + + Draw.color(); + }); + + fire = new Effect(35f, e -> { + Draw.color(Palette.lightFlame, Palette.darkFlame, e.fin()); + + Angles.randLenVectors(e.id, 2, 2f + e.fin() * 7f, (x, y) -> { + Fill.circle(e.x + x, e.y + y, 0.2f + e.fslope() * 1.5f); + }); + + Draw.color(); + }); + + fireSmoke = new Effect(35f, e -> { + Draw.color(Color.GRAY); + + Angles.randLenVectors(e.id, 1, 2f + e.fin() * 7f, (x, y) -> { + Fill.circle(e.x + x, e.y + y, 0.2f + e.fslope() * 1.5f); + }); + + Draw.color(); + }); + + steam = new Effect(35f, e -> { + Draw.color(Color.LIGHT_GRAY); + + Angles.randLenVectors(e.id, 2, 2f + e.fin() * 7f, (x, y) -> { + Fill.circle(e.x + x, e.y + y, 0.2f + e.fslope() * 1.5f); + }); + + Draw.color(); + }); + + fireballsmoke = new Effect(25f, e -> { + Draw.color(Color.GRAY); + + Angles.randLenVectors(e.id, 1, 2f + e.fin() * 7f, (x, y) -> { + Fill.circle(e.x + x, e.y + y, 0.2f + e.fout() * 1.5f); + }); + + Draw.color(); + }); + + ballfire = new Effect(25f, e -> { + Draw.color(Palette.lightFlame, Palette.darkFlame, e.fin()); + + Angles.randLenVectors(e.id, 2, 2f + e.fin() * 7f, (x, y) -> { + Fill.circle(e.x + x, e.y + y, 0.2f + e.fout() * 1.5f); + }); + + Draw.color(); + }); + + freezing = new Effect(40f, e -> { + Draw.color(Liquids.cryofluid.color); + + Angles.randLenVectors(e.id, 2, 1f + e.fin() * 2f, (x, y) -> { + Fill.circle(e.x + x, e.y + y, e.fout() * 1.2f); + }); + + Draw.color(); + }); + + melting = new Effect(40f, e -> { + Draw.color(Liquids.lava.color, Color.WHITE, e.fout() / 5f + Mathf.randomSeedRange(e.id, 0.12f)); + + Angles.randLenVectors(e.id, 2, 1f + e.fin() * 3f, (x, y) -> { + Fill.circle(e.x + x, e.y + y, .2f + e.fout() * 1.2f); + }); + + Draw.color(); + }); + + wet = new Effect(40f, e -> { + Draw.color(Liquids.water.color); + + Angles.randLenVectors(e.id, 2, 1f + e.fin() * 2f, (x, y) -> { + Fill.circle(e.x + x, e.y + y, e.fout() * 1f); + }); + + Draw.color(); + }); + + oily = new Effect(42f, e -> { + Draw.color(Liquids.oil.color); + + Angles.randLenVectors(e.id, 2, 1f + e.fin() * 2f, (x, y) -> { + Fill.circle(e.x + x, e.y + y, e.fout() * 1f); + }); + + Draw.color(); + }); + + overdriven = new Effect(20f, e -> { + Draw.color(Palette.accent); + + Angles.randLenVectors(e.id, 2, 1f + e.fin() * 2f, (x, y) -> { + Fill.square(e.x + x, e.y + y, e.fout() * 2.3f+0.5f); + }); + + Draw.color(); + }); + + dropItem = new Effect(20f, e -> { + float length = 20f * e.finpow(); + float size = 7f * e.fout(); + + Draw.rect(((Item) e.data).region, e.x + Angles.trnsx(e.rotation, length), e.y + Angles.trnsy(e.rotation, length), size, size); + }); + + + shockwave = new Effect(10f, 80f, e -> { + Draw.color(Color.WHITE, Color.LIGHT_GRAY, e.fin()); + Lines.stroke(e.fout() * 2f + 0.2f); + Lines.circle(e.x, e.y, e.fin() * 28f); + Draw.reset(); + }); + + bigShockwave = new Effect(10f, 80f, e -> { + Draw.color(Color.WHITE, Color.LIGHT_GRAY, e.fin()); + Lines.stroke(e.fout() * 3f); + Lines.circle(e.x, e.y, e.fin() * 50f); + Draw.reset(); + }); + + nuclearShockwave = new Effect(10f, 200f, e -> { + Draw.color(Color.WHITE, Color.LIGHT_GRAY, e.fin()); + Lines.stroke(e.fout() * 3f + 0.2f); + Lines.poly(e.x, e.y, 40, e.fin() * 140f); + Draw.reset(); + }); + + explosion = new Effect(30, e -> { + e.scaled(7, i -> { + Lines.stroke(3f * i.fout()); + Lines.circle(e.x, e.y, 3f + i.fin() * 10f); + }); + + Draw.color(Color.GRAY); + + Angles.randLenVectors(e.id, 6, 2f + 19f * e.finpow(), (x, y) -> { + Fill.circle(e.x + x, e.y + y, e.fout() * 3f + 0.5f); + Fill.circle(e.x + x / 2f, e.y + y / 2f, e.fout() * 1f); + }); + + Draw.color(Palette.lighterOrange, Palette.lightOrange, Color.GRAY, e.fin()); + Lines.stroke(1.5f * e.fout()); + + Angles.randLenVectors(e.id + 1, 8, 1f + 23f * e.finpow(), (x, y) -> { + Lines.lineAngle(e.x + x, e.y + y, Mathf.angle(x, y), 1f + e.fout() * 3f); + }); + + Draw.reset(); + }); + + blockExplosion = new Effect(30, e -> { + e.scaled(7, i -> { + Lines.stroke(3.1f * i.fout()); + Lines.circle(e.x, e.y, 3f + i.fin() * 14f); + }); + + Draw.color(Color.GRAY); + + Angles.randLenVectors(e.id, 6, 2f + 19f * e.finpow(), (x, y) -> { + Fill.circle(e.x + x, e.y + y, e.fout() * 3f + 0.5f); + Fill.circle(e.x + x / 2f, e.y + y / 2f, e.fout() * 1f); + }); + + Draw.color(Palette.lighterOrange, Palette.lightOrange, Color.GRAY, e.fin()); + Lines.stroke(1.7f * e.fout()); + + Angles.randLenVectors(e.id + 1, 9, 1f + 23f * e.finpow(), (x, y) -> { + Lines.lineAngle(e.x + x, e.y + y, Mathf.angle(x, y), 1f + e.fout() * 3f); + }); + + Draw.reset(); + }); + + blockExplosionSmoke = new Effect(30, e -> { + Draw.color(Color.GRAY); + + Angles.randLenVectors(e.id, 6, 4f + 30f * e.finpow(), (x, y) -> { + Fill.circle(e.x + x, e.y + y, e.fout() * 3f); + Fill.circle(e.x + x / 2f, e.y + y / 2f, e.fout() * 1f); + }); + + Draw.reset(); + }); + + + shootSmall = new Effect(8, e -> { + Draw.color(Palette.lighterOrange, Palette.lightOrange, e.fin()); + float w = 1f + 5 * e.fout(); + Shapes.tri(e.x, e.y, w, 15f * e.fout(), e.rotation); + Shapes.tri(e.x, e.y, w, 3f * e.fout(), e.rotation + 180f); + Draw.reset(); + }); + + shootHeal = new Effect(8, e -> { + Draw.color(Palette.heal); + float w = 1f + 5 * e.fout(); + Shapes.tri(e.x, e.y, w, 17f * e.fout(), e.rotation); + Shapes.tri(e.x, e.y, w, 4f * e.fout(), e.rotation + 180f); + Draw.reset(); + }); + + shootSmallSmoke = new Effect(20f, e -> { + Draw.color(Palette.lighterOrange, Color.LIGHT_GRAY, Color.GRAY, e.fin()); + + Angles.randLenVectors(e.id, 5, e.finpow() * 6f, e.rotation, 20f, (x, y) -> { + Fill.circle(e.x + x, e.y + y, e.fout() * 1.5f); + }); + + Draw.reset(); + }); + + shootBig = new Effect(9, e -> { + Draw.color(Palette.lighterOrange, Palette.lightOrange, e.fin()); + float w = 1.2f + 7 * e.fout(); + Shapes.tri(e.x, e.y, w, 25f * e.fout(), e.rotation); + Shapes.tri(e.x, e.y, w, 4f * e.fout(), e.rotation + 180f); + Draw.reset(); + }); + + shootBig2 = new Effect(10, e -> { + Draw.color(Palette.lightOrange, Color.GRAY, e.fin()); + float w = 1.2f + 8 * e.fout(); + Shapes.tri(e.x, e.y, w, 29f * e.fout(), e.rotation); + Shapes.tri(e.x, e.y, w, 5f * e.fout(), e.rotation + 180f); + Draw.reset(); + }); + + shootBigSmoke = new Effect(17f, e -> { + Draw.color(Palette.lighterOrange, Color.LIGHT_GRAY, Color.GRAY, e.fin()); + + Angles.randLenVectors(e.id, 8, e.finpow() * 19f, e.rotation, 10f, (x, y) -> { + Fill.circle(e.x + x, e.y + y, e.fout() * 2f + 0.2f); + }); + + Draw.reset(); + }); + + shootBigSmoke2 = new Effect(18f, e -> { + Draw.color(Palette.lightOrange, Color.LIGHT_GRAY, Color.GRAY, e.fin()); + + Angles.randLenVectors(e.id, 9, e.finpow() * 23f, e.rotation, 20f, (x, y) -> { + Fill.circle(e.x + x, e.y + y, e.fout() * 2.4f + 0.2f); + }); + + Draw.reset(); + }); + + shootSmallFlame = new Effect(30f, e -> { + Draw.color(Palette.lightFlame, Palette.darkFlame, Color.GRAY, e.fin()); + + Angles.randLenVectors(e.id, 8, e.finpow() * 36f, e.rotation, 10f, (x, y) -> { + Fill.circle(e.x + x, e.y + y, 0.65f + e.fout() * 1.5f); + }); + + Draw.reset(); + }); + + shootLiquid = new Effect(40f, e -> { + Draw.color(e.color, Color.WHITE, e.fout() / 6f + Mathf.randomSeedRange(e.id, 0.1f)); + + Angles.randLenVectors(e.id, 6, e.finpow() * 60f, e.rotation, 11f, (x, y) -> { + Fill.circle(e.x + x, e.y + y, 0.5f + e.fout() * 2.5f); + }); + + Draw.reset(); + }); + + shellEjectSmall = new GroundEffect(30f, 400f, e -> { + Draw.color(Palette.lightOrange, Color.LIGHT_GRAY, Palette.lightishGray, e.fin()); + float rot = Math.abs(e.rotation) + 90f; + + int i = Mathf.sign(e.rotation); + + float len = (2f + e.finpow() * 6f) * i; + float lr = rot + e.fin() * 30f * i; + Fill.rect(e.x + Angles.trnsx(lr, len) + Mathf.randomSeedRange(e.id + i + 7, 3f * e.fin()), + e.y + Angles.trnsy(lr, len) + Mathf.randomSeedRange(e.id + i + 8, 3f * e.fin()), + 1f, 2f, rot + e.fin() * 50f * i); + + Draw.color(); + }); + + shellEjectMedium = new GroundEffect(34f, 400f, e -> { + Draw.color(Palette.lightOrange, Color.LIGHT_GRAY, Palette.lightishGray, e.fin()); + float rot = e.rotation + 90f; + for(int i : Mathf.signs){ + float len = (2f + e.finpow() * 10f) * i; + float lr = rot + e.fin() * 20f * i; + Draw.rect(Core.atlas.find("casing"), + e.x + Angles.trnsx(lr, len) + Mathf.randomSeedRange(e.id + i + 7, 3f * e.fin()), + e.y + Angles.trnsy(lr, len) + Mathf.randomSeedRange(e.id + i + 8, 3f * e.fin()), + 2f, 3f, rot); + } + + Draw.color(Color.LIGHT_GRAY, Color.GRAY, e.fin()); + + for(int i : Mathf.signs){ + Angles.randLenVectors(e.id, 4, 1f + e.finpow() * 11f, e.rotation + 90f * i, 20f, (x, y) -> { + Fill.circle(e.x + x, e.y + y, e.fout() * 1.5f); + }); + } + + Draw.color(); + }); + + shellEjectBig = new GroundEffect(22f, 400f, e -> { + Draw.color(Palette.lightOrange, Color.LIGHT_GRAY, Palette.lightishGray, e.fin()); + float rot = e.rotation + 90f; + for(int i : Mathf.signs){ + float len = (4f + e.finpow() * 8f) * i; + float lr = rot + Mathf.randomSeedRange(e.id + i + 6, 20f * e.fin()) * i; + Draw.rect(Core.atlas.find("casing"), + e.x + Angles.trnsx(lr, len) + Mathf.randomSeedRange(e.id + i + 7, 3f * e.fin()), + e.y + Angles.trnsy(lr, len) + Mathf.randomSeedRange(e.id + i + 8, 3f * e.fin()), + 2.5f, 4f, + rot + e.fin() * 30f * i + Mathf.randomSeedRange(e.id + i + 9, 40f * e.fin())); + } + + Draw.color(Color.LIGHT_GRAY); + + for(int i : Mathf.signs){ + Angles.randLenVectors(e.id, 4, -e.finpow() * 15f, e.rotation + 90f * i, 25f, (x, y) -> { + Fill.circle(e.x + x, e.y + y, e.fout() * 2f); + }); + } + + Draw.color(); + }); + + lancerLaserShoot = new Effect(21f, e -> { + Draw.color(Palette.lancerLaser); + + for(int i : Mathf.signs){ + Shapes.tri(e.x, e.y, 4f * e.fout(), 29f, e.rotation + 90f * i); + } + + Draw.reset(); + }); + + lancerLaserShootSmoke = new Effect(26f, e -> { + Draw.color(Palette.lancerLaser); + + Angles.randLenVectors(e.id, 7, 80f, e.rotation, 0f, (x, y) -> { + Lines.lineAngle(e.x + x, e.y + y, Mathf.angle(x, y), e.fout() * 9f); + }); + + Draw.reset(); + }); + + lancerLaserCharge = new Effect(38f, e -> { + Draw.color(Palette.lancerLaser); + + Angles.randLenVectors(e.id, 2, 1f + 20f * e.fout(), e.rotation, 120f, (x, y) -> { + Lines.lineAngle(e.x + x, e.y + y, Mathf.angle(x, y), e.fslope() * 3f + 1f); + }); + + Draw.reset(); + }); + + lancerLaserChargeBegin = new Effect(71f, e -> { + Draw.color(Palette.lancerLaser); + Fill.circle(e.x, e.y, e.fin() * 3f); + + Draw.color(); + Fill.circle(e.x, e.y, e.fin() * 2f); + }); + + lightningCharge = new Effect(38f, e -> { + Draw.color(Palette.lancerLaser); + + Angles.randLenVectors(e.id, 2, 1f + 20f * e.fout(), e.rotation, 120f, (x, y) -> { + Shapes.tri(e.x + x, e.y + y, e.fslope() * 3f + 1, e.fslope() * 3f + 1, Mathf.angle(x, y)); + }); + + Draw.reset(); + }); + + lightningShoot = new Effect(12f, e -> { + Draw.color(Color.WHITE, Palette.lancerLaser, e.fin()); + Lines.stroke(e.fout() * 1.2f + 0.5f); + + Angles.randLenVectors(e.id, 7, 25f * e.finpow(), e.rotation, 50f, (x, y) -> { + Lines.lineAngle(e.x + x, e.y + y, Mathf.angle(x, y), e.fin() * 5f + 2f); + }); + + Draw.reset(); + }); + } + + @Override + public ContentType type(){ + return ContentType.effect; + } +} diff --git a/core/src/io/anuke/mindustry/content/Mechs.java b/core/src/io/anuke/mindustry/content/Mechs.java index 5ec66db65c..01df597434 100644 --- a/core/src/io/anuke/mindustry/content/Mechs.java +++ b/core/src/io/anuke/mindustry/content/Mechs.java @@ -9,8 +9,6 @@ import io.anuke.arc.graphics.g2d.TextureRegion; import io.anuke.arc.math.Mathf; import io.anuke.arc.math.geom.Rectangle; import io.anuke.arc.util.Time; -import io.anuke.mindustry.content.fx.BulletFx; -import io.anuke.mindustry.content.fx.UnitFx; import io.anuke.mindustry.entities.Player; import io.anuke.mindustry.entities.Units; import io.anuke.mindustry.entities.effect.Lightning; @@ -68,7 +66,7 @@ public class Mechs implements ContentList{ public void onLand(Player player){ if(player.timer.get(Player.timerAbility, cooldown)){ Effects.shake(1f, 1f, player); - Effects.effect(UnitFx.landShock, player); + Effects.effect(Fx.landShock, player); for(int i = 0; i < 8; i++){ Time.run(Mathf.random(8f), () -> Lightning.create(player.getTeam(), Palette.lancerLaser, 17f, player.x, player.y, Mathf.random(360f), 14)); } @@ -109,7 +107,7 @@ public class Mechs implements ContentList{ Units.getNearby(player.getTeam(), rect, unit -> { if(unit.dst(player) <= healRange){ if(unit.health < unit.maxHealth()){ - Effects.effect(UnitFx.heal, unit); + Effects.effect(Fx.heal, unit); wasHealed = true; } unit.healBy(healAmount); @@ -117,7 +115,7 @@ public class Mechs implements ContentList{ }); if(wasHealed){ - Effects.effect(UnitFx.healWave, player); + Effects.effect(Fx.healWave, player); } } } @@ -228,7 +226,7 @@ public class Mechs implements ContentList{ public void updateAlt(Player player){ float scl = scld(player); if(Mathf.chance(Time.delta() * (0.15*scl))){ - Effects.effect(BulletFx.hitLancer, Palette.lancerLaser, player.x, player.y); + Effects.effect(Fx.hitLancer, Palette.lancerLaser, player.x, player.y); Lightning.create(player.getTeam(), Palette.lancerLaser, 10f, player.x + player.velocity().x, player.y + player.velocity().y, player.rotation, 14); } diff --git a/core/src/io/anuke/mindustry/content/StatusEffects.java b/core/src/io/anuke/mindustry/content/StatusEffects.java index 9162d9be3a..eb37c73e11 100644 --- a/core/src/io/anuke/mindustry/content/StatusEffects.java +++ b/core/src/io/anuke/mindustry/content/StatusEffects.java @@ -3,7 +3,6 @@ package io.anuke.mindustry.content; import io.anuke.arc.entities.Effects; import io.anuke.arc.math.Mathf; import io.anuke.arc.util.Time; -import io.anuke.mindustry.content.fx.EnvironmentFx; import io.anuke.mindustry.entities.StatusController.StatusEntry; import io.anuke.mindustry.entities.Unit; import io.anuke.mindustry.game.ContentList; @@ -27,7 +26,7 @@ public class StatusEffects implements ContentList{ public StatusEntry getTransition(Unit unit, StatusEffect to, float time, float newTime, StatusEntry result){ if(to == tarred){ unit.damage(1f); - Effects.effect(EnvironmentFx.burning, unit.x + Mathf.range(unit.getSize() / 2f), unit.y + Mathf.range(unit.getSize() / 2f)); + Effects.effect(Fx.burning, unit.x + Mathf.range(unit.getSize() / 2f), unit.y + Mathf.range(unit.getSize() / 2f)); return result.set(this, Math.min(time + newTime, baseDuration + tarred.baseDuration)); } @@ -39,7 +38,7 @@ public class StatusEffects implements ContentList{ unit.damagePeriodic(0.04f); if(Mathf.chance(Time.delta() * 0.2f)){ - Effects.effect(EnvironmentFx.burning, unit.x + Mathf.range(unit.getSize() / 2f), unit.y + Mathf.range(unit.getSize() / 2f)); + Effects.effect(Fx.burning, unit.x + Mathf.range(unit.getSize() / 2f), unit.y + Mathf.range(unit.getSize() / 2f)); } } }; @@ -55,7 +54,7 @@ public class StatusEffects implements ContentList{ public void update(Unit unit, float time){ if(Mathf.chance(Time.delta() * 0.15f)){ - Effects.effect(EnvironmentFx.freezing, unit.x + Mathf.range(unit.getSize() / 2f), unit.y + Mathf.range(unit.getSize() / 2f)); + Effects.effect(Fx.freezing, unit.x + Mathf.range(unit.getSize() / 2f), unit.y + Mathf.range(unit.getSize() / 2f)); } } }; @@ -80,7 +79,7 @@ public class StatusEffects implements ContentList{ @Override public void update(Unit unit, float time){ if(Mathf.chance(Time.delta() * 0.15f)){ - Effects.effect(EnvironmentFx.wet, unit.x + Mathf.range(unit.getSize() / 2f), unit.y + Mathf.range(unit.getSize() / 2f)); + Effects.effect(Fx.wet, unit.x + Mathf.range(unit.getSize() / 2f), unit.y + Mathf.range(unit.getSize() / 2f)); } } }; @@ -106,7 +105,7 @@ public class StatusEffects implements ContentList{ unit.damagePeriodic(0.3f); if(Mathf.chance(Time.delta() * 0.2f)){ - Effects.effect(EnvironmentFx.melting, unit.x + Mathf.range(unit.getSize() / 2f), unit.y + Mathf.range(unit.getSize() / 2f)); + Effects.effect(Fx.melting, unit.x + Mathf.range(unit.getSize() / 2f), unit.y + Mathf.range(unit.getSize() / 2f)); } } }; @@ -119,7 +118,7 @@ public class StatusEffects implements ContentList{ @Override public void update(Unit unit, float time){ if(Mathf.chance(Time.delta() * 0.15f)){ - Effects.effect(EnvironmentFx.oily, unit.x + Mathf.range(unit.getSize() / 2f), unit.y + Mathf.range(unit.getSize() / 2f)); + Effects.effect(Fx.oily, unit.x + Mathf.range(unit.getSize() / 2f), unit.y + Mathf.range(unit.getSize() / 2f)); } } @@ -146,7 +145,7 @@ public class StatusEffects implements ContentList{ unit.health += 0.01f * Time.delta(); if(Mathf.chance(Time.delta() * 0.25f)){ - Effects.effect(EnvironmentFx.overdriven, unit.x + Mathf.range(unit.getSize() / 2f), unit.y + Mathf.range(unit.getSize() / 2f), 0f, unit); + Effects.effect(Fx.overdriven, unit.x + Mathf.range(unit.getSize() / 2f), unit.y + Mathf.range(unit.getSize() / 2f), 0f, unit); } } }; diff --git a/core/src/io/anuke/mindustry/content/Weapons.java b/core/src/io/anuke/mindustry/content/Weapons.java index 20fa1f5804..e731067a45 100644 --- a/core/src/io/anuke/mindustry/content/Weapons.java +++ b/core/src/io/anuke/mindustry/content/Weapons.java @@ -1,7 +1,5 @@ package io.anuke.mindustry.content; -import io.anuke.mindustry.content.fx.Fx; -import io.anuke.mindustry.content.fx.ShootFx; import io.anuke.mindustry.game.ContentList; import io.anuke.mindustry.type.ContentType; import io.anuke.mindustry.type.Weapon; @@ -17,7 +15,7 @@ public class Weapons implements ContentList{ length = 1.5f; reload = 14f; roundrobin = true; - ejectEffect = ShootFx.shellEjectSmall; + ejectEffect = Fx.shellEjectSmall; ammo = Bullets.standardMechSmall; }}; @@ -25,7 +23,7 @@ public class Weapons implements ContentList{ length = 1.5f; reload = 15f; roundrobin = true; - ejectEffect = ShootFx.shellEjectSmall; + ejectEffect = Fx.shellEjectSmall; ammo = Bullets.standardCopper; }}; @@ -33,7 +31,7 @@ public class Weapons implements ContentList{ length = 1.5f; reload = 10f; roundrobin = true; - ejectEffect = ShootFx.shellEjectSmall; + ejectEffect = Fx.shellEjectSmall; ammo = Bullets.standardGlaive; }}; @@ -42,7 +40,7 @@ public class Weapons implements ContentList{ reload = 25f; width = 1f; roundrobin = true; - ejectEffect = ShootFx.shellEjectSmall; + ejectEffect = Fx.shellEjectSmall; ammo = Bullets.standardCopper; }}; @@ -84,7 +82,7 @@ public class Weapons implements ContentList{ length = 1.5f; reload = 28f; roundrobin = true; - ejectEffect = ShootFx.shellEjectSmall; + ejectEffect = Fx.shellEjectSmall; ammo = Bullets.standardCopper; }}; @@ -107,7 +105,7 @@ public class Weapons implements ContentList{ inaccuracy = 3f; recoil = 3f; velocityRnd = 0.1f; - ejectEffect = ShootFx.shellEjectMedium; + ejectEffect = Fx.shellEjectMedium; ammo = Bullets.artilleryDense; }}; @@ -126,7 +124,7 @@ public class Weapons implements ContentList{ roundrobin = true; recoil = 5f; shake = 2f; - ejectEffect = ShootFx.shellEjectMedium; + ejectEffect = Fx.shellEjectMedium; ammo = Bullets.artilleryUnit; }}; diff --git a/core/src/io/anuke/mindustry/content/blocks/CraftingBlocks.java b/core/src/io/anuke/mindustry/content/blocks/CraftingBlocks.java index 0933c8a0fb..034480bdcf 100644 --- a/core/src/io/anuke/mindustry/content/blocks/CraftingBlocks.java +++ b/core/src/io/anuke/mindustry/content/blocks/CraftingBlocks.java @@ -3,7 +3,7 @@ package io.anuke.mindustry.content.blocks; import io.anuke.arc.graphics.Color; import io.anuke.mindustry.content.Items; import io.anuke.mindustry.content.Liquids; -import io.anuke.mindustry.content.fx.BlockFx; +import io.anuke.mindustry.content.Fx; import io.anuke.mindustry.game.ContentList; import io.anuke.mindustry.type.ItemStack; import io.anuke.mindustry.world.Block; @@ -29,7 +29,7 @@ public class CraftingBlocks extends BlockList implements ContentList{ arcsmelter = new PowerSmelter("arc-smelter"){{ health = 90; - craftEffect = BlockFx.smeltsmoke; + craftEffect = Fx.smeltsmoke; result = Items.densealloy; craftTime = 30f; size = 2; @@ -43,7 +43,7 @@ public class CraftingBlocks extends BlockList implements ContentList{ siliconsmelter = new PowerSmelter("silicon-smelter"){{ health = 90; - craftEffect = BlockFx.smeltsmoke; + craftEffect = Fx.smeltsmoke; result = Items.silicon; craftTime = 40f; size = 2; @@ -63,8 +63,8 @@ public class CraftingBlocks extends BlockList implements ContentList{ size = 2; health = 320; hasPower = hasLiquids = true; - craftEffect = BlockFx.formsmoke; - updateEffect = BlockFx.plasticburn; + craftEffect = Fx.formsmoke; + updateEffect = Fx.plasticburn; consumes.liquid(Liquids.oil, 0.25f); consumes.power(0.3f); @@ -72,7 +72,7 @@ public class CraftingBlocks extends BlockList implements ContentList{ }}; phaseWeaver = new PhaseWeaver("phase-weaver"){{ - craftEffect = BlockFx.smeltsmoke; + craftEffect = Fx.smeltsmoke; result = Items.phasefabric; craftTime = 120f; size = 2; @@ -82,7 +82,7 @@ public class CraftingBlocks extends BlockList implements ContentList{ }}; alloySmelter = new PowerSmelter("alloy-smelter"){{ - craftEffect = BlockFx.smeltsmoke; + craftEffect = Fx.smeltsmoke; result = Items.surgealloy; craftTime = 75f; size = 2; @@ -207,9 +207,9 @@ public class CraftingBlocks extends BlockList implements ContentList{ itemCapacity = 40; output = Items.sand; health = 80; - craftEffect = BlockFx.pulverize; + craftEffect = Fx.pulverize; craftTime = 40f; - updateEffect = BlockFx.pulverizeSmall; + updateEffect = Fx.pulverizeSmall; hasItems = hasPower = true; consumes.item(Items.stone, 1); @@ -222,7 +222,7 @@ public class CraftingBlocks extends BlockList implements ContentList{ output = Items.stone; itemCapacity = 20; health = 80; - craftEffect = BlockFx.purifystone; + craftEffect = Fx.purifystone; hasLiquids = hasItems = true; consumes.liquid(Liquids.lava, 1f); diff --git a/core/src/io/anuke/mindustry/content/blocks/DefenseBlocks.java b/core/src/io/anuke/mindustry/content/blocks/DefenseBlocks.java index 9f67d7fe7f..84e48c3207 100644 --- a/core/src/io/anuke/mindustry/content/blocks/DefenseBlocks.java +++ b/core/src/io/anuke/mindustry/content/blocks/DefenseBlocks.java @@ -1,7 +1,7 @@ package io.anuke.mindustry.content.blocks; import io.anuke.mindustry.content.Items; -import io.anuke.mindustry.content.fx.BlockFx; +import io.anuke.mindustry.content.Fx; import io.anuke.mindustry.game.ContentList; import io.anuke.mindustry.world.Block; import io.anuke.mindustry.world.blocks.defense.*; @@ -64,8 +64,8 @@ public class DefenseBlocks extends BlockList implements ContentList{ }}; doorLarge = new Door("door-large"){{ - openfx = BlockFx.dooropenlarge; - closefx = BlockFx.doorcloselarge; + openfx = Fx.dooropenlarge; + closefx = Fx.doorcloselarge; health = 100 * 4 * wallHealthMultiplier; size = 2; }}; diff --git a/core/src/io/anuke/mindustry/content/blocks/PowerBlocks.java b/core/src/io/anuke/mindustry/content/blocks/PowerBlocks.java index 843541ca64..af35629803 100644 --- a/core/src/io/anuke/mindustry/content/blocks/PowerBlocks.java +++ b/core/src/io/anuke/mindustry/content/blocks/PowerBlocks.java @@ -1,10 +1,9 @@ package io.anuke.mindustry.content.blocks; import io.anuke.mindustry.content.Liquids; -import io.anuke.mindustry.content.fx.BlockFx; +import io.anuke.mindustry.content.Fx; import io.anuke.mindustry.game.ContentList; import io.anuke.mindustry.world.Block; -import io.anuke.mindustry.world.Tile; import io.anuke.mindustry.world.blocks.power.*; public class PowerBlocks extends BlockList implements ContentList{ @@ -21,7 +20,7 @@ public class PowerBlocks extends BlockList implements ContentList{ thermalGenerator = new LiquidHeatGenerator("thermal-generator"){{ maxLiquidGenerate = 2f; powerProduction = 2f; - generateEffect = BlockFx.redgeneratespark; + generateEffect = Fx.redgeneratespark; size = 2; }}; diff --git a/core/src/io/anuke/mindustry/content/blocks/ProductionBlocks.java b/core/src/io/anuke/mindustry/content/blocks/ProductionBlocks.java index 101db89ec7..30a5f8f5a5 100644 --- a/core/src/io/anuke/mindustry/content/blocks/ProductionBlocks.java +++ b/core/src/io/anuke/mindustry/content/blocks/ProductionBlocks.java @@ -3,7 +3,7 @@ package io.anuke.mindustry.content.blocks; import io.anuke.arc.graphics.Color; import io.anuke.mindustry.content.Items; import io.anuke.mindustry.content.Liquids; -import io.anuke.mindustry.content.fx.BlockFx; +import io.anuke.mindustry.content.Fx; import io.anuke.mindustry.game.ContentList; import io.anuke.mindustry.world.Block; import io.anuke.mindustry.world.blocks.production.Cultivator; @@ -35,8 +35,8 @@ public class ProductionBlocks extends BlockList implements ContentList{ size = 2; hasPower = true; tier = 4; - updateEffect = BlockFx.pulverizeMedium; - drillEffect = BlockFx.mineBig; + updateEffect = Fx.pulverizeMedium; + drillEffect = Fx.mineBig; consumes.power(0.11f); }}; @@ -47,9 +47,9 @@ public class ProductionBlocks extends BlockList implements ContentList{ drawRim = true; hasPower = true; tier = 5; - updateEffect = BlockFx.pulverizeRed; + updateEffect = Fx.pulverizeRed; updateEffectChance = 0.03f; - drillEffect = BlockFx.mineHuge; + drillEffect = Fx.mineHuge; rotateSpeed = 6f; warmupSpeed = 0.01f; @@ -65,9 +65,9 @@ public class ProductionBlocks extends BlockList implements ContentList{ tier = 5; rotateSpeed = 9f; drawRim = true; - updateEffect = BlockFx.pulverizeRedder; + updateEffect = Fx.pulverizeRedder; updateEffectChance = 0.04f; - drillEffect = BlockFx.mineHuge; + drillEffect = Fx.mineHuge; warmupSpeed = 0.005f; consumes.power(0.7f); @@ -85,7 +85,7 @@ public class ProductionBlocks extends BlockList implements ContentList{ oilExtractor = new Fracker("oil-extractor"){{ result = Liquids.oil; - updateEffect = BlockFx.pulverize; + updateEffect = Fx.pulverize; liquidCapacity = 50f; updateEffectChance = 0.05f; pumpAmount = 0.09f; diff --git a/core/src/io/anuke/mindustry/content/blocks/TurretBlocks.java b/core/src/io/anuke/mindustry/content/blocks/TurretBlocks.java index f1a7ac794b..dd963b0a6e 100644 --- a/core/src/io/anuke/mindustry/content/blocks/TurretBlocks.java +++ b/core/src/io/anuke/mindustry/content/blocks/TurretBlocks.java @@ -5,7 +5,7 @@ import io.anuke.arc.graphics.g2d.Draw; import io.anuke.mindustry.content.Bullets; import io.anuke.mindustry.content.Items; import io.anuke.mindustry.content.Liquids; -import io.anuke.mindustry.content.fx.ShootFx; +import io.anuke.mindustry.content.Fx; import io.anuke.mindustry.game.ContentList; import io.anuke.mindustry.world.Block; import io.anuke.mindustry.world.blocks.defense.turrets.*; @@ -27,7 +27,7 @@ public class TurretBlocks extends BlockList implements ContentList{ restitution = 0.03f; range = 90f; shootCone = 15f; - ammoUseEffect = ShootFx.shellEjectSmall; + ammoUseEffect = Fx.shellEjectSmall; health = 80; inaccuracy = 2f; rotatespeed = 10f; @@ -52,7 +52,7 @@ public class TurretBlocks extends BlockList implements ContentList{ recoil = 0f; reload = 4f; shootCone = 50f; - ammoUseEffect = ShootFx.shellEjectSmall; + ammoUseEffect = Fx.shellEjectSmall; health = 160; }}; @@ -68,7 +68,7 @@ public class TurretBlocks extends BlockList implements ContentList{ reload = 4f; inaccuracy = 5f; shootCone = 50f; - shootEffect = ShootFx.shootLiquid; + shootEffect = Fx.shootLiquid; range = 90f; health = 360; @@ -94,10 +94,10 @@ public class TurretBlocks extends BlockList implements ContentList{ powerUsed = 1 / 3f; consumes.powerBuffered(60f); shootShake = 2f; - shootEffect = ShootFx.lancerLaserShoot; - smokeEffect = ShootFx.lancerLaserShootSmoke; - chargeEffect = ShootFx.lancerLaserCharge; - chargeBeginEffect = ShootFx.lancerLaserChargeBegin; + shootEffect = Fx.lancerLaserShoot; + smokeEffect = Fx.lancerLaserShootSmoke; + chargeEffect = Fx.lancerLaserCharge; + chargeBeginEffect = Fx.lancerLaserChargeBegin; heatColor = Color.RED; size = 2; health = 320; @@ -113,7 +113,7 @@ public class TurretBlocks extends BlockList implements ContentList{ powerUsed = 1f / 3f; consumes.powerBuffered(30f); range = 150f; - shootEffect = ShootFx.lightningShoot; + shootEffect = Fx.lightningShoot; heatColor = Color.RED; recoil = 1f; size = 1; @@ -154,7 +154,7 @@ public class TurretBlocks extends BlockList implements ContentList{ shootShake = 2f; burstSpacing = 4; shots = 3; - ammoUseEffect = ShootFx.shellEjectBig; + ammoUseEffect = Fx.shellEjectBig; health = 360; }}; @@ -171,7 +171,7 @@ public class TurretBlocks extends BlockList implements ContentList{ inaccuracy = 12f; reload = 60f; ammoEjectBack = 5f; - ammoUseEffect = ShootFx.shellEjectBig; + ammoUseEffect = Fx.shellEjectBig; cooldown = 0.03f; velocityInaccuracy = 0.2f; restitution = 0.02f; @@ -222,7 +222,7 @@ public class TurretBlocks extends BlockList implements ContentList{ coolantMultiplier = 0.5f; maxCoolantUsed = 1.5f; restitution = 0.1f; - ammoUseEffect = ShootFx.shellEjectBig; + ammoUseEffect = Fx.shellEjectBig; range = 200f; inaccuracy = 3f; recoil = 3f; @@ -238,7 +238,7 @@ public class TurretBlocks extends BlockList implements ContentList{ meltdown = new LaserTurret("meltdown"){{ shootType = Bullets.meltdownLaser; - shootEffect = ShootFx.shootBigSmoke2; + shootEffect = Fx.shootBigSmoke2; shootCone = 40f; recoil = 4f; size = 4; diff --git a/core/src/io/anuke/mindustry/content/fx/BlockFx.java b/core/src/io/anuke/mindustry/content/fx/BlockFx.java deleted file mode 100644 index 106582a241..0000000000 --- a/core/src/io/anuke/mindustry/content/fx/BlockFx.java +++ /dev/null @@ -1,330 +0,0 @@ -package io.anuke.mindustry.content.fx; - -import io.anuke.arc.graphics.Color; -import io.anuke.mindustry.entities.effect.GroundEffectEntity.GroundEffect; -import io.anuke.mindustry.graphics.Palette; -import io.anuke.mindustry.game.ContentList; -import io.anuke.arc.entities.Effects.Effect; -import io.anuke.arc.graphics.g2d.Draw; -import io.anuke.arc.graphics.g2d.Fill; -import io.anuke.arc.graphics.g2d.Lines; -import io.anuke.arc.math.Angles; -import io.anuke.arc.math.Mathf; -import io.anuke.arc.util.Tmp; - -import static io.anuke.mindustry.Vars.tilesize; - -public class BlockFx extends FxList implements ContentList{ - public static Effect reactorsmoke, nuclearsmoke, nuclearcloud, redgeneratespark, generatespark, fuelburn, plasticburn, - pulverize, pulverizeRed, pulverizeRedder, pulverizeSmall, pulverizeMedium, producesmoke, smeltsmoke, formsmoke, blastsmoke, - lava, dooropen, doorclose, dooropenlarge, doorcloselarge, purify, purifyoil, purifystone, generate, mine, mineBig, mineHuge, - smelt, teleportActivate, teleport, teleportOut, ripple, bubble, commandSend, healBlock, healBlockFull, healWaveMend, overdriveWave, - overdriveBlockFull, shieldBreak; - - @Override - public void load(){ - - reactorsmoke = new Effect(17, e -> { - Angles.randLenVectors(e.id, 4, e.fin() * 8f, (x, y) -> { - float size = 1f + e.fout() * 5f; - Draw.color(Color.LIGHT_GRAY, Color.GRAY, e.fin()); - Draw.rect("circle", e.x + x, e.y + y, size, size); - Draw.reset(); - }); - }); - nuclearsmoke = new Effect(40, e -> { - Angles.randLenVectors(e.id, 4, e.fin() * 13f, (x, y) -> { - float size = e.fslope() * 4f; - Draw.color(Color.LIGHT_GRAY, Color.GRAY, e.fin()); - Draw.rect("circle", e.x + x, e.y + y, size, size); - Draw.reset(); - }); - }); - nuclearcloud = new Effect(90, 200f, e -> { - Angles.randLenVectors(e.id, 10, e.finpow() * 90f, (x, y) -> { - float size = e.fout() * 14f; - Draw.color(Color.LIME, Color.GRAY, e.fin()); - Draw.rect("circle", e.x + x, e.y + y, size, size); - Draw.reset(); - }); - }); - redgeneratespark = new Effect(18, e -> { - Angles.randLenVectors(e.id, 5, e.fin() * 8f, (x, y) -> { - float len = e.fout() * 4f; - Draw.color(Palette.redSpark, Color.GRAY, e.fin()); - //Draw.alpha(e.fout()); - Draw.rect("circle", e.x + x, e.y + y, len, len); - Draw.reset(); - }); - }); - generatespark = new Effect(18, e -> { - Angles.randLenVectors(e.id, 5, e.fin() * 8f, (x, y) -> { - float len = e.fout() * 4f; - Draw.color(Palette.orangeSpark, Color.GRAY, e.fin()); - Draw.rect("circle", e.x + x, e.y + y, len, len); - Draw.reset(); - }); - }); - fuelburn = new Effect(23, e -> { - Angles.randLenVectors(e.id, 5, e.fin() * 9f, (x, y) -> { - float len = e.fout() * 4f; - Draw.color(Color.LIGHT_GRAY, Color.GRAY, e.fin()); - Draw.rect("circle", e.x + x, e.y + y, len, len); - Draw.reset(); - }); - }); - plasticburn = new Effect(40, e -> { - Angles.randLenVectors(e.id, 5, 3f + e.fin() * 5f, (x, y) -> { - Draw.color(Color.valueOf("e9ead3"), Color.GRAY, e.fin()); - Fill.circle(e.x + x, e.y + y, e.fout() * 1f); - Draw.reset(); - }); - }); - pulverize = new Effect(40, e -> { - Angles.randLenVectors(e.id, 5, 3f + e.fin() * 8f, (x, y) -> { - Draw.color(Palette.stoneGray); - Fill.square(e.x + x, e.y + y, e.fout() * 2f + 0.5f, 45); - Draw.reset(); - }); - }); - pulverizeRed = new Effect(40, e -> { - Angles.randLenVectors(e.id, 5, 3f + e.fin() * 8f, (x, y) -> { - Draw.color(Palette.redDust, Palette.stoneGray, e.fin()); - Fill.square(e.x + x, e.y + y, e.fout() * 2f + 0.5f, 45); - Draw.reset(); - }); - }); - pulverizeRedder = new Effect(40, e -> { - Angles.randLenVectors(e.id, 5, 3f + e.fin() * 9f, (x, y) -> { - Draw.color(Palette.redderDust, Palette.stoneGray, e.fin()); - Fill.square(e.x + x, e.y + y, e.fout() * 2.5f + 0.5f, 45); - Draw.reset(); - }); - }); - pulverizeSmall = new Effect(30, e -> { - Angles.randLenVectors(e.id, 3, e.fin() * 5f, (x, y) -> { - Draw.color(Palette.stoneGray); - Fill.square(e.x + x, e.y + y, e.fout() * 1f + 0.5f, 45); - Draw.reset(); - }); - }); - pulverizeMedium = new Effect(30, e -> { - Angles.randLenVectors(e.id, 5, 3f + e.fin() * 8f, (x, y) -> { - Draw.color(Palette.stoneGray); - Fill.square(e.x + x, e.y + y, e.fout() * 1f + 0.5f, 45); - Draw.reset(); - }); - }); - producesmoke = new Effect(12, e -> { - Angles.randLenVectors(e.id, 8, 4f + e.fin() * 18f, (x, y) -> { - Draw.color(Color.WHITE, Palette.accent, e.fin()); - Fill.square(e.x + x, e.y + y, 1f + e.fout() * 3f, 45); - Draw.reset(); - }); - }); - smeltsmoke = new Effect(15, e -> { - Angles.randLenVectors(e.id, 6, 4f + e.fin() * 5f, (x, y) -> { - Draw.color(Color.WHITE, e.color, e.fin()); - Fill.square(e.x + x, e.y + y, 0.5f + e.fout() * 2f, 45); - Draw.reset(); - }); - }); - formsmoke = new Effect(40, e -> { - Angles.randLenVectors(e.id, 6, 5f + e.fin() * 8f, (x, y) -> { - Draw.color(Palette.plasticSmoke, Color.LIGHT_GRAY, e.fin()); - Fill.square(e.x + x, e.y + y, 0.2f + e.fout() * 2f, 45); - Draw.reset(); - }); - }); - blastsmoke = new Effect(26, e -> { - Angles.randLenVectors(e.id, 12, 1f + e.fin() * 23f, (x, y) -> { - float size = 2f + e.fout() * 6f; - Draw.color(Color.LIGHT_GRAY, Color.DARK_GRAY, e.fin()); - Draw.rect("circle", e.x + x, e.y + y, size, size); - Draw.reset(); - }); - }); - lava = new Effect(18, e -> { - Angles.randLenVectors(e.id, 3, 1f + e.fin() * 10f, (x, y) -> { - float size = e.fslope() * 4f; - Draw.color(Color.ORANGE, Color.GRAY, e.fin()); - Draw.rect("circle", e.x + x, e.y + y, size, size); - Draw.reset(); - }); - }); - dooropen = new Effect(10, e -> { - Lines.stroke(e.fout() * 1.6f); - Lines.square(e.x, e.y, tilesize / 2f + e.fin() * 2f); - Draw.reset(); - }); - doorclose = new Effect(10, e -> { - Lines.stroke(e.fout() * 1.6f); - Lines.square(e.x, e.y, tilesize / 2f + e.fout() * 2f); - Draw.reset(); - }); - dooropenlarge = new Effect(10, e -> { - Lines.stroke(e.fout() * 1.6f); - Lines.square(e.x, e.y, tilesize + e.fin() * 2f); - Draw.reset(); - }); - doorcloselarge = new Effect(10, e -> { - Lines.stroke(e.fout() * 1.6f); - Lines.square(e.x, e.y, tilesize + e.fout() * 2f); - Draw.reset(); - }); - purify = new Effect(10, e -> { - Draw.color(Color.ROYAL, Color.GRAY, e.fin()); - Lines.stroke(2f); - Lines.spikes(e.x, e.y, e.fin() * 4f, 2, 6); - Draw.reset(); - }); - purifyoil = new Effect(10, e -> { - Draw.color(Color.BLACK, Color.GRAY, e.fin()); - Lines.stroke(2f); - Lines.spikes(e.x, e.y, e.fin() * 4f, 2, 6); - Draw.reset(); - }); - purifystone = new Effect(10, e -> { - Draw.color(Color.ORANGE, Color.GRAY, e.fin()); - Lines.stroke(2f); - Lines.spikes(e.x, e.y, e.fin() * 4f, 2, 6); - Draw.reset(); - }); - generate = new Effect(11, e -> { - Draw.color(Color.ORANGE, Color.YELLOW, e.fin()); - Lines.stroke(1f); - Lines.spikes(e.x, e.y, e.fin() * 5f, 2, 8); - Draw.reset(); - }); - mine = new Effect(20, e -> { - Angles.randLenVectors(e.id, 6, 3f + e.fin() * 6f, (x, y) -> { - Draw.color(e.color, Color.LIGHT_GRAY, e.fin()); - Fill.square(e.x + x, e.y + y, e.fout() * 2f, 45); - Draw.reset(); - }); - }); - mineBig = new Effect(30, e -> { - Angles.randLenVectors(e.id, 6, 4f + e.fin() * 8f, (x, y) -> { - Draw.color(e.color, Color.LIGHT_GRAY, e.fin()); - Fill.square(e.x + x, e.y + y, e.fout() * 2f + 0.2f, 45); - Draw.reset(); - }); - }); - mineHuge = new Effect(40, e -> { - Angles.randLenVectors(e.id, 8, 5f + e.fin() * 10f, (x, y) -> { - Draw.color(e.color, Color.LIGHT_GRAY, e.fin()); - Fill.square(e.x + x, e.y + y, e.fout() * 2f + 0.5f, 45); - Draw.reset(); - }); - }); - smelt = new Effect(20, e -> { - Angles.randLenVectors(e.id, 6, 2f + e.fin() * 5f, (x, y) -> { - Draw.color(Color.WHITE, e.color, e.fin()); - Fill.square(e.x + x, e.y + y, 0.5f + e.fout() * 2f, 45); - Draw.reset(); - }); - }); - teleportActivate = new Effect(50, e -> { - Draw.color(e.color); - - e.scaled(8f, e2 -> { - Lines.stroke(e2.fout() * 4f); - Lines.circle(e2.x, e2.y, 4f + e2.fin() * 27f); - }); - - Lines.stroke(e.fout() * 2f); - - Angles.randLenVectors(e.id, 30, 4f + 40f * e.fin(), (x, y) -> { - Lines.lineAngle(e.x + x, e.y + y, Mathf.angle(x, y), e.fin() * 4f + 1f); - }); - - Draw.reset(); - }); - teleport = new Effect(60, e -> { - Draw.color(e.color); - Lines.stroke(e.fin() * 2f); - Lines.circle(e.x, e.y, 7f + e.fout() * 8f); - - Angles.randLenVectors(e.id, 20, 6f + 20f * e.fout(), (x, y) -> { - Lines.lineAngle(e.x + x, e.y + y, Mathf.angle(x, y), e.fin() * 4f + 1f); - }); - - Draw.reset(); - }); - teleportOut = new Effect(20, e -> { - Draw.color(e.color); - Lines.stroke(e.fout() * 2f); - Lines.circle(e.x, e.y, 7f + e.fin() * 8f); - - Angles.randLenVectors(e.id, 20, 4f + 20f * e.fin(), (x, y) -> { - Lines.lineAngle(e.x + x, e.y + y, Mathf.angle(x, y), e.fslope() * 4f + 1f); - }); - - Draw.reset(); - }); - ripple = new GroundEffect(false, 30, e -> { - Draw.color(Tmp.c1.set(e.color).shiftValue(0.1f)); - Lines.stroke(e.fout() + 0.4f); - Lines.circle(e.x, e.y, 2f + e.fin() * 4f); - Draw.reset(); - }); - - bubble = new Effect(20, e -> { - Draw.color(Tmp.c1.set(e.color).shiftValue(0.1f)); - Lines.stroke(e.fout() + 0.2f); - Angles.randLenVectors(e.id, 2, 8f, (x, y) -> { - Lines.circle(e.x + x, e.y + y, 1f + e.fin() * 3f); - }); - Draw.reset(); - }); - - commandSend = new Effect(28, e -> { - Draw.color(Palette.command); - Lines.stroke(e.fout() * 2f); - Lines.poly(e.x, e.y, 40, 4f + e.finpow() * 120f); - Draw.color(); - }); - - healWaveMend = new Effect(40, e -> { - Draw.color(e.color); - Lines.stroke(e.fout() * 2f); - Lines.poly(e.x, e.y, 30, e.finpow() * e.rotation); - Draw.color(); - }); - - overdriveWave = new Effect(50, e -> { - Draw.color(e.color); - Lines.stroke(e.fout() * 1f); - Lines.poly(e.x, e.y, 30, e.finpow() * e.rotation); - Draw.color(); - }); - - healBlock = new Effect(20, e -> { - Draw.color(Palette.heal); - Lines.stroke(2f * e.fout() + 0.5f); - Lines.square(e.x, e.y, 1f + (e.fin() * e.rotation * tilesize/2f-1f)); - Draw.color(); - }); - - healBlockFull = new Effect(20, e -> { - Draw.color(e.color); - Draw.alpha(e.fout()); - Fill.square(e.x, e.y, e.rotation * tilesize / 2f); - Draw.color(); - }); - - overdriveBlockFull = new Effect(60, e -> { - Draw.color(e.color); - Draw.alpha(e.fslope() * 0.4f); - Fill.square(e.x, e.y, e.rotation * tilesize); - Draw.color(); - }); - - shieldBreak = new Effect(40, e -> { - Draw.color(Palette.accent); - Lines.stroke(3f * e.fout()); - Lines.poly(e.x, e.y, 6, e.rotation + e.fin(), 90); - Draw.reset(); - }); - } -} diff --git a/core/src/io/anuke/mindustry/content/fx/BulletFx.java b/core/src/io/anuke/mindustry/content/fx/BulletFx.java deleted file mode 100644 index 3c6441b876..0000000000 --- a/core/src/io/anuke/mindustry/content/fx/BulletFx.java +++ /dev/null @@ -1,281 +0,0 @@ -package io.anuke.mindustry.content.fx; - -import io.anuke.arc.graphics.Color; -import io.anuke.mindustry.graphics.Palette; -import io.anuke.mindustry.game.ContentList; -import io.anuke.arc.entities.Effects.Effect; -import io.anuke.arc.graphics.g2d.Draw; -import io.anuke.arc.graphics.g2d.Fill; -import io.anuke.arc.graphics.g2d.Lines; -import io.anuke.arc.math.Angles; -import io.anuke.arc.math.Mathf; - -public class BulletFx extends FxList implements ContentList{ - public static Effect hitBulletSmall, hitFuse, hitBulletBig, hitFlameSmall, hitLiquid, hitLaser, hitLancer, hitMeltdown, despawn, flakExplosion, blastExplosion, plasticExplosion, - artilleryTrail, incendTrail, missileTrail, absorb, flakExplosionBig, plasticExplosionFlak; - - @Override - public void load(){ - - hitBulletSmall = new Effect(14, e -> { - Draw.color(Color.WHITE, Palette.lightOrange, e.fin()); - - e.scaled(7f, s -> { - Lines.stroke(0.5f + s.fout()); - Lines.circle(e.x, e.y, s.fin()*5f); - }); - - - Lines.stroke(0.5f + e.fout()); - - Angles.randLenVectors(e.id, 5, e.fin() * 15f, (x, y) -> { - float ang = Mathf.angle(x, y); - Lines.lineAngle(e.x + x, e.y + y, ang, e.fout() * 3 + 1f); - }); - - Draw.reset(); - }); - - hitFuse = new Effect(14, e -> { - Draw.color(Color.WHITE, Palette.surge, e.fin()); - - e.scaled(7f, s -> { - Lines.stroke(0.5f + s.fout()); - Lines.circle(e.x, e.y, s.fin()*7f); - }); - - - Lines.stroke(0.5f + e.fout()); - - Angles.randLenVectors(e.id, 6, e.fin() * 15f, (x, y) -> { - float ang = Mathf.angle(x, y); - Lines.lineAngle(e.x + x, e.y + y, ang, e.fout() * 3 + 1f); - }); - - Draw.reset(); - }); - - hitBulletBig = new Effect(13, e -> { - Draw.color(Color.WHITE, Palette.lightOrange, e.fin()); - Lines.stroke(0.5f + e.fout() * 1.5f); - - Angles.randLenVectors(e.id, 8, e.finpow() * 30f, e.rotation, 50f, (x, y) -> { - float ang = Mathf.angle(x, y); - Lines.lineAngle(e.x + x, e.y + y, ang, e.fout() * 4 + 1.5f); - }); - - Draw.reset(); - }); - - hitFlameSmall = new Effect(14, e -> { - Draw.color(Palette.lightFlame, Palette.darkFlame, e.fin()); - Lines.stroke(0.5f + e.fout()); - - Angles.randLenVectors(e.id, 5, e.fin() * 15f, e.rotation, 50f, (x, y) -> { - float ang = Mathf.angle(x, y); - Lines.lineAngle(e.x + x, e.y + y, ang, e.fout() * 3 + 1f); - }); - - Draw.reset(); - }); - - hitLiquid = new Effect(16, e -> { - Draw.color(e.color); - - Angles.randLenVectors(e.id, 5, e.fin() * 15f, e.rotation + 180f, 60f, (x, y) -> { - Fill.circle(e.x + x, e.y + y, e.fout() * 2f); - }); - - Draw.reset(); - }); - - hitLancer = new Effect(12, e -> { - Draw.color(Color.WHITE); - Lines.stroke(e.fout() * 1.5f); - - Angles.randLenVectors(e.id, 8, e.finpow() * 17f, e.rotation, 360f, (x, y) -> { - float ang = Mathf.angle(x, y); - Lines.lineAngle(e.x + x, e.y + y, ang, e.fout() * 4 + 1f); - }); - - Draw.reset(); - }); - - hitMeltdown = new Effect(12, e -> { - Draw.color(Palette.meltdownHit); - Lines.stroke(e.fout() * 2f); - - Angles.randLenVectors(e.id, 6, e.finpow() * 18f, e.rotation, 360f, (x, y) -> { - float ang = Mathf.angle(x, y); - Lines.lineAngle(e.x + x, e.y + y, ang, e.fout() * 4 + 1f); - }); - - Draw.reset(); - }); - - hitLaser = new Effect(8, e -> { - Draw.color(Color.WHITE, Palette.heal, e.fin()); - Lines.stroke(0.5f + e.fout()); - Lines.circle(e.x, e.y, e.fin()*5f); - Draw.reset(); - }); - - despawn = new Effect(12, e -> { - Draw.color(Palette.lighterOrange, Color.GRAY, e.fin()); - Lines.stroke(e.fout()); - - Angles.randLenVectors(e.id, 7, e.fin() * 7f, e.rotation, 40f, (x, y) -> { - float ang = Mathf.angle(x, y); - Lines.lineAngle(e.x + x, e.y + y, ang, e.fout() * 2 + 1f); - }); - - Draw.reset(); - }); - - flakExplosion = new Effect(20, e -> { - - Draw.color(Palette.bulletYellow); - e.scaled(6, i -> { - Lines.stroke(3f * i.fout()); - Lines.circle(e.x, e.y, 3f + i.fin() * 10f); - }); - - Draw.color(Color.GRAY); - - Angles.randLenVectors(e.id, 5, 2f + 23f * e.finpow(), (x, y) -> { - Fill.circle(e.x + x, e.y + y, e.fout() * 3f + 0.5f); - }); - - Draw.color(Palette.lighterOrange); - Lines.stroke(1f * e.fout()); - - Angles.randLenVectors(e.id + 1, 4, 1f + 23f * e.finpow(), (x, y) -> { - Lines.lineAngle(e.x + x, e.y + y, Mathf.angle(x, y), 1f + e.fout() * 3f); - }); - - Draw.reset(); - }); - - plasticExplosion = new Effect(24, e -> { - - Draw.color(Palette.plastaniumFront); - e.scaled(7, i -> { - Lines.stroke(3f * i.fout()); - Lines.circle(e.x, e.y, 3f + i.fin() * 24f); - }); - - Draw.color(Color.GRAY); - - Angles.randLenVectors(e.id, 7, 2f + 28f * e.finpow(), (x, y) -> { - Fill.circle(e.x + x, e.y + y, e.fout() * 4f + 0.5f); - }); - - Draw.color(Palette.plastaniumBack); - Lines.stroke(1f * e.fout()); - - Angles.randLenVectors(e.id + 1, 4, 1f + 25f * e.finpow(), (x, y) -> { - Lines.lineAngle(e.x + x, e.y + y, Mathf.angle(x, y), 1f + e.fout() * 3f); - }); - - Draw.reset(); - }); - - plasticExplosionFlak = new Effect(28, e -> { - - Draw.color(Palette.plastaniumFront); - e.scaled(7, i -> { - Lines.stroke(3f * i.fout()); - Lines.circle(e.x, e.y, 3f + i.fin() * 34f); - }); - - Draw.color(Color.GRAY); - - Angles.randLenVectors(e.id, 7, 2f + 30f * e.finpow(), (x, y) -> { - Fill.circle(e.x + x, e.y + y, e.fout() * 4f + 0.5f); - }); - - Draw.color(Palette.plastaniumBack); - Lines.stroke(1f * e.fout()); - - Angles.randLenVectors(e.id + 1, 4, 1f + 30f * e.finpow(), (x, y) -> { - Lines.lineAngle(e.x + x, e.y + y, Mathf.angle(x, y), 1f + e.fout() * 3f); - }); - - Draw.reset(); - }); - - blastExplosion = new Effect(22, e -> { - - Draw.color(Palette.missileYellow); - e.scaled(6, i -> { - Lines.stroke(3f * i.fout()); - Lines.circle(e.x, e.y, 3f + i.fin() * 15f); - }); - - Draw.color(Color.GRAY); - - Angles.randLenVectors(e.id, 5, 2f + 23f * e.finpow(), (x, y) -> { - Fill.circle(e.x + x, e.y + y, e.fout() * 4f + 0.5f); - }); - - Draw.color(Palette.missileYellowBack); - Lines.stroke(1f * e.fout()); - - Angles.randLenVectors(e.id + 1, 4, 1f + 23f * e.finpow(), (x, y) -> { - Lines.lineAngle(e.x + x, e.y + y, Mathf.angle(x, y), 1f + e.fout() * 3f); - }); - - Draw.reset(); - }); - - artilleryTrail = new Effect(50, e -> { - Draw.color(e.color); - Fill.circle(e.x, e.y, e.rotation * e.fout()); - Draw.reset(); - }); - - incendTrail = new Effect(50, e -> { - Draw.color(Palette.lightOrange); - Fill.circle(e.x, e.y, e.rotation * e.fout()); - Draw.reset(); - }); - - missileTrail = new Effect(50, e -> { - Draw.color(e.color); - Fill.circle(e.x, e.y, e.rotation * e.fout()); - Draw.reset(); - }); - - absorb = new Effect(12, e -> { - Draw.color(Palette.accent); - Lines.stroke(2f * e.fout()); - Lines.circle(e.x, e.y, 5f * e.fout()); - Draw.reset(); - }); - - flakExplosionBig = new Effect(30, e -> { - - Draw.color(Palette.bulletYellowBack); - e.scaled(6, i -> { - Lines.stroke(3f * i.fout()); - Lines.circle(e.x, e.y, 3f + i.fin() * 25f); - }); - - Draw.color(Color.GRAY); - - Angles.randLenVectors(e.id, 6, 2f + 23f * e.finpow(), (x, y) -> { - Fill.circle(e.x + x, e.y + y, e.fout() * 4f + 0.5f); - }); - - Draw.color(Palette.bulletYellow); - Lines.stroke(1f * e.fout()); - - Angles.randLenVectors(e.id + 1, 4, 1f + 23f * e.finpow(), (x, y) -> { - Lines.lineAngle(e.x + x, e.y + y, Mathf.angle(x, y), 1f + e.fout() * 3f); - }); - - Draw.reset(); - }); - } - -} diff --git a/core/src/io/anuke/mindustry/content/fx/EnvironmentFx.java b/core/src/io/anuke/mindustry/content/fx/EnvironmentFx.java deleted file mode 100644 index 16b3c5e85a..0000000000 --- a/core/src/io/anuke/mindustry/content/fx/EnvironmentFx.java +++ /dev/null @@ -1,137 +0,0 @@ -package io.anuke.mindustry.content.fx; - -import io.anuke.arc.entities.Effects.Effect; -import io.anuke.arc.graphics.Color; -import io.anuke.arc.graphics.g2d.Draw; -import io.anuke.arc.graphics.g2d.Fill; -import io.anuke.arc.math.Angles; -import io.anuke.arc.math.Mathf; -import io.anuke.mindustry.content.Liquids; -import io.anuke.mindustry.game.ContentList; -import io.anuke.mindustry.graphics.Palette; -import io.anuke.mindustry.type.Item; - -public class EnvironmentFx extends FxList implements ContentList{ - public static Effect burning, fire, smoke, steam, fireballsmoke, ballfire, freezing, melting, wet, oily, overdriven, dropItem; - - @Override - public void load(){ - - burning = new Effect(35f, e -> { - Draw.color(Palette.lightFlame, Palette.darkFlame, e.fin()); - - Angles.randLenVectors(e.id, 3, 2f + e.fin() * 7f, (x, y) -> { - Fill.circle(e.x + x, e.y + y, 0.1f + e.fout() * 1.4f); - }); - - Draw.color(); - }); - - fire = new Effect(35f, e -> { - Draw.color(Palette.lightFlame, Palette.darkFlame, e.fin()); - - Angles.randLenVectors(e.id, 2, 2f + e.fin() * 7f, (x, y) -> { - Fill.circle(e.x + x, e.y + y, 0.2f + e.fslope() * 1.5f); - }); - - Draw.color(); - }); - - smoke = new Effect(35f, e -> { - Draw.color(Color.GRAY); - - Angles.randLenVectors(e.id, 1, 2f + e.fin() * 7f, (x, y) -> { - Fill.circle(e.x + x, e.y + y, 0.2f + e.fslope() * 1.5f); - }); - - Draw.color(); - }); - - steam = new Effect(35f, e -> { - Draw.color(Color.LIGHT_GRAY); - - Angles.randLenVectors(e.id, 2, 2f + e.fin() * 7f, (x, y) -> { - Fill.circle(e.x + x, e.y + y, 0.2f + e.fslope() * 1.5f); - }); - - Draw.color(); - }); - - fireballsmoke = new Effect(25f, e -> { - Draw.color(Color.GRAY); - - Angles.randLenVectors(e.id, 1, 2f + e.fin() * 7f, (x, y) -> { - Fill.circle(e.x + x, e.y + y, 0.2f + e.fout() * 1.5f); - }); - - Draw.color(); - }); - - ballfire = new Effect(25f, e -> { - Draw.color(Palette.lightFlame, Palette.darkFlame, e.fin()); - - Angles.randLenVectors(e.id, 2, 2f + e.fin() * 7f, (x, y) -> { - Fill.circle(e.x + x, e.y + y, 0.2f + e.fout() * 1.5f); - }); - - Draw.color(); - }); - - freezing = new Effect(40f, e -> { - Draw.color(Liquids.cryofluid.color); - - Angles.randLenVectors(e.id, 2, 1f + e.fin() * 2f, (x, y) -> { - Fill.circle(e.x + x, e.y + y, e.fout() * 1.2f); - }); - - Draw.color(); - }); - - melting = new Effect(40f, e -> { - Draw.color(Liquids.lava.color, Color.WHITE, e.fout() / 5f + Mathf.randomSeedRange(e.id, 0.12f)); - - Angles.randLenVectors(e.id, 2, 1f + e.fin() * 3f, (x, y) -> { - Fill.circle(e.x + x, e.y + y, .2f + e.fout() * 1.2f); - }); - - Draw.color(); - }); - - wet = new Effect(40f, e -> { - Draw.color(Liquids.water.color); - - Angles.randLenVectors(e.id, 2, 1f + e.fin() * 2f, (x, y) -> { - Fill.circle(e.x + x, e.y + y, e.fout() * 1f); - }); - - Draw.color(); - }); - - oily = new Effect(42f, e -> { - Draw.color(Liquids.oil.color); - - Angles.randLenVectors(e.id, 2, 1f + e.fin() * 2f, (x, y) -> { - Fill.circle(e.x + x, e.y + y, e.fout() * 1f); - }); - - Draw.color(); - }); - - overdriven = new Effect(20f, e -> { - Draw.color(Palette.accent); - - Angles.randLenVectors(e.id, 2, 1f + e.fin() * 2f, (x, y) -> { - Fill.square(e.x + x, e.y + y, e.fout() * 2.3f+0.5f); - }); - - Draw.color(); - }); - - dropItem = new Effect(20f, e -> { - float length = 20f * e.finpow(); - float size = 7f * e.fout(); - - Draw.rect(((Item) e.data).region, e.x + Angles.trnsx(e.rotation, length), e.y + Angles.trnsy(e.rotation, length), size, size); - }); - } -} diff --git a/core/src/io/anuke/mindustry/content/fx/ExplosionFx.java b/core/src/io/anuke/mindustry/content/fx/ExplosionFx.java deleted file mode 100644 index 6d823b0e48..0000000000 --- a/core/src/io/anuke/mindustry/content/fx/ExplosionFx.java +++ /dev/null @@ -1,97 +0,0 @@ -package io.anuke.mindustry.content.fx; - -import io.anuke.arc.graphics.Color; -import io.anuke.mindustry.graphics.Palette; -import io.anuke.mindustry.game.ContentList; -import io.anuke.arc.entities.Effects.Effect; -import io.anuke.arc.graphics.g2d.Draw; -import io.anuke.arc.graphics.g2d.Fill; -import io.anuke.arc.graphics.g2d.Lines; -import io.anuke.arc.math.Angles; -import io.anuke.arc.math.Mathf; - -public class ExplosionFx extends FxList implements ContentList{ - public static Effect shockwave, bigShockwave, nuclearShockwave, explosion, blockExplosion, blockExplosionSmoke; - - @Override - public void load(){ - - shockwave = new Effect(10f, 80f, e -> { - Draw.color(Color.WHITE, Color.LIGHT_GRAY, e.fin()); - Lines.stroke(e.fout() * 2f + 0.2f); - Lines.circle(e.x, e.y, e.fin() * 28f); - Draw.reset(); - }); - - bigShockwave = new Effect(10f, 80f, e -> { - Draw.color(Color.WHITE, Color.LIGHT_GRAY, e.fin()); - Lines.stroke(e.fout() * 3f); - Lines.circle(e.x, e.y, e.fin() * 50f); - Draw.reset(); - }); - - nuclearShockwave = new Effect(10f, 200f, e -> { - Draw.color(Color.WHITE, Color.LIGHT_GRAY, e.fin()); - Lines.stroke(e.fout() * 3f + 0.2f); - Lines.poly(e.x, e.y, 40, e.fin() * 140f); - Draw.reset(); - }); - - explosion = new Effect(30, e -> { - e.scaled(7, i -> { - Lines.stroke(3f * i.fout()); - Lines.circle(e.x, e.y, 3f + i.fin() * 10f); - }); - - Draw.color(Color.GRAY); - - Angles.randLenVectors(e.id, 6, 2f + 19f * e.finpow(), (x, y) -> { - Fill.circle(e.x + x, e.y + y, e.fout() * 3f + 0.5f); - Fill.circle(e.x + x / 2f, e.y + y / 2f, e.fout() * 1f); - }); - - Draw.color(Palette.lighterOrange, Palette.lightOrange, Color.GRAY, e.fin()); - Lines.stroke(1.5f * e.fout()); - - Angles.randLenVectors(e.id + 1, 8, 1f + 23f * e.finpow(), (x, y) -> { - Lines.lineAngle(e.x + x, e.y + y, Mathf.angle(x, y), 1f + e.fout() * 3f); - }); - - Draw.reset(); - }); - - blockExplosion = new Effect(30, e -> { - e.scaled(7, i -> { - Lines.stroke(3.1f * i.fout()); - Lines.circle(e.x, e.y, 3f + i.fin() * 14f); - }); - - Draw.color(Color.GRAY); - - Angles.randLenVectors(e.id, 6, 2f + 19f * e.finpow(), (x, y) -> { - Fill.circle(e.x + x, e.y + y, e.fout() * 3f + 0.5f); - Fill.circle(e.x + x / 2f, e.y + y / 2f, e.fout() * 1f); - }); - - Draw.color(Palette.lighterOrange, Palette.lightOrange, Color.GRAY, e.fin()); - Lines.stroke(1.7f * e.fout()); - - Angles.randLenVectors(e.id + 1, 9, 1f + 23f * e.finpow(), (x, y) -> { - Lines.lineAngle(e.x + x, e.y + y, Mathf.angle(x, y), 1f + e.fout() * 3f); - }); - - Draw.reset(); - }); - - blockExplosionSmoke = new Effect(30, e -> { - Draw.color(Color.GRAY); - - Angles.randLenVectors(e.id, 6, 4f + 30f * e.finpow(), (x, y) -> { - Fill.circle(e.x + x, e.y + y, e.fout() * 3f); - Fill.circle(e.x + x / 2f, e.y + y / 2f, e.fout() * 1f); - }); - - Draw.reset(); - }); - } -} diff --git a/core/src/io/anuke/mindustry/content/fx/Fx.java b/core/src/io/anuke/mindustry/content/fx/Fx.java deleted file mode 100644 index e544459e79..0000000000 --- a/core/src/io/anuke/mindustry/content/fx/Fx.java +++ /dev/null @@ -1,69 +0,0 @@ -package io.anuke.mindustry.content.fx; - -import io.anuke.arc.graphics.Color; -import io.anuke.mindustry.graphics.Palette; -import io.anuke.mindustry.game.ContentList; -import io.anuke.arc.entities.Effects.Effect; -import io.anuke.arc.graphics.g2d.Draw; -import io.anuke.arc.graphics.g2d.Fill; -import io.anuke.arc.graphics.g2d.Lines; -import io.anuke.arc.math.Angles; - -import static io.anuke.mindustry.Vars.tilesize; - -public class Fx extends FxList implements ContentList{ - public static Effect none, placeBlock, breakBlock, smoke, spawn, tapBlock, select; - - @Override - public void load(){ - - none = new Effect(0, 0f, e -> { - }); - - placeBlock = new Effect(16, e -> { - Draw.color(Palette.accent); - Lines.stroke(3f - e.fin() * 2f); - Lines.square(e.x, e.y, tilesize / 2f * e.rotation + e.fin() * 3f); - Draw.reset(); - }); - - tapBlock = new Effect(12, e -> { - Draw.color(Palette.accent); - Lines.stroke(3f - e.fin() * 2f); - Lines.circle(e.x, e.y, 4f + (tilesize / 1.5f * e.rotation) * e.fin()); - Draw.reset(); - }); - - breakBlock = new Effect(12, e -> { - Draw.color(Palette.remove); - Lines.stroke(3f - e.fin() * 2f); - Lines.square(e.x, e.y, tilesize / 2f * e.rotation + e.fin() * 3f); - - Angles.randLenVectors(e.id, 3 + (int) (e.rotation * 3), e.rotation * 2f + (tilesize * e.rotation) * e.finpow(), (x, y) -> { - Fill.square(e.x + x, e.y + y, 1f + e.fout() * (3f + e.rotation)); - }); - Draw.reset(); - }); - - select = new Effect(23, e -> { - Draw.color(Palette.accent); - Lines.stroke(e.fout() * 3f); - Lines.circle(e.x, e.y, 3f + e.fin() * 14f); - Draw.reset(); - }); - - smoke = new Effect(100, e -> { - Draw.color(Color.GRAY, Palette.darkishGray, e.fin()); - float size = 7f - e.fin() * 7f; - Draw.rect("circle", e.x, e.y, size, size); - Draw.reset(); - }); - - spawn = new Effect(23, e -> { - Lines.stroke(2f * e.fout()); - Draw.color(Palette.accent); - Lines.poly(e.x, e.y, 4, 3f + e.fin() * 8f); - Draw.reset(); - }); - } -} diff --git a/core/src/io/anuke/mindustry/content/fx/FxList.java b/core/src/io/anuke/mindustry/content/fx/FxList.java deleted file mode 100644 index 3809d32391..0000000000 --- a/core/src/io/anuke/mindustry/content/fx/FxList.java +++ /dev/null @@ -1,12 +0,0 @@ -package io.anuke.mindustry.content.fx; - -import io.anuke.mindustry.game.ContentList; -import io.anuke.mindustry.type.ContentType; - -public abstract class FxList implements ContentList{ - - @Override - public ContentType type(){ - return ContentType.effect; - } -} diff --git a/core/src/io/anuke/mindustry/content/fx/ShootFx.java b/core/src/io/anuke/mindustry/content/fx/ShootFx.java deleted file mode 100644 index 39b96c6161..0000000000 --- a/core/src/io/anuke/mindustry/content/fx/ShootFx.java +++ /dev/null @@ -1,225 +0,0 @@ -package io.anuke.mindustry.content.fx; - -import io.anuke.arc.Core; -import io.anuke.arc.entities.Effects.Effect; -import io.anuke.arc.graphics.Color; -import io.anuke.arc.graphics.g2d.Draw; -import io.anuke.arc.graphics.g2d.Fill; -import io.anuke.arc.graphics.g2d.Lines; -import io.anuke.arc.math.Angles; -import io.anuke.arc.math.Mathf; -import io.anuke.mindustry.entities.effect.GroundEffectEntity.GroundEffect; -import io.anuke.mindustry.game.ContentList; -import io.anuke.mindustry.graphics.Palette; -import io.anuke.mindustry.graphics.Shapes; - -public class ShootFx extends FxList implements ContentList{ - public static Effect shootSmall, shootHeal, shootSmallSmoke, shootBig, shootBig2, shootBigSmoke, shootBigSmoke2, shootSmallFlame, shootLiquid, shellEjectSmall, shellEjectMedium, shellEjectBig, lancerLaserShoot, lancerLaserShootSmoke, lancerLaserCharge, lancerLaserChargeBegin, lightningCharge, lightningShoot; - - @Override - public void load(){ - - shootSmall = new Effect(8, e -> { - Draw.color(Palette.lighterOrange, Palette.lightOrange, e.fin()); - float w = 1f + 5 * e.fout(); - Shapes.tri(e.x, e.y, w, 15f * e.fout(), e.rotation); - Shapes.tri(e.x, e.y, w, 3f * e.fout(), e.rotation + 180f); - Draw.reset(); - }); - - shootHeal = new Effect(8, e -> { - Draw.color(Palette.heal); - float w = 1f + 5 * e.fout(); - Shapes.tri(e.x, e.y, w, 17f * e.fout(), e.rotation); - Shapes.tri(e.x, e.y, w, 4f * e.fout(), e.rotation + 180f); - Draw.reset(); - }); - - shootSmallSmoke = new Effect(20f, e -> { - Draw.color(Palette.lighterOrange, Color.LIGHT_GRAY, Color.GRAY, e.fin()); - - Angles.randLenVectors(e.id, 5, e.finpow() * 6f, e.rotation, 20f, (x, y) -> { - Fill.circle(e.x + x, e.y + y, e.fout() * 1.5f); - }); - - Draw.reset(); - }); - - shootBig = new Effect(9, e -> { - Draw.color(Palette.lighterOrange, Palette.lightOrange, e.fin()); - float w = 1.2f + 7 * e.fout(); - Shapes.tri(e.x, e.y, w, 25f * e.fout(), e.rotation); - Shapes.tri(e.x, e.y, w, 4f * e.fout(), e.rotation + 180f); - Draw.reset(); - }); - - shootBig2 = new Effect(10, e -> { - Draw.color(Palette.lightOrange, Color.GRAY, e.fin()); - float w = 1.2f + 8 * e.fout(); - Shapes.tri(e.x, e.y, w, 29f * e.fout(), e.rotation); - Shapes.tri(e.x, e.y, w, 5f * e.fout(), e.rotation + 180f); - Draw.reset(); - }); - - shootBigSmoke = new Effect(17f, e -> { - Draw.color(Palette.lighterOrange, Color.LIGHT_GRAY, Color.GRAY, e.fin()); - - Angles.randLenVectors(e.id, 8, e.finpow() * 19f, e.rotation, 10f, (x, y) -> { - Fill.circle(e.x + x, e.y + y, e.fout() * 2f + 0.2f); - }); - - Draw.reset(); - }); - - shootBigSmoke2 = new Effect(18f, e -> { - Draw.color(Palette.lightOrange, Color.LIGHT_GRAY, Color.GRAY, e.fin()); - - Angles.randLenVectors(e.id, 9, e.finpow() * 23f, e.rotation, 20f, (x, y) -> { - Fill.circle(e.x + x, e.y + y, e.fout() * 2.4f + 0.2f); - }); - - Draw.reset(); - }); - - shootSmallFlame = new Effect(30f, e -> { - Draw.color(Palette.lightFlame, Palette.darkFlame, Color.GRAY, e.fin()); - - Angles.randLenVectors(e.id, 8, e.finpow() * 36f, e.rotation, 10f, (x, y) -> { - Fill.circle(e.x + x, e.y + y, 0.65f + e.fout() * 1.5f); - }); - - Draw.reset(); - }); - - shootLiquid = new Effect(40f, e -> { - Draw.color(e.color, Color.WHITE, e.fout() / 6f + Mathf.randomSeedRange(e.id, 0.1f)); - - Angles.randLenVectors(e.id, 6, e.finpow() * 60f, e.rotation, 11f, (x, y) -> { - Fill.circle(e.x + x, e.y + y, 0.5f + e.fout() * 2.5f); - }); - - Draw.reset(); - }); - - shellEjectSmall = new GroundEffect(30f, 400f, e -> { - Draw.color(Palette.lightOrange, Color.LIGHT_GRAY, Palette.lightishGray, e.fin()); - float rot = Math.abs(e.rotation) + 90f; - - int i = Mathf.sign(e.rotation); - - float len = (2f + e.finpow() * 6f) * i; - float lr = rot + e.fin() * 30f * i; - Fill.rect(e.x + Angles.trnsx(lr, len) + Mathf.randomSeedRange(e.id + i + 7, 3f * e.fin()), - e.y + Angles.trnsy(lr, len) + Mathf.randomSeedRange(e.id + i + 8, 3f * e.fin()), - 1f, 2f, rot + e.fin() * 50f * i); - - Draw.color(); - }); - - shellEjectMedium = new GroundEffect(34f, 400f, e -> { - Draw.color(Palette.lightOrange, Color.LIGHT_GRAY, Palette.lightishGray, e.fin()); - float rot = e.rotation + 90f; - for(int i : Mathf.signs){ - float len = (2f + e.finpow() * 10f) * i; - float lr = rot + e.fin() * 20f * i; - Draw.rect(Core.atlas.find("casing"), - e.x + Angles.trnsx(lr, len) + Mathf.randomSeedRange(e.id + i + 7, 3f * e.fin()), - e.y + Angles.trnsy(lr, len) + Mathf.randomSeedRange(e.id + i + 8, 3f * e.fin()), - 2f, 3f, rot); - } - - Draw.color(Color.LIGHT_GRAY, Color.GRAY, e.fin()); - - for(int i : Mathf.signs){ - Angles.randLenVectors(e.id, 4, 1f + e.finpow() * 11f, e.rotation + 90f * i, 20f, (x, y) -> { - Fill.circle(e.x + x, e.y + y, e.fout() * 1.5f); - }); - } - - Draw.color(); - }); - - shellEjectBig = new GroundEffect(22f, 400f, e -> { - Draw.color(Palette.lightOrange, Color.LIGHT_GRAY, Palette.lightishGray, e.fin()); - float rot = e.rotation + 90f; - for(int i : Mathf.signs){ - float len = (4f + e.finpow() * 8f) * i; - float lr = rot + Mathf.randomSeedRange(e.id + i + 6, 20f * e.fin()) * i; - Draw.rect(Core.atlas.find("casing"), - e.x + Angles.trnsx(lr, len) + Mathf.randomSeedRange(e.id + i + 7, 3f * e.fin()), - e.y + Angles.trnsy(lr, len) + Mathf.randomSeedRange(e.id + i + 8, 3f * e.fin()), - 2.5f, 4f, - rot + e.fin() * 30f * i + Mathf.randomSeedRange(e.id + i + 9, 40f * e.fin())); - } - - Draw.color(Color.LIGHT_GRAY); - - for(int i : Mathf.signs){ - Angles.randLenVectors(e.id, 4, -e.finpow() * 15f, e.rotation + 90f * i, 25f, (x, y) -> { - Fill.circle(e.x + x, e.y + y, e.fout() * 2f); - }); - } - - Draw.color(); - }); - - lancerLaserShoot = new Effect(21f, e -> { - Draw.color(Palette.lancerLaser); - - for(int i : Mathf.signs){ - Shapes.tri(e.x, e.y, 4f * e.fout(), 29f, e.rotation + 90f * i); - } - - Draw.reset(); - }); - - lancerLaserShootSmoke = new Effect(26f, e -> { - Draw.color(Palette.lancerLaser); - - Angles.randLenVectors(e.id, 7, 80f, e.rotation, 0f, (x, y) -> { - Lines.lineAngle(e.x + x, e.y + y, Mathf.angle(x, y), e.fout() * 9f); - }); - - Draw.reset(); - }); - - lancerLaserCharge = new Effect(38f, e -> { - Draw.color(Palette.lancerLaser); - - Angles.randLenVectors(e.id, 2, 1f + 20f * e.fout(), e.rotation, 120f, (x, y) -> { - Lines.lineAngle(e.x + x, e.y + y, Mathf.angle(x, y), e.fslope() * 3f + 1f); - }); - - Draw.reset(); - }); - - lancerLaserChargeBegin = new Effect(71f, e -> { - Draw.color(Palette.lancerLaser); - Fill.circle(e.x, e.y, e.fin() * 3f); - - Draw.color(); - Fill.circle(e.x, e.y, e.fin() * 2f); - }); - - lightningCharge = new Effect(38f, e -> { - Draw.color(Palette.lancerLaser); - - Angles.randLenVectors(e.id, 2, 1f + 20f * e.fout(), e.rotation, 120f, (x, y) -> { - Shapes.tri(e.x + x, e.y + y, e.fslope() * 3f + 1, e.fslope() * 3f + 1, Mathf.angle(x, y)); - }); - - Draw.reset(); - }); - - lightningShoot = new Effect(12f, e -> { - Draw.color(Color.WHITE, Palette.lancerLaser, e.fin()); - Lines.stroke(e.fout() * 1.2f + 0.5f); - - Angles.randLenVectors(e.id, 7, 25f * e.finpow(), e.rotation, 50f, (x, y) -> { - Lines.lineAngle(e.x + x, e.y + y, Mathf.angle(x, y), e.fin() * 5f + 2f); - }); - - Draw.reset(); - }); - } -} diff --git a/core/src/io/anuke/mindustry/content/fx/UnitFx.java b/core/src/io/anuke/mindustry/content/fx/UnitFx.java deleted file mode 100644 index e58fba9d8b..0000000000 --- a/core/src/io/anuke/mindustry/content/fx/UnitFx.java +++ /dev/null @@ -1,78 +0,0 @@ -package io.anuke.mindustry.content.fx; - -import io.anuke.mindustry.entities.effect.GroundEffectEntity.GroundEffect; -import io.anuke.mindustry.graphics.Palette; -import io.anuke.mindustry.game.ContentList; -import io.anuke.arc.entities.Effects.Effect; -import io.anuke.arc.graphics.g2d.Draw; -import io.anuke.arc.graphics.g2d.Fill; -import io.anuke.arc.graphics.g2d.Lines; -import io.anuke.arc.math.Angles; -import io.anuke.arc.math.Mathf; - -public class UnitFx extends FxList implements ContentList{ - public static Effect vtolHover, unitDrop, unitPickup, unitLand, pickup, healWave, heal, landShock; - - @Override - public void load(){ - - vtolHover = new Effect(40f, e -> { - float len = e.finpow() * 10f; - float ang = e.rotation + Mathf.randomSeedRange(e.id, 30f); - Draw.color(Palette.lightFlame, Palette.lightOrange, e.fin()); - Fill.circle(e.x + Angles.trnsx(ang, len), e.y + Angles.trnsy(ang, len), 2f * e.fout()); - Draw.reset(); - }); - - unitDrop = new GroundEffect(30, e -> { - Draw.color(Palette.lightishGray); - Angles.randLenVectors(e.id, 9, 3 + 20f * e.finpow(), (x, y) -> { - Fill.circle(e.x + x, e.y + y, e.fout() * 4f + 0.4f); - }); - Draw.reset(); - }); - - unitLand = new GroundEffect(30, e -> { - Draw.color(Palette.lightishGray, e.color, e.rotation); - Angles.randLenVectors(e.id, 6, 17f * e.finpow(), (x, y) -> { - Fill.circle(e.x + x, e.y + y, e.fout() * 4f + 0.3f); - }); - Draw.reset(); - }); - - unitPickup = new GroundEffect(18, e -> { - Draw.color(Palette.lightishGray); - Lines.stroke(e.fin() * 2f); - Lines.poly(e.x, e.y, 4, 13f * e.fout()); - Draw.reset(); - }); - - landShock = new GroundEffect(12, e -> { - Draw.color(Palette.lancerLaser); - Lines.stroke(e.fout() * 3f); - Lines.poly(e.x, e.y, 12, 20f * e.fout()); - Draw.reset(); - }); - - pickup = new Effect(18, e -> { - Draw.color(Palette.lightishGray); - Lines.stroke(e.fout() * 2f); - Lines.spikes(e.x, e.y, 1f + e.fin() * 6f, e.fout() * 4f, 6); - Draw.reset(); - }); - - healWave = new Effect(22, e -> { - Draw.color(Palette.heal); - Lines.stroke(e.fout() * 2f); - Lines.poly(e.x, e.y, 30, 4f + e.finpow() * 60f); - Draw.color(); - }); - - heal = new Effect(11, e -> { - Draw.color(Palette.heal); - Lines.stroke(e.fout() * 2f); - Lines.poly(e.x, e.y, 10, 2f + e.finpow() * 7f); - Draw.color(); - }); - } -} diff --git a/core/src/io/anuke/mindustry/core/ContentLoader.java b/core/src/io/anuke/mindustry/core/ContentLoader.java index e425e33e21..bb7b015539 100644 --- a/core/src/io/anuke/mindustry/core/ContentLoader.java +++ b/core/src/io/anuke/mindustry/core/ContentLoader.java @@ -7,7 +7,6 @@ import io.anuke.arc.function.Consumer; import io.anuke.arc.util.Log; import io.anuke.mindustry.content.*; import io.anuke.mindustry.content.blocks.*; -import io.anuke.mindustry.content.fx.*; import io.anuke.mindustry.entities.Player; import io.anuke.mindustry.entities.bullet.Bullet; import io.anuke.mindustry.entities.bullet.BulletType; @@ -41,13 +40,7 @@ public class ContentLoader{ private ObjectSet> initialization = new ObjectSet<>(); private ContentList[] content = { //effects - new BlockFx(), - new BulletFx(), - new EnvironmentFx(), - new ExplosionFx(), new Fx(), - new ShootFx(), - new UnitFx(), //items new Items(), diff --git a/core/src/io/anuke/mindustry/core/Renderer.java b/core/src/io/anuke/mindustry/core/Renderer.java index cff7944281..05477315ef 100644 --- a/core/src/io/anuke/mindustry/core/Renderer.java +++ b/core/src/io/anuke/mindustry/core/Renderer.java @@ -21,7 +21,7 @@ import io.anuke.arc.math.geom.Vector2; import io.anuke.arc.util.ScreenRecorder; import io.anuke.arc.util.Time; import io.anuke.arc.util.pooling.Pools; -import io.anuke.mindustry.content.fx.Fx; +import io.anuke.mindustry.content.Fx; import io.anuke.mindustry.core.GameState.State; import io.anuke.mindustry.entities.Player; import io.anuke.mindustry.entities.TileEntity; diff --git a/core/src/io/anuke/mindustry/entities/Damage.java b/core/src/io/anuke/mindustry/entities/Damage.java index 49ad873375..e8b51dbf35 100644 --- a/core/src/io/anuke/mindustry/entities/Damage.java +++ b/core/src/io/anuke/mindustry/entities/Damage.java @@ -11,7 +11,7 @@ import io.anuke.arc.math.geom.Rectangle; import io.anuke.arc.math.geom.Vector2; import io.anuke.arc.util.Time; import io.anuke.mindustry.content.Bullets; -import io.anuke.mindustry.content.fx.ExplosionFx; +import io.anuke.mindustry.content.Fx; import io.anuke.mindustry.entities.bullet.Bullet; import io.anuke.mindustry.entities.effect.Fire; import io.anuke.mindustry.entities.effect.Lightning; @@ -46,21 +46,21 @@ public class Damage{ int f = i; Time.run(i * 2f, () -> { Damage.damage(x, y, Mathf.clamp(radius + explosiveness, 0, 50f) * ((f + 1f) / waves), explosiveness / 2f); - Effects.effect(ExplosionFx.blockExplosionSmoke, x + Mathf.range(radius), y + Mathf.range(radius)); + Effects.effect(Fx.blockExplosionSmoke, x + Mathf.range(radius), y + Mathf.range(radius)); }); } if(explosiveness > 15f){ - Effects.effect(ExplosionFx.shockwave, x, y); + Effects.effect(Fx.shockwave, x, y); } if(explosiveness > 30f){ - Effects.effect(ExplosionFx.bigShockwave, x, y); + Effects.effect(Fx.bigShockwave, x, y); } float shake = Math.min(explosiveness / 4f + 3f, 9f); Effects.shake(shake, shake, x, y); - Effects.effect(ExplosionFx.blockExplosion, x, y); + Effects.effect(Fx.blockExplosion, x, y); } public static void createIncend(float x, float y, float range, int amount){ diff --git a/core/src/io/anuke/mindustry/entities/Player.java b/core/src/io/anuke/mindustry/entities/Player.java index 2410644da8..7ea5dd7797 100644 --- a/core/src/io/anuke/mindustry/entities/Player.java +++ b/core/src/io/anuke/mindustry/entities/Player.java @@ -20,7 +20,7 @@ import io.anuke.arc.util.Pack; import io.anuke.arc.util.Time; import io.anuke.arc.util.pooling.Pools; import io.anuke.mindustry.content.Mechs; -import io.anuke.mindustry.content.fx.UnitFx; +import io.anuke.mindustry.content.Fx; import io.anuke.mindustry.entities.effect.ScorchDecal; import io.anuke.mindustry.entities.traits.*; import io.anuke.mindustry.game.Team; @@ -502,7 +502,7 @@ public class Player extends Unit implements BuilderTrait, CarryTrait, ShooterTra if(mech.shake > 1f){ Effects.shake(mech.shake, mech.shake, this); } - Effects.effect(UnitFx.unitLand, tile.floor().minimapColor, x, y, tile.floor().isLiquid ? 1f : 0.5f); + Effects.effect(Fx.unitLand, tile.floor().minimapColor, x, y, tile.floor().isLiquid ? 1f : 0.5f); } mech.onLand(this); achievedFlight = false; diff --git a/core/src/io/anuke/mindustry/entities/TileEntity.java b/core/src/io/anuke/mindustry/entities/TileEntity.java index a48defd085..c77d797f8a 100644 --- a/core/src/io/anuke/mindustry/entities/TileEntity.java +++ b/core/src/io/anuke/mindustry/entities/TileEntity.java @@ -13,7 +13,7 @@ import io.anuke.arc.math.geom.Point2; import io.anuke.arc.math.geom.Vector2; import io.anuke.arc.util.Interval; import io.anuke.arc.util.Time; -import io.anuke.mindustry.content.fx.Fx; +import io.anuke.mindustry.content.Fx; import io.anuke.mindustry.entities.bullet.Bullet; import io.anuke.mindustry.entities.traits.TargetTrait; import io.anuke.mindustry.game.Team; diff --git a/core/src/io/anuke/mindustry/entities/bullet/ArtilleryBulletType.java b/core/src/io/anuke/mindustry/entities/bullet/ArtilleryBulletType.java index ed25df2f5d..ee5237a2c8 100644 --- a/core/src/io/anuke/mindustry/entities/bullet/ArtilleryBulletType.java +++ b/core/src/io/anuke/mindustry/entities/bullet/ArtilleryBulletType.java @@ -1,13 +1,13 @@ package io.anuke.mindustry.entities.bullet; -import io.anuke.mindustry.content.fx.BulletFx; import io.anuke.arc.entities.Effects; import io.anuke.arc.entities.Effects.Effect; import io.anuke.arc.graphics.g2d.Draw; +import io.anuke.mindustry.content.Fx; //TODO scale velocity depending on fslope() public class ArtilleryBulletType extends BasicBulletType{ - protected Effect trailEffect = BulletFx.artilleryTrail; + protected Effect trailEffect = Fx.artilleryTrail; public ArtilleryBulletType(float speed, float damage, String bulletSprite){ super(speed, damage, bulletSprite); diff --git a/core/src/io/anuke/mindustry/entities/bullet/BulletType.java b/core/src/io/anuke/mindustry/entities/bullet/BulletType.java index 3ac82c565b..10002296bf 100644 --- a/core/src/io/anuke/mindustry/entities/bullet/BulletType.java +++ b/core/src/io/anuke/mindustry/entities/bullet/BulletType.java @@ -3,8 +3,7 @@ package io.anuke.mindustry.entities.bullet; import io.anuke.arc.entities.Effects; import io.anuke.arc.entities.Effects.Effect; import io.anuke.mindustry.content.StatusEffects; -import io.anuke.mindustry.content.fx.BulletFx; -import io.anuke.mindustry.content.fx.ShootFx; +import io.anuke.mindustry.content.Fx; import io.anuke.mindustry.game.Content; import io.anuke.mindustry.type.ContentType; import io.anuke.mindustry.type.StatusEffect; @@ -21,9 +20,9 @@ public abstract class BulletType extends Content{ public Effect hitEffect, despawnEffect; /**Effect created when shooting.*/ - public Effect shootEffect = ShootFx.shootSmall; + public Effect shootEffect = Fx.shootSmall; /**Extra smoke effect created when shooting.*/ - public Effect smokeEffect = ShootFx.shootSmallSmoke; + public Effect smokeEffect = Fx.shootSmallSmoke; /**Extra inaccuracy when firing.*/ public float inaccuracy = 0f; /**How many bullets get created per ammo item/liquid.*/ @@ -61,8 +60,8 @@ public abstract class BulletType extends Content{ this.speed = speed; this.damage = damage; lifetime = 40f; - hitEffect = BulletFx.hitBulletSmall; - despawnEffect = BulletFx.hitBulletSmall; + hitEffect = Fx.hitBulletSmall; + despawnEffect = Fx.hitBulletSmall; } /**Returns maximum distance the bullet this bullet type has can travel.*/ diff --git a/core/src/io/anuke/mindustry/entities/bullet/FlakBulletType.java b/core/src/io/anuke/mindustry/entities/bullet/FlakBulletType.java index b18ff21368..908bd3f17b 100644 --- a/core/src/io/anuke/mindustry/entities/bullet/FlakBulletType.java +++ b/core/src/io/anuke/mindustry/entities/bullet/FlakBulletType.java @@ -1,7 +1,7 @@ package io.anuke.mindustry.entities.bullet; import io.anuke.arc.math.geom.Rectangle; -import io.anuke.mindustry.content.fx.BulletFx; +import io.anuke.mindustry.content.Fx; import io.anuke.mindustry.entities.Units; import io.anuke.arc.util.Time; @@ -13,7 +13,7 @@ public abstract class FlakBulletType extends BasicBulletType{ super(speed, damage, "shell"); splashDamage = 15f; splashDamageRadius = 34f; - hitEffect = BulletFx.flakExplosionBig; + hitEffect = Fx.flakExplosionBig; bulletWidth = 8f; bulletHeight = 10f; } diff --git a/core/src/io/anuke/mindustry/entities/bullet/LiquidBulletType.java b/core/src/io/anuke/mindustry/entities/bullet/LiquidBulletType.java index 90a396839d..b7a74f4486 100644 --- a/core/src/io/anuke/mindustry/entities/bullet/LiquidBulletType.java +++ b/core/src/io/anuke/mindustry/entities/bullet/LiquidBulletType.java @@ -7,8 +7,7 @@ import io.anuke.arc.graphics.g2d.Fill; import io.anuke.arc.math.Mathf; import io.anuke.arc.math.geom.Geometry; import io.anuke.arc.math.geom.Point2; -import io.anuke.mindustry.content.fx.BulletFx; -import io.anuke.mindustry.content.fx.Fx; +import io.anuke.mindustry.content.Fx; import io.anuke.mindustry.entities.effect.Fire; import io.anuke.mindustry.entities.effect.Puddle; import io.anuke.mindustry.type.Liquid; @@ -28,7 +27,7 @@ public class LiquidBulletType extends BulletType{ status = liquid.effect; statusIntensity = 0.5f; despawnEffect = Fx.none; - hitEffect = BulletFx.hitLiquid; + hitEffect = Fx.hitLiquid; drag = 0.01f; knockback = 0.5f; } diff --git a/core/src/io/anuke/mindustry/entities/bullet/MassDriverBolt.java b/core/src/io/anuke/mindustry/entities/bullet/MassDriverBolt.java index b263b81ab6..a10421113a 100644 --- a/core/src/io/anuke/mindustry/entities/bullet/MassDriverBolt.java +++ b/core/src/io/anuke/mindustry/entities/bullet/MassDriverBolt.java @@ -5,9 +5,7 @@ import io.anuke.arc.graphics.Color; import io.anuke.arc.graphics.g2d.Draw; import io.anuke.arc.math.Angles; import io.anuke.arc.math.Mathf; -import io.anuke.mindustry.content.fx.BlockFx; -import io.anuke.mindustry.content.fx.BulletFx; -import io.anuke.mindustry.content.fx.EnvironmentFx; +import io.anuke.mindustry.content.Fx; import io.anuke.mindustry.graphics.Palette; import io.anuke.mindustry.world.blocks.distribution.MassDriver.DriverBulletData; @@ -19,8 +17,8 @@ public class MassDriverBolt extends BulletType{ super(5.3f, 50); collidesTiles = false; lifetime = 200f; - despawnEffect = BlockFx.smeltsmoke; - hitEffect = BulletFx.hitBulletBig; + despawnEffect = Fx.smeltsmoke; + hitEffect = Fx.hitBulletBig; drag = 0.005f; } @@ -96,7 +94,7 @@ public class MassDriverBolt extends BulletType{ int amountDropped = Mathf.random(0, data.items[i]); if(amountDropped > 0){ float angle = b.rot() + Mathf.range(100f); - Effects.effect(EnvironmentFx.dropItem, Color.WHITE, b.x, b.y, angle, content.item(i)); + Effects.effect(Fx.dropItem, Color.WHITE, b.x, b.y, angle, content.item(i)); } } } diff --git a/core/src/io/anuke/mindustry/entities/bullet/MissileBulletType.java b/core/src/io/anuke/mindustry/entities/bullet/MissileBulletType.java index b62b83787a..6200666f1f 100644 --- a/core/src/io/anuke/mindustry/entities/bullet/MissileBulletType.java +++ b/core/src/io/anuke/mindustry/entities/bullet/MissileBulletType.java @@ -1,7 +1,7 @@ package io.anuke.mindustry.entities.bullet; import io.anuke.arc.graphics.Color; -import io.anuke.mindustry.content.fx.BulletFx; +import io.anuke.mindustry.content.Fx; import io.anuke.mindustry.graphics.Palette; import io.anuke.arc.entities.Effects; import io.anuke.arc.util.Time; @@ -25,7 +25,7 @@ public class MissileBulletType extends BasicBulletType{ super.update(b); if(Mathf.chance(Time.delta() * 0.2)){ - Effects.effect(BulletFx.missileTrail, trailColor, b.x, b.y, 2f); + Effects.effect(Fx.missileTrail, trailColor, b.x, b.y, 2f); } if(weaveMag > 0){ diff --git a/core/src/io/anuke/mindustry/entities/effect/Fire.java b/core/src/io/anuke/mindustry/entities/effect/Fire.java index 359a0b1d09..4ca534df54 100644 --- a/core/src/io/anuke/mindustry/entities/effect/Fire.java +++ b/core/src/io/anuke/mindustry/entities/effect/Fire.java @@ -15,7 +15,7 @@ import io.anuke.arc.util.pooling.Pool.Poolable; import io.anuke.arc.util.pooling.Pools; import io.anuke.mindustry.content.Bullets; import io.anuke.mindustry.content.StatusEffects; -import io.anuke.mindustry.content.fx.EnvironmentFx; +import io.anuke.mindustry.content.Fx; import io.anuke.mindustry.entities.Damage; import io.anuke.mindustry.entities.TileEntity; import io.anuke.mindustry.entities.traits.SaveTrait; @@ -93,11 +93,11 @@ public class Fire extends TimedEntity implements SaveTrait, SyncTrait, Poolable{ @Override public void update(){ if(Mathf.chance(0.1 * Time.delta())){ - Effects.effect(EnvironmentFx.fire, x + Mathf.range(4f), y + Mathf.range(4f)); + Effects.effect(Fx.fire, x + Mathf.range(4f), y + Mathf.range(4f)); } if(Mathf.chance(0.05 * Time.delta())){ - Effects.effect(EnvironmentFx.smoke, x + Mathf.range(4f), y + Mathf.range(4f)); + Effects.effect(Fx.fireSmoke, x + Mathf.range(4f), y + Mathf.range(4f)); } if(Net.client()){ diff --git a/core/src/io/anuke/mindustry/entities/effect/Puddle.java b/core/src/io/anuke/mindustry/entities/effect/Puddle.java index e134b9a069..167d6f08e9 100644 --- a/core/src/io/anuke/mindustry/entities/effect/Puddle.java +++ b/core/src/io/anuke/mindustry/entities/effect/Puddle.java @@ -21,8 +21,7 @@ import io.anuke.arc.util.pooling.Pools; import io.anuke.mindustry.content.Liquids; import io.anuke.mindustry.content.blocks.Blocks; import io.anuke.mindustry.content.Bullets; -import io.anuke.mindustry.content.fx.BlockFx; -import io.anuke.mindustry.content.fx.EnvironmentFx; +import io.anuke.mindustry.content.Fx; import io.anuke.mindustry.entities.Units; import io.anuke.mindustry.entities.traits.SaveTrait; import io.anuke.mindustry.entities.traits.SyncTrait; @@ -85,7 +84,7 @@ public class Puddle extends SolidEntity implements SaveTrait, Poolable, DrawTrai Puddle p = map.get(tile.pos()); if(generation == 0 && p != null && p.lastRipple <= Time.time() - 40f){ - Effects.effect(BlockFx.ripple, tile.floor().liquidDrop.color, + Effects.effect(Fx.ripple, tile.floor().liquidDrop.color, (tile.worldx() + source.worldx()) / 2f, (tile.worldy() + source.worldy()) / 2f); p.lastRipple = Time.time(); } @@ -108,7 +107,7 @@ public class Puddle extends SolidEntity implements SaveTrait, Poolable, DrawTrai p.accepting = Math.max(amount, p.accepting); if(generation == 0 && p.lastRipple <= Time.time() - 40f && p.amount >= maxLiquid / 2f){ - Effects.effect(BlockFx.ripple, p.liquid.color, (tile.worldx() + source.worldx()) / 2f, (tile.worldy() + source.worldy()) / 2f); + Effects.effect(Fx.ripple, p.liquid.color, (tile.worldx() + source.worldx()) / 2f, (tile.worldy() + source.worldy()) / 2f); p.lastRipple = Time.time(); } }else{ @@ -134,12 +133,12 @@ public class Puddle extends SolidEntity implements SaveTrait, Poolable, DrawTrai } }else if(dest.temperature > 0.7f && liquid.temperature < 0.55f){ //cold liquid poured onto hot puddle if(Mathf.chance(0.5f * amount)){ - Effects.effect(EnvironmentFx.steam, x, y); + Effects.effect(Fx.steam, x, y); } return -0.1f * amount; }else if(liquid.temperature > 0.7f && dest.temperature < 0.55f){ //hot liquid poured onto cold puddle if(Mathf.chance(0.8f * amount)){ - Effects.effect(EnvironmentFx.steam, x, y); + Effects.effect(Fx.steam, x, y); } return -0.4f * amount; } @@ -209,7 +208,7 @@ public class Puddle extends SolidEntity implements SaveTrait, Poolable, DrawTrai unit.applyEffect(liquid.effect, 0.5f); if(unit.velocity().len() > 0.1){ - Effects.effect(BlockFx.ripple, liquid.color, unit.x, unit.y); + Effects.effect(Fx.ripple, liquid.color, unit.x, unit.y); } }); diff --git a/core/src/io/anuke/mindustry/entities/traits/BuilderTrait.java b/core/src/io/anuke/mindustry/entities/traits/BuilderTrait.java index 9a3b6e174d..73dedf309d 100644 --- a/core/src/io/anuke/mindustry/entities/traits/BuilderTrait.java +++ b/core/src/io/anuke/mindustry/entities/traits/BuilderTrait.java @@ -16,7 +16,7 @@ import io.anuke.arc.math.geom.Vector2; import io.anuke.arc.util.Time; import io.anuke.mindustry.Vars; import io.anuke.mindustry.content.blocks.Blocks; -import io.anuke.mindustry.content.fx.BlockFx; +import io.anuke.mindustry.content.Fx; import io.anuke.mindustry.entities.Player; import io.anuke.mindustry.entities.TileEntity; import io.anuke.mindustry.entities.Unit; @@ -285,7 +285,7 @@ public interface BuilderTrait extends Entity{ } if(Mathf.chance(0.06 * Time.delta())){ - Effects.effect(BlockFx.pulverizeSmall, + Effects.effect(Fx.pulverizeSmall, tile.worldx() + Mathf.range(tilesize / 2f), tile.worldy() + Mathf.range(tilesize / 2f), 0f, item.color); } diff --git a/core/src/io/anuke/mindustry/entities/traits/CarryTrait.java b/core/src/io/anuke/mindustry/entities/traits/CarryTrait.java index b63ce195cd..de7f571161 100644 --- a/core/src/io/anuke/mindustry/entities/traits/CarryTrait.java +++ b/core/src/io/anuke/mindustry/entities/traits/CarryTrait.java @@ -2,7 +2,7 @@ package io.anuke.mindustry.entities.traits; import io.anuke.annotations.Annotations.Loc; import io.anuke.annotations.Annotations.Remote; -import io.anuke.mindustry.content.fx.UnitFx; +import io.anuke.mindustry.content.Fx; import io.anuke.mindustry.entities.Player; import io.anuke.mindustry.gen.Call; import io.anuke.arc.entities.Effects; @@ -26,7 +26,7 @@ public interface CarryTrait extends TeamTrait, SolidTrait, TargetTrait{ if(trait.getCarry() != null){ //already carrying something, drop it //drop current - Effects.effect(UnitFx.unitDrop, trait.getCarry()); + Effects.effect(Fx.unitDrop, trait.getCarry()); trait.getCarry().setCarrier(null); trait.setCarry(null); @@ -37,7 +37,7 @@ public interface CarryTrait extends TeamTrait, SolidTrait, TargetTrait{ trait.setCarry(unit); unit.setCarrier(trait); - Effects.effect(UnitFx.unitPickup, trait); + Effects.effect(Fx.unitPickup, trait); } } diff --git a/core/src/io/anuke/mindustry/entities/units/BaseUnit.java b/core/src/io/anuke/mindustry/entities/units/BaseUnit.java index 4d5eb7c956..07c4d2dd4f 100644 --- a/core/src/io/anuke/mindustry/entities/units/BaseUnit.java +++ b/core/src/io/anuke/mindustry/entities/units/BaseUnit.java @@ -14,7 +14,7 @@ import io.anuke.arc.math.geom.Rectangle; import io.anuke.arc.util.Interval; import io.anuke.arc.util.Time; import io.anuke.mindustry.Vars; -import io.anuke.mindustry.content.fx.ExplosionFx; +import io.anuke.mindustry.content.Fx; import io.anuke.mindustry.entities.Damage; import io.anuke.mindustry.entities.TileEntity; import io.anuke.mindustry.entities.Unit; @@ -77,7 +77,7 @@ public abstract class BaseUnit extends Unit implements ShooterTrait{ unit.onSuperDeath(); ScorchDecal.create(unit.x, unit.y); - Effects.effect(ExplosionFx.explosion, unit); + Effects.effect(Fx.explosion, unit); Effects.shake(2f, 2f, unit); //must run afterwards so the unit's group is not null when sending the removal packet diff --git a/core/src/io/anuke/mindustry/input/InputHandler.java b/core/src/io/anuke/mindustry/input/InputHandler.java index 36b1fab2ef..b10d48a36e 100644 --- a/core/src/io/anuke/mindustry/input/InputHandler.java +++ b/core/src/io/anuke/mindustry/input/InputHandler.java @@ -12,7 +12,7 @@ import io.anuke.arc.math.geom.Vector2; import io.anuke.arc.scene.ui.layout.Table; import io.anuke.arc.util.Time; import io.anuke.mindustry.content.blocks.Blocks; -import io.anuke.mindustry.content.fx.EnvironmentFx; +import io.anuke.mindustry.content.Fx; import io.anuke.mindustry.entities.Player; import io.anuke.mindustry.entities.effect.ItemTransfer; import io.anuke.mindustry.entities.traits.BuilderTrait.BuildRequest; @@ -57,7 +57,7 @@ public abstract class InputHandler implements InputProcessor{ throw new ValidateException(player, "Player cannot drop an item."); } - Effects.effect(EnvironmentFx.dropItem, Color.WHITE, player.x, player.y, angle, player.inventory.getItem().item); + Effects.effect(Fx.dropItem, Color.WHITE, player.x, player.y, angle, player.inventory.getItem().item); player.inventory.clearItem(); } diff --git a/core/src/io/anuke/mindustry/input/MobileInput.java b/core/src/io/anuke/mindustry/input/MobileInput.java index b613415c2f..e4fbee2f6e 100644 --- a/core/src/io/anuke/mindustry/input/MobileInput.java +++ b/core/src/io/anuke/mindustry/input/MobileInput.java @@ -19,7 +19,7 @@ import io.anuke.arc.scene.ui.layout.Table; import io.anuke.arc.util.Align; import io.anuke.arc.util.Time; import io.anuke.mindustry.content.blocks.Blocks; -import io.anuke.mindustry.content.fx.Fx; +import io.anuke.mindustry.content.Fx; import io.anuke.mindustry.core.GameState.State; import io.anuke.mindustry.entities.Player; import io.anuke.mindustry.entities.TileEntity; diff --git a/core/src/io/anuke/mindustry/type/Weapon.java b/core/src/io/anuke/mindustry/type/Weapon.java index 00210b1e71..dda242a463 100644 --- a/core/src/io/anuke/mindustry/type/Weapon.java +++ b/core/src/io/anuke/mindustry/type/Weapon.java @@ -10,7 +10,7 @@ import io.anuke.arc.math.Angles; import io.anuke.arc.math.Mathf; import io.anuke.arc.math.geom.Vector2; import io.anuke.mindustry.Vars; -import io.anuke.mindustry.content.fx.Fx; +import io.anuke.mindustry.content.Fx; import io.anuke.mindustry.entities.Player; import io.anuke.mindustry.entities.bullet.Bullet; import io.anuke.mindustry.entities.bullet.BulletType; diff --git a/core/src/io/anuke/mindustry/world/BaseBlock.java b/core/src/io/anuke/mindustry/world/BaseBlock.java index 82088ff38e..0fa31beb61 100644 --- a/core/src/io/anuke/mindustry/world/BaseBlock.java +++ b/core/src/io/anuke/mindustry/world/BaseBlock.java @@ -6,7 +6,7 @@ import io.anuke.arc.math.Mathf; import io.anuke.arc.math.geom.Vector2; import io.anuke.arc.util.Time; import io.anuke.mindustry.Vars; -import io.anuke.mindustry.content.fx.EnvironmentFx; +import io.anuke.mindustry.content.Fx; import io.anuke.mindustry.entities.TileEntity; import io.anuke.mindustry.entities.Unit; import io.anuke.mindustry.entities.effect.Puddle; @@ -157,13 +157,13 @@ public abstract class BaseBlock extends MappableContent{ tile.entity.damage(1 * Time.delta()); next.entity.damage(1 * Time.delta()); if(Mathf.chance(0.1 * Time.delta())){ - Effects.effect(EnvironmentFx.fire, (tile.worldx() + next.worldx()) / 2f, (tile.worldy() + next.worldy()) / 2f); + Effects.effect(Fx.fire, (tile.worldx() + next.worldx()) / 2f, (tile.worldy() + next.worldy()) / 2f); } }else if((liquid.temperature > 0.7f && other.temperature < 0.55f) || (other.temperature > 0.7f && liquid.temperature < 0.55f)){ tile.entity.liquids.remove(liquid, Math.min(tile.entity.liquids.get(liquid), 0.7f * Time.delta())); if(Mathf.chance(0.2f * Time.delta())){ - Effects.effect(EnvironmentFx.steam, (tile.worldx() + next.worldx()) / 2f, (tile.worldy() + next.worldy()) / 2f); + Effects.effect(Fx.steam, (tile.worldx() + next.worldx()) / 2f, (tile.worldy() + next.worldy()) / 2f); } } } diff --git a/core/src/io/anuke/mindustry/world/blocks/BuildBlock.java b/core/src/io/anuke/mindustry/world/blocks/BuildBlock.java index 4337d83955..441508c55c 100644 --- a/core/src/io/anuke/mindustry/world/blocks/BuildBlock.java +++ b/core/src/io/anuke/mindustry/world/blocks/BuildBlock.java @@ -9,8 +9,7 @@ import io.anuke.arc.entities.Effects; import io.anuke.arc.graphics.g2d.Draw; import io.anuke.arc.graphics.g2d.TextureRegion; import io.anuke.arc.math.Mathf; -import io.anuke.mindustry.content.fx.ExplosionFx; -import io.anuke.mindustry.content.fx.Fx; +import io.anuke.mindustry.content.Fx; import io.anuke.mindustry.entities.Player; import io.anuke.mindustry.entities.TileEntity; import io.anuke.mindustry.entities.Unit; @@ -103,7 +102,7 @@ public class BuildBlock extends Block{ @Override public void onDestroyed(Tile tile){ - Effects.effect(ExplosionFx.blockExplosionSmoke, tile); + Effects.effect(Fx.blockExplosionSmoke, tile); if(!tile.floor().solid && !tile.floor().isLiquid){ RubbleDecal.create(tile.drawx(), tile.drawy(), size); diff --git a/core/src/io/anuke/mindustry/world/blocks/Floor.java b/core/src/io/anuke/mindustry/world/blocks/Floor.java index abc3cd3a9b..aabc7e3020 100644 --- a/core/src/io/anuke/mindustry/world/blocks/Floor.java +++ b/core/src/io/anuke/mindustry/world/blocks/Floor.java @@ -11,7 +11,7 @@ import io.anuke.arc.math.Mathf; import io.anuke.arc.math.geom.Geometry; import io.anuke.arc.math.geom.Vector2; import io.anuke.mindustry.content.StatusEffects; -import io.anuke.mindustry.content.fx.BlockFx; +import io.anuke.mindustry.content.Fx; import io.anuke.mindustry.type.Liquid; import io.anuke.mindustry.type.StatusEffect; import io.anuke.mindustry.world.Block; @@ -33,9 +33,9 @@ public class Floor extends Block{ /** How many ticks it takes to drown on this. */ public float drownTime = 0f; /** Effect when walking on this floor. */ - public Effect walkEffect = BlockFx.ripple; + public Effect walkEffect = Fx.ripple; /** Effect displayed when drowning on this floor. */ - public Effect drownUpdateEffect = BlockFx.bubble; + public Effect drownUpdateEffect = Fx.bubble; /** Status effect applied when walking on. */ public StatusEffect status = StatusEffects.none; /** Intensity of applied status effect. */ diff --git a/core/src/io/anuke/mindustry/world/blocks/defense/Door.java b/core/src/io/anuke/mindustry/world/blocks/defense/Door.java index 7b2303a99a..a85545453c 100644 --- a/core/src/io/anuke/mindustry/world/blocks/defense/Door.java +++ b/core/src/io/anuke/mindustry/world/blocks/defense/Door.java @@ -8,7 +8,7 @@ import io.anuke.arc.entities.Effects.Effect; import io.anuke.arc.graphics.g2d.Draw; import io.anuke.arc.graphics.g2d.TextureRegion; import io.anuke.arc.math.geom.Rectangle; -import io.anuke.mindustry.content.fx.BlockFx; +import io.anuke.mindustry.content.Fx; import io.anuke.mindustry.entities.Player; import io.anuke.mindustry.entities.TileEntity; import io.anuke.mindustry.entities.Units; @@ -21,8 +21,8 @@ import java.io.IOException; public class Door extends Wall{ protected final Rectangle rect = new Rectangle(); - protected Effect openfx = BlockFx.dooropen; - protected Effect closefx = BlockFx.doorclose; + protected Effect openfx = Fx.dooropen; + protected Effect closefx = Fx.doorclose; protected TextureRegion openRegion; diff --git a/core/src/io/anuke/mindustry/world/blocks/defense/ForceProjector.java b/core/src/io/anuke/mindustry/world/blocks/defense/ForceProjector.java index a8a76c46a6..374c1fd3ff 100644 --- a/core/src/io/anuke/mindustry/world/blocks/defense/ForceProjector.java +++ b/core/src/io/anuke/mindustry/world/blocks/defense/ForceProjector.java @@ -13,8 +13,7 @@ import io.anuke.arc.graphics.g2d.Fill; import io.anuke.arc.graphics.g2d.TextureRegion; import io.anuke.arc.math.Mathf; import io.anuke.arc.util.Time; -import io.anuke.mindustry.content.fx.BlockFx; -import io.anuke.mindustry.content.fx.BulletFx; +import io.anuke.mindustry.content.Fx; import io.anuke.mindustry.entities.TileEntity; import io.anuke.mindustry.entities.traits.AbsorbTrait; import io.anuke.mindustry.graphics.Palette; @@ -94,7 +93,7 @@ public class ForceProjector extends Block { entity.radscl = Mathf.lerpDelta(entity.radscl, entity.broken ? 0f : 1f, 0.05f); if(Mathf.chance(Time.delta() * entity.buildup / breakage * 0.1f)){ - Effects.effect(BlockFx.reactorsmoke, tile.drawx() + Mathf.range(tilesize/2f), tile.drawy() + Mathf.range(tilesize/2f)); + Effects.effect(Fx.reactorsmoke, tile.drawx() + Mathf.range(tilesize/2f), tile.drawy() + Mathf.range(tilesize/2f)); } // Use Cases: @@ -137,7 +136,7 @@ public class ForceProjector extends Block { if(entity.buildup >= breakage && !entity.broken){ entity.broken = true; entity.buildup = breakage; - Effects.effect(BlockFx.shieldBreak, tile.drawx(), tile.drawy(), radius); + Effects.effect(Fx.shieldBreak, tile.drawx(), tile.drawy(), radius); } if(entity.hit > 0f){ @@ -151,7 +150,7 @@ public class ForceProjector extends Block { AbsorbTrait trait = (AbsorbTrait)bullet; if(trait.canBeAbsorbed() && trait.getTeam() != tile.getTeam() && isInsideHexagon(trait.getX(), trait.getY(), realRadius * 2f, tile.drawx(), tile.drawy())){ trait.absorb(); - Effects.effect(BulletFx.absorb, trait); + Effects.effect(Fx.absorb, trait); float relativeDamagePowerDraw = trait.getShieldDamage() * powerDamage / consumePower.powerCapacity; entity.hit = 1f; diff --git a/core/src/io/anuke/mindustry/world/blocks/defense/MendProjector.java b/core/src/io/anuke/mindustry/world/blocks/defense/MendProjector.java index 503ad4c2f1..e79e877c09 100644 --- a/core/src/io/anuke/mindustry/world/blocks/defense/MendProjector.java +++ b/core/src/io/anuke/mindustry/world/blocks/defense/MendProjector.java @@ -11,7 +11,7 @@ import io.anuke.arc.graphics.g2d.TextureRegion; import io.anuke.arc.math.Mathf; import io.anuke.arc.util.Time; import io.anuke.arc.util.Tmp; -import io.anuke.mindustry.content.fx.BlockFx; +import io.anuke.mindustry.content.Fx; import io.anuke.mindustry.entities.TileEntity; import io.anuke.mindustry.world.Block; import io.anuke.mindustry.world.Tile; @@ -68,7 +68,7 @@ public class MendProjector extends Block{ if(entity.charge >= reload){ float realRange = range + entity.phaseHeat * phaseRangeBoost; - Effects.effect(BlockFx.healWaveMend, Tmp.c1.set(color).lerp(phase, entity.phaseHeat), tile.drawx(), tile.drawy(), realRange); + Effects.effect(Fx.healWaveMend, Tmp.c1.set(color).lerp(phase, entity.phaseHeat), tile.drawx(), tile.drawy(), realRange); entity.charge = 0f; int tileRange = (int)(realRange / tilesize); @@ -85,7 +85,7 @@ public class MendProjector extends Block{ if(other.getTeamID() == tile.getTeamID() && !healed.contains(other.pos()) && other.entity != null && other.entity.health < other.entity.maxHealth()){ other.entity.healBy(other.entity.maxHealth() * (healPercent + entity.phaseHeat*phaseBoost)/100f * entity.power.satisfaction); - Effects.effect(BlockFx.healBlockFull, Tmp.c1.set(color).lerp(phase, entity.phaseHeat), other.drawx(), other.drawy(), other.block().size); + Effects.effect(Fx.healBlockFull, Tmp.c1.set(color).lerp(phase, entity.phaseHeat), other.drawx(), other.drawy(), other.block().size); healed.add(other.pos()); } } diff --git a/core/src/io/anuke/mindustry/world/blocks/defense/OverdriveProjector.java b/core/src/io/anuke/mindustry/world/blocks/defense/OverdriveProjector.java index 32f8498d59..54dd2f526f 100644 --- a/core/src/io/anuke/mindustry/world/blocks/defense/OverdriveProjector.java +++ b/core/src/io/anuke/mindustry/world/blocks/defense/OverdriveProjector.java @@ -11,7 +11,7 @@ import io.anuke.arc.graphics.g2d.TextureRegion; import io.anuke.arc.math.Mathf; import io.anuke.arc.util.Time; import io.anuke.arc.util.Tmp; -import io.anuke.mindustry.content.fx.BlockFx; +import io.anuke.mindustry.content.Fx; import io.anuke.mindustry.entities.TileEntity; import io.anuke.mindustry.world.Block; import io.anuke.mindustry.world.Tile; @@ -70,7 +70,7 @@ public class OverdriveProjector extends Block{ float realRange = range + entity.phaseHeat * phaseRangeBoost; float realBoost = (speedBoost + entity.phaseHeat*speedBoostPhase) * entity.power.satisfaction; - Effects.effect(BlockFx.overdriveWave, Tmp.c1.set(color).lerp(phase, entity.phaseHeat), tile.drawx(), tile.drawy(), realRange); + Effects.effect(Fx.overdriveWave, Tmp.c1.set(color).lerp(phase, entity.phaseHeat), tile.drawx(), tile.drawy(), realRange); entity.charge = 0f; int tileRange = (int)(realRange / tilesize); @@ -88,7 +88,7 @@ public class OverdriveProjector extends Block{ if(other.getTeamID() == tile.getTeamID() && !healed.contains(other.pos()) && other.entity != null){ other.entity.timeScaleDuration = Math.max(other.entity.timeScaleDuration, reload + 1f); other.entity.timeScale = Math.max(other.entity.timeScale, realBoost); - Effects.effect(BlockFx.overdriveBlockFull, Tmp.c1.set(color).lerp(phase, entity.phaseHeat), other.drawx(), other.drawy(), other.block().size); + Effects.effect(Fx.overdriveBlockFull, Tmp.c1.set(color).lerp(phase, entity.phaseHeat), other.drawx(), other.drawy(), other.block().size); healed.add(other.pos()); } } diff --git a/core/src/io/anuke/mindustry/world/blocks/defense/turrets/ChargeTurret.java b/core/src/io/anuke/mindustry/world/blocks/defense/turrets/ChargeTurret.java index 51a22071b7..855dc67fb2 100644 --- a/core/src/io/anuke/mindustry/world/blocks/defense/turrets/ChargeTurret.java +++ b/core/src/io/anuke/mindustry/world/blocks/defense/turrets/ChargeTurret.java @@ -4,7 +4,7 @@ import io.anuke.arc.entities.Effects; import io.anuke.arc.entities.Effects.Effect; import io.anuke.arc.math.Mathf; import io.anuke.arc.util.Time; -import io.anuke.mindustry.content.fx.Fx; +import io.anuke.mindustry.content.Fx; import io.anuke.mindustry.entities.TileEntity; import io.anuke.mindustry.entities.bullet.BulletType; import io.anuke.mindustry.world.Tile; diff --git a/core/src/io/anuke/mindustry/world/blocks/defense/turrets/CooledTurret.java b/core/src/io/anuke/mindustry/world/blocks/defense/turrets/CooledTurret.java index 09255365a2..65053c9284 100644 --- a/core/src/io/anuke/mindustry/world/blocks/defense/turrets/CooledTurret.java +++ b/core/src/io/anuke/mindustry/world/blocks/defense/turrets/CooledTurret.java @@ -1,6 +1,6 @@ package io.anuke.mindustry.world.blocks.defense.turrets; -import io.anuke.mindustry.content.fx.BlockFx; +import io.anuke.mindustry.content.Fx; import io.anuke.mindustry.type.Liquid; import io.anuke.mindustry.world.Tile; import io.anuke.mindustry.world.consumers.ConsumeLiquidFilter; @@ -16,7 +16,7 @@ public class CooledTurret extends Turret{ protected float coolantMultiplier = 1f; /**Max coolant used per tick.*/ protected float maxCoolantUsed = 1f; - protected Effect coolEffect = BlockFx.fuelburn; + protected Effect coolEffect = Fx.fuelburn; public CooledTurret(String name){ super(name); diff --git a/core/src/io/anuke/mindustry/world/blocks/defense/turrets/Turret.java b/core/src/io/anuke/mindustry/world/blocks/defense/turrets/Turret.java index 080de1cc24..6a07a00846 100644 --- a/core/src/io/anuke/mindustry/world/blocks/defense/turrets/Turret.java +++ b/core/src/io/anuke/mindustry/world/blocks/defense/turrets/Turret.java @@ -15,7 +15,7 @@ import io.anuke.arc.math.Angles; import io.anuke.arc.math.Mathf; import io.anuke.arc.math.geom.Vector2; import io.anuke.arc.util.Time; -import io.anuke.mindustry.content.fx.Fx; +import io.anuke.mindustry.content.Fx; import io.anuke.mindustry.entities.Predict; import io.anuke.mindustry.entities.TileEntity; import io.anuke.mindustry.entities.Units; diff --git a/core/src/io/anuke/mindustry/world/blocks/distribution/MassDriver.java b/core/src/io/anuke/mindustry/world/blocks/distribution/MassDriver.java index 8339a7c1bd..c822a4b362 100644 --- a/core/src/io/anuke/mindustry/world/blocks/distribution/MassDriver.java +++ b/core/src/io/anuke/mindustry/world/blocks/distribution/MassDriver.java @@ -16,10 +16,7 @@ import io.anuke.arc.util.Time; import io.anuke.arc.util.pooling.Pool.Poolable; import io.anuke.arc.util.pooling.Pools; import io.anuke.mindustry.content.Bullets; -import io.anuke.mindustry.content.Bullets; -import io.anuke.mindustry.content.fx.BlockFx; -import io.anuke.mindustry.content.fx.EnvironmentFx; -import io.anuke.mindustry.content.fx.ShootFx; +import io.anuke.mindustry.content.Fx; import io.anuke.mindustry.entities.Player; import io.anuke.mindustry.entities.TileEntity; import io.anuke.mindustry.entities.bullet.Bullet; @@ -46,9 +43,9 @@ public class MassDriver extends Block{ protected int minDistribute = 10; protected float knockback = 4f; protected float reloadTime = 100f; - protected Effect shootEffect = ShootFx.shootBig2; - protected Effect smokeEffect = ShootFx.shootBigSmoke2; - protected Effect recieveEffect = BlockFx.mineBig; + protected Effect shootEffect = Fx.shootBig2; + protected Effect smokeEffect = Fx.shootBigSmoke2; + protected Effect recieveEffect = Fx.mineBig; protected float shake = 3f; protected final static float powerPercentageUsed = 1.0f; protected TextureRegion turretRegion; @@ -309,7 +306,7 @@ public class MassDriver extends Block{ int amountDropped = Mathf.random(0, data.items[i]); if(amountDropped > 0){ float angle = Mathf.range(180f); - Effects.effect(EnvironmentFx.dropItem, Color.WHITE, bullet.x, bullet.y, angle, content.item(i)); + Effects.effect(Fx.dropItem, Color.WHITE, bullet.x, bullet.y, angle, content.item(i)); } } diff --git a/core/src/io/anuke/mindustry/world/blocks/power/ItemLiquidGenerator.java b/core/src/io/anuke/mindustry/world/blocks/power/ItemLiquidGenerator.java index d2d5106863..44fdd5caf9 100644 --- a/core/src/io/anuke/mindustry/world/blocks/power/ItemLiquidGenerator.java +++ b/core/src/io/anuke/mindustry/world/blocks/power/ItemLiquidGenerator.java @@ -7,7 +7,7 @@ import io.anuke.arc.graphics.g2d.Draw; import io.anuke.arc.graphics.g2d.TextureRegion; import io.anuke.arc.math.Mathf; import io.anuke.arc.util.Time; -import io.anuke.mindustry.content.fx.BlockFx; +import io.anuke.mindustry.content.Fx; import io.anuke.mindustry.entities.TileEntity; import io.anuke.mindustry.type.Item; import io.anuke.mindustry.type.Liquid; @@ -32,8 +32,8 @@ public class ItemLiquidGenerator extends PowerGenerator{ /** Maximum liquid used per frame. */ protected float maxLiquidGenerate = 0.4f; - protected Effects.Effect generateEffect = BlockFx.generatespark; - protected Effects.Effect explodeEffect = BlockFx.generatespark; + protected Effects.Effect generateEffect = Fx.generatespark; + protected Effects.Effect explodeEffect = Fx.generatespark; protected Color heatColor = Color.valueOf("ff9b59"); protected TextureRegion topRegion; diff --git a/core/src/io/anuke/mindustry/world/blocks/power/NuclearReactor.java b/core/src/io/anuke/mindustry/world/blocks/power/NuclearReactor.java index 5f7345ddf7..91e7fadf75 100644 --- a/core/src/io/anuke/mindustry/world/blocks/power/NuclearReactor.java +++ b/core/src/io/anuke/mindustry/world/blocks/power/NuclearReactor.java @@ -9,8 +9,7 @@ import io.anuke.arc.math.Mathf; import io.anuke.arc.util.Time; import io.anuke.arc.math.geom.Vector2; import io.anuke.mindustry.content.Items; -import io.anuke.mindustry.content.fx.BlockFx; -import io.anuke.mindustry.content.fx.ExplosionFx; +import io.anuke.mindustry.content.Fx; import io.anuke.mindustry.entities.Damage; import io.anuke.mindustry.entities.TileEntity; import io.anuke.mindustry.type.Liquid; @@ -106,7 +105,7 @@ public class NuclearReactor extends PowerGenerator{ if(entity.heat > smokeThreshold){ float smoke = 1.0f + (entity.heat - smokeThreshold) / (1f - smokeThreshold); //ranges from 1.0 to 2.0 if(Mathf.chance(smoke / 20.0 * entity.delta())){ - Effects.effect(BlockFx.reactorsmoke, tile.worldx() + Mathf.range(size * tilesize / 2f), + Effects.effect(Fx.reactorsmoke, tile.worldx() + Mathf.range(size * tilesize / 2f), tile.worldy() + Mathf.random(size * tilesize / 2f)); } } @@ -131,9 +130,9 @@ public class NuclearReactor extends PowerGenerator{ if(fuel < 5 && entity.heat < 0.5f) return; Effects.shake(6f, 16f, tile.worldx(), tile.worldy()); - Effects.effect(ExplosionFx.nuclearShockwave, tile.worldx(), tile.worldy()); + Effects.effect(Fx.nuclearShockwave, tile.worldx(), tile.worldy()); for(int i = 0; i < 6; i++){ - Time.run(Mathf.random(40), () -> Effects.effect(BlockFx.nuclearcloud, tile.worldx(), tile.worldy())); + Time.run(Mathf.random(40), () -> Effects.effect(Fx.nuclearcloud, tile.worldx(), tile.worldy())); } Damage.damage(tile.worldx(), tile.worldy(), explosionRadius * tilesize, explosionDamage * 4); @@ -142,14 +141,14 @@ public class NuclearReactor extends PowerGenerator{ for(int i = 0; i < 20; i++){ Time.run(Mathf.random(50), () -> { tr.rnd(Mathf.random(40f)); - Effects.effect(ExplosionFx.explosion, tr.x + tile.worldx(), tr.y + tile.worldy()); + Effects.effect(Fx.explosion, tr.x + tile.worldx(), tr.y + tile.worldy()); }); } for(int i = 0; i < 70; i++){ Time.run(Mathf.random(80), () -> { tr.rnd(Mathf.random(120f)); - Effects.effect(BlockFx.nuclearsmoke, tr.x + tile.worldx(), tr.y + tile.worldy()); + Effects.effect(Fx.nuclearsmoke, tr.x + tile.worldx(), tr.y + tile.worldy()); }); } } diff --git a/core/src/io/anuke/mindustry/world/blocks/production/Cultivator.java b/core/src/io/anuke/mindustry/world/blocks/production/Cultivator.java index ed692caf57..e900b092d5 100644 --- a/core/src/io/anuke/mindustry/world/blocks/production/Cultivator.java +++ b/core/src/io/anuke/mindustry/world/blocks/production/Cultivator.java @@ -10,7 +10,7 @@ import io.anuke.arc.math.RandomXS128; import io.anuke.arc.util.Time; import io.anuke.mindustry.content.Items; import io.anuke.mindustry.content.blocks.Blocks; -import io.anuke.mindustry.content.fx.Fx; +import io.anuke.mindustry.content.Fx; import io.anuke.mindustry.entities.TileEntity; import io.anuke.mindustry.type.Item; import io.anuke.mindustry.world.Tile; diff --git a/core/src/io/anuke/mindustry/world/blocks/production/Drill.java b/core/src/io/anuke/mindustry/world/blocks/production/Drill.java index b4fa156706..67c1168f75 100644 --- a/core/src/io/anuke/mindustry/world/blocks/production/Drill.java +++ b/core/src/io/anuke/mindustry/world/blocks/production/Drill.java @@ -12,7 +12,7 @@ import io.anuke.arc.graphics.g2d.TextureRegion; import io.anuke.arc.math.Mathf; import io.anuke.arc.util.Time; import io.anuke.mindustry.content.Liquids; -import io.anuke.mindustry.content.fx.BlockFx; +import io.anuke.mindustry.content.Fx; import io.anuke.mindustry.entities.TileEntity; import io.anuke.mindustry.graphics.Layer; import io.anuke.mindustry.type.Item; @@ -48,11 +48,11 @@ public class Drill extends Block{ /**Whether to draw the item this drill is mining.*/ protected boolean drawMineItem = false; /**Effect played when an item is produced. This is colored.*/ - protected Effect drillEffect = BlockFx.mine; + protected Effect drillEffect = Fx.mine; /**Speed the drill bit rotates at.*/ protected float rotateSpeed = 2f; /**Effect randomly played while drilling.*/ - protected Effect updateEffect = BlockFx.pulverizeSmall; + protected Effect updateEffect = Fx.pulverizeSmall; /**Chance the update effect will appear.*/ protected float updateEffectChance = 0.02f; diff --git a/core/src/io/anuke/mindustry/world/blocks/production/GenericCrafter.java b/core/src/io/anuke/mindustry/world/blocks/production/GenericCrafter.java index 4c1eef5ef7..21bcebe89c 100644 --- a/core/src/io/anuke/mindustry/world/blocks/production/GenericCrafter.java +++ b/core/src/io/anuke/mindustry/world/blocks/production/GenericCrafter.java @@ -2,8 +2,7 @@ package io.anuke.mindustry.world.blocks.production; import io.anuke.arc.Core; import io.anuke.arc.graphics.g2d.TextureRegion; -import io.anuke.mindustry.content.fx.BlockFx; -import io.anuke.mindustry.content.fx.Fx; +import io.anuke.mindustry.content.Fx; import io.anuke.mindustry.entities.TileEntity; import io.anuke.mindustry.type.Item; import io.anuke.mindustry.world.Block; @@ -26,7 +25,7 @@ public class GenericCrafter extends Block{ protected Item output; protected float craftTime = 80; - protected Effect craftEffect = BlockFx.purify; + protected Effect craftEffect = Fx.purify; protected Effect updateEffect = Fx.none; protected float updateEffectChance = 0.04f; diff --git a/core/src/io/anuke/mindustry/world/blocks/production/Incinerator.java b/core/src/io/anuke/mindustry/world/blocks/production/Incinerator.java index d8fea6e766..28574e24d0 100644 --- a/core/src/io/anuke/mindustry/world/blocks/production/Incinerator.java +++ b/core/src/io/anuke/mindustry/world/blocks/production/Incinerator.java @@ -7,7 +7,7 @@ import io.anuke.arc.graphics.g2d.Draw; import io.anuke.arc.graphics.g2d.Fill; import io.anuke.arc.math.Mathf; import io.anuke.arc.util.Time; -import io.anuke.mindustry.content.fx.BlockFx; +import io.anuke.mindustry.content.Fx; import io.anuke.mindustry.entities.TileEntity; import io.anuke.mindustry.type.Item; import io.anuke.mindustry.type.Liquid; @@ -15,7 +15,7 @@ import io.anuke.mindustry.world.Block; import io.anuke.mindustry.world.Tile; public class Incinerator extends Block{ - protected Effect effect = BlockFx.fuelburn; + protected Effect effect = Fx.fuelburn; protected Color flameColor = Color.valueOf("ffad9d"); public Incinerator(String name){ diff --git a/core/src/io/anuke/mindustry/world/blocks/production/PowerSmelter.java b/core/src/io/anuke/mindustry/world/blocks/production/PowerSmelter.java index a2423363ae..2b34b859ee 100644 --- a/core/src/io/anuke/mindustry/world/blocks/production/PowerSmelter.java +++ b/core/src/io/anuke/mindustry/world/blocks/production/PowerSmelter.java @@ -3,7 +3,7 @@ package io.anuke.mindustry.world.blocks.production; import io.anuke.arc.Core; import io.anuke.arc.graphics.Color; import io.anuke.arc.graphics.g2d.TextureRegion; -import io.anuke.mindustry.content.fx.BlockFx; +import io.anuke.mindustry.content.Fx; import io.anuke.mindustry.entities.TileEntity; import io.anuke.mindustry.type.Item; import io.anuke.mindustry.type.ItemStack; @@ -41,8 +41,8 @@ public class PowerSmelter extends PowerBlock{ protected float craftTime = 20f; //time to craft one item, so max 3 items per second by default protected float burnEffectChance = 0.01f; - protected Effect craftEffect = BlockFx.smelt, - burnEffect = BlockFx.fuelburn; + protected Effect craftEffect = Fx.smelt, + burnEffect = Fx.fuelburn; protected Color flameColor = Color.valueOf("ffc999"); protected TextureRegion topRegion; diff --git a/core/src/io/anuke/mindustry/world/blocks/production/Smelter.java b/core/src/io/anuke/mindustry/world/blocks/production/Smelter.java index 985a9f0d75..65b338006d 100644 --- a/core/src/io/anuke/mindustry/world/blocks/production/Smelter.java +++ b/core/src/io/anuke/mindustry/world/blocks/production/Smelter.java @@ -1,7 +1,7 @@ package io.anuke.mindustry.world.blocks.production; import io.anuke.arc.graphics.Color; -import io.anuke.mindustry.content.fx.BlockFx; +import io.anuke.mindustry.content.Fx; import io.anuke.mindustry.entities.TileEntity; import io.anuke.mindustry.type.Item; import io.anuke.mindustry.type.ItemStack; @@ -32,7 +32,7 @@ public class Smelter extends Block{ protected float craftTime = 20f; protected float burnDuration = 50f; - protected Effect craftEffect = BlockFx.smelt, burnEffect = BlockFx.fuelburn; + protected Effect craftEffect = Fx.smelt, burnEffect = Fx.fuelburn; protected Color flameColor = Color.valueOf("ffb879"); public Smelter(String name){ diff --git a/core/src/io/anuke/mindustry/world/blocks/production/SolidPump.java b/core/src/io/anuke/mindustry/world/blocks/production/SolidPump.java index 729fc05a90..434a5011e3 100644 --- a/core/src/io/anuke/mindustry/world/blocks/production/SolidPump.java +++ b/core/src/io/anuke/mindustry/world/blocks/production/SolidPump.java @@ -3,7 +3,7 @@ package io.anuke.mindustry.world.blocks.production; import io.anuke.arc.Core; import io.anuke.arc.graphics.g2d.TextureRegion; import io.anuke.mindustry.content.Liquids; -import io.anuke.mindustry.content.fx.Fx; +import io.anuke.mindustry.content.Fx; import io.anuke.mindustry.entities.TileEntity; import io.anuke.mindustry.type.Liquid; import io.anuke.mindustry.world.Tile; diff --git a/core/src/io/anuke/mindustry/world/blocks/storage/CoreBlock.java b/core/src/io/anuke/mindustry/world/blocks/storage/CoreBlock.java index d33212a858..a046e4fdee 100644 --- a/core/src/io/anuke/mindustry/world/blocks/storage/CoreBlock.java +++ b/core/src/io/anuke/mindustry/world/blocks/storage/CoreBlock.java @@ -12,7 +12,7 @@ import io.anuke.arc.math.Mathf; import io.anuke.arc.util.Time; import io.anuke.mindustry.Vars; import io.anuke.mindustry.content.UnitTypes; -import io.anuke.mindustry.content.fx.Fx; +import io.anuke.mindustry.content.Fx; import io.anuke.mindustry.entities.Player; import io.anuke.mindustry.entities.TileEntity; import io.anuke.mindustry.entities.Unit; diff --git a/core/src/io/anuke/mindustry/world/blocks/units/CommandCenter.java b/core/src/io/anuke/mindustry/world/blocks/units/CommandCenter.java index 57de75effc..0be196abda 100644 --- a/core/src/io/anuke/mindustry/world/blocks/units/CommandCenter.java +++ b/core/src/io/anuke/mindustry/world/blocks/units/CommandCenter.java @@ -13,7 +13,7 @@ import io.anuke.arc.graphics.g2d.TextureRegion; import io.anuke.arc.scene.ui.ButtonGroup; import io.anuke.arc.scene.ui.ImageButton; import io.anuke.arc.scene.ui.layout.Table; -import io.anuke.mindustry.content.fx.BlockFx; +import io.anuke.mindustry.content.Fx; import io.anuke.mindustry.entities.Player; import io.anuke.mindustry.entities.TileEntity; import io.anuke.mindustry.entities.units.BaseUnit; @@ -35,7 +35,7 @@ public class CommandCenter extends Block{ protected TextureRegion[] commandRegions = new TextureRegion[UnitCommand.values().length]; protected Color topColor = Palette.command; protected Color bottomColor = Color.valueOf("5e5e5e"); - protected Effect effect = BlockFx.commandSend; + protected Effect effect = Fx.commandSend; public CommandCenter(String name){ super(name); diff --git a/core/src/io/anuke/mindustry/world/blocks/units/MechPad.java b/core/src/io/anuke/mindustry/world/blocks/units/MechPad.java index 822b8d96bc..38257657d4 100644 --- a/core/src/io/anuke/mindustry/world/blocks/units/MechPad.java +++ b/core/src/io/anuke/mindustry/world/blocks/units/MechPad.java @@ -12,7 +12,7 @@ import io.anuke.arc.math.geom.Geometry; import io.anuke.arc.util.Time; import io.anuke.mindustry.Vars; import io.anuke.mindustry.content.Mechs; -import io.anuke.mindustry.content.fx.Fx; +import io.anuke.mindustry.content.Fx; import io.anuke.mindustry.entities.Player; import io.anuke.mindustry.entities.TileEntity; import io.anuke.mindustry.entities.Unit; @@ -24,7 +24,6 @@ import io.anuke.mindustry.graphics.Shaders; import io.anuke.mindustry.type.Mech; import io.anuke.mindustry.world.Block; import io.anuke.mindustry.world.Tile; -import io.anuke.mindustry.world.meta.BlockStat; import java.io.DataInput; import java.io.DataOutput; diff --git a/core/src/io/anuke/mindustry/world/blocks/units/Reconstructor.java b/core/src/io/anuke/mindustry/world/blocks/units/Reconstructor.java index 75d69c255b..de7753e644 100644 --- a/core/src/io/anuke/mindustry/world/blocks/units/Reconstructor.java +++ b/core/src/io/anuke/mindustry/world/blocks/units/Reconstructor.java @@ -11,7 +11,7 @@ import io.anuke.arc.graphics.g2d.TextureRegion; import io.anuke.arc.math.Mathf; import io.anuke.arc.util.Time; import io.anuke.mindustry.Vars; -import io.anuke.mindustry.content.fx.Fx; +import io.anuke.mindustry.content.Fx; import io.anuke.mindustry.entities.Player; import io.anuke.mindustry.entities.TileEntity; import io.anuke.mindustry.entities.Unit; diff --git a/core/src/io/anuke/mindustry/world/blocks/units/UnitFactory.java b/core/src/io/anuke/mindustry/world/blocks/units/UnitFactory.java index b29ecab1b0..5df8efceee 100644 --- a/core/src/io/anuke/mindustry/world/blocks/units/UnitFactory.java +++ b/core/src/io/anuke/mindustry/world/blocks/units/UnitFactory.java @@ -10,7 +10,7 @@ import io.anuke.arc.graphics.g2d.Lines; import io.anuke.arc.graphics.g2d.TextureRegion; import io.anuke.arc.math.Mathf; import io.anuke.mindustry.Vars; -import io.anuke.mindustry.content.fx.BlockFx; +import io.anuke.mindustry.content.Fx; import io.anuke.mindustry.entities.TileEntity; import io.anuke.mindustry.entities.units.BaseUnit; import io.anuke.mindustry.entities.units.UnitType; @@ -64,7 +64,7 @@ public class UnitFactory extends Block{ entity.buildTime = 0f; Effects.shake(2f, 3f, entity); - Effects.effect(BlockFx.producesmoke, tile.drawx(), tile.drawy()); + Effects.effect(Fx.producesmoke, tile.drawx(), tile.drawy()); if(!Net.client()){ BaseUnit unit = factory.type.create(tile.getTeam()); From ee9f65d4a3e1a2ee6856e740156e9ad60fdce1b6 Mon Sep 17 00:00:00 2001 From: Anuken Date: Mon, 7 Jan 2019 18:39:06 -0500 Subject: [PATCH 5/6] Block class merge --- .../io/anuke/mindustry/ai/BlockIndexer.java | 2 +- .../io/anuke/mindustry/ai/WaveSpawner.java | 2 +- .../io/anuke/mindustry/content/Blocks.java | 1191 +++++++++++++++++ .../io/anuke/mindustry/content/Bullets.java | 6 - core/src/io/anuke/mindustry/content/Fx.java | 9 +- .../src/io/anuke/mindustry/content/Items.java | 6 - .../io/anuke/mindustry/content/Liquids.java | 6 - .../src/io/anuke/mindustry/content/Mechs.java | 6 - .../io/anuke/mindustry/content/Recipes.java | 233 ++-- .../mindustry/content/StatusEffects.java | 6 - .../io/anuke/mindustry/content/UnitTypes.java | 6 - .../io/anuke/mindustry/content/Weapons.java | 6 - .../mindustry/content/blocks/BlockList.java | 12 - .../mindustry/content/blocks/Blocks.java | 177 --- .../content/blocks/CraftingBlocks.java | 235 ---- .../mindustry/content/blocks/DebugBlocks.java | 180 --- .../content/blocks/DefenseBlocks.java | 98 -- .../content/blocks/DistributionBlocks.java | 57 - .../content/blocks/LiquidBlocks.java | 70 - .../mindustry/content/blocks/OreBlocks.java | 36 - .../mindustry/content/blocks/PowerBlocks.java | 81 -- .../content/blocks/ProductionBlocks.java | 112 -- .../content/blocks/StorageBlocks.java | 33 - .../content/blocks/TurretBlocks.java | 256 ---- .../mindustry/content/blocks/UnitBlocks.java | 95 -- .../content/blocks/UpgradeBlocks.java | 61 - .../anuke/mindustry/core/ContentLoader.java | 13 - .../io/anuke/mindustry/core/NetServer.java | 2 +- core/src/io/anuke/mindustry/core/World.java | 2 +- .../io/anuke/mindustry/editor/EditorTool.java | 2 +- .../io/anuke/mindustry/editor/MapEditor.java | 2 +- .../mindustry/editor/MapEditorDialog.java | 4 +- .../src/io/anuke/mindustry/entities/Unit.java | 2 +- .../mindustry/entities/effect/Puddle.java | 2 +- .../entities/traits/BuilderTrait.java | 2 +- .../mindustry/entities/units/types/Drone.java | 2 +- .../io/anuke/mindustry/game/ContentList.java | 5 - .../mindustry/graphics/BlockRenderer.java | 2 +- .../mindustry/graphics/OverlayRenderer.java | 2 +- .../anuke/mindustry/input/DesktopInput.java | 2 +- .../anuke/mindustry/input/InputHandler.java | 2 +- .../io/anuke/mindustry/input/MobileInput.java | 2 +- core/src/io/anuke/mindustry/io/MapIO.java | 5 +- .../anuke/mindustry/io/SaveFileVersion.java | 5 +- .../io/anuke/mindustry/maps/MapTileData.java | 2 +- .../anuke/mindustry/maps/SectorPresets.java | 21 +- .../anuke/mindustry/maps/TutorialSector.java | 15 +- .../maps/generation/FortressGenerator.java | 30 +- .../maps/generation/WorldGenerator.java | 12 +- .../missions/MissionWithStartingCore.java | 4 +- .../src/io/anuke/mindustry/net/NetworkIO.java | 2 +- .../ui/fragments/BlockConfigFragment.java | 2 +- core/src/io/anuke/mindustry/world/Build.java | 2 +- .../io/anuke/mindustry/world/ColorMapper.java | 6 - .../mindustry/world/LegacyColorMapper.java | 18 +- core/src/io/anuke/mindustry/world/Tile.java | 2 +- .../mindustry/world/blocks/OreBlock.java | 16 +- .../world/blocks/production/Cultivator.java | 2 +- .../world/blocks/sandbox/ItemSource.java | 34 + .../world/blocks/sandbox/ItemVoid.java | 21 + .../world/blocks/sandbox/LiquidSource.java | 105 ++ .../world/blocks/sandbox/PowerSource.java | 20 + .../world/blocks/sandbox/PowerVoid.java | 18 + tests/src/test/java/ApplicationTests.java | 22 +- .../src/test/java/power/PowerTestFixture.java | 2 +- 65 files changed, 1597 insertions(+), 1799 deletions(-) create mode 100644 core/src/io/anuke/mindustry/content/Blocks.java delete mode 100644 core/src/io/anuke/mindustry/content/blocks/BlockList.java delete mode 100644 core/src/io/anuke/mindustry/content/blocks/Blocks.java delete mode 100644 core/src/io/anuke/mindustry/content/blocks/CraftingBlocks.java delete mode 100644 core/src/io/anuke/mindustry/content/blocks/DebugBlocks.java delete mode 100644 core/src/io/anuke/mindustry/content/blocks/DefenseBlocks.java delete mode 100644 core/src/io/anuke/mindustry/content/blocks/DistributionBlocks.java delete mode 100644 core/src/io/anuke/mindustry/content/blocks/LiquidBlocks.java delete mode 100644 core/src/io/anuke/mindustry/content/blocks/OreBlocks.java delete mode 100644 core/src/io/anuke/mindustry/content/blocks/PowerBlocks.java delete mode 100644 core/src/io/anuke/mindustry/content/blocks/ProductionBlocks.java delete mode 100644 core/src/io/anuke/mindustry/content/blocks/StorageBlocks.java delete mode 100644 core/src/io/anuke/mindustry/content/blocks/TurretBlocks.java delete mode 100644 core/src/io/anuke/mindustry/content/blocks/UnitBlocks.java delete mode 100644 core/src/io/anuke/mindustry/content/blocks/UpgradeBlocks.java create mode 100644 core/src/io/anuke/mindustry/world/blocks/sandbox/ItemSource.java create mode 100644 core/src/io/anuke/mindustry/world/blocks/sandbox/ItemVoid.java create mode 100644 core/src/io/anuke/mindustry/world/blocks/sandbox/LiquidSource.java create mode 100644 core/src/io/anuke/mindustry/world/blocks/sandbox/PowerSource.java create mode 100644 core/src/io/anuke/mindustry/world/blocks/sandbox/PowerVoid.java diff --git a/core/src/io/anuke/mindustry/ai/BlockIndexer.java b/core/src/io/anuke/mindustry/ai/BlockIndexer.java index 9269a205bc..6e96b6cb36 100644 --- a/core/src/io/anuke/mindustry/ai/BlockIndexer.java +++ b/core/src/io/anuke/mindustry/ai/BlockIndexer.java @@ -5,7 +5,7 @@ import io.anuke.arc.collection.*; import io.anuke.arc.function.Predicate; import io.anuke.arc.math.Mathf; import io.anuke.arc.math.geom.Geometry; -import io.anuke.mindustry.content.blocks.Blocks; +import io.anuke.mindustry.content.Blocks; import io.anuke.mindustry.entities.TileEntity; import io.anuke.mindustry.game.EventType.TileChangeEvent; import io.anuke.mindustry.game.EventType.WorldLoadEvent; diff --git a/core/src/io/anuke/mindustry/ai/WaveSpawner.java b/core/src/io/anuke/mindustry/ai/WaveSpawner.java index 414daba785..5096d1c670 100644 --- a/core/src/io/anuke/mindustry/ai/WaveSpawner.java +++ b/core/src/io/anuke/mindustry/ai/WaveSpawner.java @@ -5,7 +5,7 @@ import io.anuke.arc.collection.Array; import io.anuke.arc.collection.GridBits; import io.anuke.arc.math.Mathf; import io.anuke.arc.util.Structs; -import io.anuke.mindustry.content.blocks.Blocks; +import io.anuke.mindustry.content.Blocks; import io.anuke.mindustry.entities.units.BaseUnit; import io.anuke.mindustry.entities.units.Squad; import io.anuke.mindustry.game.EventType.WorldLoadEvent; diff --git a/core/src/io/anuke/mindustry/content/Blocks.java b/core/src/io/anuke/mindustry/content/Blocks.java new file mode 100644 index 0000000000..3f29b85afe --- /dev/null +++ b/core/src/io/anuke/mindustry/content/Blocks.java @@ -0,0 +1,1191 @@ +package io.anuke.mindustry.content; + +import io.anuke.arc.graphics.Color; +import io.anuke.arc.graphics.g2d.Draw; +import io.anuke.arc.graphics.g2d.Lines; +import io.anuke.arc.math.Mathf; +import io.anuke.arc.util.Time; +import io.anuke.mindustry.game.ContentList; +import io.anuke.mindustry.graphics.CacheLayer; +import io.anuke.mindustry.type.Item; +import io.anuke.mindustry.type.ItemStack; +import io.anuke.mindustry.world.Block; +import io.anuke.mindustry.world.Tile; +import io.anuke.mindustry.world.blocks.*; +import io.anuke.mindustry.world.blocks.defense.*; +import io.anuke.mindustry.world.blocks.defense.turrets.*; +import io.anuke.mindustry.world.blocks.distribution.*; +import io.anuke.mindustry.world.blocks.power.*; +import io.anuke.mindustry.world.blocks.production.*; +import io.anuke.mindustry.world.blocks.sandbox.*; +import io.anuke.mindustry.world.blocks.storage.CoreBlock; +import io.anuke.mindustry.world.blocks.storage.SortedUnloader; +import io.anuke.mindustry.world.blocks.storage.Vault; +import io.anuke.mindustry.world.blocks.units.*; + +import static io.anuke.mindustry.Vars.content; + +public class Blocks implements ContentList{ + public static Block + + air, blockpart, spawn, space, metalfloor, deepwater, water, lava, tar, stone, + blackstone, dirt, sand, ice, snow, grass, shrub, rock, icerock, blackrock, smelter, arcsmelter, siliconsmelter, + plastaniumCompressor, phaseWeaver, alloySmelter, pyratiteMixer, blastMixer, cryofluidmixer, melter, separator, + centrifuge, biomatterCompressor, pulverizer, solidifier, incinerator, powerVoid, powerSource, itemSource, liquidSource, + itemVoid, copperWall, copperWallLarge, denseAlloyWall, denseAlloyWallLarge, thoriumWall, thoriumWallLarge, door, doorLarge, + phaseWall, phaseWallLarge, surgeWall, surgeWallLarge, mendProjector, overdriveProjector, forceProjector, shockMine, conveyor, + titaniumconveyor, distributor, junction, itemBridge, phaseConveyor, sorter, router, overflowGate, massDriver, mechanicalPump, + rotaryPump, thermalPump, conduit, pulseConduit, liquidRouter, liquidtank, liquidJunction, bridgeConduit, phaseConduit, + combustionGenerator, thermalGenerator, turbineGenerator, rtgGenerator, solarPanel, largeSolarPanel, thoriumReactor, + fusionReactor, battery, batteryLarge, powerNode, powerNodeLarge, mechanicalDrill, pneumaticDrill, laserDrill, blastDrill, + plasmaDrill, waterExtractor, oilExtractor, cultivator, core, vault, container, unloader, duo, scorch, hail, wave, lancer, + arc, swarmer, salvo, fuse, ripple, cyclone, spectre, meltdown, spiritFactory, phantomFactory, wraithFactory, ghoulFactory, + revenantFactory, daggerFactory, titanFactory, fortressFactory, reconstructor, repairPoint, commandCenter, alphaPad, deltaPad, + tauPad, omegaPad, dartPad, javelinPad, tridentPad, glaivePad; + + @Override + public void load(){ + //region environment blocks + + //create ores for every floor and item combination necessary + for(Item item : content.items()){ + if(!item.genOre) continue; + + for(Block block : content.blocks()){ + if(block instanceof Floor && ((Floor) block).hasOres){ + new OreBlock(item, (Floor) block); + } + } + } + + air = new Floor("air"){ + { + blend = false; + alwaysReplace = true; + } + + public void draw(Tile tile){} + public void load(){} + public void init(){} + }; + + blockpart = new BlockPart(); + + spawn = new Block("spawn"){ + + public void drawShadow(Tile tile){} + + public void draw(Tile tile){ + Draw.color(Color.SCARLET); + Lines.circle(tile.worldx(), tile.worldy(), 4f +Mathf.absin(Time.time(), 6f, 6f)); + Draw.color(); + } + }; + + //Registers build blocks from size 1-6 + //no reference is needed here since they can be looked up by name later + for(int i = 1; i <= 6; i++){ + new BuildBlock("build" + i); + } + + space = new Floor("space"){{ + placeableOn = false; + variants = 0; + cacheLayer = CacheLayer.space; + solid = true; + blend = false; + minimapColor = Color.valueOf("000001"); + }}; + + metalfloor = new Floor("metalfloor"){{ + variants = 6; + }}; + + deepwater = new Floor("deepwater"){{ + liquidColor = Color.valueOf("546bb3"); + speedMultiplier = 0.2f; + variants = 0; + liquidDrop = Liquids.water; + isLiquid = true; + status = StatusEffects.wet; + statusIntensity = 1f; + drownTime = 140f; + cacheLayer = CacheLayer.water; + minimapColor = Color.valueOf("465a96"); + }}; + + water = new Floor("water"){{ + liquidColor = Color.valueOf("546bb3"); + speedMultiplier = 0.5f; + variants = 0; + status = StatusEffects.wet; + statusIntensity = 0.9f; + liquidDrop = Liquids.water; + isLiquid = true; + cacheLayer = CacheLayer.water; + minimapColor = Color.valueOf("506eb4"); + }}; + + lava = new Floor("lava"){{ + drownTime = 100f; + liquidColor = Color.valueOf("ed5334"); + speedMultiplier = 0.2f; + damageTaken = 0.5f; + status = StatusEffects.melting; + statusIntensity = 0.8f; + variants = 0; + liquidDrop = Liquids.lava; + isLiquid = true; + cacheLayer = CacheLayer.lava; + minimapColor = Color.valueOf("ed5334"); + }}; + + tar = new Floor("tar"){{ + drownTime = 150f; + liquidColor = Color.valueOf("292929"); + status = StatusEffects.tarred; + statusIntensity = 1f; + speedMultiplier = 0.19f; + variants = 0; + liquidDrop = Liquids.oil; + isLiquid = true; + cacheLayer = CacheLayer.oil; + minimapColor = Color.valueOf("292929"); + }}; + + stone = new Floor("stone"){{ + hasOres = true; + drops = new ItemStack(Items.stone, 1); + blends = block -> block != this && !(block instanceof OreBlock); + minimapColor = Color.valueOf("323232"); + playerUnmineable = true; + }}; + + blackstone = new Floor("blackstone"){{ + drops = new ItemStack(Items.stone, 1); + minimapColor = Color.valueOf("252525"); + playerUnmineable = true; + hasOres = true; + }}; + + dirt = new Floor("dirt"){{ + minimapColor = Color.valueOf("6e501e"); + }}; + + sand = new Floor("sand"){{ + drops = new ItemStack(Items.sand, 1); + minimapColor = Color.valueOf("988a67"); + hasOres = true; + playerUnmineable = true; + }}; + + ice = new Floor("ice"){{ + dragMultiplier = 0.2f; + speedMultiplier = 0.4f; + minimapColor = Color.valueOf("b8eef8"); + hasOres = true; + }}; + + snow = new Floor("snow"){{ + minimapColor = Color.valueOf("c2d1d2"); + hasOres = true; + }}; + + grass = new Floor("grass"){{ + hasOres = true; + minimapColor = Color.valueOf("549d5b"); + }}; + + shrub = new Rock("shrub"); + + rock = new Rock("rock"){{ + variants = 2; + }}; + + icerock = new Rock("icerock"){{ + variants = 2; + }}; + + blackrock = new Rock("blackrock"){{ + variants = 1; + }}; + + //endregion + //region crafting + + smelter = new Smelter("smelter"){{ + health = 70; + result = Items.densealloy; + craftTime = 45f; + burnDuration = 46f; + useFlux = true; + + consumes.items(new ItemStack(Items.copper, 1), new ItemStack(Items.lead, 2)); + consumes.item(Items.coal).optional(true); + }}; + + arcsmelter = new PowerSmelter("arc-smelter"){{ + health = 90; + craftEffect = Fx.smeltsmoke; + result = Items.densealloy; + craftTime = 30f; + size = 2; + + useFlux = true; + fluxNeeded = 2; + + consumes.items(new ItemStack(Items.copper, 1), new ItemStack(Items.lead, 2)); + consumes.power(0.1f); + }}; + + siliconsmelter = new PowerSmelter("silicon-smelter"){{ + health = 90; + craftEffect = Fx.smeltsmoke; + result = Items.silicon; + craftTime = 40f; + size = 2; + hasLiquids = false; + flameColor = Color.valueOf("ffef99"); + + consumes.items(new ItemStack(Items.coal, 1), new ItemStack(Items.sand, 2)); + consumes.power(0.05f); + }}; + + plastaniumCompressor = new PlastaniumCompressor("plastanium-compressor"){{ + hasItems = true; + liquidCapacity = 60f; + craftTime = 60f; + output = Items.plastanium; + itemCapacity = 30; + size = 2; + health = 320; + hasPower = hasLiquids = true; + craftEffect = Fx.formsmoke; + updateEffect = Fx.plasticburn; + + consumes.liquid(Liquids.oil, 0.25f); + consumes.power(0.3f); + consumes.item(Items.titanium, 2); + }}; + + phaseWeaver = new PhaseWeaver("phase-weaver"){{ + craftEffect = Fx.smeltsmoke; + result = Items.phasefabric; + craftTime = 120f; + size = 2; + + consumes.items(new ItemStack(Items.thorium, 4), new ItemStack(Items.sand, 10)); + consumes.power(0.5f); + }}; + + alloySmelter = new PowerSmelter("alloy-smelter"){{ + craftEffect = Fx.smeltsmoke; + result = Items.surgealloy; + craftTime = 75f; + size = 2; + + useFlux = true; + fluxNeeded = 3; + + consumes.power(0.4f); + consumes.items(new ItemStack(Items.titanium, 2), new ItemStack(Items.lead, 4), new ItemStack(Items.silicon, 3), new ItemStack(Items.copper, 3)); + }}; + + cryofluidmixer = new LiquidMixer("cryofluidmixer"){{ + outputLiquid = Liquids.cryofluid; + liquidPerItem = 50f; + itemCapacity = 50; + size = 2; + hasPower = true; + + consumes.power(0.1f); + consumes.item(Items.titanium); + consumes.liquid(Liquids.water, 0.3f); + }}; + + blastMixer = new GenericCrafter("blast-mixer"){{ + itemCapacity = 20; + hasItems = true; + hasPower = true; + hasLiquids = true; + output = Items.blastCompound; + size = 2; + + consumes.liquid(Liquids.oil, 0.05f); + consumes.item(Items.pyratite, 1); + consumes.power(0.04f); + }}; + + pyratiteMixer = new PowerSmelter("pyratite-mixer"){{ + flameColor = Color.CLEAR; + itemCapacity = 20; + hasItems = true; + hasPower = true; + result = Items.pyratite; + + size = 2; + + consumes.power(0.02f); + consumes.items(new ItemStack(Items.coal, 1), new ItemStack(Items.lead, 2), new ItemStack(Items.sand, 2)); + }}; + + melter = new PowerCrafter("melter"){{ + health = 200; + outputLiquid = Liquids.lava; + outputLiquidAmount = 1f; + itemCapacity = 20; + craftTime = 10f; + hasLiquids = hasPower = true; + + consumes.power(0.1f); + consumes.item(Items.stone, 1); + }}; + + separator = new Separator("separator"){{ + results = new ItemStack[]{ + new ItemStack(null, 10), + new ItemStack(Items.sand, 10), + new ItemStack(Items.stone, 9), + new ItemStack(Items.copper, 4), + new ItemStack(Items.lead, 2), + new ItemStack(Items.coal, 2), + new ItemStack(Items.titanium, 1), + }; + filterTime = 40f; + itemCapacity = 40; + health = 50; + + consumes.item(Items.stone, 2); + consumes.liquid(Liquids.water, 0.3f); + }}; + + centrifuge = new Separator("centrifuge"){{ + results = new ItemStack[]{ + new ItemStack(null, 13), + new ItemStack(Items.sand, 12), + new ItemStack(Items.stone, 11), + new ItemStack(Items.copper, 5), + new ItemStack(Items.lead, 3), + new ItemStack(Items.coal, 3), + new ItemStack(Items.titanium, 2), + new ItemStack(Items.thorium, 1) + }; + + hasPower = true; + filterTime = 15f; + itemCapacity = 60; + health = 50 * 4; + spinnerLength = 1.5f; + spinnerRadius = 3.5f; + spinnerThickness = 1.5f; + spinnerSpeed = 3f; + size = 2; + + consumes.item(Items.stone, 2); + consumes.power(0.2f); + consumes.liquid(Liquids.water, 0.5f); + }}; + + biomatterCompressor = new Compressor("biomattercompressor"){{ + liquidCapacity = 60f; + itemCapacity = 50; + craftTime = 20f; + outputLiquid = Liquids.oil; + outputLiquidAmount = 2.5f; + size = 2; + health = 320; + hasLiquids = true; + + consumes.item(Items.biomatter, 1); + consumes.power(0.06f); + }}; + + pulverizer = new Pulverizer("pulverizer"){{ + itemCapacity = 40; + output = Items.sand; + health = 80; + craftEffect = Fx.pulverize; + craftTime = 40f; + updateEffect = Fx.pulverizeSmall; + hasItems = hasPower = true; + + consumes.item(Items.stone, 1); + consumes.power(0.05f); + }}; + + solidifier = new GenericCrafter("solidifer"){{ + liquidCapacity = 21f; + craftTime = 14; + output = Items.stone; + itemCapacity = 20; + health = 80; + craftEffect = Fx.purifystone; + hasLiquids = hasItems = true; + + consumes.liquid(Liquids.lava, 1f); + }}; + + incinerator = new Incinerator("incinerator"){{ + health = 90; + }}; + + //endregion + //region sandbox + + powerVoid = new PowerVoid("power-void"); + powerSource = new PowerSource("power-source"); + itemSource = new ItemSource("item-source"); + itemVoid = new ItemVoid("item-void"); + liquidSource = new LiquidSource("liquid-source"); + + //endregion + //region defense + + int wallHealthMultiplier = 3; + + copperWall = new Wall("copper-wall"){{ + health = 80 * wallHealthMultiplier; + }}; + + copperWallLarge = new Wall("copper-wall-large"){{ + health = 80 * 4 * wallHealthMultiplier; + size = 2; + }}; + + denseAlloyWall = new Wall("dense-alloy-wall"){{ + health = 110 * wallHealthMultiplier; + }}; + + denseAlloyWallLarge = new Wall("dense-alloy-wall-large"){{ + health = 110 * wallHealthMultiplier * 4; + size = 2; + }}; + + thoriumWall = new Wall("thorium-wall"){{ + health = 200 * wallHealthMultiplier; + }}; + + thoriumWallLarge = new Wall("thorium-wall-large"){{ + health = 200 * wallHealthMultiplier * 4; + size = 2; + }}; + + phaseWall = new DeflectorWall("phase-wall"){{ + health = 150 * wallHealthMultiplier; + }}; + + phaseWallLarge = new DeflectorWall("phase-wall-large"){{ + health = 150 * 4 * wallHealthMultiplier; + size = 2; + }}; + + surgeWall = new SurgeWall("surge-wall"){{ + health = 230 * wallHealthMultiplier; + }}; + + surgeWallLarge = new SurgeWall("surge-wall-large"){{ + health = 230 * 4 * wallHealthMultiplier; + size = 2; + }}; + + door = new Door("door"){{ + health = 100 * wallHealthMultiplier; + }}; + + doorLarge = new Door("door-large"){{ + openfx = Fx.dooropenlarge; + closefx = Fx.doorcloselarge; + health = 100 * 4 * wallHealthMultiplier; + size = 2; + }}; + + mendProjector = new MendProjector("mend-projector"){{ + consumes.power(0.2f, 1.0f); + size = 2; + consumes.item(Items.phasefabric).optional(true); + }}; + + overdriveProjector = new OverdriveProjector("overdrive-projector"){{ + consumes.power(0.35f, 1.0f); + size = 2; + consumes.item(Items.phasefabric).optional(true); + }}; + + forceProjector = new ForceProjector("force-projector"){{ + size = 3; + consumes.item(Items.phasefabric).optional(true); + }}; + + shockMine = new ShockMine("shock-mine"){{ + health = 40; + damage = 11; + tileDamage = 7f; + length = 10; + tendrils = 5; + }}; + + //endregion + //region distribution + + + conveyor = new Conveyor("conveyor"){{ + health = 45; + speed = 0.03f; + }}; + + titaniumconveyor = new Conveyor("titanium-conveyor"){{ + health = 65; + speed = 0.07f; + }}; + + junction = new Junction("junction"){{ + speed = 26; + capacity = 32; + }}; + + itemBridge = new BufferedItemBridge("bridge-conveyor"){{ + range = 4; + speed = 60f; + bufferCapacity = 15; + }}; + + phaseConveyor = new ItemBridge("phase-conveyor"){{ + range = 12; + hasPower = true; + consumes.power(0.03f, 1.0f); + }}; + + sorter = new Sorter("sorter"); + + router = new Router("router"); + + distributor = new Router("distributor"){{ + size = 2; + }}; + + overflowGate = new OverflowGate("overflow-gate"); + + massDriver = new MassDriver("mass-driver"){{ + size = 3; + itemCapacity = 60; + range = 440f; + }}; + + //endregion + //region liquid + + + mechanicalPump = new Pump("mechanical-pump"){{ + pumpAmount = 0.1f; + tier = 0; + }}; + + rotaryPump = new Pump("rotary-pump"){{ + pumpAmount = 0.2f; + consumes.power(0.015f); + liquidCapacity = 30f; + hasPower = true; + size = 2; + tier = 1; + }}; + + thermalPump = new Pump("thermal-pump"){{ + pumpAmount = 0.275f; + consumes.power(0.03f); + liquidCapacity = 40f; + hasPower = true; + size = 2; + tier = 2; + }}; + + conduit = new Conduit("conduit"){{ + health = 45; + }}; + + pulseConduit = new Conduit("pulse-conduit"){{ + liquidCapacity = 16f; + liquidFlowFactor = 4.9f; + health = 90; + }}; + + liquidRouter = new LiquidRouter("liquid-router"){{ + liquidCapacity = 20f; + }}; + + liquidtank = new LiquidTank("liquid-tank"){{ + size = 3; + liquidCapacity = 1500f; + health = 500; + }}; + + liquidJunction = new LiquidJunction("liquid-junction"); + + bridgeConduit = new LiquidExtendingBridge("bridge-conduit"){{ + range = 4; + hasPower = false; + }}; + + phaseConduit = new LiquidBridge("phase-conduit"){{ + range = 12; + hasPower = true; + consumes.power(0.03f, 1.0f); + }}; + + //endregion + //region power + + combustionGenerator = new BurnerGenerator("combustion-generator"){{ + powerProduction = 0.09f; + itemDuration = 40f; + }}; + + thermalGenerator = new LiquidHeatGenerator("thermal-generator"){{ + maxLiquidGenerate = 2f; + powerProduction = 2f; + generateEffect = Fx.redgeneratespark; + size = 2; + }}; + + turbineGenerator = new TurbineGenerator("turbine-generator"){{ + powerProduction = 0.28f; + itemDuration = 30f; + consumes.liquid(Liquids.water, 0.05f); + size = 2; + }}; + + rtgGenerator = new DecayGenerator("rtg-generator"){{ + size = 2; + powerProduction = 0.3f; + itemDuration = 220f; + }}; + + solarPanel = new SolarGenerator("solar-panel"){{ + powerProduction = 0.0045f; + }}; + + largeSolarPanel = new SolarGenerator("solar-panel-large"){{ + size = 3; + powerProduction = 0.055f; + }}; + + thoriumReactor = new NuclearReactor("thorium-reactor"){{ + size = 3; + health = 700; + powerProduction = 1.1f; + }}; + + fusionReactor = new FusionReactor("fusion-reactor"){{ + size = 4; + health = 600; + }}; + + battery = new Battery("battery"){{ + consumes.powerBuffered(320f, 1f); + }}; + + batteryLarge = new Battery("battery-large"){{ + size = 3; + consumes.powerBuffered(2000f, 1f); + }}; + + powerNode = new PowerNode("power-node"){{ + maxNodes = 4; + laserRange = 6; + }}; + + powerNodeLarge = new PowerNode("power-node-large"){{ + size = 2; + maxNodes = 6; + laserRange = 9.5f; + }}; + + //endregion power + //region production + + mechanicalDrill = new Drill("mechanical-drill"){{ + tier = 2; + drillTime = 300; + size = 2; + drawMineItem = true; + }}; + + pneumaticDrill = new Drill("pneumatic-drill"){{ + tier = 3; + drillTime = 240; + size = 2; + drawMineItem = true; + }}; + + laserDrill = new Drill("laser-drill"){{ + drillTime = 140; + size = 2; + hasPower = true; + tier = 4; + updateEffect = Fx.pulverizeMedium; + drillEffect = Fx.mineBig; + + consumes.power(0.11f); + }}; + + blastDrill = new Drill("blast-drill"){{ + drillTime = 60; + size = 3; + drawRim = true; + hasPower = true; + tier = 5; + updateEffect = Fx.pulverizeRed; + updateEffectChance = 0.03f; + drillEffect = Fx.mineHuge; + rotateSpeed = 6f; + warmupSpeed = 0.01f; + + consumes.power(0.3f); + }}; + + plasmaDrill = new Drill("plasma-drill"){{ + heatColor = Color.valueOf("ff461b"); + drillTime = 50; + size = 4; + hasLiquids = true; + hasPower = true; + tier = 5; + rotateSpeed = 9f; + drawRim = true; + updateEffect = Fx.pulverizeRedder; + updateEffectChance = 0.04f; + drillEffect = Fx.mineHuge; + warmupSpeed = 0.005f; + + consumes.power(0.7f); + }}; + + waterExtractor = new SolidPump("water-extractor"){{ + result = Liquids.water; + pumpAmount = 0.065f; + size = 2; + liquidCapacity = 30f; + rotateSpeed = 1.4f; + + consumes.power(0.09f); + }}; + + oilExtractor = new Fracker("oil-extractor"){{ + result = Liquids.oil; + updateEffect = Fx.pulverize; + liquidCapacity = 50f; + updateEffectChance = 0.05f; + pumpAmount = 0.09f; + size = 3; + liquidCapacity = 30f; + + consumes.item(Items.sand); + consumes.power(0.3f); + consumes.liquid(Liquids.water, 0.15f); + }}; + + cultivator = new Cultivator("cultivator"){{ + result = Items.biomatter; + drillTime = 200; + size = 2; + hasLiquids = true; + hasPower = true; + + consumes.power(0.08f); + consumes.liquid(Liquids.water, 0.15f); + }}; + + //endregion + //region storage + + core = new CoreBlock("core"){{ + health = 1100; + itemCapacity = 3000; + }}; + + vault = new Vault("vault"){{ + size = 3; + itemCapacity = 1000; + }}; + + container = new Vault("container"){{ + size = 2; + itemCapacity = 300; + }}; + + unloader = new SortedUnloader("unloader"){{ + speed = 7f; + }}; + + //endregion + //region turrets + + duo = new DoubleTurret("duo"){{ + ammo( + Items.copper, Bullets.standardCopper, + Items.densealloy, Bullets.standardDense, + Items.pyratite, Bullets.standardIncendiary, + Items.silicon, Bullets.standardHoming + ); + reload = 25f; + restitution = 0.03f; + range = 90f; + shootCone = 15f; + ammoUseEffect = Fx.shellEjectSmall; + health = 80; + inaccuracy = 2f; + rotatespeed = 10f; + }}; + + hail = new ArtilleryTurret("hail"){{ + ammo( + Items.densealloy, Bullets.artilleryDense, + Items.silicon, Bullets.artilleryHoming, + Items.pyratite, Bullets.artlleryIncendiary + ); + reload = 60f; + recoil = 2f; + range = 230f; + inaccuracy = 1f; + shootCone = 10f; + health = 120; + }}; + + scorch = new LiquidTurret("scorch"){{ + ammo(Liquids.oil, Bullets.basicFlame); + recoil = 0f; + reload = 4f; + shootCone = 50f; + ammoUseEffect = Fx.shellEjectSmall; + health = 160; + }}; + + wave = new LiquidTurret("wave"){{ + ammo( + Liquids.water, Bullets.waterShot, + Liquids.lava, Bullets.lavaShot, + Liquids.cryofluid, Bullets.cryoShot, + Liquids.oil, Bullets.oilShot + ); + size = 2; + recoil = 0f; + reload = 4f; + inaccuracy = 5f; + shootCone = 50f; + shootEffect = Fx.shootLiquid; + range = 90f; + health = 360; + + drawer = (tile, entity) -> { + Draw.rect(region, tile.drawx() + tr2.x, tile.drawy() + tr2.y, entity.rotation - 90); + + Draw.color(entity.liquids.current().color); + Draw.alpha(entity.liquids.total() / liquidCapacity); + Draw.rect(name + "-liquid", tile.drawx() + tr2.x, tile.drawy() + tr2.y, entity.rotation - 90); + Draw.color(); + }; + }}; + + lancer = new ChargeTurret("lancer"){{ + range = 90f; + chargeTime = 60f; + chargeMaxDelay = 30f; + chargeEffects = 7; + shootType = Bullets.lancerLaser; + recoil = 2f; + reload = 100f; + cooldown = 0.03f; + powerUsed = 1 / 3f; + consumes.powerBuffered(60f); + shootShake = 2f; + shootEffect = Fx.lancerLaserShoot; + smokeEffect = Fx.lancerLaserShootSmoke; + chargeEffect = Fx.lancerLaserCharge; + chargeBeginEffect = Fx.lancerLaserChargeBegin; + heatColor = Color.RED; + size = 2; + health = 320; + targetAir = false; + }}; + + arc = new PowerTurret("arc"){{ + shootType = Bullets.arc; + reload = 85f; + shootShake = 1f; + shootCone = 40f; + rotatespeed = 8f; + powerUsed = 1f / 3f; + consumes.powerBuffered(30f); + range = 150f; + shootEffect = Fx.lightningShoot; + heatColor = Color.RED; + recoil = 1f; + size = 1; + }}; + + swarmer = new BurstTurret("swarmer"){{ + ammo( + Items.blastCompound, Bullets.missileExplosive, + Items.pyratite, Bullets.missileIncendiary, + Items.surgealloy, Bullets.missileSurge + ); + reload = 50f; + shots = 4; + burstSpacing = 5; + inaccuracy = 10f; + range = 140f; + xRand = 6f; + size = 2; + health = 380; + }}; + + salvo = new BurstTurret("salvo"){{ + ammo( + Items.copper, Bullets.standardCopper, + Items.densealloy, Bullets.standardDense, + Items.pyratite, Bullets.standardIncendiary, + Items.silicon, Bullets.standardHoming, + Items.thorium, Bullets.standardThorium + ); + + size = 2; + range = 120f; + reload = 35f; + restitution = 0.03f; + ammoEjectBack = 3f; + cooldown = 0.03f; + recoil = 3f; + shootShake = 2f; + burstSpacing = 4; + shots = 3; + ammoUseEffect = Fx.shellEjectBig; + health = 360; + }}; + + ripple = new ArtilleryTurret("ripple"){{ + ammo( + Items.densealloy, Bullets.artilleryDense, + Items.silicon, Bullets.artilleryHoming, + Items.pyratite, Bullets.artlleryIncendiary, + Items.blastCompound, Bullets.artilleryExplosive, + Items.plastanium, Bullets.arilleryPlastic + ); + size = 3; + shots = 4; + inaccuracy = 12f; + reload = 60f; + ammoEjectBack = 5f; + ammoUseEffect = Fx.shellEjectBig; + cooldown = 0.03f; + velocityInaccuracy = 0.2f; + restitution = 0.02f; + recoil = 6f; + shootShake = 2f; + range = 320f; + + health = 550; + }}; + + cyclone = new ItemTurret("cyclone"){{ + ammo( + Items.blastCompound, Bullets.flakExplosive, + Items.plastanium, Bullets.flakPlastic, + Items.surgealloy, Bullets.flakSurge + ); + xRand = 4f; + reload = 8f; + range = 145f; + size = 3; + recoil = 3f; + rotatespeed = 10f; + inaccuracy = 13f; + shootCone = 30f; + + health = 145 * size * size; + }}; + + fuse = new ItemTurret("fuse"){{ + ammo(Items.densealloy, Bullets.fuseShot); + reload = 50f; + shootShake = 4f; + range = 80f; + recoil = 5f; + restitution = 0.1f; + size = 3; + + health = 155 * size * size; + }}; + + spectre = new DoubleTurret("spectre"){{ + ammo( + Items.densealloy, Bullets.standardDenseBig, + Items.pyratite, Bullets.standardIncendiaryBig, + Items.thorium, Bullets.standardThoriumBig + ); + reload = 6f; + coolantMultiplier = 0.5f; + maxCoolantUsed = 1.5f; + restitution = 0.1f; + ammoUseEffect = Fx.shellEjectBig; + range = 200f; + inaccuracy = 3f; + recoil = 3f; + xRand = 3f; + shotWidth = 4f; + shootShake = 2f; + shots = 2; + size = 4; + shootCone = 24f; + + health = 155 * size * size; + }}; + + meltdown = new LaserTurret("meltdown"){{ + shootType = Bullets.meltdownLaser; + shootEffect = Fx.shootBigSmoke2; + shootCone = 40f; + recoil = 4f; + size = 4; + shootShake = 2f; + powerUsed = 0.5f; + consumes.powerBuffered(120f); + range = 160f; + reload = 200f; + firingMoveFract = 0.1f; + shootDuration = 220f; + + health = 165 * size * size; + }}; + + //endregion + //region units + + spiritFactory = new UnitFactory("spirit-factory"){{ + type = UnitTypes.spirit; + produceTime = 5700; + size = 2; + consumes.power(0.08f); + consumes.items(new ItemStack(Items.silicon, 30), new ItemStack(Items.lead, 30)); + }}; + + phantomFactory = new UnitFactory("phantom-factory"){{ + type = UnitTypes.phantom; + produceTime = 7300; + size = 2; + consumes.power(0.2f); + consumes.items(new ItemStack(Items.silicon, 70), new ItemStack(Items.lead, 80), new ItemStack(Items.titanium, 80)); + }}; + + wraithFactory = new UnitFactory("wraith-factory"){{ + type = UnitTypes.wraith; + produceTime = 1800; + size = 2; + consumes.power(0.1f); + consumes.items(new ItemStack(Items.silicon, 10), new ItemStack(Items.titanium, 10)); + }}; + + ghoulFactory = new UnitFactory("ghoul-factory"){{ + type = UnitTypes.ghoul; + produceTime = 3600; + size = 3; + consumes.power(0.2f); + consumes.items(new ItemStack(Items.silicon, 30), new ItemStack(Items.titanium, 30), new ItemStack(Items.plastanium, 20)); + }}; + + revenantFactory = new UnitFactory("revenant-factory"){{ + type = UnitTypes.revenant; + produceTime = 8000; + size = 4; + consumes.power(0.3f); + consumes.items(new ItemStack(Items.silicon, 80), new ItemStack(Items.titanium, 80), new ItemStack(Items.plastanium, 50)); + }}; + + daggerFactory = new UnitFactory("dagger-factory"){{ + type = UnitTypes.dagger; + produceTime = 1700; + size = 2; + consumes.power(0.05f); + consumes.items(new ItemStack(Items.silicon, 10)); + }}; + + titanFactory = new UnitFactory("titan-factory"){{ + type = UnitTypes.titan; + produceTime = 3400; + size = 3; + consumes.power(0.15f); + consumes.items(new ItemStack(Items.silicon, 20), new ItemStack(Items.thorium, 30)); + }}; + + fortressFactory = new UnitFactory("fortress-factory"){{ + type = UnitTypes.fortress; + produceTime = 5000; + size = 3; + consumes.power(0.2f); + consumes.items(new ItemStack(Items.silicon, 40), new ItemStack(Items.thorium, 50)); + }}; + + repairPoint = new RepairPoint("repair-point"){{ + repairSpeed = 0.1f; + }}; + + reconstructor = new Reconstructor("reconstructor"){{ + size = 2; + }}; + + commandCenter = new CommandCenter("command-center"){{ + size = 2; + }}; + + //endregion + //region upgrades + + alphaPad = new MechPad("alpha-mech-pad"){{ + mech = Mechs.alpha; + size = 2; + consumes.powerBuffered(50f); + }}; + + deltaPad = new MechPad("delta-mech-pad"){{ + mech = Mechs.delta; + size = 2; + consumes.powerBuffered(70f); + }}; + + tauPad = new MechPad("tau-mech-pad"){{ + mech = Mechs.tau; + size = 2; + consumes.powerBuffered(100f); + }}; + + omegaPad = new MechPad("omega-mech-pad"){{ + mech = Mechs.omega; + size = 3; + consumes.powerBuffered(120f); + }}; + + dartPad = new MechPad("dart-ship-pad"){{ + mech = Mechs.dart; + size = 2; + consumes.powerBuffered(50f); + }}; + + javelinPad = new MechPad("javelin-ship-pad"){{ + mech = Mechs.javelin; + size = 2; + consumes.powerBuffered(80f); + }}; + + tridentPad = new MechPad("trident-ship-pad"){{ + mech = Mechs.trident; + size = 2; + consumes.powerBuffered(100f); + }}; + + glaivePad = new MechPad("glaive-ship-pad"){{ + mech = Mechs.glaive; + size = 3; + consumes.powerBuffered(120f); + }}; + + //endregion + } +} diff --git a/core/src/io/anuke/mindustry/content/Bullets.java b/core/src/io/anuke/mindustry/content/Bullets.java index e8551c7978..d8f2749edc 100644 --- a/core/src/io/anuke/mindustry/content/Bullets.java +++ b/core/src/io/anuke/mindustry/content/Bullets.java @@ -17,7 +17,6 @@ import io.anuke.mindustry.entities.effect.Puddle; import io.anuke.mindustry.game.ContentList; import io.anuke.mindustry.graphics.Palette; import io.anuke.mindustry.graphics.Shapes; -import io.anuke.mindustry.type.ContentType; import io.anuke.mindustry.world.Tile; import io.anuke.mindustry.world.blocks.BuildBlock; @@ -644,9 +643,4 @@ public class Bullets implements ContentList{ } }; } - - @Override - public ContentType type(){ - return ContentType.bullet; - } } diff --git a/core/src/io/anuke/mindustry/content/Fx.java b/core/src/io/anuke/mindustry/content/Fx.java index ee3985365e..589a774286 100644 --- a/core/src/io/anuke/mindustry/content/Fx.java +++ b/core/src/io/anuke/mindustry/content/Fx.java @@ -8,12 +8,10 @@ import io.anuke.arc.graphics.g2d.Fill; import io.anuke.arc.graphics.g2d.Lines; import io.anuke.arc.math.Angles; import io.anuke.arc.math.Mathf; -import io.anuke.mindustry.content.Liquids; import io.anuke.mindustry.entities.effect.GroundEffectEntity.GroundEffect; import io.anuke.mindustry.game.ContentList; import io.anuke.mindustry.graphics.Palette; import io.anuke.mindustry.graphics.Shapes; -import io.anuke.mindustry.type.ContentType; import io.anuke.mindustry.type.Item; import static io.anuke.mindustry.Vars.tilesize; @@ -24,7 +22,7 @@ public class Fx implements ContentList{ none, placeBlock, breakBlock, smoke, spawn, tapBlock, select, vtolHover, unitDrop, unitPickup, unitLand, pickup, healWave, heal, landShock, reactorsmoke, nuclearsmoke, nuclearcloud, redgeneratespark, generatespark, fuelburn, plasticburn, pulverize, pulverizeRed, pulverizeRedder, pulverizeSmall, pulverizeMedium, - producesmoke, smeltsmoke, formsmoke, blastsmoke, lava, doorclose, dooropenlarge, doorcloselarge, purify, purifyoil, purifystone, generate, + producesmoke, smeltsmoke, formsmoke, blastsmoke, lava, doorclose, dooropen, dooropenlarge, doorcloselarge, purify, purifyoil, purifystone, generate, mine, mineBig, mineHuge, smelt, teleportActivate, teleport, teleportOut, ripple, bubble, commandSend, healBlock, healBlockFull, healWaveMend, overdriveWave, overdriveBlockFull, shieldBreak, hitBulletSmall, hitFuse, hitBulletBig, hitFlameSmall, hitLiquid, hitLaser, hitLancer, hitMeltdown, despawn, flakExplosion, blastExplosion, @@ -806,9 +804,4 @@ public class Fx implements ContentList{ Draw.reset(); }); } - - @Override - public ContentType type(){ - return ContentType.effect; - } } diff --git a/core/src/io/anuke/mindustry/content/Items.java b/core/src/io/anuke/mindustry/content/Items.java index 5dd7220a32..db42768218 100644 --- a/core/src/io/anuke/mindustry/content/Items.java +++ b/core/src/io/anuke/mindustry/content/Items.java @@ -2,7 +2,6 @@ package io.anuke.mindustry.content; import io.anuke.arc.graphics.Color; import io.anuke.mindustry.game.ContentList; -import io.anuke.mindustry.type.ContentType; import io.anuke.mindustry.type.Item; import io.anuke.mindustry.type.ItemType; @@ -101,9 +100,4 @@ public class Items implements ContentList{ explosiveness = 0.2f; }}; } - - @Override - public ContentType type(){ - return ContentType.item; - } } diff --git a/core/src/io/anuke/mindustry/content/Liquids.java b/core/src/io/anuke/mindustry/content/Liquids.java index 9ff4a489ea..9da8727e5d 100644 --- a/core/src/io/anuke/mindustry/content/Liquids.java +++ b/core/src/io/anuke/mindustry/content/Liquids.java @@ -2,7 +2,6 @@ package io.anuke.mindustry.content; import io.anuke.arc.graphics.Color; import io.anuke.mindustry.game.ContentList; -import io.anuke.mindustry.type.ContentType; import io.anuke.mindustry.type.Liquid; public class Liquids implements ContentList{ @@ -53,9 +52,4 @@ public class Liquids implements ContentList{ } }; } - - @Override - public ContentType type(){ - return ContentType.liquid; - } } diff --git a/core/src/io/anuke/mindustry/content/Mechs.java b/core/src/io/anuke/mindustry/content/Mechs.java index 01df597434..9124d484d3 100644 --- a/core/src/io/anuke/mindustry/content/Mechs.java +++ b/core/src/io/anuke/mindustry/content/Mechs.java @@ -15,7 +15,6 @@ import io.anuke.mindustry.entities.effect.Lightning; import io.anuke.mindustry.game.ContentList; import io.anuke.mindustry.graphics.Palette; import io.anuke.mindustry.graphics.Shaders; -import io.anuke.mindustry.type.ContentType; import io.anuke.mindustry.type.Mech; public class Mechs implements ContentList{ @@ -291,9 +290,4 @@ public class Mechs implements ContentList{ starterDesktop = alpha; starterMobile = dart; } - - @Override - public ContentType type(){ - return ContentType.mech; - } } diff --git a/core/src/io/anuke/mindustry/content/Recipes.java b/core/src/io/anuke/mindustry/content/Recipes.java index 19e30d8037..8cb0be7fc6 100644 --- a/core/src/io/anuke/mindustry/content/Recipes.java +++ b/core/src/io/anuke/mindustry/content/Recipes.java @@ -1,9 +1,7 @@ package io.anuke.mindustry.content; -import io.anuke.mindustry.content.blocks.*; import io.anuke.mindustry.game.ContentList; import io.anuke.mindustry.game.GameMode; -import io.anuke.mindustry.type.ContentType; import io.anuke.mindustry.type.ItemStack; import io.anuke.mindustry.type.Recipe; import io.anuke.mindustry.type.Recipe.RecipeVisibility; @@ -15,186 +13,181 @@ public class Recipes implements ContentList{ @Override public void load(){ //DEBUG - new Recipe(distribution, DebugBlocks.itemSource).setMode(GameMode.sandbox).setHidden(true).setAlwaysUnlocked(true); - new Recipe(distribution, DebugBlocks.itemVoid).setMode(GameMode.sandbox).setHidden(true).setAlwaysUnlocked(true); - new Recipe(liquid, DebugBlocks.liquidSource).setMode(GameMode.sandbox).setHidden(true).setAlwaysUnlocked(true); - new Recipe(power, DebugBlocks.powerVoid).setMode(GameMode.sandbox).setHidden(true).setAlwaysUnlocked(true); - new Recipe(power, DebugBlocks.powerInfinite).setMode(GameMode.sandbox).setHidden(true).setAlwaysUnlocked(true); + new Recipe(distribution, Blocks.itemSource).setMode(GameMode.sandbox).setHidden(true).setAlwaysUnlocked(true); + new Recipe(distribution, Blocks.itemVoid).setMode(GameMode.sandbox).setHidden(true).setAlwaysUnlocked(true); + new Recipe(liquid, Blocks.liquidSource).setMode(GameMode.sandbox).setHidden(true).setAlwaysUnlocked(true); + new Recipe(power, Blocks.powerVoid).setMode(GameMode.sandbox).setHidden(true).setAlwaysUnlocked(true); + new Recipe(power, Blocks.powerSource).setMode(GameMode.sandbox).setHidden(true).setAlwaysUnlocked(true); //DEFENSE //walls - new Recipe(defense, DefenseBlocks.copperWall, new ItemStack(Items.copper, 12)).setAlwaysUnlocked(true); - new Recipe(defense, DefenseBlocks.copperWallLarge, new ItemStack(Items.copper, 12 * 4)).setAlwaysUnlocked(true); + new Recipe(defense, Blocks.copperWall, new ItemStack(Items.copper, 12)).setAlwaysUnlocked(true); + new Recipe(defense, Blocks.copperWallLarge, new ItemStack(Items.copper, 12 * 4)).setAlwaysUnlocked(true); - new Recipe(defense, DefenseBlocks.denseAlloyWall, new ItemStack(Items.densealloy, 12)); - new Recipe(defense, DefenseBlocks.denseAlloyWallLarge, new ItemStack(Items.densealloy, 12 * 4)); + new Recipe(defense, Blocks.denseAlloyWall, new ItemStack(Items.densealloy, 12)); + new Recipe(defense, Blocks.denseAlloyWallLarge, new ItemStack(Items.densealloy, 12 * 4)); - new Recipe(defense, DefenseBlocks.door, new ItemStack(Items.densealloy, 12), new ItemStack(Items.silicon, 8)); - new Recipe(defense, DefenseBlocks.doorLarge, new ItemStack(Items.densealloy, 12 * 4), new ItemStack(Items.silicon, 8 * 4)); + new Recipe(defense, Blocks.door, new ItemStack(Items.densealloy, 12), new ItemStack(Items.silicon, 8)); + new Recipe(defense, Blocks.doorLarge, new ItemStack(Items.densealloy, 12 * 4), new ItemStack(Items.silicon, 8 * 4)); - new Recipe(defense, DefenseBlocks.thoriumWall, new ItemStack(Items.thorium, 12)); - new Recipe(defense, DefenseBlocks.thoriumWallLarge, new ItemStack(Items.thorium, 12 * 4)); + new Recipe(defense, Blocks.thoriumWall, new ItemStack(Items.thorium, 12)); + new Recipe(defense, Blocks.thoriumWallLarge, new ItemStack(Items.thorium, 12 * 4)); - new Recipe(defense, DefenseBlocks.phaseWall, new ItemStack(Items.phasefabric, 12)); - new Recipe(defense, DefenseBlocks.phaseWallLarge, new ItemStack(Items.phasefabric, 12 * 4)); + new Recipe(defense, Blocks.phaseWall, new ItemStack(Items.phasefabric, 12)); + new Recipe(defense, Blocks.phaseWallLarge, new ItemStack(Items.phasefabric, 12 * 4)); - new Recipe(defense, DefenseBlocks.surgeWall, new ItemStack(Items.surgealloy, 12)); - new Recipe(defense, DefenseBlocks.surgeWallLarge, new ItemStack(Items.surgealloy, 12 * 4)); + new Recipe(defense, Blocks.surgeWall, new ItemStack(Items.surgealloy, 12)); + new Recipe(defense, Blocks.surgeWallLarge, new ItemStack(Items.surgealloy, 12 * 4)); - new Recipe(effect, StorageBlocks.container, new ItemStack(Items.densealloy, 200)); - new Recipe(effect, StorageBlocks.vault, new ItemStack(Items.densealloy, 500), new ItemStack(Items.thorium, 250)); + new Recipe(effect, Blocks.container, new ItemStack(Items.densealloy, 200)); + new Recipe(effect, Blocks.vault, new ItemStack(Items.densealloy, 500), new ItemStack(Items.thorium, 250)); - new Recipe(effect, StorageBlocks.core, + new Recipe(effect, Blocks.core, new ItemStack(Items.copper, 2000), new ItemStack(Items.densealloy, 2000), new ItemStack(Items.silicon, 1750), new ItemStack(Items.thorium, 1000), new ItemStack(Items.surgealloy, 500), new ItemStack(Items.phasefabric, 750) ); //projectors - new Recipe(effect, DefenseBlocks.mendProjector, new ItemStack(Items.lead, 200), new ItemStack(Items.densealloy, 150), new ItemStack(Items.titanium, 50), new ItemStack(Items.silicon, 180)); - new Recipe(effect, DefenseBlocks.overdriveProjector, new ItemStack(Items.lead, 200), new ItemStack(Items.densealloy, 150), new ItemStack(Items.titanium, 150), new ItemStack(Items.silicon, 250)); - new Recipe(effect, DefenseBlocks.forceProjector, new ItemStack(Items.lead, 200), new ItemStack(Items.densealloy, 150), new ItemStack(Items.titanium, 150), new ItemStack(Items.silicon, 250)); + new Recipe(effect, Blocks.mendProjector, new ItemStack(Items.lead, 200), new ItemStack(Items.densealloy, 150), new ItemStack(Items.titanium, 50), new ItemStack(Items.silicon, 180)); + new Recipe(effect, Blocks.overdriveProjector, new ItemStack(Items.lead, 200), new ItemStack(Items.densealloy, 150), new ItemStack(Items.titanium, 150), new ItemStack(Items.silicon, 250)); + new Recipe(effect, Blocks.forceProjector, new ItemStack(Items.lead, 200), new ItemStack(Items.densealloy, 150), new ItemStack(Items.titanium, 150), new ItemStack(Items.silicon, 250)); - new Recipe(effect, DefenseBlocks.shockMine, new ItemStack(Items.lead, 50), new ItemStack(Items.silicon, 25)) + new Recipe(effect, Blocks.shockMine, new ItemStack(Items.lead, 50), new ItemStack(Items.silicon, 25)) .setDependencies(Items.blastCompound); //TURRETS - new Recipe(turret, TurretBlocks.duo, new ItemStack(Items.copper, 40)).setAlwaysUnlocked(true); - new Recipe(turret, TurretBlocks.arc, new ItemStack(Items.copper, 50), new ItemStack(Items.lead, 30), new ItemStack(Items.silicon, 20)); - new Recipe(turret, TurretBlocks.hail, new ItemStack(Items.copper, 60), new ItemStack(Items.densealloy, 35)); - new Recipe(turret, TurretBlocks.lancer, new ItemStack(Items.copper, 50), new ItemStack(Items.lead, 100), new ItemStack(Items.silicon, 90)); - new Recipe(turret, TurretBlocks.wave, new ItemStack(Items.densealloy, 60), new ItemStack(Items.titanium, 70), new ItemStack(Items.lead, 150)); - new Recipe(turret, TurretBlocks.salvo, new ItemStack(Items.copper, 210), new ItemStack(Items.densealloy, 190), new ItemStack(Items.thorium, 130)); - new Recipe(turret, TurretBlocks.swarmer, new ItemStack(Items.densealloy, 70), new ItemStack(Items.titanium, 70), new ItemStack(Items.plastanium, 90), new ItemStack(Items.silicon, 60)); - new Recipe(turret, TurretBlocks.ripple, new ItemStack(Items.copper, 300), new ItemStack(Items.densealloy, 220), new ItemStack(Items.thorium, 120)); - new Recipe(turret, TurretBlocks.cyclone, new ItemStack(Items.copper, 400), new ItemStack(Items.densealloy, 400), new ItemStack(Items.surgealloy, 200), new ItemStack(Items.plastanium, 150)); - new Recipe(turret, TurretBlocks.fuse, new ItemStack(Items.copper, 450), new ItemStack(Items.densealloy, 450), new ItemStack(Items.surgealloy, 250)); - new Recipe(turret, TurretBlocks.spectre, new ItemStack(Items.copper, 700), new ItemStack(Items.densealloy, 600), new ItemStack(Items.surgealloy, 500), new ItemStack(Items.plastanium, 350), new ItemStack(Items.thorium, 500)); - new Recipe(turret, TurretBlocks.meltdown, new ItemStack(Items.copper, 500), new ItemStack(Items.lead, 700), new ItemStack(Items.densealloy, 600), new ItemStack(Items.surgealloy, 650), new ItemStack(Items.silicon, 650)); + new Recipe(turret, Blocks.duo, new ItemStack(Items.copper, 40)).setAlwaysUnlocked(true); + new Recipe(turret, Blocks.arc, new ItemStack(Items.copper, 50), new ItemStack(Items.lead, 30), new ItemStack(Items.silicon, 20)); + new Recipe(turret, Blocks.hail, new ItemStack(Items.copper, 60), new ItemStack(Items.densealloy, 35)); + new Recipe(turret, Blocks.lancer, new ItemStack(Items.copper, 50), new ItemStack(Items.lead, 100), new ItemStack(Items.silicon, 90)); + new Recipe(turret, Blocks.wave, new ItemStack(Items.densealloy, 60), new ItemStack(Items.titanium, 70), new ItemStack(Items.lead, 150)); + new Recipe(turret, Blocks.salvo, new ItemStack(Items.copper, 210), new ItemStack(Items.densealloy, 190), new ItemStack(Items.thorium, 130)); + new Recipe(turret, Blocks.swarmer, new ItemStack(Items.densealloy, 70), new ItemStack(Items.titanium, 70), new ItemStack(Items.plastanium, 90), new ItemStack(Items.silicon, 60)); + new Recipe(turret, Blocks.ripple, new ItemStack(Items.copper, 300), new ItemStack(Items.densealloy, 220), new ItemStack(Items.thorium, 120)); + new Recipe(turret, Blocks.cyclone, new ItemStack(Items.copper, 400), new ItemStack(Items.densealloy, 400), new ItemStack(Items.surgealloy, 200), new ItemStack(Items.plastanium, 150)); + new Recipe(turret, Blocks.fuse, new ItemStack(Items.copper, 450), new ItemStack(Items.densealloy, 450), new ItemStack(Items.surgealloy, 250)); + new Recipe(turret, Blocks.spectre, new ItemStack(Items.copper, 700), new ItemStack(Items.densealloy, 600), new ItemStack(Items.surgealloy, 500), new ItemStack(Items.plastanium, 350), new ItemStack(Items.thorium, 500)); + new Recipe(turret, Blocks.meltdown, new ItemStack(Items.copper, 500), new ItemStack(Items.lead, 700), new ItemStack(Items.densealloy, 600), new ItemStack(Items.surgealloy, 650), new ItemStack(Items.silicon, 650)); //DISTRIBUTION - new Recipe(distribution, DistributionBlocks.conveyor, new ItemStack(Items.copper, 1)).setAlwaysUnlocked(true); - new Recipe(distribution, DistributionBlocks.titaniumconveyor, new ItemStack(Items.copper, 2), new ItemStack(Items.titanium, 1)); - new Recipe(distribution, DistributionBlocks.phaseConveyor, new ItemStack(Items.phasefabric, 10), new ItemStack(Items.silicon, 15), new ItemStack(Items.lead, 20), new ItemStack(Items.densealloy, 20)); + new Recipe(distribution, Blocks.conveyor, new ItemStack(Items.copper, 1)).setAlwaysUnlocked(true); + new Recipe(distribution, Blocks.titaniumconveyor, new ItemStack(Items.copper, 2), new ItemStack(Items.titanium, 1)); + new Recipe(distribution, Blocks.phaseConveyor, new ItemStack(Items.phasefabric, 10), new ItemStack(Items.silicon, 15), new ItemStack(Items.lead, 20), new ItemStack(Items.densealloy, 20)); //starter transport - new Recipe(distribution, DistributionBlocks.junction, new ItemStack(Items.copper, 2)).setAlwaysUnlocked(true); - new Recipe(distribution, DistributionBlocks.router, new ItemStack(Items.copper, 6)).setAlwaysUnlocked(true); + new Recipe(distribution, Blocks.junction, new ItemStack(Items.copper, 2)).setAlwaysUnlocked(true); + new Recipe(distribution, Blocks.router, new ItemStack(Items.copper, 6)).setAlwaysUnlocked(true); //advanced densealloy transport - new Recipe(distribution, DistributionBlocks.distributor, new ItemStack(Items.densealloy, 8), new ItemStack(Items.copper, 8)); - new Recipe(distribution, DistributionBlocks.sorter, new ItemStack(Items.densealloy, 4), new ItemStack(Items.copper, 4)); - new Recipe(distribution, DistributionBlocks.overflowGate, new ItemStack(Items.densealloy, 4), new ItemStack(Items.copper, 8)); - new Recipe(distribution, DistributionBlocks.itemBridge, new ItemStack(Items.densealloy, 8), new ItemStack(Items.copper, 8)); - new Recipe(distribution, StorageBlocks.unloader, new ItemStack(Items.densealloy, 50), new ItemStack(Items.silicon, 60)); - new Recipe(distribution, DistributionBlocks.massDriver, new ItemStack(Items.densealloy, 250), new ItemStack(Items.silicon, 150), new ItemStack(Items.lead, 250), new ItemStack(Items.thorium, 100)); + new Recipe(distribution, Blocks.distributor, new ItemStack(Items.densealloy, 8), new ItemStack(Items.copper, 8)); + new Recipe(distribution, Blocks.sorter, new ItemStack(Items.densealloy, 4), new ItemStack(Items.copper, 4)); + new Recipe(distribution, Blocks.overflowGate, new ItemStack(Items.densealloy, 4), new ItemStack(Items.copper, 8)); + new Recipe(distribution, Blocks.itemBridge, new ItemStack(Items.densealloy, 8), new ItemStack(Items.copper, 8)); + new Recipe(distribution, Blocks.unloader, new ItemStack(Items.densealloy, 50), new ItemStack(Items.silicon, 60)); + new Recipe(distribution, Blocks.massDriver, new ItemStack(Items.densealloy, 250), new ItemStack(Items.silicon, 150), new ItemStack(Items.lead, 250), new ItemStack(Items.thorium, 100)); //CRAFTING //smelting - new Recipe(crafting, CraftingBlocks.smelter, new ItemStack(Items.copper, 100)); - new Recipe(crafting, CraftingBlocks.arcsmelter, new ItemStack(Items.copper, 110), new ItemStack(Items.densealloy, 70), new ItemStack(Items.lead, 50)); - new Recipe(crafting, CraftingBlocks.siliconsmelter, new ItemStack(Items.copper, 60), new ItemStack(Items.lead, 50)); + new Recipe(crafting, Blocks.smelter, new ItemStack(Items.copper, 100)); + new Recipe(crafting, Blocks.arcsmelter, new ItemStack(Items.copper, 110), new ItemStack(Items.densealloy, 70), new ItemStack(Items.lead, 50)); + new Recipe(crafting, Blocks.siliconsmelter, new ItemStack(Items.copper, 60), new ItemStack(Items.lead, 50)); //advanced fabrication - new Recipe(crafting, CraftingBlocks.plastaniumCompressor, new ItemStack(Items.silicon, 160), new ItemStack(Items.lead, 230), new ItemStack(Items.densealloy, 120), new ItemStack(Items.titanium, 160)); - new Recipe(crafting, CraftingBlocks.phaseWeaver, new ItemStack(Items.silicon, 260), new ItemStack(Items.lead, 240), new ItemStack(Items.thorium, 150)); - new Recipe(crafting, CraftingBlocks.alloySmelter, new ItemStack(Items.silicon, 160), new ItemStack(Items.lead, 160), new ItemStack(Items.thorium, 140)); + new Recipe(crafting, Blocks.plastaniumCompressor, new ItemStack(Items.silicon, 160), new ItemStack(Items.lead, 230), new ItemStack(Items.densealloy, 120), new ItemStack(Items.titanium, 160)); + new Recipe(crafting, Blocks.phaseWeaver, new ItemStack(Items.silicon, 260), new ItemStack(Items.lead, 240), new ItemStack(Items.thorium, 150)); + new Recipe(crafting, Blocks.alloySmelter, new ItemStack(Items.silicon, 160), new ItemStack(Items.lead, 160), new ItemStack(Items.thorium, 140)); //misc - new Recipe(crafting, CraftingBlocks.pulverizer, new ItemStack(Items.copper, 60), new ItemStack(Items.lead, 50)); - new Recipe(crafting, CraftingBlocks.pyratiteMixer, new ItemStack(Items.copper, 100), new ItemStack(Items.lead, 50)); - new Recipe(crafting, CraftingBlocks.blastMixer, new ItemStack(Items.lead, 60), new ItemStack(Items.densealloy, 40)); - new Recipe(crafting, CraftingBlocks.cryofluidmixer, new ItemStack(Items.lead, 130), new ItemStack(Items.silicon, 80), new ItemStack(Items.thorium, 90)); + new Recipe(crafting, Blocks.pulverizer, new ItemStack(Items.copper, 60), new ItemStack(Items.lead, 50)); + new Recipe(crafting, Blocks.pyratiteMixer, new ItemStack(Items.copper, 100), new ItemStack(Items.lead, 50)); + new Recipe(crafting, Blocks.blastMixer, new ItemStack(Items.lead, 60), new ItemStack(Items.densealloy, 40)); + new Recipe(crafting, Blocks.cryofluidmixer, new ItemStack(Items.lead, 130), new ItemStack(Items.silicon, 80), new ItemStack(Items.thorium, 90)); - new Recipe(crafting, CraftingBlocks.solidifier, new ItemStack(Items.densealloy, 30), new ItemStack(Items.copper, 20)); - new Recipe(crafting, CraftingBlocks.melter, new ItemStack(Items.copper, 60), new ItemStack(Items.lead, 70), new ItemStack(Items.densealloy, 90)); - new Recipe(crafting, CraftingBlocks.incinerator, new ItemStack(Items.densealloy, 10), new ItemStack(Items.lead, 30)); + new Recipe(crafting, Blocks.solidifier, new ItemStack(Items.densealloy, 30), new ItemStack(Items.copper, 20)); + new Recipe(crafting, Blocks.melter, new ItemStack(Items.copper, 60), new ItemStack(Items.lead, 70), new ItemStack(Items.densealloy, 90)); + new Recipe(crafting, Blocks.incinerator, new ItemStack(Items.densealloy, 10), new ItemStack(Items.lead, 30)); //processing - new Recipe(crafting, CraftingBlocks.biomatterCompressor, new ItemStack(Items.lead, 70), new ItemStack(Items.silicon, 60)); - new Recipe(crafting, CraftingBlocks.separator, new ItemStack(Items.copper, 60), new ItemStack(Items.densealloy, 50)); - new Recipe(crafting, CraftingBlocks.centrifuge, new ItemStack(Items.copper, 130), new ItemStack(Items.densealloy, 130), new ItemStack(Items.silicon, 60), new ItemStack(Items.titanium, 50)); + new Recipe(crafting, Blocks.biomatterCompressor, new ItemStack(Items.lead, 70), new ItemStack(Items.silicon, 60)); + new Recipe(crafting, Blocks.separator, new ItemStack(Items.copper, 60), new ItemStack(Items.densealloy, 50)); + new Recipe(crafting, Blocks.centrifuge, new ItemStack(Items.copper, 130), new ItemStack(Items.densealloy, 130), new ItemStack(Items.silicon, 60), new ItemStack(Items.titanium, 50)); //POWER - new Recipe(power, PowerBlocks.powerNode, new ItemStack(Items.copper, 2), new ItemStack(Items.lead, 6)) - .setDependencies(PowerBlocks.combustionGenerator); - new Recipe(power, PowerBlocks.powerNodeLarge, new ItemStack(Items.densealloy, 10), new ItemStack(Items.lead, 20), new ItemStack(Items.silicon, 6)) - .setDependencies(PowerBlocks.powerNode); - new Recipe(power, PowerBlocks.battery, new ItemStack(Items.copper, 8), new ItemStack(Items.lead, 30), new ItemStack(Items.silicon, 4)) - .setDependencies(PowerBlocks.powerNode); - new Recipe(power, PowerBlocks.batteryLarge, new ItemStack(Items.densealloy, 40), new ItemStack(Items.lead, 80), new ItemStack(Items.silicon, 30)) - .setDependencies(PowerBlocks.powerNode); + new Recipe(power, Blocks.powerNode, new ItemStack(Items.copper, 2), new ItemStack(Items.lead, 6)) + .setDependencies(Blocks.combustionGenerator); + new Recipe(power, Blocks.powerNodeLarge, new ItemStack(Items.densealloy, 10), new ItemStack(Items.lead, 20), new ItemStack(Items.silicon, 6)) + .setDependencies(Blocks.powerNode); + new Recipe(power, Blocks.battery, new ItemStack(Items.copper, 8), new ItemStack(Items.lead, 30), new ItemStack(Items.silicon, 4)) + .setDependencies(Blocks.powerNode); + new Recipe(power, Blocks.batteryLarge, new ItemStack(Items.densealloy, 40), new ItemStack(Items.lead, 80), new ItemStack(Items.silicon, 30)) + .setDependencies(Blocks.powerNode); //generators - combustion - new Recipe(power, PowerBlocks.combustionGenerator, new ItemStack(Items.copper, 50), new ItemStack(Items.lead, 30)); - new Recipe(power, PowerBlocks.turbineGenerator, new ItemStack(Items.copper, 70), new ItemStack(Items.densealloy, 50), new ItemStack(Items.lead, 80), new ItemStack(Items.silicon, 60)); - new Recipe(power, PowerBlocks.thermalGenerator, new ItemStack(Items.copper, 80), new ItemStack(Items.densealloy, 70), new ItemStack(Items.lead, 100), new ItemStack(Items.silicon, 70), new ItemStack(Items.thorium, 70)); + new Recipe(power, Blocks.combustionGenerator, new ItemStack(Items.copper, 50), new ItemStack(Items.lead, 30)); + new Recipe(power, Blocks.turbineGenerator, new ItemStack(Items.copper, 70), new ItemStack(Items.densealloy, 50), new ItemStack(Items.lead, 80), new ItemStack(Items.silicon, 60)); + new Recipe(power, Blocks.thermalGenerator, new ItemStack(Items.copper, 80), new ItemStack(Items.densealloy, 70), new ItemStack(Items.lead, 100), new ItemStack(Items.silicon, 70), new ItemStack(Items.thorium, 70)); //generators - solar - new Recipe(power, PowerBlocks.solarPanel, new ItemStack(Items.lead, 20), new ItemStack(Items.silicon, 30)); - new Recipe(power, PowerBlocks.largeSolarPanel, new ItemStack(Items.lead, 200), new ItemStack(Items.silicon, 290), new ItemStack(Items.phasefabric, 30)); + new Recipe(power, Blocks.solarPanel, new ItemStack(Items.lead, 20), new ItemStack(Items.silicon, 30)); + new Recipe(power, Blocks.largeSolarPanel, new ItemStack(Items.lead, 200), new ItemStack(Items.silicon, 290), new ItemStack(Items.phasefabric, 30)); //generators - nuclear - new Recipe(power, PowerBlocks.thoriumReactor, new ItemStack(Items.lead, 600), new ItemStack(Items.silicon, 400), new ItemStack(Items.densealloy, 300), new ItemStack(Items.thorium, 300)); - new Recipe(power, PowerBlocks.rtgGenerator, new ItemStack(Items.lead, 200), new ItemStack(Items.silicon, 150), new ItemStack(Items.phasefabric, 50), new ItemStack(Items.plastanium, 150), new ItemStack(Items.thorium, 100)); + new Recipe(power, Blocks.thoriumReactor, new ItemStack(Items.lead, 600), new ItemStack(Items.silicon, 400), new ItemStack(Items.densealloy, 300), new ItemStack(Items.thorium, 300)); + new Recipe(power, Blocks.rtgGenerator, new ItemStack(Items.lead, 200), new ItemStack(Items.silicon, 150), new ItemStack(Items.phasefabric, 50), new ItemStack(Items.plastanium, 150), new ItemStack(Items.thorium, 100)); //DRILLS, PRODUCERS - new Recipe(production, ProductionBlocks.mechanicalDrill, new ItemStack(Items.copper, 45)).setAlwaysUnlocked(true); - new Recipe(production, ProductionBlocks.pneumaticDrill, new ItemStack(Items.copper, 60), new ItemStack(Items.densealloy, 50)); - new Recipe(production, ProductionBlocks.laserDrill, new ItemStack(Items.copper, 70), new ItemStack(Items.densealloy, 90), new ItemStack(Items.silicon, 60), new ItemStack(Items.titanium, 50)); - new Recipe(production, ProductionBlocks.blastDrill, new ItemStack(Items.copper, 130), new ItemStack(Items.densealloy, 180), new ItemStack(Items.silicon, 120), new ItemStack(Items.titanium, 100), new ItemStack(Items.thorium, 60)); + new Recipe(production, Blocks.mechanicalDrill, new ItemStack(Items.copper, 45)).setAlwaysUnlocked(true); + new Recipe(production, Blocks.pneumaticDrill, new ItemStack(Items.copper, 60), new ItemStack(Items.densealloy, 50)); + new Recipe(production, Blocks.laserDrill, new ItemStack(Items.copper, 70), new ItemStack(Items.densealloy, 90), new ItemStack(Items.silicon, 60), new ItemStack(Items.titanium, 50)); + new Recipe(production, Blocks.blastDrill, new ItemStack(Items.copper, 130), new ItemStack(Items.densealloy, 180), new ItemStack(Items.silicon, 120), new ItemStack(Items.titanium, 100), new ItemStack(Items.thorium, 60)); - new Recipe(production, ProductionBlocks.waterExtractor, new ItemStack(Items.copper, 50), new ItemStack(Items.densealloy, 50), new ItemStack(Items.lead, 40)); - new Recipe(production, ProductionBlocks.cultivator, new ItemStack(Items.copper, 20), new ItemStack(Items.lead, 50), new ItemStack(Items.silicon, 20)); - new Recipe(production, ProductionBlocks.oilExtractor, new ItemStack(Items.copper, 300), new ItemStack(Items.densealloy, 350), new ItemStack(Items.lead, 230), new ItemStack(Items.thorium, 230), new ItemStack(Items.silicon, 150)); + new Recipe(production, Blocks.waterExtractor, new ItemStack(Items.copper, 50), new ItemStack(Items.densealloy, 50), new ItemStack(Items.lead, 40)); + new Recipe(production, Blocks.cultivator, new ItemStack(Items.copper, 20), new ItemStack(Items.lead, 50), new ItemStack(Items.silicon, 20)); + new Recipe(production, Blocks.oilExtractor, new ItemStack(Items.copper, 300), new ItemStack(Items.densealloy, 350), new ItemStack(Items.lead, 230), new ItemStack(Items.thorium, 230), new ItemStack(Items.silicon, 150)); //UNITS //upgrades - new Recipe(upgrade, UpgradeBlocks.dartPad, new ItemStack(Items.lead, 150), new ItemStack(Items.copper, 150), new ItemStack(Items.silicon, 200), new ItemStack(Items.titanium, 240)).setVisible(RecipeVisibility.desktopOnly); - new Recipe(upgrade, UpgradeBlocks.tridentPad, new ItemStack(Items.lead, 250), new ItemStack(Items.copper, 250), new ItemStack(Items.silicon, 250), new ItemStack(Items.titanium, 300), new ItemStack(Items.plastanium, 200)); - new Recipe(upgrade, UpgradeBlocks.javelinPad, new ItemStack(Items.lead, 350), new ItemStack(Items.silicon, 450), new ItemStack(Items.titanium, 500), new ItemStack(Items.plastanium, 400), new ItemStack(Items.phasefabric, 200)); - new Recipe(upgrade, UpgradeBlocks.glaivePad, new ItemStack(Items.lead, 450), new ItemStack(Items.silicon, 650), new ItemStack(Items.titanium, 700), new ItemStack(Items.plastanium, 600), new ItemStack(Items.surgealloy, 200)); + new Recipe(upgrade, Blocks.dartPad, new ItemStack(Items.lead, 150), new ItemStack(Items.copper, 150), new ItemStack(Items.silicon, 200), new ItemStack(Items.titanium, 240)).setVisible(RecipeVisibility.desktopOnly); + new Recipe(upgrade, Blocks.tridentPad, new ItemStack(Items.lead, 250), new ItemStack(Items.copper, 250), new ItemStack(Items.silicon, 250), new ItemStack(Items.titanium, 300), new ItemStack(Items.plastanium, 200)); + new Recipe(upgrade, Blocks.javelinPad, new ItemStack(Items.lead, 350), new ItemStack(Items.silicon, 450), new ItemStack(Items.titanium, 500), new ItemStack(Items.plastanium, 400), new ItemStack(Items.phasefabric, 200)); + new Recipe(upgrade, Blocks.glaivePad, new ItemStack(Items.lead, 450), new ItemStack(Items.silicon, 650), new ItemStack(Items.titanium, 700), new ItemStack(Items.plastanium, 600), new ItemStack(Items.surgealloy, 200)); - new Recipe(upgrade, UpgradeBlocks.alphaPad, new ItemStack(Items.lead, 200), new ItemStack(Items.densealloy, 100), new ItemStack(Items.copper, 150)).setVisible(RecipeVisibility.mobileOnly); - new Recipe(upgrade, UpgradeBlocks.tauPad, new ItemStack(Items.lead, 250), new ItemStack(Items.densealloy, 250), new ItemStack(Items.copper, 250), new ItemStack(Items.silicon, 250)); - new Recipe(upgrade, UpgradeBlocks.deltaPad, 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(upgrade, UpgradeBlocks.omegaPad, 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(upgrade, Blocks.alphaPad, new ItemStack(Items.lead, 200), new ItemStack(Items.densealloy, 100), new ItemStack(Items.copper, 150)).setVisible(RecipeVisibility.mobileOnly); + new Recipe(upgrade, Blocks.tauPad, new ItemStack(Items.lead, 250), new ItemStack(Items.densealloy, 250), new ItemStack(Items.copper, 250), new ItemStack(Items.silicon, 250)); + new Recipe(upgrade, Blocks.deltaPad, 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(upgrade, Blocks.omegaPad, 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)); //actual unit related stuff - new Recipe(units, UnitBlocks.spiritFactory, new ItemStack(Items.copper, 70), new ItemStack(Items.lead, 110), new ItemStack(Items.silicon, 130)); - new Recipe(units, UnitBlocks.phantomFactory, new ItemStack(Items.densealloy, 90), new ItemStack(Items.thorium, 80), new ItemStack(Items.lead, 110), new ItemStack(Items.silicon, 210)); + new Recipe(units, Blocks.spiritFactory, new ItemStack(Items.copper, 70), new ItemStack(Items.lead, 110), new ItemStack(Items.silicon, 130)); + new Recipe(units, Blocks.phantomFactory, new ItemStack(Items.densealloy, 90), new ItemStack(Items.thorium, 80), new ItemStack(Items.lead, 110), new ItemStack(Items.silicon, 210)); - new Recipe(units, UnitBlocks.daggerFactory, new ItemStack(Items.lead, 90), new ItemStack(Items.silicon, 70)); - new Recipe(units, UnitBlocks.titanFactory, new ItemStack(Items.thorium, 90), new ItemStack(Items.lead, 140), new ItemStack(Items.silicon, 90)); - new Recipe(units, UnitBlocks.fortressFactory, new ItemStack(Items.thorium, 200), new ItemStack(Items.lead, 220), new ItemStack(Items.silicon, 150), new ItemStack(Items.surgealloy, 100), new ItemStack(Items.phasefabric, 50)); + new Recipe(units, Blocks.daggerFactory, new ItemStack(Items.lead, 90), new ItemStack(Items.silicon, 70)); + new Recipe(units, Blocks.titanFactory, new ItemStack(Items.thorium, 90), new ItemStack(Items.lead, 140), new ItemStack(Items.silicon, 90)); + new Recipe(units, Blocks.fortressFactory, new ItemStack(Items.thorium, 200), new ItemStack(Items.lead, 220), new ItemStack(Items.silicon, 150), new ItemStack(Items.surgealloy, 100), new ItemStack(Items.phasefabric, 50)); - new Recipe(units, UnitBlocks.wraithFactory, new ItemStack(Items.titanium, 60), new ItemStack(Items.lead, 80), new ItemStack(Items.silicon, 90)); - new Recipe(units, UnitBlocks.ghoulFactory, new ItemStack(Items.plastanium, 80), new ItemStack(Items.titanium, 100), new ItemStack(Items.lead, 130), new ItemStack(Items.silicon, 220)); - new Recipe(units, UnitBlocks.revenantFactory, new ItemStack(Items.plastanium, 300), new ItemStack(Items.titanium, 400), new ItemStack(Items.lead, 300), new ItemStack(Items.silicon, 400), new ItemStack(Items.surgealloy, 100)); + new Recipe(units, Blocks.wraithFactory, new ItemStack(Items.titanium, 60), new ItemStack(Items.lead, 80), new ItemStack(Items.silicon, 90)); + new Recipe(units, Blocks.ghoulFactory, new ItemStack(Items.plastanium, 80), new ItemStack(Items.titanium, 100), new ItemStack(Items.lead, 130), new ItemStack(Items.silicon, 220)); + new Recipe(units, Blocks.revenantFactory, new ItemStack(Items.plastanium, 300), new ItemStack(Items.titanium, 400), new ItemStack(Items.lead, 300), new ItemStack(Items.silicon, 400), new ItemStack(Items.surgealloy, 100)); - new Recipe(units, UnitBlocks.repairPoint, new ItemStack(Items.lead, 30), new ItemStack(Items.copper, 30), new ItemStack(Items.silicon, 30)); - new Recipe(units, UnitBlocks.commandCenter, new ItemStack(Items.lead, 100), new ItemStack(Items.densealloy, 100), new ItemStack(Items.silicon, 200)); + new Recipe(units, Blocks.repairPoint, new ItemStack(Items.lead, 30), new ItemStack(Items.copper, 30), new ItemStack(Items.silicon, 30)); + new Recipe(units, Blocks.commandCenter, new ItemStack(Items.lead, 100), new ItemStack(Items.densealloy, 100), new ItemStack(Items.silicon, 200)); //LIQUIDS - new Recipe(liquid, LiquidBlocks.conduit, new ItemStack(Items.lead, 1)).setDependencies(CraftingBlocks.smelter); - new Recipe(liquid, LiquidBlocks.pulseConduit, new ItemStack(Items.titanium, 1), new ItemStack(Items.lead, 1)); - new Recipe(liquid, LiquidBlocks.phaseConduit, new ItemStack(Items.phasefabric, 10), new ItemStack(Items.silicon, 15), new ItemStack(Items.lead, 20), new ItemStack(Items.titanium, 20)); + new Recipe(liquid, Blocks.conduit, new ItemStack(Items.lead, 1)).setDependencies(Blocks.smelter); + new Recipe(liquid, Blocks.pulseConduit, new ItemStack(Items.titanium, 1), new ItemStack(Items.lead, 1)); + new Recipe(liquid, Blocks.phaseConduit, new ItemStack(Items.phasefabric, 10), new ItemStack(Items.silicon, 15), new ItemStack(Items.lead, 20), new ItemStack(Items.titanium, 20)); - new Recipe(liquid, LiquidBlocks.liquidRouter, new ItemStack(Items.titanium, 4), new ItemStack(Items.lead, 4)); - new Recipe(liquid, LiquidBlocks.liquidtank, new ItemStack(Items.titanium, 50), new ItemStack(Items.lead, 50)); - new Recipe(liquid, LiquidBlocks.liquidJunction, new ItemStack(Items.titanium, 4), new ItemStack(Items.lead, 4)); - new Recipe(liquid, LiquidBlocks.bridgeConduit, new ItemStack(Items.titanium, 8), new ItemStack(Items.lead, 8)); + new Recipe(liquid, Blocks.liquidRouter, new ItemStack(Items.titanium, 4), new ItemStack(Items.lead, 4)); + new Recipe(liquid, Blocks.liquidtank, new ItemStack(Items.titanium, 50), new ItemStack(Items.lead, 50)); + new Recipe(liquid, Blocks.liquidJunction, new ItemStack(Items.titanium, 4), new ItemStack(Items.lead, 4)); + new Recipe(liquid, Blocks.bridgeConduit, new ItemStack(Items.titanium, 8), new ItemStack(Items.lead, 8)); - new Recipe(liquid, LiquidBlocks.mechanicalPump, new ItemStack(Items.copper, 30), new ItemStack(Items.lead, 20)).setDependencies(CraftingBlocks.smelter); - new Recipe(liquid, LiquidBlocks.rotaryPump, new ItemStack(Items.copper, 140), new ItemStack(Items.lead, 100), new ItemStack(Items.silicon, 40), new ItemStack(Items.titanium, 70)); - new Recipe(liquid, LiquidBlocks.thermalPump, new ItemStack(Items.copper, 160), new ItemStack(Items.lead, 130), new ItemStack(Items.silicon, 60), new ItemStack(Items.titanium, 80), new ItemStack(Items.thorium, 70)); - } - - @Override - public ContentType type(){ - return ContentType.recipe; + new Recipe(liquid, Blocks.mechanicalPump, new ItemStack(Items.copper, 30), new ItemStack(Items.lead, 20)).setDependencies(Blocks.smelter); + new Recipe(liquid, Blocks.rotaryPump, new ItemStack(Items.copper, 140), new ItemStack(Items.lead, 100), new ItemStack(Items.silicon, 40), new ItemStack(Items.titanium, 70)); + new Recipe(liquid, Blocks.thermalPump, new ItemStack(Items.copper, 160), new ItemStack(Items.lead, 130), new ItemStack(Items.silicon, 60), new ItemStack(Items.titanium, 80), new ItemStack(Items.thorium, 70)); } } diff --git a/core/src/io/anuke/mindustry/content/StatusEffects.java b/core/src/io/anuke/mindustry/content/StatusEffects.java index eb37c73e11..bc4f0c420a 100644 --- a/core/src/io/anuke/mindustry/content/StatusEffects.java +++ b/core/src/io/anuke/mindustry/content/StatusEffects.java @@ -6,7 +6,6 @@ import io.anuke.arc.util.Time; import io.anuke.mindustry.entities.StatusController.StatusEntry; import io.anuke.mindustry.entities.Unit; import io.anuke.mindustry.game.ContentList; -import io.anuke.mindustry.type.ContentType; import io.anuke.mindustry.type.StatusEffect; public class StatusEffects implements ContentList{ @@ -168,9 +167,4 @@ public class StatusEffects implements ContentList{ freezing.setOpposites(burning, melting); burning.setOpposites(wet, freezing); } - - @Override - public ContentType type(){ - return ContentType.status; - } } diff --git a/core/src/io/anuke/mindustry/content/UnitTypes.java b/core/src/io/anuke/mindustry/content/UnitTypes.java index 9fcee1977e..0bbbb20e4a 100644 --- a/core/src/io/anuke/mindustry/content/UnitTypes.java +++ b/core/src/io/anuke/mindustry/content/UnitTypes.java @@ -4,7 +4,6 @@ import io.anuke.arc.collection.ObjectSet; import io.anuke.mindustry.entities.units.UnitType; import io.anuke.mindustry.entities.units.types.*; import io.anuke.mindustry.game.ContentList; -import io.anuke.mindustry.type.ContentType; public class UnitTypes implements ContentList{ public static UnitType @@ -106,9 +105,4 @@ public class UnitTypes implements ContentList{ toMine = ObjectSet.with(Items.lead, Items.copper, Items.titanium); }}; } - - @Override - public ContentType type(){ - return ContentType.unit; - } } diff --git a/core/src/io/anuke/mindustry/content/Weapons.java b/core/src/io/anuke/mindustry/content/Weapons.java index e731067a45..1d4d3b5153 100644 --- a/core/src/io/anuke/mindustry/content/Weapons.java +++ b/core/src/io/anuke/mindustry/content/Weapons.java @@ -1,7 +1,6 @@ package io.anuke.mindustry.content; import io.anuke.mindustry.game.ContentList; -import io.anuke.mindustry.type.ContentType; import io.anuke.mindustry.type.Weapon; public class Weapons implements ContentList{ @@ -180,9 +179,4 @@ public class Weapons implements ContentList{ ammo = Bullets.healBullet; }}; } - - @Override - public ContentType type(){ - return ContentType.weapon; - } } diff --git a/core/src/io/anuke/mindustry/content/blocks/BlockList.java b/core/src/io/anuke/mindustry/content/blocks/BlockList.java deleted file mode 100644 index 85cf617fd9..0000000000 --- a/core/src/io/anuke/mindustry/content/blocks/BlockList.java +++ /dev/null @@ -1,12 +0,0 @@ -package io.anuke.mindustry.content.blocks; - -import io.anuke.mindustry.game.ContentList; -import io.anuke.mindustry.type.ContentType; - -public abstract class BlockList implements ContentList{ - - @Override - public ContentType type(){ - return ContentType.item; - } -} diff --git a/core/src/io/anuke/mindustry/content/blocks/Blocks.java b/core/src/io/anuke/mindustry/content/blocks/Blocks.java deleted file mode 100644 index 16618bb039..0000000000 --- a/core/src/io/anuke/mindustry/content/blocks/Blocks.java +++ /dev/null @@ -1,177 +0,0 @@ -package io.anuke.mindustry.content.blocks; - -import io.anuke.arc.graphics.Color; -import io.anuke.mindustry.content.Items; -import io.anuke.mindustry.content.Liquids; -import io.anuke.mindustry.content.StatusEffects; -import io.anuke.mindustry.game.ContentList; -import io.anuke.mindustry.graphics.CacheLayer; -import io.anuke.mindustry.type.ItemStack; -import io.anuke.mindustry.world.Block; -import io.anuke.mindustry.world.Tile; -import io.anuke.mindustry.world.blocks.*; -import io.anuke.arc.util.Time; -import io.anuke.arc.graphics.g2d.Draw; -import io.anuke.arc.graphics.g2d.Lines; -import io.anuke.arc.math.Mathf; - -public class Blocks extends BlockList implements ContentList{ - public static Block air, blockpart, spawn, space, metalfloor, deepwater, water, lava, tar, stone, - blackstone, dirt, sand, ice, snow, grass, shrub, rock, icerock, blackrock; - - - @Override - public void load(){ - air = new Floor("air"){ - { - blend = false; - alwaysReplace = true; - } - - public void draw(Tile tile){} - public void load(){} - public void init(){} - }; - - blockpart = new BlockPart(); - - spawn = new Block("spawn"){ - - public void drawShadow(Tile tile){} - - public void draw(Tile tile){ - Draw.color(Color.SCARLET); - Lines.circle(tile.worldx(), tile.worldy(), 4f +Mathf.absin(Time.time(), 6f, 6f)); - Draw.color(); - } - }; - - //Registers build blocks from size 1-6 - //no reference is needed here since they can be looked up by name later - for(int i = 1; i <= 6; i++){ - new BuildBlock("build" + i); - } - - space = new Floor("space"){{ - placeableOn = false; - variants = 0; - cacheLayer = CacheLayer.space; - solid = true; - blend = false; - minimapColor = Color.valueOf("000001"); - }}; - - metalfloor = new Floor("metalfloor"){{ - variants = 6; - }}; - - deepwater = new Floor("deepwater"){{ - liquidColor = Color.valueOf("546bb3"); - speedMultiplier = 0.2f; - variants = 0; - liquidDrop = Liquids.water; - isLiquid = true; - status = StatusEffects.wet; - statusIntensity = 1f; - drownTime = 140f; - cacheLayer = CacheLayer.water; - minimapColor = Color.valueOf("465a96"); - }}; - - water = new Floor("water"){{ - liquidColor = Color.valueOf("546bb3"); - speedMultiplier = 0.5f; - variants = 0; - status = StatusEffects.wet; - statusIntensity = 0.9f; - liquidDrop = Liquids.water; - isLiquid = true; - cacheLayer = CacheLayer.water; - minimapColor = Color.valueOf("506eb4"); - }}; - - lava = new Floor("lava"){{ - drownTime = 100f; - liquidColor = Color.valueOf("ed5334"); - speedMultiplier = 0.2f; - damageTaken = 0.5f; - status = StatusEffects.melting; - statusIntensity = 0.8f; - variants = 0; - liquidDrop = Liquids.lava; - isLiquid = true; - cacheLayer = CacheLayer.lava; - minimapColor = Color.valueOf("ed5334"); - }}; - - tar = new Floor("tar"){{ - drownTime = 150f; - liquidColor = Color.valueOf("292929"); - status = StatusEffects.tarred; - statusIntensity = 1f; - speedMultiplier = 0.19f; - variants = 0; - liquidDrop = Liquids.oil; - isLiquid = true; - cacheLayer = CacheLayer.oil; - minimapColor = Color.valueOf("292929"); - }}; - - stone = new Floor("stone"){{ - hasOres = true; - drops = new ItemStack(Items.stone, 1); - blends = block -> block != this && !(block instanceof OreBlock); - minimapColor = Color.valueOf("323232"); - playerUnmineable = true; - }}; - - blackstone = new Floor("blackstone"){{ - drops = new ItemStack(Items.stone, 1); - minimapColor = Color.valueOf("252525"); - playerUnmineable = true; - hasOres = true; - }}; - - dirt = new Floor("dirt"){{ - minimapColor = Color.valueOf("6e501e"); - }}; - - sand = new Floor("sand"){{ - drops = new ItemStack(Items.sand, 1); - minimapColor = Color.valueOf("988a67"); - hasOres = true; - playerUnmineable = true; - }}; - - ice = new Floor("ice"){{ - dragMultiplier = 0.2f; - speedMultiplier = 0.4f; - minimapColor = Color.valueOf("b8eef8"); - hasOres = true; - }}; - - snow = new Floor("snow"){{ - minimapColor = Color.valueOf("c2d1d2"); - hasOres = true; - }}; - - grass = new Floor("grass"){{ - hasOres = true; - minimapColor = Color.valueOf("549d5b"); - }}; - - shrub = new Rock("shrub"); - - rock = new Rock("rock"){{ - variants = 2; - }}; - - icerock = new Rock("icerock"){{ - variants = 2; - }}; - - blackrock = new Rock("blackrock"){{ - variants = 1; - }}; - } -} diff --git a/core/src/io/anuke/mindustry/content/blocks/CraftingBlocks.java b/core/src/io/anuke/mindustry/content/blocks/CraftingBlocks.java deleted file mode 100644 index 034480bdcf..0000000000 --- a/core/src/io/anuke/mindustry/content/blocks/CraftingBlocks.java +++ /dev/null @@ -1,235 +0,0 @@ -package io.anuke.mindustry.content.blocks; - -import io.anuke.arc.graphics.Color; -import io.anuke.mindustry.content.Items; -import io.anuke.mindustry.content.Liquids; -import io.anuke.mindustry.content.Fx; -import io.anuke.mindustry.game.ContentList; -import io.anuke.mindustry.type.ItemStack; -import io.anuke.mindustry.world.Block; -import io.anuke.mindustry.world.blocks.production.*; - -public class CraftingBlocks extends BlockList implements ContentList{ - public static Block smelter, arcsmelter, siliconsmelter, plastaniumCompressor, phaseWeaver, alloySmelter, - pyratiteMixer, blastMixer, - cryofluidmixer, melter, separator, centrifuge, biomatterCompressor, pulverizer, solidifier, incinerator; - - @Override - public void load(){ - smelter = new Smelter("smelter"){{ - health = 70; - result = Items.densealloy; - craftTime = 45f; - burnDuration = 46f; - useFlux = true; - - consumes.items(new ItemStack(Items.copper, 1), new ItemStack(Items.lead, 2)); - consumes.item(Items.coal).optional(true); - }}; - - arcsmelter = new PowerSmelter("arc-smelter"){{ - health = 90; - craftEffect = Fx.smeltsmoke; - result = Items.densealloy; - craftTime = 30f; - size = 2; - - useFlux = true; - fluxNeeded = 2; - - consumes.items(new ItemStack(Items.copper, 1), new ItemStack(Items.lead, 2)); - consumes.power(0.1f); - }}; - - siliconsmelter = new PowerSmelter("silicon-smelter"){{ - health = 90; - craftEffect = Fx.smeltsmoke; - result = Items.silicon; - craftTime = 40f; - size = 2; - hasLiquids = false; - flameColor = Color.valueOf("ffef99"); - - consumes.items(new ItemStack(Items.coal, 1), new ItemStack(Items.sand, 2)); - consumes.power(0.05f); - }}; - - plastaniumCompressor = new PlastaniumCompressor("plastanium-compressor"){{ - hasItems = true; - liquidCapacity = 60f; - craftTime = 60f; - output = Items.plastanium; - itemCapacity = 30; - size = 2; - health = 320; - hasPower = hasLiquids = true; - craftEffect = Fx.formsmoke; - updateEffect = Fx.plasticburn; - - consumes.liquid(Liquids.oil, 0.25f); - consumes.power(0.3f); - consumes.item(Items.titanium, 2); - }}; - - phaseWeaver = new PhaseWeaver("phase-weaver"){{ - craftEffect = Fx.smeltsmoke; - result = Items.phasefabric; - craftTime = 120f; - size = 2; - - consumes.items(new ItemStack(Items.thorium, 4), new ItemStack(Items.sand, 10)); - consumes.power(0.5f); - }}; - - alloySmelter = new PowerSmelter("alloy-smelter"){{ - craftEffect = Fx.smeltsmoke; - result = Items.surgealloy; - craftTime = 75f; - size = 2; - - useFlux = true; - fluxNeeded = 3; - - consumes.power(0.4f); - consumes.items(new ItemStack(Items.titanium, 2), new ItemStack(Items.lead, 4), new ItemStack(Items.silicon, 3), new ItemStack(Items.copper, 3)); - }}; - - cryofluidmixer = new LiquidMixer("cryofluidmixer"){{ - outputLiquid = Liquids.cryofluid; - liquidPerItem = 50f; - itemCapacity = 50; - size = 2; - hasPower = true; - - consumes.power(0.1f); - consumes.item(Items.titanium); - consumes.liquid(Liquids.water, 0.3f); - }}; - - blastMixer = new GenericCrafter("blast-mixer"){{ - itemCapacity = 20; - hasItems = true; - hasPower = true; - hasLiquids = true; - output = Items.blastCompound; - size = 2; - - consumes.liquid(Liquids.oil, 0.05f); - consumes.item(Items.pyratite, 1); - consumes.power(0.04f); - }}; - - pyratiteMixer = new PowerSmelter("pyratite-mixer"){{ - flameColor = Color.CLEAR; - itemCapacity = 20; - hasItems = true; - hasPower = true; - result = Items.pyratite; - - size = 2; - - consumes.power(0.02f); - consumes.items(new ItemStack(Items.coal, 1), new ItemStack(Items.lead, 2), new ItemStack(Items.sand, 2)); - }}; - - melter = new PowerCrafter("melter"){{ - health = 200; - outputLiquid = Liquids.lava; - outputLiquidAmount = 1f; - itemCapacity = 20; - craftTime = 10f; - hasLiquids = hasPower = true; - - consumes.power(0.1f); - consumes.item(Items.stone, 1); - }}; - - separator = new Separator("separator"){{ - results = new ItemStack[]{ - new ItemStack(null, 10), - new ItemStack(Items.sand, 10), - new ItemStack(Items.stone, 9), - new ItemStack(Items.copper, 4), - new ItemStack(Items.lead, 2), - new ItemStack(Items.coal, 2), - new ItemStack(Items.titanium, 1), - }; - filterTime = 40f; - itemCapacity = 40; - health = 50; - - consumes.item(Items.stone, 2); - consumes.liquid(Liquids.water, 0.3f); - }}; - - centrifuge = new Separator("centrifuge"){{ - results = new ItemStack[]{ - new ItemStack(null, 13), - new ItemStack(Items.sand, 12), - new ItemStack(Items.stone, 11), - new ItemStack(Items.copper, 5), - new ItemStack(Items.lead, 3), - new ItemStack(Items.coal, 3), - new ItemStack(Items.titanium, 2), - new ItemStack(Items.thorium, 1) - }; - - hasPower = true; - filterTime = 15f; - itemCapacity = 60; - health = 50 * 4; - spinnerLength = 1.5f; - spinnerRadius = 3.5f; - spinnerThickness = 1.5f; - spinnerSpeed = 3f; - size = 2; - - consumes.item(Items.stone, 2); - consumes.power(0.2f); - consumes.liquid(Liquids.water, 0.5f); - }}; - - biomatterCompressor = new Compressor("biomattercompressor"){{ - liquidCapacity = 60f; - itemCapacity = 50; - craftTime = 20f; - outputLiquid = Liquids.oil; - outputLiquidAmount = 2.5f; - size = 2; - health = 320; - hasLiquids = true; - - consumes.item(Items.biomatter, 1); - consumes.power(0.06f); - }}; - - pulverizer = new Pulverizer("pulverizer"){{ - itemCapacity = 40; - output = Items.sand; - health = 80; - craftEffect = Fx.pulverize; - craftTime = 40f; - updateEffect = Fx.pulverizeSmall; - hasItems = hasPower = true; - - consumes.item(Items.stone, 1); - consumes.power(0.05f); - }}; - - solidifier = new GenericCrafter("solidifer"){{ - liquidCapacity = 21f; - craftTime = 14; - output = Items.stone; - itemCapacity = 20; - health = 80; - craftEffect = Fx.purifystone; - hasLiquids = hasItems = true; - - consumes.liquid(Liquids.lava, 1f); - }}; - - incinerator = new Incinerator("incinerator"){{ - health = 90; - }}; - } -} diff --git a/core/src/io/anuke/mindustry/content/blocks/DebugBlocks.java b/core/src/io/anuke/mindustry/content/blocks/DebugBlocks.java deleted file mode 100644 index b3906fb184..0000000000 --- a/core/src/io/anuke/mindustry/content/blocks/DebugBlocks.java +++ /dev/null @@ -1,180 +0,0 @@ -package io.anuke.mindustry.content.blocks; - -import io.anuke.arc.collection.Array; -import io.anuke.annotations.Annotations.Loc; -import io.anuke.annotations.Annotations.Remote; -import io.anuke.mindustry.content.Liquids; -import io.anuke.mindustry.entities.Player; -import io.anuke.mindustry.entities.TileEntity; -import io.anuke.mindustry.gen.Call; -import io.anuke.mindustry.game.ContentList; -import io.anuke.mindustry.type.Item; -import io.anuke.mindustry.type.Liquid; -import io.anuke.mindustry.world.Block; -import io.anuke.mindustry.world.Tile; -import io.anuke.mindustry.world.blocks.PowerBlock; -import io.anuke.mindustry.world.blocks.distribution.Sorter; -import io.anuke.mindustry.world.blocks.power.PowerNode; -import io.anuke.mindustry.world.meta.BlockStat; -import io.anuke.arc.graphics.g2d.Draw; -import io.anuke.arc.scene.ui.ButtonGroup; -import io.anuke.arc.scene.ui.ImageButton; -import io.anuke.arc.scene.ui.layout.Table; - -import java.io.DataInput; -import java.io.DataOutput; -import java.io.IOException; -import static io.anuke.mindustry.Vars.*; - -public class DebugBlocks extends BlockList implements ContentList{ - public static Block powerVoid, powerInfinite, itemSource, liquidSource, itemVoid; - - @Remote(targets = Loc.both, called = Loc.both, forward = true) - public static void setLiquidSourceLiquid(Player player, Tile tile, Liquid liquid){ - LiquidSourceEntity entity = tile.entity(); - entity.source = liquid; - } - - @Override - public void load(){ - powerVoid = new PowerBlock("powervoid"){ - { - consumes.power(Float.MAX_VALUE); - } - - @Override - public void init(){ - super.init(); - stats.remove(BlockStat.powerUse); - } - }; - - powerInfinite = new PowerNode("powerinfinite"){ - { - maxNodes = 100; - outputsPower = true; - consumesPower = false; - } - - @Override - public float getPowerProduction(Tile tile){ - return 10000f; - } - }; - - itemSource = new Sorter("itemsource"){ - { - hasItems = true; - } - - @Override - public boolean outputsItems(){ - return true; - } - - @Override - public void update(Tile tile){ - SorterEntity entity = tile.entity(); - if(entity.sortItem == null) return; - - entity.items.set(entity.sortItem, 1); - tryDump(tile, entity.sortItem); - entity.items.set(entity.sortItem, 0); - } - - @Override - public boolean acceptItem(Item item, Tile tile, Tile source){ - return false; - } - }; - - liquidSource = new Block("liquidsource"){ - { - update = true; - solid = true; - hasLiquids = true; - liquidCapacity = 100f; - configurable = true; - outputsLiquid = true; - } - - @Override - public void update(Tile tile){ - LiquidSourceEntity entity = tile.entity(); - - tile.entity.liquids.add(entity.source, liquidCapacity); - tryDumpLiquid(tile, entity.source); - } - - @Override - public void draw(Tile tile){ - super.draw(tile); - - LiquidSourceEntity entity = tile.entity(); - - Draw.color(entity.source.color); - Draw.rect("blank", tile.worldx(), tile.worldy(), 4f, 4f); - Draw.color(); - } - - @Override - public void buildTable(Tile tile, Table table){ - LiquidSourceEntity entity = tile.entity(); - - Array items = content.liquids(); - - ButtonGroup group = new ButtonGroup<>(); - Table cont = new Table(); - - for(int i = 0; i < items.size; i++){ - if(!control.unlocks.isUnlocked(items.get(i))) continue; - - final int f = i; - ImageButton button = cont.addImageButton("liquid-icon-" + items.get(i).name, "clear-toggle", 24, - () -> Call.setLiquidSourceLiquid(null, tile, items.get(f))).size(38).group(group).get(); - button.setChecked(entity.source.id == f); - - if(i % 4 == 3){ - cont.row(); - } - } - - table.add(cont); - } - - @Override - public TileEntity newEntity(){ - return new LiquidSourceEntity(); - } - }; - - itemVoid = new Block("itemvoid"){ - { - update = solid = true; - } - - @Override - public void handleItem(Item item, Tile tile, Tile source){ - } - - @Override - public boolean acceptItem(Item item, Tile tile, Tile source){ - return true; - } - }; - } - - class LiquidSourceEntity extends TileEntity{ - public Liquid source = Liquids.water; - - @Override - public void writeConfig(DataOutput stream) throws IOException{ - stream.writeByte(source.id); - } - - @Override - public void readConfig(DataInput stream) throws IOException{ - source = content.liquid(stream.readByte()); - } - } -} diff --git a/core/src/io/anuke/mindustry/content/blocks/DefenseBlocks.java b/core/src/io/anuke/mindustry/content/blocks/DefenseBlocks.java deleted file mode 100644 index 84e48c3207..0000000000 --- a/core/src/io/anuke/mindustry/content/blocks/DefenseBlocks.java +++ /dev/null @@ -1,98 +0,0 @@ -package io.anuke.mindustry.content.blocks; - -import io.anuke.mindustry.content.Items; -import io.anuke.mindustry.content.Fx; -import io.anuke.mindustry.game.ContentList; -import io.anuke.mindustry.world.Block; -import io.anuke.mindustry.world.blocks.defense.*; - -public class DefenseBlocks extends BlockList implements ContentList{ - public static Block copperWall, copperWallLarge, denseAlloyWall, denseAlloyWallLarge, thoriumWall, thoriumWallLarge, door, doorLarge, - phaseWall, phaseWallLarge, surgeWall, surgeWallLarge, mendProjector, overdriveProjector, forceProjector, shockMine; - - @Override - public void load(){ - int wallHealthMultiplier = 3; - - copperWall = new Wall("copper-wall"){{ - health = 80 * wallHealthMultiplier; - }}; - - copperWallLarge = new Wall("copper-wall-large"){{ - health = 80 * 4 * wallHealthMultiplier; - size = 2; - }}; - - denseAlloyWall = new Wall("dense-alloy-wall"){{ - health = 110 * wallHealthMultiplier; - }}; - - denseAlloyWallLarge = new Wall("dense-alloy-wall-large"){{ - health = 110 * wallHealthMultiplier * 4; - size = 2; - }}; - - thoriumWall = new Wall("thorium-wall"){{ - health = 200 * wallHealthMultiplier; - }}; - - thoriumWallLarge = new Wall("thorium-wall-large"){{ - health = 200 * wallHealthMultiplier * 4; - size = 2; - }}; - - phaseWall = new DeflectorWall("phase-wall"){{ - health = 150 * wallHealthMultiplier; - }}; - - phaseWallLarge = new DeflectorWall("phase-wall-large"){{ - health = 150 * 4 * wallHealthMultiplier; - size = 2; - }}; - - surgeWall = new SurgeWall("surge-wall"){{ - health = 230 * wallHealthMultiplier; - }}; - - surgeWallLarge = new SurgeWall("surge-wall-large"){{ - health = 230 * 4 * wallHealthMultiplier; - size = 2; - }}; - - door = new Door("door"){{ - health = 100 * wallHealthMultiplier; - }}; - - doorLarge = new Door("door-large"){{ - openfx = Fx.dooropenlarge; - closefx = Fx.doorcloselarge; - health = 100 * 4 * wallHealthMultiplier; - size = 2; - }}; - - mendProjector = new MendProjector("mend-projector"){{ - consumes.power(0.2f, 1.0f); - size = 2; - consumes.item(Items.phasefabric).optional(true); - }}; - - overdriveProjector = new OverdriveProjector("overdrive-projector"){{ - consumes.power(0.35f, 1.0f); - size = 2; - consumes.item(Items.phasefabric).optional(true); - }}; - - forceProjector = new ForceProjector("force-projector"){{ - size = 3; - consumes.item(Items.phasefabric).optional(true); - }}; - - shockMine = new ShockMine("shock-mine"){{ - health = 40; - damage = 11; - tileDamage = 7f; - length = 10; - tendrils = 5; - }}; - } -} diff --git a/core/src/io/anuke/mindustry/content/blocks/DistributionBlocks.java b/core/src/io/anuke/mindustry/content/blocks/DistributionBlocks.java deleted file mode 100644 index 0266642557..0000000000 --- a/core/src/io/anuke/mindustry/content/blocks/DistributionBlocks.java +++ /dev/null @@ -1,57 +0,0 @@ -package io.anuke.mindustry.content.blocks; - -import io.anuke.mindustry.game.ContentList; -import io.anuke.mindustry.world.Block; -import io.anuke.mindustry.world.blocks.distribution.*; - -public class DistributionBlocks extends BlockList implements ContentList{ - public static Block conveyor, titaniumconveyor, distributor, junction, - itemBridge, phaseConveyor, sorter, router, overflowGate, massDriver; - - @Override - public void load(){ - - conveyor = new Conveyor("conveyor"){{ - health = 45; - speed = 0.03f; - }}; - - titaniumconveyor = new Conveyor("titanium-conveyor"){{ - health = 65; - speed = 0.07f; - }}; - - junction = new Junction("junction"){{ - speed = 26; - capacity = 32; - }}; - - itemBridge = new BufferedItemBridge("bridge-conveyor"){{ - range = 4; - speed = 60f; - bufferCapacity = 15; - }}; - - phaseConveyor = new ItemBridge("phase-conveyor"){{ - range = 12; - hasPower = true; - consumes.power(0.03f, 1.0f); - }}; - - sorter = new Sorter("sorter"); - - router = new Router("router"); - - distributor = new Router("distributor"){{ - size = 2; - }}; - - overflowGate = new OverflowGate("overflow-gate"); - - massDriver = new MassDriver("mass-driver"){{ - size = 3; - itemCapacity = 60; - range = 440f; - }}; - } -} diff --git a/core/src/io/anuke/mindustry/content/blocks/LiquidBlocks.java b/core/src/io/anuke/mindustry/content/blocks/LiquidBlocks.java deleted file mode 100644 index 164f72fa44..0000000000 --- a/core/src/io/anuke/mindustry/content/blocks/LiquidBlocks.java +++ /dev/null @@ -1,70 +0,0 @@ -package io.anuke.mindustry.content.blocks; - -import io.anuke.mindustry.game.ContentList; -import io.anuke.mindustry.world.Block; -import io.anuke.mindustry.world.blocks.distribution.*; -import io.anuke.mindustry.world.blocks.production.Pump; - -public class LiquidBlocks extends BlockList implements ContentList{ - public static Block mechanicalPump, rotaryPump, thermalPump, conduit, pulseConduit, liquidRouter, liquidtank, liquidJunction, bridgeConduit, phaseConduit; - - @Override - public void load(){ - - mechanicalPump = new Pump("mechanical-pump"){{ - pumpAmount = 0.1f; - tier = 0; - }}; - - rotaryPump = new Pump("rotary-pump"){{ - pumpAmount = 0.2f; - consumes.power(0.015f); - liquidCapacity = 30f; - hasPower = true; - size = 2; - tier = 1; - }}; - - thermalPump = new Pump("thermal-pump"){{ - pumpAmount = 0.275f; - consumes.power(0.03f); - liquidCapacity = 40f; - hasPower = true; - size = 2; - tier = 2; - }}; - - conduit = new Conduit("conduit"){{ - health = 45; - }}; - - pulseConduit = new Conduit("pulse-conduit"){{ - liquidCapacity = 16f; - liquidFlowFactor = 4.9f; - health = 90; - }}; - - liquidRouter = new LiquidRouter("liquid-router"){{ - liquidCapacity = 20f; - }}; - - liquidtank = new LiquidTank("liquid-tank"){{ - size = 3; - liquidCapacity = 1500f; - health = 500; - }}; - - liquidJunction = new LiquidJunction("liquid-junction"); - - bridgeConduit = new LiquidExtendingBridge("bridge-conduit"){{ - range = 4; - hasPower = false; - }}; - - phaseConduit = new LiquidBridge("phase-conduit"){{ - range = 12; - hasPower = true; - consumes.power(0.03f, 1.0f); - }}; - } -} diff --git a/core/src/io/anuke/mindustry/content/blocks/OreBlocks.java b/core/src/io/anuke/mindustry/content/blocks/OreBlocks.java deleted file mode 100644 index 515542e9fd..0000000000 --- a/core/src/io/anuke/mindustry/content/blocks/OreBlocks.java +++ /dev/null @@ -1,36 +0,0 @@ -package io.anuke.mindustry.content.blocks; - -import io.anuke.arc.collection.ObjectMap; -import io.anuke.mindustry.type.Item; -import io.anuke.mindustry.world.Block; -import io.anuke.mindustry.world.blocks.Floor; -import io.anuke.mindustry.world.blocks.OreBlock; - -import static io.anuke.mindustry.Vars.content; - -public class OreBlocks extends BlockList{ - private static final ObjectMap> oreBlockMap = new ObjectMap<>(); - - public static Block get(Block floor, Item item){ - if(!oreBlockMap.containsKey(item)) throw new IllegalArgumentException("Item '" + item + "' is not an ore!"); - if(!oreBlockMap.get(item).containsKey(floor)) - throw new IllegalArgumentException("Block '" + floor.name + "' does not support ores!"); - return oreBlockMap.get(item).get(floor); - } - - @Override - public void load(){ - - for(Item item : content.items()){ - if(!item.genOre) continue; - ObjectMap map = new ObjectMap<>(); - oreBlockMap.put(item, map); - - for(Block block : content.blocks()){ - if(block instanceof Floor && ((Floor) block).hasOres){ - map.put(block, new OreBlock(item, (Floor) block)); - } - } - } - } -} diff --git a/core/src/io/anuke/mindustry/content/blocks/PowerBlocks.java b/core/src/io/anuke/mindustry/content/blocks/PowerBlocks.java deleted file mode 100644 index af35629803..0000000000 --- a/core/src/io/anuke/mindustry/content/blocks/PowerBlocks.java +++ /dev/null @@ -1,81 +0,0 @@ -package io.anuke.mindustry.content.blocks; - -import io.anuke.mindustry.content.Liquids; -import io.anuke.mindustry.content.Fx; -import io.anuke.mindustry.game.ContentList; -import io.anuke.mindustry.world.Block; -import io.anuke.mindustry.world.blocks.power.*; - -public class PowerBlocks extends BlockList implements ContentList{ - public static Block combustionGenerator, thermalGenerator, turbineGenerator, rtgGenerator, solarPanel, largeSolarPanel, - thoriumReactor, fusionReactor, battery, batteryLarge, powerNode, powerNodeLarge; - - @Override - public void load(){ - combustionGenerator = new BurnerGenerator("combustion-generator"){{ - powerProduction = 0.09f; - itemDuration = 40f; - }}; - - thermalGenerator = new LiquidHeatGenerator("thermal-generator"){{ - maxLiquidGenerate = 2f; - powerProduction = 2f; - generateEffect = Fx.redgeneratespark; - size = 2; - }}; - - turbineGenerator = new TurbineGenerator("turbine-generator"){{ - powerProduction = 0.28f; - itemDuration = 30f; - consumes.liquid(Liquids.water, 0.05f); - size = 2; - }}; - - rtgGenerator = new DecayGenerator("rtg-generator"){{ - size = 2; - powerProduction = 0.3f; - itemDuration = 220f; - }}; - - solarPanel = new SolarGenerator("solar-panel"){{ - powerProduction = 0.0045f; - }}; - - largeSolarPanel = new SolarGenerator("solar-panel-large"){{ - size = 3; - powerProduction = 0.055f; - }}; - - thoriumReactor = new NuclearReactor("thorium-reactor"){{ - size = 3; - health = 700; - powerProduction = 1.1f; - }}; - - fusionReactor = new FusionReactor("fusion-reactor"){{ - size = 4; - health = 600; - }}; - - battery = new Battery("battery"){{ - consumes.powerBuffered(320f, 1f); - }}; - - batteryLarge = new Battery("battery-large"){{ - size = 3; - consumes.powerBuffered(2000f, 1f); - }}; - - powerNode = new PowerNode("power-node"){{ - maxNodes = 4; - laserRange = 6; - }}; - - powerNodeLarge = new PowerNode("power-node-large"){{ - size = 2; - maxNodes = 6; - laserRange = 9.5f; - }}; - - } -} diff --git a/core/src/io/anuke/mindustry/content/blocks/ProductionBlocks.java b/core/src/io/anuke/mindustry/content/blocks/ProductionBlocks.java deleted file mode 100644 index 30a5f8f5a5..0000000000 --- a/core/src/io/anuke/mindustry/content/blocks/ProductionBlocks.java +++ /dev/null @@ -1,112 +0,0 @@ -package io.anuke.mindustry.content.blocks; - -import io.anuke.arc.graphics.Color; -import io.anuke.mindustry.content.Items; -import io.anuke.mindustry.content.Liquids; -import io.anuke.mindustry.content.Fx; -import io.anuke.mindustry.game.ContentList; -import io.anuke.mindustry.world.Block; -import io.anuke.mindustry.world.blocks.production.Cultivator; -import io.anuke.mindustry.world.blocks.production.Drill; -import io.anuke.mindustry.world.blocks.production.Fracker; -import io.anuke.mindustry.world.blocks.production.SolidPump; - -public class ProductionBlocks extends BlockList implements ContentList{ - public static Block mechanicalDrill, pneumaticDrill, laserDrill, blastDrill, plasmaDrill, waterExtractor, oilExtractor, cultivator; - - @Override - public void load(){ - mechanicalDrill = new Drill("mechanical-drill"){{ - tier = 2; - drillTime = 300; - size = 2; - drawMineItem = true; - }}; - - pneumaticDrill = new Drill("pneumatic-drill"){{ - tier = 3; - drillTime = 240; - size = 2; - drawMineItem = true; - }}; - - laserDrill = new Drill("laser-drill"){{ - drillTime = 140; - size = 2; - hasPower = true; - tier = 4; - updateEffect = Fx.pulverizeMedium; - drillEffect = Fx.mineBig; - - consumes.power(0.11f); - }}; - - blastDrill = new Drill("blast-drill"){{ - drillTime = 60; - size = 3; - drawRim = true; - hasPower = true; - tier = 5; - updateEffect = Fx.pulverizeRed; - updateEffectChance = 0.03f; - drillEffect = Fx.mineHuge; - rotateSpeed = 6f; - warmupSpeed = 0.01f; - - consumes.power(0.3f); - }}; - - plasmaDrill = new Drill("plasma-drill"){{ - heatColor = Color.valueOf("ff461b"); - drillTime = 50; - size = 4; - hasLiquids = true; - hasPower = true; - tier = 5; - rotateSpeed = 9f; - drawRim = true; - updateEffect = Fx.pulverizeRedder; - updateEffectChance = 0.04f; - drillEffect = Fx.mineHuge; - warmupSpeed = 0.005f; - - consumes.power(0.7f); - }}; - - waterExtractor = new SolidPump("water-extractor"){{ - result = Liquids.water; - pumpAmount = 0.065f; - size = 2; - liquidCapacity = 30f; - rotateSpeed = 1.4f; - - consumes.power(0.09f); - }}; - - oilExtractor = new Fracker("oil-extractor"){{ - result = Liquids.oil; - updateEffect = Fx.pulverize; - liquidCapacity = 50f; - updateEffectChance = 0.05f; - pumpAmount = 0.09f; - size = 3; - liquidCapacity = 30f; - - consumes.item(Items.sand); - consumes.power(0.3f); - consumes.liquid(Liquids.water, 0.15f); - }}; - - cultivator = new Cultivator("cultivator"){{ - result = Items.biomatter; - drillTime = 200; - size = 2; - hasLiquids = true; - hasPower = true; - - consumes.power(0.08f); - consumes.liquid(Liquids.water, 0.15f); - }}; - - } -} diff --git a/core/src/io/anuke/mindustry/content/blocks/StorageBlocks.java b/core/src/io/anuke/mindustry/content/blocks/StorageBlocks.java deleted file mode 100644 index 9972317a99..0000000000 --- a/core/src/io/anuke/mindustry/content/blocks/StorageBlocks.java +++ /dev/null @@ -1,33 +0,0 @@ -package io.anuke.mindustry.content.blocks; - -import io.anuke.mindustry.game.ContentList; -import io.anuke.mindustry.world.Block; -import io.anuke.mindustry.world.blocks.storage.CoreBlock; -import io.anuke.mindustry.world.blocks.storage.SortedUnloader; -import io.anuke.mindustry.world.blocks.storage.Vault; - -public class StorageBlocks extends BlockList implements ContentList{ - public static Block core, vault, container, unloader; - - @Override - public void load(){ - core = new CoreBlock("core"){{ - health = 1100; - itemCapacity = 3000; - }}; - - vault = new Vault("vault"){{ - size = 3; - itemCapacity = 1000; - }}; - - container = new Vault("container"){{ - size = 2; - itemCapacity = 300; - }}; - - unloader = new SortedUnloader("unloader"){{ - speed = 7f; - }}; - } -} diff --git a/core/src/io/anuke/mindustry/content/blocks/TurretBlocks.java b/core/src/io/anuke/mindustry/content/blocks/TurretBlocks.java deleted file mode 100644 index dd963b0a6e..0000000000 --- a/core/src/io/anuke/mindustry/content/blocks/TurretBlocks.java +++ /dev/null @@ -1,256 +0,0 @@ -package io.anuke.mindustry.content.blocks; - -import io.anuke.arc.graphics.Color; -import io.anuke.arc.graphics.g2d.Draw; -import io.anuke.mindustry.content.Bullets; -import io.anuke.mindustry.content.Items; -import io.anuke.mindustry.content.Liquids; -import io.anuke.mindustry.content.Fx; -import io.anuke.mindustry.game.ContentList; -import io.anuke.mindustry.world.Block; -import io.anuke.mindustry.world.blocks.defense.turrets.*; - -public class TurretBlocks extends BlockList implements ContentList{ - public static Block duo, scorch, hail, wave, lancer, arc, swarmer, salvo, - fuse, ripple, cyclone, spectre, meltdown; - - @Override - public void load(){ - duo = new DoubleTurret("duo"){{ - ammo( - Items.copper, Bullets.standardCopper, - Items.densealloy, Bullets.standardDense, - Items.pyratite, Bullets.standardIncendiary, - Items.silicon, Bullets.standardHoming - ); - reload = 25f; - restitution = 0.03f; - range = 90f; - shootCone = 15f; - ammoUseEffect = Fx.shellEjectSmall; - health = 80; - inaccuracy = 2f; - rotatespeed = 10f; - }}; - - hail = new ArtilleryTurret("hail"){{ - ammo( - Items.densealloy, Bullets.artilleryDense, - Items.silicon, Bullets.artilleryHoming, - Items.pyratite, Bullets.artlleryIncendiary - ); - reload = 60f; - recoil = 2f; - range = 230f; - inaccuracy = 1f; - shootCone = 10f; - health = 120; - }}; - - scorch = new LiquidTurret("scorch"){{ - ammo(Liquids.oil, Bullets.basicFlame); - recoil = 0f; - reload = 4f; - shootCone = 50f; - ammoUseEffect = Fx.shellEjectSmall; - health = 160; - }}; - - wave = new LiquidTurret("wave"){{ - ammo( - Liquids.water, Bullets.waterShot, - Liquids.lava, Bullets.lavaShot, - Liquids.cryofluid, Bullets.cryoShot, - Liquids.oil, Bullets.oilShot - ); - size = 2; - recoil = 0f; - reload = 4f; - inaccuracy = 5f; - shootCone = 50f; - shootEffect = Fx.shootLiquid; - range = 90f; - health = 360; - - drawer = (tile, entity) -> { - Draw.rect(region, tile.drawx() + tr2.x, tile.drawy() + tr2.y, entity.rotation - 90); - - Draw.color(entity.liquids.current().color); - Draw.alpha(entity.liquids.total() / liquidCapacity); - Draw.rect(name + "-liquid", tile.drawx() + tr2.x, tile.drawy() + tr2.y, entity.rotation - 90); - Draw.color(); - }; - }}; - - lancer = new ChargeTurret("lancer"){{ - range = 90f; - chargeTime = 60f; - chargeMaxDelay = 30f; - chargeEffects = 7; - shootType = Bullets.lancerLaser; - recoil = 2f; - reload = 100f; - cooldown = 0.03f; - powerUsed = 1 / 3f; - consumes.powerBuffered(60f); - shootShake = 2f; - shootEffect = Fx.lancerLaserShoot; - smokeEffect = Fx.lancerLaserShootSmoke; - chargeEffect = Fx.lancerLaserCharge; - chargeBeginEffect = Fx.lancerLaserChargeBegin; - heatColor = Color.RED; - size = 2; - health = 320; - targetAir = false; - }}; - - arc = new PowerTurret("arc"){{ - shootType = Bullets.arc; - reload = 85f; - shootShake = 1f; - shootCone = 40f; - rotatespeed = 8f; - powerUsed = 1f / 3f; - consumes.powerBuffered(30f); - range = 150f; - shootEffect = Fx.lightningShoot; - heatColor = Color.RED; - recoil = 1f; - size = 1; - }}; - - swarmer = new BurstTurret("swarmer"){{ - ammo( - Items.blastCompound, Bullets.missileExplosive, - Items.pyratite, Bullets.missileIncendiary, - Items.surgealloy, Bullets.missileSurge - ); - reload = 50f; - shots = 4; - burstSpacing = 5; - inaccuracy = 10f; - range = 140f; - xRand = 6f; - size = 2; - health = 380; - }}; - - salvo = new BurstTurret("salvo"){{ - ammo( - Items.copper, Bullets.standardCopper, - Items.densealloy, Bullets.standardDense, - Items.pyratite, Bullets.standardIncendiary, - Items.silicon, Bullets.standardHoming, - Items.thorium, Bullets.standardThorium - ); - - size = 2; - range = 120f; - reload = 35f; - restitution = 0.03f; - ammoEjectBack = 3f; - cooldown = 0.03f; - recoil = 3f; - shootShake = 2f; - burstSpacing = 4; - shots = 3; - ammoUseEffect = Fx.shellEjectBig; - health = 360; - }}; - - ripple = new ArtilleryTurret("ripple"){{ - ammo( - Items.densealloy, Bullets.artilleryDense, - Items.silicon, Bullets.artilleryHoming, - Items.pyratite, Bullets.artlleryIncendiary, - Items.blastCompound, Bullets.artilleryExplosive, - Items.plastanium, Bullets.arilleryPlastic - ); - size = 3; - shots = 4; - inaccuracy = 12f; - reload = 60f; - ammoEjectBack = 5f; - ammoUseEffect = Fx.shellEjectBig; - cooldown = 0.03f; - velocityInaccuracy = 0.2f; - restitution = 0.02f; - recoil = 6f; - shootShake = 2f; - range = 320f; - - health = 550; - }}; - - cyclone = new ItemTurret("cyclone"){{ - ammo( - Items.blastCompound, Bullets.flakExplosive, - Items.plastanium, Bullets.flakPlastic, - Items.surgealloy, Bullets.flakSurge - ); - xRand = 4f; - reload = 8f; - range = 145f; - size = 3; - recoil = 3f; - rotatespeed = 10f; - inaccuracy = 13f; - shootCone = 30f; - - health = 145 * size * size; - }}; - - fuse = new ItemTurret("fuse"){{ - ammo(Items.densealloy, Bullets.fuseShot); - reload = 50f; - shootShake = 4f; - range = 80f; - recoil = 5f; - restitution = 0.1f; - size = 3; - - health = 155 * size * size; - }}; - - spectre = new DoubleTurret("spectre"){{ - ammo( - Items.densealloy, Bullets.standardDenseBig, - Items.pyratite, Bullets.standardIncendiaryBig, - Items.thorium, Bullets.standardThoriumBig - ); - reload = 6f; - coolantMultiplier = 0.5f; - maxCoolantUsed = 1.5f; - restitution = 0.1f; - ammoUseEffect = Fx.shellEjectBig; - range = 200f; - inaccuracy = 3f; - recoil = 3f; - xRand = 3f; - shotWidth = 4f; - shootShake = 2f; - shots = 2; - size = 4; - shootCone = 24f; - - health = 155 * size * size; - }}; - - meltdown = new LaserTurret("meltdown"){{ - shootType = Bullets.meltdownLaser; - shootEffect = Fx.shootBigSmoke2; - shootCone = 40f; - recoil = 4f; - size = 4; - shootShake = 2f; - powerUsed = 0.5f; - consumes.powerBuffered(120f); - range = 160f; - reload = 200f; - firingMoveFract = 0.1f; - shootDuration = 220f; - - health = 165 * size * size; - }}; - } -} diff --git a/core/src/io/anuke/mindustry/content/blocks/UnitBlocks.java b/core/src/io/anuke/mindustry/content/blocks/UnitBlocks.java deleted file mode 100644 index 14ad6cbafa..0000000000 --- a/core/src/io/anuke/mindustry/content/blocks/UnitBlocks.java +++ /dev/null @@ -1,95 +0,0 @@ -package io.anuke.mindustry.content.blocks; - -import io.anuke.mindustry.content.Items; -import io.anuke.mindustry.content.UnitTypes; -import io.anuke.mindustry.game.ContentList; -import io.anuke.mindustry.type.ItemStack; -import io.anuke.mindustry.world.Block; -import io.anuke.mindustry.world.blocks.units.*; - -public class UnitBlocks extends BlockList implements ContentList{ - public static Block - spiritFactory, phantomFactory, - wraithFactory, ghoulFactory, revenantFactory, - daggerFactory, titanFactory, fortressFactory, - reconstructor, repairPoint, commandCenter; - - @Override - public void load(){ - spiritFactory = new UnitFactory("spirit-factory"){{ - type = UnitTypes.spirit; - produceTime = 5700; - size = 2; - consumes.power(0.08f); - consumes.items(new ItemStack(Items.silicon, 30), new ItemStack(Items.lead, 30)); - }}; - - phantomFactory = new UnitFactory("phantom-factory"){{ - type = UnitTypes.phantom; - produceTime = 7300; - size = 2; - consumes.power(0.2f); - consumes.items(new ItemStack(Items.silicon, 70), new ItemStack(Items.lead, 80), new ItemStack(Items.titanium, 80)); - }}; - - wraithFactory = new UnitFactory("wraith-factory"){{ - type = UnitTypes.wraith; - produceTime = 1800; - size = 2; - consumes.power(0.1f); - consumes.items(new ItemStack(Items.silicon, 10), new ItemStack(Items.titanium, 10)); - }}; - - ghoulFactory = new UnitFactory("ghoul-factory"){{ - type = UnitTypes.ghoul; - produceTime = 3600; - size = 3; - consumes.power(0.2f); - consumes.items(new ItemStack(Items.silicon, 30), new ItemStack(Items.titanium, 30), new ItemStack(Items.plastanium, 20)); - }}; - - revenantFactory = new UnitFactory("revenant-factory"){{ - type = UnitTypes.revenant; - produceTime = 8000; - size = 4; - consumes.power(0.3f); - consumes.items(new ItemStack(Items.silicon, 80), new ItemStack(Items.titanium, 80), new ItemStack(Items.plastanium, 50)); - }}; - - daggerFactory = new UnitFactory("dagger-factory"){{ - type = UnitTypes.dagger; - produceTime = 1700; - size = 2; - consumes.power(0.05f); - consumes.items(new ItemStack(Items.silicon, 10)); - }}; - - titanFactory = new UnitFactory("titan-factory"){{ - type = UnitTypes.titan; - produceTime = 3400; - size = 3; - consumes.power(0.15f); - consumes.items(new ItemStack(Items.silicon, 20), new ItemStack(Items.thorium, 30)); - }}; - - fortressFactory = new UnitFactory("fortress-factory"){{ - type = UnitTypes.fortress; - produceTime = 5000; - size = 3; - consumes.power(0.2f); - consumes.items(new ItemStack(Items.silicon, 40), new ItemStack(Items.thorium, 50)); - }}; - - repairPoint = new RepairPoint("repair-point"){{ - repairSpeed = 0.1f; - }}; - - reconstructor = new Reconstructor("reconstructor"){{ - size = 2; - }}; - - commandCenter = new CommandCenter("command-center"){{ - size = 2; - }}; - } -} diff --git a/core/src/io/anuke/mindustry/content/blocks/UpgradeBlocks.java b/core/src/io/anuke/mindustry/content/blocks/UpgradeBlocks.java deleted file mode 100644 index 359033c45e..0000000000 --- a/core/src/io/anuke/mindustry/content/blocks/UpgradeBlocks.java +++ /dev/null @@ -1,61 +0,0 @@ -package io.anuke.mindustry.content.blocks; - -import io.anuke.mindustry.content.Mechs; -import io.anuke.mindustry.world.Block; -import io.anuke.mindustry.world.blocks.units.MechPad; - -public class UpgradeBlocks extends BlockList{ - public static Block alphaPad, deltaPad, tauPad, omegaPad, dartPad, javelinPad, tridentPad, glaivePad; - - @Override - public void load(){ - - alphaPad = new MechPad("alpha-mech-pad"){{ - mech = Mechs.alpha; - size = 2; - consumes.powerBuffered(50f); - }}; - - deltaPad = new MechPad("delta-mech-pad"){{ - mech = Mechs.delta; - size = 2; - consumes.powerBuffered(70f); - }}; - - tauPad = new MechPad("tau-mech-pad"){{ - mech = Mechs.tau; - size = 2; - consumes.powerBuffered(100f); - }}; - - omegaPad = new MechPad("omega-mech-pad"){{ - mech = Mechs.omega; - size = 3; - consumes.powerBuffered(120f); - }}; - - dartPad = new MechPad("dart-ship-pad"){{ - mech = Mechs.dart; - size = 2; - consumes.powerBuffered(50f); - }}; - - javelinPad = new MechPad("javelin-ship-pad"){{ - mech = Mechs.javelin; - size = 2; - consumes.powerBuffered(80f); - }}; - - tridentPad = new MechPad("trident-ship-pad"){{ - mech = Mechs.trident; - size = 2; - consumes.powerBuffered(100f); - }}; - - glaivePad = new MechPad("glaive-ship-pad"){{ - mech = Mechs.glaive; - size = 3; - consumes.powerBuffered(120f); - }}; - } -} diff --git a/core/src/io/anuke/mindustry/core/ContentLoader.java b/core/src/io/anuke/mindustry/core/ContentLoader.java index bb7b015539..7f9091e0e7 100644 --- a/core/src/io/anuke/mindustry/core/ContentLoader.java +++ b/core/src/io/anuke/mindustry/core/ContentLoader.java @@ -6,7 +6,6 @@ import io.anuke.arc.collection.ObjectSet; import io.anuke.arc.function.Consumer; import io.anuke.arc.util.Log; import io.anuke.mindustry.content.*; -import io.anuke.mindustry.content.blocks.*; import io.anuke.mindustry.entities.Player; import io.anuke.mindustry.entities.bullet.Bullet; import io.anuke.mindustry.entities.bullet.BulletType; @@ -65,18 +64,6 @@ public class ContentLoader{ //blocks new Blocks(), - new DefenseBlocks(), - new DistributionBlocks(), - new ProductionBlocks(), - new TurretBlocks(), - new DebugBlocks(), - new LiquidBlocks(), - new StorageBlocks(), - new UnitBlocks(), - new PowerBlocks(), - new CraftingBlocks(), - new UpgradeBlocks(), - new OreBlocks(), //not really a content class, but this makes initialization easier new ColorMapper(), diff --git a/core/src/io/anuke/mindustry/core/NetServer.java b/core/src/io/anuke/mindustry/core/NetServer.java index 16f0b1185c..c942397815 100644 --- a/core/src/io/anuke/mindustry/core/NetServer.java +++ b/core/src/io/anuke/mindustry/core/NetServer.java @@ -22,7 +22,7 @@ import io.anuke.arc.util.Time; import io.anuke.arc.util.io.ByteBufferOutput; import io.anuke.arc.util.io.CountableByteArrayOutputStream; import io.anuke.mindustry.content.Mechs; -import io.anuke.mindustry.content.blocks.Blocks; +import io.anuke.mindustry.content.Blocks; import io.anuke.mindustry.core.GameState.State; import io.anuke.mindustry.entities.Player; import io.anuke.mindustry.entities.traits.BuilderTrait.BuildRequest; diff --git a/core/src/io/anuke/mindustry/core/World.java b/core/src/io/anuke/mindustry/core/World.java index 490ac28612..9fadff2f44 100644 --- a/core/src/io/anuke/mindustry/core/World.java +++ b/core/src/io/anuke/mindustry/core/World.java @@ -15,7 +15,7 @@ import io.anuke.arc.util.Tmp; import io.anuke.mindustry.ai.BlockIndexer; import io.anuke.mindustry.ai.Pathfinder; import io.anuke.mindustry.ai.WaveSpawner; -import io.anuke.mindustry.content.blocks.Blocks; +import io.anuke.mindustry.content.Blocks; import io.anuke.mindustry.core.GameState.State; import io.anuke.mindustry.game.EventType.TileChangeEvent; import io.anuke.mindustry.game.EventType.WorldLoadEvent; diff --git a/core/src/io/anuke/mindustry/editor/EditorTool.java b/core/src/io/anuke/mindustry/editor/EditorTool.java index 3693f03266..981fa88057 100644 --- a/core/src/io/anuke/mindustry/editor/EditorTool.java +++ b/core/src/io/anuke/mindustry/editor/EditorTool.java @@ -4,7 +4,7 @@ import io.anuke.arc.collection.IntArray; import io.anuke.arc.function.IntPositionConsumer; import io.anuke.arc.util.Pack; import io.anuke.arc.util.Structs; -import io.anuke.mindustry.content.blocks.Blocks; +import io.anuke.mindustry.content.Blocks; import io.anuke.mindustry.maps.MapTileData; import io.anuke.mindustry.maps.MapTileData.DataPosition; import io.anuke.mindustry.maps.MapTileData.TileDataMarker; diff --git a/core/src/io/anuke/mindustry/editor/MapEditor.java b/core/src/io/anuke/mindustry/editor/MapEditor.java index 369f9f6682..e7fee69dbd 100644 --- a/core/src/io/anuke/mindustry/editor/MapEditor.java +++ b/core/src/io/anuke/mindustry/editor/MapEditor.java @@ -5,7 +5,7 @@ import io.anuke.arc.math.Mathf; import io.anuke.arc.util.Pack; import io.anuke.arc.util.Structs; import io.anuke.mindustry.Vars; -import io.anuke.mindustry.content.blocks.Blocks; +import io.anuke.mindustry.content.Blocks; import io.anuke.mindustry.editor.DrawOperation.TileOperation; import io.anuke.mindustry.game.Team; import io.anuke.mindustry.maps.MapTileData; diff --git a/core/src/io/anuke/mindustry/editor/MapEditorDialog.java b/core/src/io/anuke/mindustry/editor/MapEditorDialog.java index 8f3818e5f1..0d413c84cf 100644 --- a/core/src/io/anuke/mindustry/editor/MapEditorDialog.java +++ b/core/src/io/anuke/mindustry/editor/MapEditorDialog.java @@ -18,7 +18,7 @@ import io.anuke.arc.scene.ui.layout.Unit; import io.anuke.arc.scene.utils.UIUtils; import io.anuke.arc.util.*; import io.anuke.mindustry.Vars; -import io.anuke.mindustry.content.blocks.StorageBlocks; +import io.anuke.mindustry.content.Blocks; import io.anuke.mindustry.core.Platform; import io.anuke.mindustry.game.Team; import io.anuke.mindustry.io.MapIO; @@ -521,7 +521,7 @@ public class MapEditorDialog extends Dialog implements Disposable{ for(Block block : Vars.content.blocks()){ TextureRegion[] regions = block.getCompactIcon(); if((block.synthetic() && (Recipe.getByResult(block) == null || !control.unlocks.isUnlocked(Recipe.getByResult(block)))) - && block != StorageBlocks.core){ + && block != Blocks.core){ continue; } diff --git a/core/src/io/anuke/mindustry/entities/Unit.java b/core/src/io/anuke/mindustry/entities/Unit.java index de4427b37a..8a10379838 100644 --- a/core/src/io/anuke/mindustry/entities/Unit.java +++ b/core/src/io/anuke/mindustry/entities/Unit.java @@ -15,7 +15,7 @@ import io.anuke.arc.math.geom.Geometry; import io.anuke.arc.math.geom.Rectangle; import io.anuke.arc.math.geom.Vector2; import io.anuke.arc.util.Time; -import io.anuke.mindustry.content.blocks.Blocks; +import io.anuke.mindustry.content.Blocks; import io.anuke.mindustry.entities.traits.*; import io.anuke.mindustry.game.Team; import io.anuke.mindustry.game.Teams.TeamData; diff --git a/core/src/io/anuke/mindustry/entities/effect/Puddle.java b/core/src/io/anuke/mindustry/entities/effect/Puddle.java index 167d6f08e9..8ca9022031 100644 --- a/core/src/io/anuke/mindustry/entities/effect/Puddle.java +++ b/core/src/io/anuke/mindustry/entities/effect/Puddle.java @@ -19,7 +19,7 @@ import io.anuke.arc.util.Time; import io.anuke.arc.util.pooling.Pool.Poolable; import io.anuke.arc.util.pooling.Pools; import io.anuke.mindustry.content.Liquids; -import io.anuke.mindustry.content.blocks.Blocks; +import io.anuke.mindustry.content.Blocks; import io.anuke.mindustry.content.Bullets; import io.anuke.mindustry.content.Fx; import io.anuke.mindustry.entities.Units; diff --git a/core/src/io/anuke/mindustry/entities/traits/BuilderTrait.java b/core/src/io/anuke/mindustry/entities/traits/BuilderTrait.java index 73dedf309d..dc1f1ba96b 100644 --- a/core/src/io/anuke/mindustry/entities/traits/BuilderTrait.java +++ b/core/src/io/anuke/mindustry/entities/traits/BuilderTrait.java @@ -15,7 +15,7 @@ import io.anuke.arc.math.Mathf; import io.anuke.arc.math.geom.Vector2; import io.anuke.arc.util.Time; import io.anuke.mindustry.Vars; -import io.anuke.mindustry.content.blocks.Blocks; +import io.anuke.mindustry.content.Blocks; import io.anuke.mindustry.content.Fx; import io.anuke.mindustry.entities.Player; import io.anuke.mindustry.entities.TileEntity; diff --git a/core/src/io/anuke/mindustry/entities/units/types/Drone.java b/core/src/io/anuke/mindustry/entities/units/types/Drone.java index 7d6ffb133a..ea0458ab54 100644 --- a/core/src/io/anuke/mindustry/entities/units/types/Drone.java +++ b/core/src/io/anuke/mindustry/entities/units/types/Drone.java @@ -6,7 +6,7 @@ import io.anuke.arc.entities.EntityGroup; import io.anuke.arc.math.Mathf; import io.anuke.arc.math.geom.Geometry; import io.anuke.arc.util.Structs; -import io.anuke.mindustry.content.blocks.Blocks; +import io.anuke.mindustry.content.Blocks; import io.anuke.mindustry.entities.Player; import io.anuke.mindustry.entities.TileEntity; import io.anuke.mindustry.entities.Units; diff --git a/core/src/io/anuke/mindustry/game/ContentList.java b/core/src/io/anuke/mindustry/game/ContentList.java index 838777cb84..8fc59c8bf2 100644 --- a/core/src/io/anuke/mindustry/game/ContentList.java +++ b/core/src/io/anuke/mindustry/game/ContentList.java @@ -1,12 +1,7 @@ package io.anuke.mindustry.game; -import io.anuke.mindustry.type.ContentType; - /**Interface for a list of content to be loaded in {@link io.anuke.mindustry.core.ContentLoader}.*/ public interface ContentList{ /**This method should create all the content.*/ void load(); - - /**This method should return the type of content being loaded.*/ - ContentType type(); } diff --git a/core/src/io/anuke/mindustry/graphics/BlockRenderer.java b/core/src/io/anuke/mindustry/graphics/BlockRenderer.java index 680c007cfa..6a7e2a258b 100644 --- a/core/src/io/anuke/mindustry/graphics/BlockRenderer.java +++ b/core/src/io/anuke/mindustry/graphics/BlockRenderer.java @@ -8,7 +8,7 @@ import io.anuke.arc.graphics.Color; import io.anuke.arc.graphics.g2d.Draw; import io.anuke.arc.graphics.glutils.FrameBuffer; import io.anuke.arc.util.Tmp; -import io.anuke.mindustry.content.blocks.Blocks; +import io.anuke.mindustry.content.Blocks; import io.anuke.mindustry.game.EventType.TileChangeEvent; import io.anuke.mindustry.game.EventType.WorldLoadEvent; import io.anuke.mindustry.game.Team; diff --git a/core/src/io/anuke/mindustry/graphics/OverlayRenderer.java b/core/src/io/anuke/mindustry/graphics/OverlayRenderer.java index ed56e89b1c..84aebcb6eb 100644 --- a/core/src/io/anuke/mindustry/graphics/OverlayRenderer.java +++ b/core/src/io/anuke/mindustry/graphics/OverlayRenderer.java @@ -9,7 +9,7 @@ import io.anuke.arc.math.geom.Rectangle; import io.anuke.arc.math.geom.Vector2; import io.anuke.arc.util.Time; import io.anuke.arc.util.Tmp; -import io.anuke.mindustry.content.blocks.Blocks; +import io.anuke.mindustry.content.Blocks; import io.anuke.mindustry.entities.Player; import io.anuke.mindustry.game.Team; import io.anuke.mindustry.input.InputHandler; diff --git a/core/src/io/anuke/mindustry/input/DesktopInput.java b/core/src/io/anuke/mindustry/input/DesktopInput.java index 034a896272..84e23a5d00 100644 --- a/core/src/io/anuke/mindustry/input/DesktopInput.java +++ b/core/src/io/anuke/mindustry/input/DesktopInput.java @@ -7,7 +7,7 @@ import io.anuke.arc.graphics.g2d.Draw; import io.anuke.arc.graphics.g2d.Lines; import io.anuke.arc.graphics.g2d.TextureRegion; import io.anuke.arc.math.Mathf; -import io.anuke.mindustry.content.blocks.Blocks; +import io.anuke.mindustry.content.Blocks; import io.anuke.mindustry.core.GameState.State; import io.anuke.mindustry.entities.Player; import io.anuke.mindustry.graphics.Palette; diff --git a/core/src/io/anuke/mindustry/input/InputHandler.java b/core/src/io/anuke/mindustry/input/InputHandler.java index b10d48a36e..d349b52ec7 100644 --- a/core/src/io/anuke/mindustry/input/InputHandler.java +++ b/core/src/io/anuke/mindustry/input/InputHandler.java @@ -11,7 +11,7 @@ import io.anuke.arc.math.Mathf; import io.anuke.arc.math.geom.Vector2; import io.anuke.arc.scene.ui.layout.Table; import io.anuke.arc.util.Time; -import io.anuke.mindustry.content.blocks.Blocks; +import io.anuke.mindustry.content.Blocks; import io.anuke.mindustry.content.Fx; import io.anuke.mindustry.entities.Player; import io.anuke.mindustry.entities.effect.ItemTransfer; diff --git a/core/src/io/anuke/mindustry/input/MobileInput.java b/core/src/io/anuke/mindustry/input/MobileInput.java index e4fbee2f6e..0919175024 100644 --- a/core/src/io/anuke/mindustry/input/MobileInput.java +++ b/core/src/io/anuke/mindustry/input/MobileInput.java @@ -18,7 +18,7 @@ import io.anuke.arc.math.geom.Vector2; import io.anuke.arc.scene.ui.layout.Table; import io.anuke.arc.util.Align; import io.anuke.arc.util.Time; -import io.anuke.mindustry.content.blocks.Blocks; +import io.anuke.mindustry.content.Blocks; import io.anuke.mindustry.content.Fx; import io.anuke.mindustry.core.GameState.State; import io.anuke.mindustry.entities.Player; diff --git a/core/src/io/anuke/mindustry/io/MapIO.java b/core/src/io/anuke/mindustry/io/MapIO.java index 87e8c228ec..6a0ac1367f 100644 --- a/core/src/io/anuke/mindustry/io/MapIO.java +++ b/core/src/io/anuke/mindustry/io/MapIO.java @@ -8,8 +8,7 @@ import io.anuke.arc.graphics.Pixmap; import io.anuke.arc.graphics.Pixmap.Format; import io.anuke.arc.util.Pack; import io.anuke.arc.util.Structs; -import io.anuke.mindustry.content.blocks.Blocks; -import io.anuke.mindustry.content.blocks.StorageBlocks; +import io.anuke.mindustry.content.Blocks; import io.anuke.mindustry.game.Team; import io.anuke.mindustry.maps.Map; import io.anuke.mindustry.maps.MapMeta; @@ -96,7 +95,7 @@ public class MapIO{ } } - data.write(x, y, DataPosition.wall, StorageBlocks.core.id); + data.write(x, y, DataPosition.wall, Blocks.core.id); data.write(x, y, DataPosition.rotationTeam, Pack.byteByte((byte)0, (byte)Team.blue.ordinal())); } } diff --git a/core/src/io/anuke/mindustry/io/SaveFileVersion.java b/core/src/io/anuke/mindustry/io/SaveFileVersion.java index 73ad0f5ddb..f7e048f446 100644 --- a/core/src/io/anuke/mindustry/io/SaveFileVersion.java +++ b/core/src/io/anuke/mindustry/io/SaveFileVersion.java @@ -5,8 +5,7 @@ import io.anuke.arc.entities.Entities; import io.anuke.arc.entities.EntityGroup; import io.anuke.arc.entities.trait.Entity; import io.anuke.arc.util.Pack; -import io.anuke.mindustry.content.blocks.Blocks; -import io.anuke.mindustry.content.blocks.StorageBlocks; +import io.anuke.mindustry.content.Blocks; import io.anuke.mindustry.entities.traits.SaveTrait; import io.anuke.mindustry.entities.traits.TypeTrait; import io.anuke.mindustry.game.Content; @@ -134,7 +133,7 @@ public abstract class SaveFileVersion{ tile.entity.readConfig(stream); tile.entity.read(stream); - if(tile.block() == StorageBlocks.core){ + if(tile.block() == Blocks.core){ state.teams.get(t).cores.add(tile); } }else if(wallid == 0){ diff --git a/core/src/io/anuke/mindustry/maps/MapTileData.java b/core/src/io/anuke/mindustry/maps/MapTileData.java index 25398e561b..2948522b95 100644 --- a/core/src/io/anuke/mindustry/maps/MapTileData.java +++ b/core/src/io/anuke/mindustry/maps/MapTileData.java @@ -4,7 +4,7 @@ import io.anuke.arc.collection.IntIntMap; import io.anuke.arc.util.Pack; import io.anuke.arc.util.Structs; import io.anuke.mindustry.Vars; -import io.anuke.mindustry.content.blocks.Blocks; +import io.anuke.mindustry.content.Blocks; import io.anuke.mindustry.world.Block; import java.nio.ByteBuffer; diff --git a/core/src/io/anuke/mindustry/maps/SectorPresets.java b/core/src/io/anuke/mindustry/maps/SectorPresets.java index c60115e2e2..c6fd850b7b 100644 --- a/core/src/io/anuke/mindustry/maps/SectorPresets.java +++ b/core/src/io/anuke/mindustry/maps/SectorPresets.java @@ -2,14 +2,7 @@ package io.anuke.mindustry.maps; import io.anuke.arc.collection.Array; import io.anuke.arc.collection.GridMap; -import io.anuke.mindustry.content.Items; -import io.anuke.mindustry.content.Liquids; -import io.anuke.mindustry.content.Mechs; -import io.anuke.mindustry.content.UnitTypes; -import io.anuke.mindustry.content.blocks.CraftingBlocks; -import io.anuke.mindustry.content.blocks.ProductionBlocks; -import io.anuke.mindustry.content.blocks.UnitBlocks; -import io.anuke.mindustry.content.blocks.UpgradeBlocks; +import io.anuke.mindustry.content.*; import io.anuke.mindustry.entities.units.UnitCommand; import io.anuke.mindustry.maps.missions.*; import io.anuke.mindustry.type.Item; @@ -30,9 +23,9 @@ public class SectorPresets{ //command center mission add(new SectorPreset(0, 1, Array.ofRecursive( - Missions.blockRecipe(UnitBlocks.daggerFactory), + Missions.blockRecipe(Blocks.daggerFactory), new UnitMission(UnitTypes.dagger), - Missions.blockRecipe(UnitBlocks.commandCenter), + Missions.blockRecipe(Blocks.commandCenter), new CommandMission(UnitCommand.retreat), new CommandMission(UnitCommand.attack), new BattleMission() @@ -42,7 +35,7 @@ public class SectorPresets{ //pad mission add(new SectorPreset(0, -2, Array.ofRecursive( - Missions.blockRecipe(mobile ? UpgradeBlocks.alphaPad : UpgradeBlocks.dartPad), + Missions.blockRecipe(mobile ? Blocks.alphaPad : Blocks.dartPad), new MechMission(mobile ? Mechs.alpha : Mechs.dart), new WaveMission(15) ), @@ -51,10 +44,10 @@ public class SectorPresets{ //oil mission add(new SectorPreset(-2, 0, Array.ofRecursive( - Missions.blockRecipe(ProductionBlocks.cultivator), - Missions.blockRecipe(ProductionBlocks.waterExtractor), + Missions.blockRecipe(Blocks.cultivator), + Missions.blockRecipe(Blocks.waterExtractor), new ContentMission(Items.biomatter), - Missions.blockRecipe(CraftingBlocks.biomatterCompressor), + Missions.blockRecipe(Blocks.biomatterCompressor), new ContentMission(Liquids.oil), new BattleMission() ), diff --git a/core/src/io/anuke/mindustry/maps/TutorialSector.java b/core/src/io/anuke/mindustry/maps/TutorialSector.java index 436f0678c2..8d9f81b4db 100644 --- a/core/src/io/anuke/mindustry/maps/TutorialSector.java +++ b/core/src/io/anuke/mindustry/maps/TutorialSector.java @@ -1,11 +1,8 @@ package io.anuke.mindustry.maps; import io.anuke.arc.collection.Array; +import io.anuke.mindustry.content.Blocks; import io.anuke.mindustry.content.Items; -import io.anuke.mindustry.content.blocks.CraftingBlocks; -import io.anuke.mindustry.content.blocks.ProductionBlocks; -import io.anuke.mindustry.content.blocks.StorageBlocks; -import io.anuke.mindustry.content.blocks.UnitBlocks; import io.anuke.mindustry.maps.missions.BlockMission; import io.anuke.mindustry.maps.missions.ItemMission; import io.anuke.mindustry.maps.missions.Mission; @@ -92,12 +89,12 @@ public class TutorialSector{ //intentionally unlocalized new ItemMission(Items.copper, 50).setMessage("An updated tutorial will return next build.\nFor now, you'll have to deal with... this."), - new BlockMission(ProductionBlocks.mechanicalDrill), + new BlockMission(Blocks.mechanicalDrill), new ItemMission(Items.copper, 100), new ItemMission(Items.lead, 50), - new BlockMission(CraftingBlocks.smelter), + new BlockMission(Blocks.smelter), new ItemMission(Items.densealloy, 10), new WaveMission(5) ); @@ -109,9 +106,9 @@ public class TutorialSector{ private static void generateBase(){ int x = sectorSize - 50, y = sectorSize - 50; - world.setBlock(world.tile(x, y), StorageBlocks.core, waveTeam); - world.setBlock(world.tile(x - 1, y + 2), UnitBlocks.daggerFactory, waveTeam); - world.setBlock(world.tile(x - 1, y - 3), UnitBlocks.daggerFactory, waveTeam); + world.setBlock(world.tile(x, y), Blocks.core, waveTeam); + world.setBlock(world.tile(x - 1, y + 2), Blocks.daggerFactory, waveTeam); + world.setBlock(world.tile(x - 1, y - 3), Blocks.daggerFactory, waveTeam); //since placed() is not called here, add core manually state.teams.get(waveTeam).cores.add(world.tile(x, y)); diff --git a/core/src/io/anuke/mindustry/maps/generation/FortressGenerator.java b/core/src/io/anuke/mindustry/maps/generation/FortressGenerator.java index 2c3449ca0e..bfd360bcf8 100644 --- a/core/src/io/anuke/mindustry/maps/generation/FortressGenerator.java +++ b/core/src/io/anuke/mindustry/maps/generation/FortressGenerator.java @@ -9,9 +9,9 @@ import io.anuke.arc.function.TriFunction; import io.anuke.arc.math.Mathf; import io.anuke.arc.math.geom.Geometry; import io.anuke.arc.math.geom.Point2; +import io.anuke.mindustry.content.Blocks; import io.anuke.mindustry.content.Items; import io.anuke.mindustry.content.Liquids; -import io.anuke.mindustry.content.blocks.*; import io.anuke.mindustry.game.Team; import io.anuke.mindustry.type.Recipe; import io.anuke.mindustry.world.Block; @@ -54,7 +54,7 @@ public class FortressGenerator{ } void gen(){ - gen.setBlock(enemyX, enemyY, StorageBlocks.core, team); + gen.setBlock(enemyX, enemyY, Blocks.core, team); gen.random.nextBoolean(); float difficultyScl = Mathf.clamp(gen.sector.difficulty / 20f + gen.random.range(0.25f), 0f, 0.9999f); @@ -109,25 +109,25 @@ public class FortressGenerator{ Array passes = Array.with( //initial seeding solar panels - placer.get(PowerBlocks.largeSolarPanel, 0.001f), + placer.get(Blocks.largeSolarPanel, 0.001f), //extra seeding - seeder.get(PowerBlocks.solarPanel, tile -> tile.block() == PowerBlocks.largeSolarPanel && gen.random.chance(0.3)), + seeder.get(Blocks.solarPanel, tile -> tile.block() == Blocks.largeSolarPanel && gen.random.chance(0.3)), //coal gens - seeder.get(PowerBlocks.combustionGenerator, tile -> tile.block() instanceof SolarGenerator && gen.random.chance(0.2)), + seeder.get(Blocks.combustionGenerator, tile -> tile.block() instanceof SolarGenerator && gen.random.chance(0.2)), //water extractors - seeder.get(ProductionBlocks.waterExtractor, tile -> tile.block() instanceof NuclearReactor && gen.random.chance(0.5)), + seeder.get(Blocks.waterExtractor, tile -> tile.block() instanceof NuclearReactor && gen.random.chance(0.5)), //mend projectors - seeder.get(DefenseBlocks.mendProjector, tile -> tile.block() instanceof PowerGenerator && gen.random.chance(0.04)), + seeder.get(Blocks.mendProjector, tile -> tile.block() instanceof PowerGenerator && gen.random.chance(0.04)), //power turrets seeder.get(powerTurret, tile -> tile.block() instanceof PowerGenerator && gen.random.chance(0.04)), //repair point - seeder.get(UnitBlocks.repairPoint, tile -> tile.block() instanceof PowerGenerator && gen.random.chance(0.1)), + seeder.get(Blocks.repairPoint, tile -> tile.block() instanceof PowerGenerator && gen.random.chance(0.1)), //turrets1 seeder.get(turret1, tile -> tile.block() instanceof PowerBlock && gen.random.chance(0.22 - turret1.size*0.02)), @@ -136,22 +136,22 @@ public class FortressGenerator{ seeder.get(turret2, tile -> tile.block() instanceof PowerBlock && gen.random.chance(0.12 - turret2.size*0.02)), //shields - seeder.get(DefenseBlocks.forceProjector, tile -> (tile.block() instanceof CoreBlock || tile.block() instanceof UnitFactory) && gen.random.chance(0.2 * dscl2)), + seeder.get(Blocks.forceProjector, tile -> (tile.block() instanceof CoreBlock || tile.block() instanceof UnitFactory) && gen.random.chance(0.2 * dscl2)), //unit pads (assorted) - seeder.get(UnitBlocks.daggerFactory, tile -> (tile.block() instanceof MendProjector || tile.block() instanceof ForceProjector) && gen.random.chance(0.3 * dscl2)), + seeder.get(Blocks.daggerFactory, tile -> (tile.block() instanceof MendProjector || tile.block() instanceof ForceProjector) && gen.random.chance(0.3 * dscl2)), //unit pads (assorted) - seeder.get(UnitBlocks.wraithFactory, tile -> (tile.block() instanceof MendProjector || tile.block() instanceof ForceProjector) && gen.random.chance(0.3 * dscl2)), + seeder.get(Blocks.wraithFactory, tile -> (tile.block() instanceof MendProjector || tile.block() instanceof ForceProjector) && gen.random.chance(0.3 * dscl2)), //unit pads (assorted) - seeder.get(UnitBlocks.titanFactory, tile -> (tile.block() instanceof MendProjector || tile.block() instanceof ForceProjector) && gen.random.chance(0.23 * dscl2)), + seeder.get(Blocks.titanFactory, tile -> (tile.block() instanceof MendProjector || tile.block() instanceof ForceProjector) && gen.random.chance(0.23 * dscl2)), //unit pads (assorted) - seeder.get(UnitBlocks.ghoulFactory, tile -> (tile.block() instanceof MendProjector || tile.block() instanceof ForceProjector) && gen.random.chance(0.23 * dscl2)), + seeder.get(Blocks.ghoulFactory, tile -> (tile.block() instanceof MendProjector || tile.block() instanceof ForceProjector) && gen.random.chance(0.23 * dscl2)), //vaults - seeder.get(StorageBlocks.vault, tile -> (tile.block() instanceof CoreBlock || tile.block() instanceof ForceProjector) && gen.random.chance(0.4)), + seeder.get(Blocks.vault, tile -> (tile.block() instanceof CoreBlock || tile.block() instanceof ForceProjector) && gen.random.chance(0.4)), //big turrets seeder.get(bigTurret, tile -> tile.block() instanceof StorageBlock && gen.random.chance(0.65)), @@ -173,7 +173,7 @@ public class FortressGenerator{ }, //mines - placer.get(DefenseBlocks.shockMine, 0.02f * difficultyScl), + placer.get(Blocks.shockMine, 0.02f * difficultyScl), //fill up turrets w/ ammo (x, y) -> { diff --git a/core/src/io/anuke/mindustry/maps/generation/WorldGenerator.java b/core/src/io/anuke/mindustry/maps/generation/WorldGenerator.java index d397cd83c5..7b3e5b8796 100644 --- a/core/src/io/anuke/mindustry/maps/generation/WorldGenerator.java +++ b/core/src/io/anuke/mindustry/maps/generation/WorldGenerator.java @@ -11,9 +11,7 @@ import io.anuke.arc.util.Structs; import io.anuke.arc.util.noise.RidgedPerlin; import io.anuke.arc.util.noise.Simplex; import io.anuke.mindustry.content.Items; -import io.anuke.mindustry.content.blocks.Blocks; -import io.anuke.mindustry.content.blocks.OreBlocks; -import io.anuke.mindustry.content.blocks.StorageBlocks; +import io.anuke.mindustry.content.Blocks; import io.anuke.mindustry.game.Team; import io.anuke.mindustry.maps.Map; import io.anuke.mindustry.maps.MapTileData; @@ -191,10 +189,10 @@ public class WorldGenerator{ } } - world.setBlock(tiles[spawns.get(0).x][spawns.get(0).y], StorageBlocks.core, Team.blue); + world.setBlock(tiles[spawns.get(0).x][spawns.get(0).y], Blocks.core, Team.blue); if(state.mode.isPvp){ - world.setBlock(tiles[spawns.get(1).x][spawns.get(1).y], StorageBlocks.core, Team.red); + world.setBlock(tiles[spawns.get(1).x][spawns.get(1).y], Blocks.core, Team.red); } world.endMapLoad(); @@ -237,7 +235,7 @@ public class WorldGenerator{ if(entry.noise.octaveNoise2D(1, 0.7, 1f / (4 + i * 2), x, y) / 4f + Math.abs(0.5f - entry.noise.octaveNoise2D(2, 0.7, 1f / (50 + i * 2), x, y)) > 0.48f && Math.abs(0.5f - entry.noise.octaveNoise2D(1, 1, 1f / (55 + i * 4), x, y)) > 0.22f){ - tile.setFloor((Floor) OreBlocks.get(tile.floor(), entry.item)); + tile.setFloor((Floor) OreBlock.get(tile.floor(), entry.item)); break; } } @@ -393,7 +391,7 @@ public class WorldGenerator{ Item entry = ores.get(i); if(Math.abs(0.5f - sim.octaveNoise2D(2, 0.7, 1f / (50 + i * 2), offsetX, offsetY)) > 0.23f && Math.abs(0.5f - sim2.octaveNoise2D(1, 1, 1f / (40 + i * 4), offsetX, offsetY)) > 0.32f){ - floor = OreBlocks.get(floor, entry); + floor = OreBlock.get(floor, entry); break; } } diff --git a/core/src/io/anuke/mindustry/maps/missions/MissionWithStartingCore.java b/core/src/io/anuke/mindustry/maps/missions/MissionWithStartingCore.java index 24a086d02a..a8d21a0633 100644 --- a/core/src/io/anuke/mindustry/maps/missions/MissionWithStartingCore.java +++ b/core/src/io/anuke/mindustry/maps/missions/MissionWithStartingCore.java @@ -2,7 +2,7 @@ package io.anuke.mindustry.maps.missions; import io.anuke.arc.math.geom.Point2; import io.anuke.arc.collection.Array; -import io.anuke.mindustry.content.blocks.StorageBlocks; +import io.anuke.mindustry.content.Blocks; import io.anuke.mindustry.game.Team; import io.anuke.mindustry.maps.generation.Generation; import io.anuke.mindustry.world.Tile; @@ -39,7 +39,7 @@ public abstract class MissionWithStartingCore extends Mission{ } Tile startingCoreTile = gen.tiles[spawnPoints.first().x][spawnPoints.first().y]; - startingCoreTile.setBlock(StorageBlocks.core); + startingCoreTile.setBlock(Blocks.core); startingCoreTile.setTeam(team); state.teams.get(team).cores.add(startingCoreTile); diff --git a/core/src/io/anuke/mindustry/net/NetworkIO.java b/core/src/io/anuke/mindustry/net/NetworkIO.java index dc16abf908..659370dd32 100644 --- a/core/src/io/anuke/mindustry/net/NetworkIO.java +++ b/core/src/io/anuke/mindustry/net/NetworkIO.java @@ -6,7 +6,7 @@ import io.anuke.arc.collection.ObjectMap.Entry; import io.anuke.arc.entities.Entities; import io.anuke.arc.util.Pack; import io.anuke.arc.util.Time; -import io.anuke.mindustry.content.blocks.Blocks; +import io.anuke.mindustry.content.Blocks; import io.anuke.mindustry.entities.Player; import io.anuke.mindustry.game.GameMode; import io.anuke.mindustry.game.Team; diff --git a/core/src/io/anuke/mindustry/ui/fragments/BlockConfigFragment.java b/core/src/io/anuke/mindustry/ui/fragments/BlockConfigFragment.java index 3a0c43a706..6617701231 100644 --- a/core/src/io/anuke/mindustry/ui/fragments/BlockConfigFragment.java +++ b/core/src/io/anuke/mindustry/ui/fragments/BlockConfigFragment.java @@ -8,7 +8,7 @@ import io.anuke.arc.scene.Group; import io.anuke.arc.scene.actions.Actions; import io.anuke.arc.scene.ui.layout.Table; import io.anuke.arc.util.Align; -import io.anuke.mindustry.content.blocks.Blocks; +import io.anuke.mindustry.content.Blocks; import io.anuke.mindustry.core.GameState.State; import io.anuke.mindustry.input.InputHandler; import io.anuke.mindustry.world.Block; diff --git a/core/src/io/anuke/mindustry/world/Build.java b/core/src/io/anuke/mindustry/world/Build.java index 4f16b48e00..008eb1bd8b 100644 --- a/core/src/io/anuke/mindustry/world/Build.java +++ b/core/src/io/anuke/mindustry/world/Build.java @@ -6,7 +6,7 @@ import io.anuke.arc.math.Mathf; import io.anuke.arc.math.geom.Geometry; import io.anuke.arc.math.geom.Point2; import io.anuke.arc.math.geom.Rectangle; -import io.anuke.mindustry.content.blocks.Blocks; +import io.anuke.mindustry.content.Blocks; import io.anuke.mindustry.entities.Units; import io.anuke.mindustry.game.EventType.BlockBuildBeginEvent; import io.anuke.mindustry.game.Team; diff --git a/core/src/io/anuke/mindustry/world/ColorMapper.java b/core/src/io/anuke/mindustry/world/ColorMapper.java index 2ed01898b6..c8cbb56f5b 100644 --- a/core/src/io/anuke/mindustry/world/ColorMapper.java +++ b/core/src/io/anuke/mindustry/world/ColorMapper.java @@ -5,7 +5,6 @@ import io.anuke.arc.collection.ObjectIntMap; import io.anuke.arc.graphics.Color; import io.anuke.mindustry.game.ContentList; import io.anuke.mindustry.game.Team; -import io.anuke.mindustry.type.ContentType; import static io.anuke.mindustry.Vars.content; @@ -49,9 +48,4 @@ public class ColorMapper implements ContentList{ colorMap.put(block, color); } } - - @Override - public ContentType type(){ - return ContentType.block; - } } diff --git a/core/src/io/anuke/mindustry/world/LegacyColorMapper.java b/core/src/io/anuke/mindustry/world/LegacyColorMapper.java index cafed297fe..794133e047 100644 --- a/core/src/io/anuke/mindustry/world/LegacyColorMapper.java +++ b/core/src/io/anuke/mindustry/world/LegacyColorMapper.java @@ -2,12 +2,11 @@ package io.anuke.mindustry.world; import io.anuke.arc.collection.IntMap; import io.anuke.arc.graphics.Color; +import io.anuke.mindustry.content.Blocks; import io.anuke.mindustry.content.Items; -import io.anuke.mindustry.content.blocks.Blocks; -import io.anuke.mindustry.content.blocks.OreBlocks; import io.anuke.mindustry.game.ContentList; -import io.anuke.mindustry.type.ContentType; import io.anuke.mindustry.world.blocks.Floor; +import io.anuke.mindustry.world.blocks.OreBlock; public class LegacyColorMapper implements ContentList{ private static IntMap blockMap = new IntMap<>(); @@ -39,15 +38,10 @@ public class LegacyColorMapper implements ContentList{ map("6e501e", Blocks.dirt, 0); map("ed5334", Blocks.lava, 0); map("292929", Blocks.tar, 0); - map("c3a490", OreBlocks.get(Blocks.stone, Items.copper), 0); - map("161616", OreBlocks.get(Blocks.stone, Items.coal), 0); - map("6277bc", OreBlocks.get(Blocks.stone, Items.titanium), 0); - map("83bc58", OreBlocks.get(Blocks.stone, Items.thorium), 0); - } - - @Override - public ContentType type(){ - return ContentType.block; + map("c3a490", OreBlock.get(Blocks.stone, Items.copper), 0); + map("161616", OreBlock.get(Blocks.stone, Items.coal), 0); + map("6277bc", OreBlock.get(Blocks.stone, Items.titanium), 0); + map("83bc58", OreBlock.get(Blocks.stone, Items.thorium), 0); } private void map(String color, Block block, int elevation){ diff --git a/core/src/io/anuke/mindustry/world/Tile.java b/core/src/io/anuke/mindustry/world/Tile.java index 976b0f0310..f857dc6367 100644 --- a/core/src/io/anuke/mindustry/world/Tile.java +++ b/core/src/io/anuke/mindustry/world/Tile.java @@ -7,7 +7,7 @@ import io.anuke.arc.math.geom.Point2; import io.anuke.arc.math.geom.Position; import io.anuke.arc.math.geom.Vector2; import io.anuke.arc.util.Pack; -import io.anuke.mindustry.content.blocks.Blocks; +import io.anuke.mindustry.content.Blocks; import io.anuke.mindustry.entities.TileEntity; import io.anuke.mindustry.entities.traits.TargetTrait; import io.anuke.mindustry.game.Team; diff --git a/core/src/io/anuke/mindustry/world/blocks/OreBlock.java b/core/src/io/anuke/mindustry/world/blocks/OreBlock.java index ec04c1ade7..4eb4687cca 100644 --- a/core/src/io/anuke/mindustry/world/blocks/OreBlock.java +++ b/core/src/io/anuke/mindustry/world/blocks/OreBlock.java @@ -1,13 +1,17 @@ package io.anuke.mindustry.world.blocks; +import io.anuke.arc.collection.ObjectMap; +import io.anuke.arc.graphics.g2d.Draw; import io.anuke.arc.graphics.g2d.TextureRegion; +import io.anuke.arc.math.Mathf; import io.anuke.mindustry.type.Item; import io.anuke.mindustry.type.ItemStack; +import io.anuke.mindustry.world.Block; import io.anuke.mindustry.world.Tile; -import io.anuke.arc.graphics.g2d.Draw; -import io.anuke.arc.math.Mathf; public class OreBlock extends Floor{ + private static final ObjectMap> oreBlockMap = new ObjectMap<>(); + public Floor base; public OreBlock(Item ore, Floor base){ @@ -18,6 +22,8 @@ public class OreBlock extends Floor{ this.variants = 3; this.minimapColor = ore.color; this.edge = base.name; + + oreBlockMap.getOr(ore, ObjectMap::new).put(base, this); } @Override @@ -47,4 +53,10 @@ public class OreBlock extends Floor{ base.drawEdges(tile, true); } + public static Block get(Block floor, Item item){ + if(!oreBlockMap.containsKey(item)) throw new IllegalArgumentException("Item '" + item + "' is not an ore!"); + if(!oreBlockMap.get(item).containsKey(floor)) + throw new IllegalArgumentException("Block '" + floor.name + "' does not support ores!"); + return oreBlockMap.get(item).get(floor); + } } diff --git a/core/src/io/anuke/mindustry/world/blocks/production/Cultivator.java b/core/src/io/anuke/mindustry/world/blocks/production/Cultivator.java index e900b092d5..323586d846 100644 --- a/core/src/io/anuke/mindustry/world/blocks/production/Cultivator.java +++ b/core/src/io/anuke/mindustry/world/blocks/production/Cultivator.java @@ -9,7 +9,7 @@ import io.anuke.arc.math.Mathf; import io.anuke.arc.math.RandomXS128; import io.anuke.arc.util.Time; import io.anuke.mindustry.content.Items; -import io.anuke.mindustry.content.blocks.Blocks; +import io.anuke.mindustry.content.Blocks; import io.anuke.mindustry.content.Fx; import io.anuke.mindustry.entities.TileEntity; import io.anuke.mindustry.type.Item; diff --git a/core/src/io/anuke/mindustry/world/blocks/sandbox/ItemSource.java b/core/src/io/anuke/mindustry/world/blocks/sandbox/ItemSource.java new file mode 100644 index 0000000000..dfb1aee3a7 --- /dev/null +++ b/core/src/io/anuke/mindustry/world/blocks/sandbox/ItemSource.java @@ -0,0 +1,34 @@ +package io.anuke.mindustry.world.blocks.sandbox; + +import io.anuke.mindustry.type.Item; +import io.anuke.mindustry.world.Block; +import io.anuke.mindustry.world.Tile; +import io.anuke.mindustry.world.blocks.distribution.Sorter.SorterEntity; + +public class ItemSource extends Block{ + + public ItemSource(String name){ + super(name); + hasItems = true; + } + + @Override + public boolean outputsItems(){ + return true; + } + + @Override + public void update(Tile tile){ + SorterEntity entity = tile.entity(); + if(entity.sortItem == null) return; + + entity.items.set(entity.sortItem, 1); + tryDump(tile, entity.sortItem); + entity.items.set(entity.sortItem, 0); + } + + @Override + public boolean acceptItem(Item item, Tile tile, Tile source){ + return false; + } +} diff --git a/core/src/io/anuke/mindustry/world/blocks/sandbox/ItemVoid.java b/core/src/io/anuke/mindustry/world/blocks/sandbox/ItemVoid.java new file mode 100644 index 0000000000..aa4d55371b --- /dev/null +++ b/core/src/io/anuke/mindustry/world/blocks/sandbox/ItemVoid.java @@ -0,0 +1,21 @@ +package io.anuke.mindustry.world.blocks.sandbox; + +import io.anuke.mindustry.type.Item; +import io.anuke.mindustry.world.Block; +import io.anuke.mindustry.world.Tile; + +public class ItemVoid extends Block{ + + public ItemVoid(String name){ + super(name); + update = solid = true; + } + + @Override + public void handleItem(Item item, Tile tile, Tile source){} + + @Override + public boolean acceptItem(Item item, Tile tile, Tile source){ + return true; + } +} diff --git a/core/src/io/anuke/mindustry/world/blocks/sandbox/LiquidSource.java b/core/src/io/anuke/mindustry/world/blocks/sandbox/LiquidSource.java new file mode 100644 index 0000000000..dba3df94e6 --- /dev/null +++ b/core/src/io/anuke/mindustry/world/blocks/sandbox/LiquidSource.java @@ -0,0 +1,105 @@ +package io.anuke.mindustry.world.blocks.sandbox; + +import io.anuke.annotations.Annotations.Loc; +import io.anuke.annotations.Annotations.Remote; +import io.anuke.arc.collection.Array; +import io.anuke.arc.graphics.g2d.Draw; +import io.anuke.arc.scene.ui.ButtonGroup; +import io.anuke.arc.scene.ui.ImageButton; +import io.anuke.arc.scene.ui.layout.Table; +import io.anuke.mindustry.content.Liquids; +import io.anuke.mindustry.entities.Player; +import io.anuke.mindustry.entities.TileEntity; +import io.anuke.mindustry.type.Liquid; +import io.anuke.mindustry.world.Block; +import io.anuke.mindustry.world.Tile; +import io.anuke.mindustry.gen.Call; + +import java.io.DataInput; +import java.io.DataOutput; +import java.io.IOException; + +import static io.anuke.mindustry.Vars.content; +import static io.anuke.mindustry.Vars.control; + +public class LiquidSource extends Block{ + + public LiquidSource(String name){ + super(name); + update = true; + solid = true; + hasLiquids = true; + liquidCapacity = 100f; + configurable = true; + outputsLiquid = true; + } + + @Override + public void update(Tile tile){ + LiquidSourceEntity entity = tile.entity(); + + tile.entity.liquids.add(entity.source, liquidCapacity); + tryDumpLiquid(tile, entity.source); + } + + @Override + public void draw(Tile tile){ + super.draw(tile); + + LiquidSourceEntity entity = tile.entity(); + + Draw.color(entity.source.color); + Draw.rect("blank", tile.worldx(), tile.worldy(), 4f, 4f); + Draw.color(); + } + + @Override + public void buildTable(Tile tile, Table table){ + LiquidSourceEntity entity = tile.entity(); + + Array items = content.liquids(); + + ButtonGroup group = new ButtonGroup<>(); + Table cont = new Table(); + + for(int i = 0; i < items.size; i++){ + if(!control.unlocks.isUnlocked(items.get(i))) continue; + + final int f = i; + ImageButton button = cont.addImageButton("liquid-icon-" + items.get(i).name, "clear-toggle", 24, + () -> Call.setLiquidSourceLiquid(null, tile, items.get(f))).size(38).group(group).get(); + button.setChecked(entity.source.id == f); + + if(i % 4 == 3){ + cont.row(); + } + } + + table.add(cont); + } + + @Override + public TileEntity newEntity(){ + return new LiquidSourceEntity(); + } + + @Remote(targets = Loc.both, called = Loc.both, forward = true) + public static void setLiquidSourceLiquid(Player player, Tile tile, Liquid liquid){ + LiquidSourceEntity entity = tile.entity(); + entity.source = liquid; + } + + class LiquidSourceEntity extends TileEntity{ + public Liquid source = Liquids.water; + + @Override + public void writeConfig(DataOutput stream) throws IOException{ + stream.writeByte(source.id); + } + + @Override + public void readConfig(DataInput stream) throws IOException{ + source = content.liquid(stream.readByte()); + } + } +} diff --git a/core/src/io/anuke/mindustry/world/blocks/sandbox/PowerSource.java b/core/src/io/anuke/mindustry/world/blocks/sandbox/PowerSource.java new file mode 100644 index 0000000000..9c95ccd689 --- /dev/null +++ b/core/src/io/anuke/mindustry/world/blocks/sandbox/PowerSource.java @@ -0,0 +1,20 @@ +package io.anuke.mindustry.world.blocks.sandbox; + +import io.anuke.mindustry.world.Tile; +import io.anuke.mindustry.world.blocks.power.PowerNode; + +public class PowerSource extends PowerNode{ + + public PowerSource(String name){ + super(name); + maxNodes = 100; + outputsPower = true; + consumesPower = false; + } + + @Override + public float getPowerProduction(Tile tile){ + return 10000f; + } + +} diff --git a/core/src/io/anuke/mindustry/world/blocks/sandbox/PowerVoid.java b/core/src/io/anuke/mindustry/world/blocks/sandbox/PowerVoid.java new file mode 100644 index 0000000000..549183c0be --- /dev/null +++ b/core/src/io/anuke/mindustry/world/blocks/sandbox/PowerVoid.java @@ -0,0 +1,18 @@ +package io.anuke.mindustry.world.blocks.sandbox; + +import io.anuke.mindustry.world.blocks.PowerBlock; +import io.anuke.mindustry.world.meta.BlockStat; + +public class PowerVoid extends PowerBlock{ + + public PowerVoid(String name){ + super(name); + consumes.power(Float.MAX_VALUE); + } + + @Override + public void init(){ + super.init(); + stats.remove(BlockStat.powerUse); + } +} diff --git a/tests/src/test/java/ApplicationTests.java b/tests/src/test/java/ApplicationTests.java index c13c7c7f25..268925d3bc 100644 --- a/tests/src/test/java/ApplicationTests.java +++ b/tests/src/test/java/ApplicationTests.java @@ -5,9 +5,9 @@ import io.anuke.arc.math.geom.Point2; import io.anuke.arc.util.Log; import io.anuke.arc.util.Time; import io.anuke.mindustry.Vars; +import io.anuke.mindustry.content.Blocks; import io.anuke.mindustry.content.Items; import io.anuke.mindustry.content.UnitTypes; -import io.anuke.mindustry.content.blocks.*; import io.anuke.mindustry.core.GameState.State; import io.anuke.mindustry.core.Logic; import io.anuke.mindustry.core.NetServer; @@ -142,12 +142,12 @@ public class ApplicationTests{ createMap(); int bx = 4; int by = 4; - world.setBlock(world.tile(bx, by), StorageBlocks.core, Team.blue); + world.setBlock(world.tile(bx, by), Blocks.core, Team.blue); assertEquals(world.tile(bx, by).getTeam(), Team.blue); for(int x = bx-1; x <= bx + 1; x++){ for(int y = by-1; y <= by + 1; y++){ if(x == bx && by == y){ - assertEquals(world.tile(x, y).block(), StorageBlocks.core); + assertEquals(world.tile(x, y).block(), Blocks.core); }else{ assertTrue(world.tile(x, y).block() == Blocks.blockpart && world.tile(x, y).getLinked() == world.tile(bx, by)); } @@ -204,9 +204,9 @@ public class ApplicationTests{ @Test void inventoryDeposit(){ - depositTest(CraftingBlocks.smelter, Items.copper); - depositTest(StorageBlocks.vault, Items.copper); - depositTest(PowerBlocks.thoriumReactor, Items.thorium); + depositTest(Blocks.smelter, Items.copper); + depositTest(Blocks.vault, Items.copper); + depositTest(Blocks.thoriumReactor, Items.thorium); } @Test @@ -231,14 +231,14 @@ public class ApplicationTests{ d1.set(10f, 20f); d2.set(10f, 20f); - d1.addBuildRequest(new BuildRequest(0, 0, 0, Recipe.getByResult(DefenseBlocks.copperWallLarge))); - d2.addBuildRequest(new BuildRequest(1, 1, 0, Recipe.getByResult(DefenseBlocks.copperWallLarge))); + d1.addBuildRequest(new BuildRequest(0, 0, 0, Recipe.getByResult(Blocks.copperWallLarge))); + d2.addBuildRequest(new BuildRequest(1, 1, 0, Recipe.getByResult(Blocks.copperWallLarge))); Time.setDeltaProvider(() -> 9999999f); d1.updateBuilding(d1); d2.updateBuilding(d2); - assertEquals(DefenseBlocks.copperWallLarge, world.tile(0, 0).block()); + assertEquals(Blocks.copperWallLarge, world.tile(0, 0).block()); assertEquals(Blocks.air, world.tile(2, 2).block()); assertEquals(Blocks.blockpart, world.tile(1, 1).block()); } @@ -253,7 +253,7 @@ public class ApplicationTests{ d1.set(10f, 20f); d2.set(10f, 20f); - d1.addBuildRequest(new BuildRequest(0, 0, 0, Recipe.getByResult(DefenseBlocks.copperWallLarge))); + d1.addBuildRequest(new BuildRequest(0, 0, 0, Recipe.getByResult(Blocks.copperWallLarge))); d2.addBuildRequest(new BuildRequest(1, 1)); Time.setDeltaProvider(() -> 3f); @@ -277,7 +277,7 @@ public class ApplicationTests{ createMap(); Tile core = world.tile(5, 5); - world.setBlock(core, StorageBlocks.core, Team.blue); + world.setBlock(core, Blocks.core, Team.blue); for(Item item : content.items()){ core.entity.items.set(item, 3000); } diff --git a/tests/src/test/java/power/PowerTestFixture.java b/tests/src/test/java/power/PowerTestFixture.java index 3c4e6e9327..38db7cc8a6 100644 --- a/tests/src/test/java/power/PowerTestFixture.java +++ b/tests/src/test/java/power/PowerTestFixture.java @@ -3,7 +3,7 @@ package power; import io.anuke.arc.math.Mathf; import io.anuke.arc.util.Time; import io.anuke.mindustry.Vars; -import io.anuke.mindustry.content.blocks.Blocks; +import io.anuke.mindustry.content.Blocks; import io.anuke.mindustry.core.ContentLoader; import io.anuke.mindustry.world.Block; import io.anuke.mindustry.world.Tile; From 351b8c24694afd9b4c62d101f2792fe68546a421 Mon Sep 17 00:00:00 2001 From: Anuken Date: Mon, 7 Jan 2019 18:48:55 -0500 Subject: [PATCH 6/6] Fixed content class errors --- .../{powerinfinite.png => power-source.png} | Bin .../power/{powervoid.png => power-void.png} | Bin .../{itemsource.png => item-source.png} | Bin .../{itemvoid.png => item-void.png} | Bin .../{liquidsource.png => liquid-source.png} | Bin core/assets/bundles/bundle.properties | 20 +- core/assets/bundles/bundle_cs.properties | 20 +- core/assets/bundles/bundle_de.properties | 20 +- core/assets/bundles/bundle_es.properties | 20 +- core/assets/bundles/bundle_fr.properties | 20 +- core/assets/bundles/bundle_fr_BE.properties | 20 +- core/assets/bundles/bundle_in_ID.properties | 20 +- core/assets/bundles/bundle_it.properties | 20 +- core/assets/bundles/bundle_ja.properties | 20 +- core/assets/bundles/bundle_ko.properties | 20 +- core/assets/bundles/bundle_pl.properties | 20 +- core/assets/bundles/bundle_pt_BR.properties | 20 +- core/assets/bundles/bundle_ru.properties | 20 +- core/assets/bundles/bundle_tk.properties | 20 +- core/assets/bundles/bundle_tr.properties | 20 +- core/assets/bundles/bundle_uk_UA.properties | 20 +- core/assets/bundles/bundle_zh_CN.properties | 20 +- core/assets/bundles/bundle_zh_TW.properties | 20 +- core/assets/sprites/sprites.atlas | 54 ++-- core/assets/sprites/sprites.png | Bin 345249 -> 345186 bytes .../io/anuke/mindustry/content/Blocks.java | 26 +- core/src/io/anuke/mindustry/content/Fx.java | 305 ++++++++++++++++++ .../mindustry/world/blocks/OreBlock.java | 3 +- 28 files changed, 535 insertions(+), 213 deletions(-) rename core/assets-raw/sprites/blocks/power/{powerinfinite.png => power-source.png} (100%) rename core/assets-raw/sprites/blocks/power/{powervoid.png => power-void.png} (100%) rename core/assets-raw/sprites/blocks/production/{itemsource.png => item-source.png} (100%) rename core/assets-raw/sprites/blocks/production/{itemvoid.png => item-void.png} (100%) rename core/assets-raw/sprites/blocks/production/{liquidsource.png => liquid-source.png} (100%) diff --git a/core/assets-raw/sprites/blocks/power/powerinfinite.png b/core/assets-raw/sprites/blocks/power/power-source.png similarity index 100% rename from core/assets-raw/sprites/blocks/power/powerinfinite.png rename to core/assets-raw/sprites/blocks/power/power-source.png diff --git a/core/assets-raw/sprites/blocks/power/powervoid.png b/core/assets-raw/sprites/blocks/power/power-void.png similarity index 100% rename from core/assets-raw/sprites/blocks/power/powervoid.png rename to core/assets-raw/sprites/blocks/power/power-void.png diff --git a/core/assets-raw/sprites/blocks/production/itemsource.png b/core/assets-raw/sprites/blocks/production/item-source.png similarity index 100% rename from core/assets-raw/sprites/blocks/production/itemsource.png rename to core/assets-raw/sprites/blocks/production/item-source.png diff --git a/core/assets-raw/sprites/blocks/production/itemvoid.png b/core/assets-raw/sprites/blocks/production/item-void.png similarity index 100% rename from core/assets-raw/sprites/blocks/production/itemvoid.png rename to core/assets-raw/sprites/blocks/production/item-void.png diff --git a/core/assets-raw/sprites/blocks/production/liquidsource.png b/core/assets-raw/sprites/blocks/production/liquid-source.png similarity index 100% rename from core/assets-raw/sprites/blocks/production/liquidsource.png rename to core/assets-raw/sprites/blocks/production/liquid-source.png diff --git a/core/assets/bundles/bundle.properties b/core/assets/bundles/bundle.properties index 1226ab8965..d012ff4be7 100644 --- a/core/assets/bundles/bundle.properties +++ b/core/assets/bundles/bundle.properties @@ -580,11 +580,11 @@ block.omega-mech-pad.name = Omega Mech Pad block.tau-mech-pad.name = Tau Mech Pad block.conduit.name = Conduit block.mechanical-pump.name = Mechanical Pump -block.itemsource.name = Item Source -block.itemvoid.name = Item Void -block.liquidsource.name = Liquid Source -block.powervoid.name = Power Void -block.powerinfinite.name = Power Infinite +block.item-source.name = Item Source +block.item-void.name = Item Void +block.liquid-source.name = Liquid Source +block.power-void.name = Power Void +block.power-source.name = Power Infinite block.unloader.name = Unloader block.vault.name = Vault block.wave.name = Wave @@ -782,11 +782,11 @@ block.router.description = Accepts items from one direction and outputs them to block.distributor.description = An advanced router which splits items to up to 7 other directions equally. block.bridge-conveyor.description = Advanced item transport block. Allows transporting items over up to 3 tiles of any terrain or building. block.alpha-mech-pad.description = When given enough power, rebuilds your ship into the[accent] Alpha[] mech. -block.itemsource.description = Infinitely outputs items. Sandbox only. -block.liquidsource.description = Infinitely outputs liquids. Sandbox only. -block.itemvoid.description = Destroys any items which go into it without using power. Sandbox only. -block.powerinfinite.description = Infinitely outputs power. Sandbox only. -block.powervoid.description = Voids all power inputted into it. Sandbox only. +block.item-source.description = Infinitely outputs items. Sandbox only. +block.liquid-source.description = Infinitely outputs liquids. Sandbox only. +block.item-void.description = Destroys any items which go into it without using power. Sandbox only. +block.power-source.description = Infinitely outputs power. Sandbox only. +block.power-void.description = Voids all power inputted into it. Sandbox only. liquid.water.description = Commonly used for cooling machines and waste processing. liquid.lava.description = Can be transformed into[LIGHT_GRAY] stone[], used for generating power or used as ammo for certain turrets. liquid.oil.description = Can be burnt, exploded or used as a coolant. diff --git a/core/assets/bundles/bundle_cs.properties b/core/assets/bundles/bundle_cs.properties index bc230d8ef4..db3fa556b1 100644 --- a/core/assets/bundles/bundle_cs.properties +++ b/core/assets/bundles/bundle_cs.properties @@ -578,11 +578,11 @@ block.omega-mech-pad.name = Plošina pro Omega Mech block.tau-mech-pad.name = Plošina pro Tau Mech block.conduit.name = Potrubí block.mechanical-pump.name = Mechanická pumpa -block.itemsource.name = Zdroj předmětů -block.itemvoid.name = Prázdnota pro předměty -block.liquidsource.name = Zdroj tekutin -block.powervoid.name = Prázdnota pro energii -block.powerinfinite.name = Nekonečný zdroj energie +block.item-source.name = Zdroj předmětů +block.item-void.name = Prázdnota pro předměty +block.liquid-source.name = Zdroj tekutin +block.power-void.name = Prázdnota pro energii +block.power-source.name = Nekonečný zdroj energie block.unloader.name = Odbavovač block.vault.name = Trezor block.wave.name = Vlna @@ -780,11 +780,11 @@ block.router.description = Příijmá předměty z jednoho směru a posílá je block.distributor.description = Pokročilý směrovač, který z libovolného počtu vstupů vytvoří libovolný počet výstupu a rozdělí přísun předmětů rovnoměrně do každého z nich, obdoba Multiplexeru a Demultiplexeru. block.bridge-conveyor.description = Pokročilý blok přepravy předmětů. Dovoluje transport předmětů až přez tři pole jakéhokoliv terénu nebo budovy. block.alpha-mech-pad.description = Když je dodán dostatek energie, Přestaví tvoji loď na[accent] Alfa[] mecha. -block.itemsource.description = Nekonečný zdroj předmětů. Jen pro Sandbox. -block.liquidsource.description = Nekonečný zdroj tekutin. Jen pro Sandbox. -block.itemvoid.description = Likviduje jakéhokoliv vstupní předmět bež použití energie. Jen pro Sandbox. -block.powerinfinite.description = Nekonečný zdroj energie. Jen pro Sandbox. -block.powervoid.description = Prázdnota pro veškerou energii vstupující do něj. Jen pro Sandbox. +block.item-source.description = Nekonečný zdroj předmětů. Jen pro Sandbox. +block.liquid-source.description = Nekonečný zdroj tekutin. Jen pro Sandbox. +block.item-void.description = Likviduje jakéhokoliv vstupní předmět bež použití energie. Jen pro Sandbox. +block.power-source.description = Nekonečný zdroj energie. Jen pro Sandbox. +block.power-void.description = Prázdnota pro veškerou energii vstupující do něj. Jen pro Sandbox. liquid.water.description = Nejčastěji se používá ke chlazení a zpracování odpadu. liquid.lava.description = Může být transformován na[LIGHT_GRAY] kámen[], nebo pro generátor energie nebo jako střelivo pro určitý druh střílen. liquid.oil.description = Může být spálen, vybouchnout nebo použit jako chlazení. diff --git a/core/assets/bundles/bundle_de.properties b/core/assets/bundles/bundle_de.properties index d7840e685c..60211fa662 100644 --- a/core/assets/bundles/bundle_de.properties +++ b/core/assets/bundles/bundle_de.properties @@ -567,11 +567,11 @@ block.omega-mech-pad.name = Omega Mech Pad block.tau-mech-pad.name = Tau Mech Pad block.conduit.name = Leitungsrohr block.mechanical-pump.name = Mechanische Pumpe -block.itemsource.name = Materialquelle -block.itemvoid.name = Materialschlucker -block.liquidsource.name = Flüssigkeitsquelle -block.powervoid.name = Stromsenke -block.powerinfinite.name = Unendliche Stromquelle +block.item-source.name = Materialquelle +block.item-void.name = Materialschlucker +block.liquid-source.name = Flüssigkeitsquelle +block.power-void.name = Stromsenke +block.power-source.name = Unendliche Stromquelle block.unloader.name = Entlader block.vault.name = Tresor block.wave.name = Welle @@ -769,11 +769,11 @@ block.router.description = Akzeptiert Materialien aus einer Richtung und leitet block.distributor.description = Ein weiterentwickelter Router, der Materialien in bis zu sieben Richtungen gleichmäßig verteilt. block.bridge-conveyor.description = Verbesserter Transportblock. Erlaubt es, Materialien über bis zu 3 Kacheln beliebigen Terrains oder Inhalts zu transportieren. block.alpha-mech-pad.description = Sofern genügend Strom zur Verfügung steht, baut dieses Pad deinen Schiff in einen [accent]Alpha[] mech zurück. -block.itemsource.description = Produziert unendlich items. Nur im Sandkasten verfügbar. -block.liquidsource.description = Produziert unendlich Flüssigkeiten. Nur im Sandkasten verfügbar. -block.itemvoid.description = Zerstört Materialien, die hereingegeben werden, ohne Strom zu verbrauchen. Nur im Sandkasten verfügbar. -block.powerinfinite.description = Erzeugt unendlich viel Strom. Nur im Sandkasten verfügbar. -block.powervoid.description = Verschlingt den kompletten übrigen Strom. Nur im Sandkasten verfügbar. +block.item-source.description = Produziert unendlich items. Nur im Sandkasten verfügbar. +block.liquid-source.description = Produziert unendlich Flüssigkeiten. Nur im Sandkasten verfügbar. +block.item-void.description = Zerstört Materialien, die hereingegeben werden, ohne Strom zu verbrauchen. Nur im Sandkasten verfügbar. +block.power-source.description = Erzeugt unendlich viel Strom. Nur im Sandkasten verfügbar. +block.power-void.description = Verschlingt den kompletten übrigen Strom. Nur im Sandkasten verfügbar. liquid.water.description = Wird überlicherweise zum Kühlen von Maschinen und zur Müllverarbeitung verwendet. liquid.lava.description = Kann zu [LIGHT_GRAY] Stein[] verarbeitet werden, zur Stromerzeugung verwendet werden oder als Munition für bestimmte Geschütztürme verwendet werden. liquid.oil.description = Kann verbrannt, zum explodieren gebracht, oder als Kühlung verwendet werden. diff --git a/core/assets/bundles/bundle_es.properties b/core/assets/bundles/bundle_es.properties index cd975d0fb1..e03d2ef7a8 100644 --- a/core/assets/bundles/bundle_es.properties +++ b/core/assets/bundles/bundle_es.properties @@ -567,11 +567,11 @@ block.omega-mech-pad.name = Pad de mecanoide Omega block.tau-mech-pad.name = Pad de mecanoide Tau block.conduit.name = Conducto block.mechanical-pump.name = Bomba Mecánica -block.itemsource.name = Fuente de objetos -block.itemvoid.name = Vacío de objetos -block.liquidsource.name = Fuente de líquidos -block.powervoid.name = Vacío de energía -block.powerinfinite.name = Energía Infinita +block.item-source.name = Fuente de objetos +block.item-void.name = Vacío de objetos +block.liquid-source.name = Fuente de líquidos +block.power-void.name = Vacío de energía +block.power-source.name = Energía Infinita block.unloader.name = Descargador block.vault.name = Bóveda block.wave.name = Horda @@ -769,11 +769,11 @@ block.router.description = Acepta objetos de una dirección y deja objetos equit block.distributor.description = Un enrutador avanzado que distribuye objetos equitativamente en hasta otras 7 direcciones. block.bridge-conveyor.description = Bloque avanado de transporte. Puede transportar objetos por encima hasta 3 casillas de cualquier terreno o construcción. block.alpha-mech-pad.description = Cuando se le da suficiente energía, reconstruye tu nave en el mecanoide[accent] Alpha[]. -block.itemsource.description = Da objetos infinitos. Solo en sandbox. -block.liquidsource.description = Da líquido infinito. Solo en sandbox. -block.itemvoid.description = Destruye cuanquier objeto que va a él sin necesitar energía. Solo en sandbox. -block.powerinfinite.description = Da energía infinita. Solo en sandbox. -block.powervoid.description = Elimina toda la energía que se le da. Solo en sandbox. +block.item-source.description = Da objetos infinitos. Solo en sandbox. +block.liquid-source.description = Da líquido infinito. Solo en sandbox. +block.item-void.description = Destruye cuanquier objeto que va a él sin necesitar energía. Solo en sandbox. +block.power-source.description = Da energía infinita. Solo en sandbox. +block.power-void.description = Elimina toda la energía que se le da. Solo en sandbox. liquid.water.description = Usado comúnmente para enfriar máquinas y para procesar residuos. liquid.lava.description = Puede usarse para ser transformado en[LIGHT_GRAY] stone[], para generar energía o para munición de ciertas torres. liquid.oil.description = Puede ser quemado, explotado o como un enfriador. diff --git a/core/assets/bundles/bundle_fr.properties b/core/assets/bundles/bundle_fr.properties index 42f1fd7640..c00f0245c7 100644 --- a/core/assets/bundles/bundle_fr.properties +++ b/core/assets/bundles/bundle_fr.properties @@ -567,11 +567,11 @@ block.omega-mech-pad.name = Reconstructeur de mécha "Oméga" block.tau-mech-pad.name = Reconstructeur de mécha "Tau" block.conduit.name = Conduit block.mechanical-pump.name = Pompe mécanique -block.itemsource.name = Source d'objets -block.itemvoid.name = Destructeur d'objets -block.liquidsource.name = Source de liquide -block.powervoid.name = absorbeur énergétique -block.powerinfinite.name = Puissance infinie +block.item-source.name = Source d'objets +block.item-void.name = Destructeur d'objets +block.liquid-source.name = Source de liquide +block.power-void.name = absorbeur énergétique +block.power-source.name = Puissance infinie block.unloader.name = Déchargeur block.vault.name = Coffre-Fort block.wave.name = Vague @@ -769,11 +769,11 @@ block.router.description = Accepte les objets depuis une ou plus directions et l block.distributor.description = Un routeur avancé qui sépare les objets jusqu'à 7 autres directions équitablement. block.bridge-conveyor.description = bloc de transport avancé permettant de traverser jusqu'à 3 blocs de n'importe quel terrain ou batiment. block.alpha-mech-pad.description = Avec assez d'énergie, reconstruit votre vaisseau en un mécha [accent] Alpha[]. -block.itemsource.description = Produit des objets à l'infini. Bac à sable uniquement . -block.liquidsource.description = Source de liquide infinie . Bac à sable uniquement. -block.itemvoid.description = Désintègre n'importe quel objet qui va à l'intérieur sans utiliser d'énergie. Bac à sable uniquement. -block.powerinfinite.description = Produit de l'énergie à l'infini. Bac à sable uniquement. -block.powervoid.description = Supprime toute l'énergie allant à l'intérieur.Bac à sable uniquement +block.item-source.description = Produit des objets à l'infini. Bac à sable uniquement . +block.liquid-source.description = Source de liquide infinie . Bac à sable uniquement. +block.item-void.description = Désintègre n'importe quel objet qui va à l'intérieur sans utiliser d'énergie. Bac à sable uniquement. +block.power-source.description = Produit de l'énergie à l'infini. Bac à sable uniquement. +block.power-void.description = Supprime toute l'énergie allant à l'intérieur.Bac à sable uniquement liquid.water.description = Couramment utilisé pour le refroidissement et le traitement des déchets. liquid.lava.description = Peut être transformé en [LIGHT_GRAY]pierre[], utilisé pour produire de l'énergie ou utilisé comme munition par certaines tourelles. liquid.oil.description = Peut être brûlé, utilisé comme explosif ou comme liquide de refroidissement. diff --git a/core/assets/bundles/bundle_fr_BE.properties b/core/assets/bundles/bundle_fr_BE.properties index a4af1a5971..aea8596d1a 100644 --- a/core/assets/bundles/bundle_fr_BE.properties +++ b/core/assets/bundles/bundle_fr_BE.properties @@ -575,11 +575,11 @@ block.omega-mech-pad.name = Omega Mech Pad block.tau-mech-pad.name = Tau Mech Pad block.conduit.name = Conduit block.mechanical-pump.name = Pompe Méchanique -block.itemsource.name = Source d'objets -block.itemvoid.name = Destructeur d'objets -block.liquidsource.name = Source de liquide -block.powervoid.name = Absorbeur énergétique -block.powerinfinite.name = Puissance infinie +block.item-source.name = Source d'objets +block.item-void.name = Destructeur d'objets +block.liquid-source.name = Source de liquide +block.power-void.name = Absorbeur énergétique +block.power-source.name = Puissance infinie block.unloader.name = Déchargeur block.vault.name = Coffre-Fort block.wave.name = Vague @@ -777,11 +777,11 @@ block.router.description = Accepte les éléments d'une direction et les envoie block.distributor.description = Un routeur avancé qui divise les articles en 7 autres directions de manière égale. [scarlet]Seule et unique ![] block.bridge-conveyor.description = Bloc de transport d'articles avancé. Permet de transporter des objets sur plus de 3 tuiles de n'importe quel terrain ou bâtiment. block.alpha-mech-pad.description = Lorsque vous avez assez de puissance, reconstruisez votre vaisseau dans le [accent]Alpha[] mech. -block.itemsource.description = Sort infiniment les articles. Bac à sable seulement. -block.liquidsource.description = Débit infini de liquides. Bac à sable seulement. -block.itemvoid.description = Détruit tous les objets qui y entrent sans utiliser d'énergie. Bac à sable seulement. -block.powerinfinite.description = Débit infini d'énergie. Bac à sable seulement. -block.powervoid.description = Annule toute l'énergie qui y est introduite. Bac à sable seulement. +block.item-source.description = Sort infiniment les articles. Bac à sable seulement. +block.liquid-source.description = Débit infini de liquides. Bac à sable seulement. +block.item-void.description = Détruit tous les objets qui y entrent sans utiliser d'énergie. Bac à sable seulement. +block.power-source.description = Débit infini d'énergie. Bac à sable seulement. +block.power-void.description = Annule toute l'énergie qui y est introduite. Bac à sable seulement. liquid.water.description = Couramment utilisé pour les machines de refroidissement et le traitement des déchets. liquid.lava.description = Peut être transformé en [LIGHT_GRAY]pierre[], utilisé pour générer de l'énergie ou utilisé comme munition pour certaines tourelles. liquid.oil.description = Peut être brûlé, explosé ou utilisé comme liquide de refroidissement. diff --git a/core/assets/bundles/bundle_in_ID.properties b/core/assets/bundles/bundle_in_ID.properties index a3d1721f67..425feb8d32 100644 --- a/core/assets/bundles/bundle_in_ID.properties +++ b/core/assets/bundles/bundle_in_ID.properties @@ -567,11 +567,11 @@ block.omega-mech-pad.name = Omega Mech Pad block.tau-mech-pad.name = Tau Mech Pad block.conduit.name = saluran block.mechanical-pump.name = Mechanical Pump -block.itemsource.name = Item Source -block.itemvoid.name = Item Void -block.liquidsource.name = Liquid Source -block.powervoid.name = Power Void -block.powerinfinite.name = Power Infinite +block.item-source.name = Item Source +block.item-void.name = Item Void +block.liquid-source.name = Liquid Source +block.power-void.name = Power Void +block.power-source.name = Power Infinite block.unloader.name = Unloader block.vault.name = Vault block.wave.name = Wave @@ -769,11 +769,11 @@ block.router.description = Accepts items from one direction and outputs them to block.distributor.description = An advanced router which splits items to up to 7 other directions equally. block.bridge-conveyor.description = Advanced item transport block. Allows transporting items over up to 3 tiles of any terrain or building. block.alpha-mech-pad.description = When given enough power, rebuilds your ship into the[accent] Alpha[] mech. -block.itemsource.description = Infinitely outputs items. Sandbox only. -block.liquidsource.description = Infinitely outputs liquids. Sandbox only. -block.itemvoid.description = Destroys any items which go into it without using power. Sandbox only. -block.powerinfinite.description = Infinitely outputs power. Sandbox only. -block.powervoid.description = Voids all power inputted into it. Sandbox only. +block.item-source.description = Infinitely outputs items. Sandbox only. +block.liquid-source.description = Infinitely outputs liquids. Sandbox only. +block.item-void.description = Destroys any items which go into it without using power. Sandbox only. +block.power-source.description = Infinitely outputs power. Sandbox only. +block.power-void.description = Voids all power inputted into it. Sandbox only. liquid.water.description = Commonly used for cooling machines and waste processing. liquid.lava.description = Can be transformed into[LIGHT_GRAY] stone[], used for generating power or used as ammo for certain turrets. liquid.oil.description = Can be burnt, exploded or used as a coolant. diff --git a/core/assets/bundles/bundle_it.properties b/core/assets/bundles/bundle_it.properties index 514ff0569f..5e5b9be96f 100644 --- a/core/assets/bundles/bundle_it.properties +++ b/core/assets/bundles/bundle_it.properties @@ -567,11 +567,11 @@ block.omega-mech-pad.name = Omega Mech Pad block.tau-mech-pad.name = Tau Mech Pad block.conduit.name = Condotto block.mechanical-pump.name = Pompa meccanica -block.itemsource.name = Sorgente oggetti -block.itemvoid.name = Vuoto oggetti -block.liquidsource.name = Sorgente liquida -block.powervoid.name = Energia nulla -block.powerinfinite.name = Energia infinita +block.item-source.name = Sorgente oggetti +block.item-void.name = Vuoto oggetti +block.liquid-source.name = Sorgente liquida +block.power-void.name = Energia nulla +block.power-source.name = Energia infinita block.unloader.name = Scaricatore block.vault.name = Deposito block.wave.name = Idrogetto @@ -769,11 +769,11 @@ block.router.description = Accepts items from one direction and outputs them to block.distributor.description = An advanced router which splits items to up to 7 other directions equally. block.bridge-conveyor.description = Advanced item transport block. Allows transporting items over up to 3 tiles of any terrain or building. block.alpha-mech-pad.description = When given enough power, rebuilds your ship into the[accent] Alpha[] mech. -block.itemsource.description = Infinitely outputs items. Sandbox only. -block.liquidsource.description = Infinitely outputs liquids. Sandbox only. -block.itemvoid.description = Destroys any items which go into it without using power. Sandbox only. -block.powerinfinite.description = Infinitely outputs power. Sandbox only. -block.powervoid.description = Voids all power inputted into it. Sandbox only. +block.item-source.description = Infinitely outputs items. Sandbox only. +block.liquid-source.description = Infinitely outputs liquids. Sandbox only. +block.item-void.description = Destroys any items which go into it without using power. Sandbox only. +block.power-source.description = Infinitely outputs power. Sandbox only. +block.power-void.description = Voids all power inputted into it. Sandbox only. liquid.water.description = Commonly used for cooling machines and waste processing. liquid.lava.description = Can be transformed into[LIGHT_GRAY] stone[], used for generating power or used as ammo for certain turrets. liquid.oil.description = Can be burnt, exploded or used as a coolant. diff --git a/core/assets/bundles/bundle_ja.properties b/core/assets/bundles/bundle_ja.properties index ad32034bc4..a1c9a94c7a 100644 --- a/core/assets/bundles/bundle_ja.properties +++ b/core/assets/bundles/bundle_ja.properties @@ -576,11 +576,11 @@ block.omega-mech-pad.name = オメガパッド block.tau-mech-pad.name = タウパッド block.conduit.name = パイプ block.mechanical-pump.name = 機械ポンプ -block.itemsource.name = アイテムソース -block.itemvoid.name = アイテムボイド -block.liquidsource.name = 液体ソース -block.powervoid.name = 電力ボイド -block.powerinfinite.name = 無限電源 +block.item-source.name = アイテムソース +block.item-void.name = アイテムボイド +block.liquid-source.name = 液体ソース +block.power-void.name = 電力ボイド +block.power-source.name = 無限電源 block.unloader.name = アンローダー block.vault.name = ボールト block.wave.name = ウェーブ @@ -778,11 +778,11 @@ block.router.description = 一つの方向から受け取ったアイテムを block.distributor.description = 高度なルーターです。アイテムを7方向に均等に分けて搬出します。 block.bridge-conveyor.description = 高度な輸送ブロックです。地形や建物を超えて、3ブロック離れた場所にアイテムを輸送することができます。 block.alpha-mech-pad.description = 電力を使用して、機体を[accent]アルファ[]機体に作り替えます。 -block.itemsource.description = アイテムを無限に搬出します。サンドボックスのみ。 -block.liquidsource.description = 液体を無限に搬出します。サンドボックスのみ。 -block.itemvoid.description = 電力なしでアイテムを廃棄します。サンドボックスのみ。 -block.powerinfinite.description = 無限に電力を搬出します。サンドボックスのみ。 -block.powervoid.description = 入力されたすべての電力を破棄します。サンドボックスのみ。 +block.item-source.description = アイテムを無限に搬出します。サンドボックスのみ。 +block.liquid-source.description = 液体を無限に搬出します。サンドボックスのみ。 +block.item-void.description = 電力なしでアイテムを廃棄します。サンドボックスのみ。 +block.power-source.description = 無限に電力を搬出します。サンドボックスのみ。 +block.power-void.description = 入力されたすべての電力を破棄します。サンドボックスのみ。 liquid.water.description = 一般的に機械の冷却や廃棄物の処理などに使用されます。 liquid.lava.description = 冷却して石にしたり、発電や一部ターレットの弾薬として使用することができます。 liquid.oil.description = 燃焼させたり、爆発させたり、冷却水としても使われます。 diff --git a/core/assets/bundles/bundle_ko.properties b/core/assets/bundles/bundle_ko.properties index 00d11c78d8..a7b519112a 100644 --- a/core/assets/bundles/bundle_ko.properties +++ b/core/assets/bundles/bundle_ko.properties @@ -570,11 +570,11 @@ block.omega-mech-pad.name = 오메가 기체 패드 block.tau-mech-pad.name = 타우 기체 패드 block.conduit.name = 파이프 block.mechanical-pump.name = 기계식 펌프 -block.itemsource.name = 아이템 소스 -block.itemvoid.name = 아이템 삭제 장치 -block.liquidsource.name = 무한 액체공급 장치 -block.powervoid.name = 방전장치 -block.powerinfinite.name = 무한 전력공급 장치 +block.item-source.name = 아이템 소스 +block.item-void.name = 아이템 삭제 장치 +block.liquid-source.name = 무한 액체공급 장치 +block.power-void.name = 방전장치 +block.power-source.name = 무한 전력공급 장치 block.unloader.name = 언로더 block.vault.name = 창고 block.wave.name = 파도 @@ -772,11 +772,11 @@ block.router.description = 한 방향에서 아이템을 받은 후 최대 3개 block.distributor.description = 아이템을 최대 7개의 다른 방향으로 똑같이 분할하는 고급 분배기. block.bridge-conveyor.description = 고급 자원 수송 블록.\n지형이나 건물을 넘어 최대 3개 타일을 건너뛰고 자원을 운송할 수 있습니다. block.alpha-mech-pad.description = 알파 기체로 바꿀 수 있는 패드입니다. -block.itemsource.description = 자원을 선택하면 그 자원이 무한하게 생성되는 블록입니다. -block.liquidsource.description = 무한한 액체를 출력해냅니다. -block.itemvoid.description = 아이템을 사라지게 만듭니다. -block.powerinfinite.description = 무한한 전력을 공급해주는 블록입니다. -block.powervoid.description = 설정된 아이템을 계속해서 출력하는 블록입니다. +block.item-source.description = 자원을 선택하면 그 자원이 무한하게 생성되는 블록입니다. +block.liquid-source.description = 무한한 액체를 출력해냅니다. +block.item-void.description = 아이템을 사라지게 만듭니다. +block.power-source.description = 무한한 전력을 공급해주는 블록입니다. +block.power-void.description = 설정된 아이템을 계속해서 출력하는 블록입니다. liquid.water.description = 지상 유닛이 이 위를 지나가면 이동속도가 느려지고, 깊은 물에 빠지면 죽습니다. liquid.lava.description = 지상 유닛이 이 위를 지나가면 이동속도가 매우 느려지고, 지속적으로 데미지를 입습니다. liquid.oil.description = 일부 조합 블록에서 사용되는 자원입니다. diff --git a/core/assets/bundles/bundle_pl.properties b/core/assets/bundles/bundle_pl.properties index 5c602156e2..16defe23ae 100644 --- a/core/assets/bundles/bundle_pl.properties +++ b/core/assets/bundles/bundle_pl.properties @@ -567,11 +567,11 @@ block.omega-mech-pad.name = Omega Mech Pad block.tau-mech-pad.name = Tau Mech Pad block.conduit.name = Rura block.mechanical-pump.name = Mechaniczna Pompa -block.itemsource.name = Źródło przedmiotów -block.itemvoid.name = Próżnia przedmiotów -block.liquidsource.name = Źródło płynów -block.powervoid.name = Próżnia prądu -block.powerinfinite.name = Nieskończony Prąd +block.item-source.name = Źródło przedmiotów +block.item-void.name = Próżnia przedmiotów +block.liquid-source.name = Źródło płynów +block.power-void.name = Próżnia prądu +block.power-source.name = Nieskończony Prąd block.unloader.name = Wyciągacz block.vault.name = Magazyn block.wave.name = Działo Płynowe @@ -769,11 +769,11 @@ block.router.description = Akceptuje przedmioty z jednego miejsca i rozdziela je block.distributor.description = Zaawansowany rozdzielacz, rozdzielający przedmioty do 7 innych kierunków. block.bridge-conveyor.description = Zaawansowany blok transportujący. Pozwala na przenoszenie przedmiotów nawet do 3 bloków na każdym terenie, przez każdy budynek. block.alpha-mech-pad.description = When given enough power, rebuilds your ship into the[accent] Alpha[] mech. -block.itemsource.description = Wydziela przedmioty w nieskończoność. Dostępny tylko w trybie sandbox. -block.liquidsource.description = Wydziela ciecz w nieskończoność. Dostępny tylko w trybie sandbox. -block.itemvoid.description = Niszczy wszystkie przedmioty, które idą do tego bloku, który nie wymaga prądu. Dostępny tylko w trybie sandbox. -block.powerinfinite.description = Wydziela prąd w nieskończoność. Dostępny tylko w trybie sandbox. -block.powervoid.description = Niszczy całą energię wprowadzoną do tego bloku. Dostępny tylko w trybie sandbox. +block.item-source.description = Wydziela przedmioty w nieskończoność. Dostępny tylko w trybie sandbox. +block.liquid-source.description = Wydziela ciecz w nieskończoność. Dostępny tylko w trybie sandbox. +block.item-void.description = Niszczy wszystkie przedmioty, które idą do tego bloku, który nie wymaga prądu. Dostępny tylko w trybie sandbox. +block.power-source.description = Wydziela prąd w nieskończoność. Dostępny tylko w trybie sandbox. +block.power-void.description = Niszczy całą energię wprowadzoną do tego bloku. Dostępny tylko w trybie sandbox. liquid.water.description = Powszechnie używana do schładzania budowli i przetwarzania odpadów. liquid.lava.description = Może być przekształcona w [LIGHT_GRAY] kamień[]; używana do generowania prądu lub używana jako amunicja dla niektórych działek. liquid.oil.description = Może się palić, eksplodować lub być używana do schładzania. diff --git a/core/assets/bundles/bundle_pt_BR.properties b/core/assets/bundles/bundle_pt_BR.properties index cb44f65e08..51d539d334 100644 --- a/core/assets/bundles/bundle_pt_BR.properties +++ b/core/assets/bundles/bundle_pt_BR.properties @@ -567,11 +567,11 @@ block.omega-mech-pad.name = Controle do meca Omega block.tau-mech-pad.name = Controle do meca Tau block.conduit.name = Cano block.mechanical-pump.name = Bomba Mecanica -block.itemsource.name = Fonte do item -block.itemvoid.name = Item Void -block.liquidsource.name = Liquid Source -block.powervoid.name = Power Void -block.powerinfinite.name = Power Infinite +block.item-source.name = Fonte do item +block.item-void.name = Item Void +block.liquid-source.name = Liquid Source +block.power-void.name = Power Void +block.power-source.name = Power Infinite block.unloader.name = Unloader block.vault.name = Cofre block.wave.name = Wave @@ -769,11 +769,11 @@ block.router.description = Aceita itens de uma direção e os divide em 3 direç block.distributor.description = Um roteador avancada que espalhas os itens em 7 outras direções igualmente. block.bridge-conveyor.description = Bloco de transporte de itens avancado. Possibilita o transporte de itens acima de 3 blocos de construção ou paredes. block.alpha-mech-pad.description = Quando dado energia o suficiente, Reconstrua sua nave em [accent] Alpha[] mech. -block.itemsource.description = Infinivamente da itens. Apenas caixa de areia. -block.liquidsource.description = Infinitivamente da Liquidos. Apenas caixa de areia. -block.itemvoid.description = Destroi qualquer item que entre sem requerir energia. Apenas caixa de areia. -block.powerinfinite.description = Infinitivamente da energia. Apenas caixa de areia. -block.powervoid.description = Destroi qualquer energia que entre dentro. Apenas caixa de areia. +block.item-source.description = Infinivamente da itens. Apenas caixa de areia. +block.liquid-source.description = Infinitivamente da Liquidos. Apenas caixa de areia. +block.item-void.description = Destroi qualquer item que entre sem requerir energia. Apenas caixa de areia. +block.power-source.description = Infinitivamente da energia. Apenas caixa de areia. +block.power-void.description = Destroi qualquer energia que entre dentro. Apenas caixa de areia. liquid.water.description = Comumente usado em resfriamento e no processo de perda. liquid.lava.description = Pode ser transformado em[LIGHT_GRAY] pedra[], usado para gerar energia ou usado como munição para certas torres. liquid.oil.description = Pode ser queimado, explodido ou usado como resfriador. diff --git a/core/assets/bundles/bundle_ru.properties b/core/assets/bundles/bundle_ru.properties index 000b995f43..ec792c0440 100644 --- a/core/assets/bundles/bundle_ru.properties +++ b/core/assets/bundles/bundle_ru.properties @@ -569,11 +569,11 @@ block.omega-mech-pad.name = Реконструктор мехов "Омега" block.tau-mech-pad.name = Реконструктор мехов "Тау" block.conduit.name = Трубопровод block.mechanical-pump.name = Механическая помпа -block.itemsource.name = Источник предметов -block.itemvoid.name = Предметный вакуум -block.liquidsource.name = Источник жидкостей -block.powervoid.name = Энергетический вакуум -block.powerinfinite.name = Источник энергии +block.item-source.name = Источник предметов +block.item-void.name = Предметный вакуум +block.liquid-source.name = Источник жидкостей +block.power-void.name = Энергетический вакуум +block.power-source.name = Источник энергии block.unloader.name = Разгрузчик block.vault.name = Хранилище block.wave.name = Волна @@ -771,11 +771,11 @@ block.router.description = Принимает предметы из одного block.distributor.description = Передовой маршрутизатор, который равномерно разбивает элементы до 7 других направлений. block.bridge-conveyor.description = Улучшенный транспортный блок элементов. Позволяет транспортировать предметы до 3-х блоков над любым ландшафтом или зданием. block.alpha-mech-pad.description = Превращает вас в мех [accent] Альфа[]. Требует энергию. -block.itemsource.description = Бесконечно выводит предметы. Работает только в песочнице. -block.liquidsource.description = Бесконечно выводит жидкости. Работает только в песочнице. -block.itemvoid.description = Уничтожает любые предметы, которые входят в него, без использования энергии. Работает только в режиме песочницы. -block.powerinfinite.description = Бесконечность — не предел. Бесконечно выводит энергию. Доступен только в режиме песочницы. -block.powervoid.description = Энергия просто уходит в пустоту. Присутствует только в песочнице. +block.item-source.description = Бесконечно выводит предметы. Работает только в песочнице. +block.liquid-source.description = Бесконечно выводит жидкости. Работает только в песочнице. +block.item-void.description = Уничтожает любые предметы, которые входят в него, без использования энергии. Работает только в режиме песочницы. +block.power-source.description = Бесконечность — не предел. Бесконечно выводит энергию. Доступен только в режиме песочницы. +block.power-void.description = Энергия просто уходит в пустоту. Присутствует только в песочнице. liquid.water.description = Намного лучше чем [BLUE]монооксид дигидрогена[].\n\n Для получения воды используйте помпу(насос) на источнике(блоке) или экстрактор воды.\n\n Эту жидкость можно подвести к бурам для ускорения скорости добычи или к турелям для ускорения стрельбы. liquid.lava.description = [accent]Горячо...\nВещество расплавленное из горно-каменных пород. liquid.oil.description = Кто-то писал о добавлении золота в игру. Его добавили, правда оно какое-то чёрное...\nСмесь жидких углеводородов, выделяющаяся из природного газа в результате снижения температуры и пластового давления. diff --git a/core/assets/bundles/bundle_tk.properties b/core/assets/bundles/bundle_tk.properties index e0476393f0..65701c2094 100644 --- a/core/assets/bundles/bundle_tk.properties +++ b/core/assets/bundles/bundle_tk.properties @@ -567,11 +567,11 @@ block.omega-mech-pad.name = Omega Mech Pad block.tau-mech-pad.name = Tau Mech Pad block.conduit.name = boru block.mechanical-pump.name = Mekanikal pompa -block.itemsource.name = esya kaynagi -block.itemvoid.name = esya deligi -block.liquidsource.name = sivi kaynagi -block.powervoid.name = guc deligi -block.powerinfinite.name = sonsuz guc +block.item-source.name = esya kaynagi +block.item-void.name = esya deligi +block.liquid-source.name = sivi kaynagi +block.power-void.name = guc deligi +block.power-source.name = sonsuz guc block.unloader.name = bekletici block.vault.name = kasa block.wave.name = Dalga @@ -769,11 +769,11 @@ block.router.description = Accepts items from one direction and outputs them to block.distributor.description = An advanced router which splits items to up to 7 other directions equally. block.bridge-conveyor.description = Advanced item transport block. Allows transporting items over up to 3 tiles of any terrain or building. block.alpha-mech-pad.description = When given enough power, rebuilds your ship into the[accent] Alpha[] mech. -block.itemsource.description = Infinitely outputs items. Sandbox only. -block.liquidsource.description = Infinitely outputs liquids. Sandbox only. -block.itemvoid.description = Destroys any items which go into it without using power. Sandbox only. -block.powerinfinite.description = Infinitely outputs power. Sandbox only. -block.powervoid.description = Voids all power inputted into it. Sandbox only. +block.item-source.description = Infinitely outputs items. Sandbox only. +block.liquid-source.description = Infinitely outputs liquids. Sandbox only. +block.item-void.description = Destroys any items which go into it without using power. Sandbox only. +block.power-source.description = Infinitely outputs power. Sandbox only. +block.power-void.description = Voids all power inputted into it. Sandbox only. liquid.water.description = Commonly used for cooling machines and waste processing. liquid.lava.description = Can be transformed into[LIGHT_GRAY] stone[], used for generating power or used as ammo for certain turrets. liquid.oil.description = Can be burnt, exploded or used as a coolant. diff --git a/core/assets/bundles/bundle_tr.properties b/core/assets/bundles/bundle_tr.properties index 616b2c03b4..2bd8915ce8 100644 --- a/core/assets/bundles/bundle_tr.properties +++ b/core/assets/bundles/bundle_tr.properties @@ -569,11 +569,11 @@ block.omega-mech-pad.name = Omega Mech Pad block.tau-mech-pad.name = Tau Mech Pad block.conduit.name = sıvı borusu block.mechanical-pump.name = Mechanical Pump -block.itemsource.name = Item Source -block.itemvoid.name = Item Void -block.liquidsource.name = Liquid Source -block.powervoid.name = Power Void -block.powerinfinite.name = Power Infinite +block.item-source.name = Item Source +block.item-void.name = Item Void +block.liquid-source.name = Liquid Source +block.power-void.name = Power Void +block.power-source.name = Power Infinite block.unloader.name = Unloader block.vault.name = Vault block.wave.name = Wave @@ -771,11 +771,11 @@ block.router.description = Accepts items from one direction and outputs them to block.distributor.description = An advanced router which splits items to up to 7 other directions equally. block.bridge-conveyor.description = Advanced item transport block. Allows transporting items over up to 3 tiles of any terrain or building. block.alpha-mech-pad.description = When given enough power, rebuilds your ship into the[accent] Alpha[] mech. -block.itemsource.description = Infinitely outputs items. Sandbox only. -block.liquidsource.description = Infinitely outputs liquids. Sandbox only. -block.itemvoid.description = Destroys any items which go into it without using power. Sandbox only. -block.powerinfinite.description = Infinitely outputs power. Sandbox only. -block.powervoid.description = Voids all power inputted into it. Sandbox only. +block.item-source.description = Infinitely outputs items. Sandbox only. +block.liquid-source.description = Infinitely outputs liquids. Sandbox only. +block.item-void.description = Destroys any items which go into it without using power. Sandbox only. +block.power-source.description = Infinitely outputs power. Sandbox only. +block.power-void.description = Voids all power inputted into it. Sandbox only. liquid.water.description = Commonly used for cooling machines and waste processing. liquid.lava.description = Can be transformed into[LIGHT_GRAY] stone[], used for generating power or used as ammo for certain turrets. liquid.oil.description = Can be burnt, exploded or used as a coolant. diff --git a/core/assets/bundles/bundle_uk_UA.properties b/core/assets/bundles/bundle_uk_UA.properties index c78427623f..3dd40bb0f5 100644 --- a/core/assets/bundles/bundle_uk_UA.properties +++ b/core/assets/bundles/bundle_uk_UA.properties @@ -580,11 +580,11 @@ block.omega-mech-pad.name = Реконструктор "Омега" block.tau-mech-pad.name = Реконструктор "Тау" block.conduit.name = Трубопровід block.mechanical-pump.name = Механічний насос -block.itemsource.name = Джерело предметів -block.itemvoid.name = Предметний вакуум -block.liquidsource.name = Рідке джерело -block.powervoid.name = Енергетичний вакуум -block.powerinfinite.name = Нескінченна енергія +block.item-source.name = Джерело предметів +block.item-void.name = Предметний вакуум +block.liquid-source.name = Рідке джерело +block.power-void.name = Енергетичний вакуум +block.power-source.name = Нескінченна енергія block.unloader.name = Розвантажувач block.vault.name = Сховище block.wave.name = Хвиля @@ -782,11 +782,11 @@ block.router.description = Приймає елементи з одного на block.distributor.description = Розширений маршрутизатор, який рівномірно розбиває елементи на 7 різних напрямків. block.bridge-conveyor.description = Покращений блок транспортування предметів. Дозволяє транспортувати предмети понад 3 блоки над будь-якої місцевостю або будівлеє. block.alpha-mech-pad.description = Коли ви отримаєте достатньо енергії, перебудовує ваш корабель у [accent] Альфа[] мех. -block.itemsource.description = Безліченно виводить предмети. -block.liquidsource.description = Безліченно виводить рідини. -block.itemvoid.description = Знищує будь-які предмети, які входять, без використання енергії. -block.powerinfinite.description = Нескінченність не межа. Безмежно виводить енергію. -block.powervoid.description = Енергія просто йде в порожнечу. +block.item-source.description = Безліченно виводить предмети. +block.liquid-source.description = Безліченно виводить рідини. +block.item-void.description = Знищує будь-які предмети, які входять, без використання енергії. +block.power-source.description = Нескінченність не межа. Безмежно виводить енергію. +block.power-void.description = Енергія просто йде в порожнечу. liquid.water.description = Цю рідину можно підвести до бурів для прискорення швидкості видобутку або к турелям для прискорення стрілянини. liquid.lava.description = Можна перетворити в[LIGHT_GRAY] камінь[]. liquid.oil.description = Можна спалити, взірвати або використовувати для охолодження. diff --git a/core/assets/bundles/bundle_zh_CN.properties b/core/assets/bundles/bundle_zh_CN.properties index cc6dbb00bb..a3e85d08d8 100644 --- a/core/assets/bundles/bundle_zh_CN.properties +++ b/core/assets/bundles/bundle_zh_CN.properties @@ -567,11 +567,11 @@ block.omega-mech-pad.name = Omega 机甲平台 block.tau-mech-pad.name = Tau 机甲平台 block.conduit.name = 导管 block.mechanical-pump.name = 机械泵 -block.itemsource.name = 物品源 -block.itemvoid.name = 物品黑洞 -block.liquidsource.name = 液体源 -block.powervoid.name = 能源黑洞 -block.powerinfinite.name = 无限能源 +block.item-source.name = 物品源 +block.item-void.name = 物品黑洞 +block.liquid-source.name = 液体源 +block.power-void.name = 能源黑洞 +block.power-source.name = 无限能源 block.unloader.name = 装卸器 block.vault.name = 仓库 block.wave.name = 波浪 @@ -769,11 +769,11 @@ block.router.description = 从一个方向接受物品，并将它们平均输 block.distributor.description = 一个高级路由器，可以将物品分成最多7个方向。 block.bridge-conveyor.description = 高级项目传输块。允许在跨越任何地形或建筑物上运输物品，最多跨越3个块。 block.alpha-mech-pad.description = 当给予足够的电力时，将你的装置重建为[accent] Alpha []机甲。 -block.itemsource.description = 无限输出物品。仅限沙箱。 -block.liquidsource.description = 无限输出液体。仅限沙箱。 -block.itemvoid.description = 在不使用电源的情况下销毁任何进入它的物品。仅限沙箱。 -block.powerinfinite.description = 无限输出功率。仅限沙箱。 -block.powervoid.description = 消耗输入的所有功率。仅限沙箱。 +block.item-source.description = 无限输出物品。仅限沙箱。 +block.liquid-source.description = 无限输出液体。仅限沙箱。 +block.item-void.description = 在不使用电源的情况下销毁任何进入它的物品。仅限沙箱。 +block.power-source.description = 无限输出功率。仅限沙箱。 +block.power-void.description = 消耗输入的所有功率。仅限沙箱。 liquid.water.description = 通常用于冷却和废物处理。 liquid.lava.description = 可以转换成[LIGHT_GRAY] 石头 []，用于发电或用作某些炮塔的弹药。 liquid.oil.description = 可以燃烧，爆炸或用作冷却液。 diff --git a/core/assets/bundles/bundle_zh_TW.properties b/core/assets/bundles/bundle_zh_TW.properties index d7f8aaf123..6796aaaf6d 100644 --- a/core/assets/bundles/bundle_zh_TW.properties +++ b/core/assets/bundles/bundle_zh_TW.properties @@ -578,11 +578,11 @@ block.omega-mech-pad.name = 奧米伽機甲墊 block.tau-mech-pad.name = Tau機甲墊 block.conduit.name = 管線 block.mechanical-pump.name = 機械泵 -block.itemsource.name = 物品源 -block.itemvoid.name = 物品虚 -block.liquidsource.name = 液體源 -block.powervoid.name = 能量空虛 -block.powerinfinite.name = 無限能量 +block.item-source.name = 物品源 +block.item-void.name = 物品虚 +block.liquid-source.name = 液體源 +block.power-void.name = 能量空虛 +block.power-source.name = 無限能量 block.unloader.name = 裝卸器 block.vault.name = 存儲庫 block.wave.name = 波浪炮 @@ -780,11 +780,11 @@ block.router.description = 接受來自一個方向的物品並將它們平均 block.distributor.description = 高級的分配器，可將物品均分到最多7個其他方向。 block.bridge-conveyor.description = 高級的物品運輸方塊。允許跨過最多3個任何地形或建築物的方塊運輸物品。 block.alpha-mech-pad.description = 當給予足夠能量時，將你的船重建為[accent]阿爾法[]機甲。 -block.itemsource.description = 不限地輸出物品。僅限沙盒。 -block.liquidsource.description = 不限地輸出液體。僅限沙盒。 -block.itemvoid.description = 不使用能量銷毀任何進入它的物品。僅限沙盒。 -block.powerinfinite.description = 不限地輸出能量。僅限沙盒。 -block.powervoid.description = 銷毀所有輸入的能量。僅限沙盒。 +block.item-source.description = 不限地輸出物品。僅限沙盒。 +block.liquid-source.description = 不限地輸出液體。僅限沙盒。 +block.item-void.description = 不使用能量銷毀任何進入它的物品。僅限沙盒。 +block.power-source.description = 不限地輸出能量。僅限沙盒。 +block.power-void.description = 銷毀所有輸入的能量。僅限沙盒。 liquid.water.description = 常用於冷卻機器和廢物處理。 liquid.lava.description = 可以轉換為[LIGHT_GRAY]石頭[]、用於發電或用作某些砲塔的彈藥。 liquid.oil.description = 可以燃燒、爆炸或用作冷卻劑。 diff --git a/core/assets/sprites/sprites.atlas b/core/assets/sprites/sprites.atlas index d5145aeba9..842c5712f2 100644 --- a/core/assets/sprites/sprites.atlas +++ b/core/assets/sprites/sprites.atlas @@ -2944,28 +2944,28 @@ incinerator orig: 32, 32 offset: 0, 0 index: -1 -block-icon-itemsource +block-icon-item-source rotate: false xy: 483, 425 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 -itemsource +item-source rotate: false xy: 483, 425 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 -block-icon-itemvoid +block-icon-item-void rotate: false xy: 415, 357 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 -itemvoid +item-void rotate: false xy: 415, 357 size: 32, 32 @@ -3042,6 +3042,20 @@ block-icon-liquid-router orig: 32, 32 offset: 0, 0 index: -1 +block-icon-liquid-source + rotate: false + xy: 483, 357 + size: 32, 32 + orig: 32, 32 + offset: 0, 0 + index: -1 +liquid-source + rotate: false + xy: 483, 357 + size: 32, 32 + orig: 32, 32 + offset: 0, 0 + index: -1 block-icon-liquid-tank rotate: false xy: 261, 1243 @@ -3049,20 +3063,6 @@ block-icon-liquid-tank orig: 96, 96 offset: 0, 0 index: -1 -block-icon-liquidsource - rotate: false - xy: 483, 357 - size: 32, 32 - orig: 32, 32 - offset: 0, 0 - index: -1 -liquidsource - rotate: false - xy: 483, 357 - size: 32, 32 - orig: 32, 32 - offset: 0, 0 - index: -1 block-icon-mass-driver rotate: false xy: 359, 1341 @@ -3308,14 +3308,28 @@ block-icon-power-node-large orig: 64, 64 offset: 0, 0 index: -1 -block-icon-powerinfinite +block-icon-power-source rotate: false xy: 229, 310 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 -block-icon-powervoid +power-source + rotate: false + xy: 229, 310 + size: 32, 32 + orig: 32, 32 + offset: 0, 0 + index: -1 +block-icon-power-void + rotate: false + xy: 229, 276 + size: 32, 32 + orig: 32, 32 + offset: 0, 0 + index: -1 +power-void rotate: false xy: 229, 276 size: 32, 32 diff --git a/core/assets/sprites/sprites.png b/core/assets/sprites/sprites.png index eb3273ed024dbad7084e3b895c3fe71012edec62..ed95b1de59ffa84e17dd72f7d33841080925566f 100644 GIT binary patch delta 41646 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 delta 41755 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 e&T!yA!`W4z9%dTnw=pm { + Angles.randLenVectors(e.id, 4, e.fin() * 8f, (x, y) -> { + float size = 1f + e.fout() * 5f; + Draw.color(Color.LIGHT_GRAY, Color.GRAY, e.fin()); + Draw.rect("circle", e.x + x, e.y + y, size, size); + Draw.reset(); + }); + }); + nuclearsmoke = new Effect(40, e -> { + Angles.randLenVectors(e.id, 4, e.fin() * 13f, (x, y) -> { + float size = e.fslope() * 4f; + Draw.color(Color.LIGHT_GRAY, Color.GRAY, e.fin()); + Draw.rect("circle", e.x + x, e.y + y, size, size); + Draw.reset(); + }); + }); + nuclearcloud = new Effect(90, 200f, e -> { + Angles.randLenVectors(e.id, 10, e.finpow() * 90f, (x, y) -> { + float size = e.fout() * 14f; + Draw.color(Color.LIME, Color.GRAY, e.fin()); + Draw.rect("circle", e.x + x, e.y + y, size, size); + Draw.reset(); + }); + }); + redgeneratespark = new Effect(18, e -> { + Angles.randLenVectors(e.id, 5, e.fin() * 8f, (x, y) -> { + float len = e.fout() * 4f; + Draw.color(Palette.redSpark, Color.GRAY, e.fin()); + //Draw.alpha(e.fout()); + Draw.rect("circle", e.x + x, e.y + y, len, len); + Draw.reset(); + }); + }); + generatespark = new Effect(18, e -> { + Angles.randLenVectors(e.id, 5, e.fin() * 8f, (x, y) -> { + float len = e.fout() * 4f; + Draw.color(Palette.orangeSpark, Color.GRAY, e.fin()); + Draw.rect("circle", e.x + x, e.y + y, len, len); + Draw.reset(); + }); + }); + fuelburn = new Effect(23, e -> { + Angles.randLenVectors(e.id, 5, e.fin() * 9f, (x, y) -> { + float len = e.fout() * 4f; + Draw.color(Color.LIGHT_GRAY, Color.GRAY, e.fin()); + Draw.rect("circle", e.x + x, e.y + y, len, len); + Draw.reset(); + }); + }); + plasticburn = new Effect(40, e -> { + Angles.randLenVectors(e.id, 5, 3f + e.fin() * 5f, (x, y) -> { + Draw.color(Color.valueOf("e9ead3"), Color.GRAY, e.fin()); + Fill.circle(e.x + x, e.y + y, e.fout() * 1f); + Draw.reset(); + }); + }); + pulverize = new Effect(40, e -> { + Angles.randLenVectors(e.id, 5, 3f + e.fin() * 8f, (x, y) -> { + Draw.color(Palette.stoneGray); + Fill.square(e.x + x, e.y + y, e.fout() * 2f + 0.5f, 45); + Draw.reset(); + }); + }); + pulverizeRed = new Effect(40, e -> { + Angles.randLenVectors(e.id, 5, 3f + e.fin() * 8f, (x, y) -> { + Draw.color(Palette.redDust, Palette.stoneGray, e.fin()); + Fill.square(e.x + x, e.y + y, e.fout() * 2f + 0.5f, 45); + Draw.reset(); + }); + }); + pulverizeRedder = new Effect(40, e -> { + Angles.randLenVectors(e.id, 5, 3f + e.fin() * 9f, (x, y) -> { + Draw.color(Palette.redderDust, Palette.stoneGray, e.fin()); + Fill.square(e.x + x, e.y + y, e.fout() * 2.5f + 0.5f, 45); + Draw.reset(); + }); + }); + pulverizeSmall = new Effect(30, e -> { + Angles.randLenVectors(e.id, 3, e.fin() * 5f, (x, y) -> { + Draw.color(Palette.stoneGray); + Fill.square(e.x + x, e.y + y, e.fout() * 1f + 0.5f, 45); + Draw.reset(); + }); + }); + pulverizeMedium = new Effect(30, e -> { + Angles.randLenVectors(e.id, 5, 3f + e.fin() * 8f, (x, y) -> { + Draw.color(Palette.stoneGray); + Fill.square(e.x + x, e.y + y, e.fout() * 1f + 0.5f, 45); + Draw.reset(); + }); + }); + producesmoke = new Effect(12, e -> { + Angles.randLenVectors(e.id, 8, 4f + e.fin() * 18f, (x, y) -> { + Draw.color(Color.WHITE, Palette.accent, e.fin()); + Fill.square(e.x + x, e.y + y, 1f + e.fout() * 3f, 45); + Draw.reset(); + }); + }); + smeltsmoke = new Effect(15, e -> { + Angles.randLenVectors(e.id, 6, 4f + e.fin() * 5f, (x, y) -> { + Draw.color(Color.WHITE, e.color, e.fin()); + Fill.square(e.x + x, e.y + y, 0.5f + e.fout() * 2f, 45); + Draw.reset(); + }); + }); + formsmoke = new Effect(40, e -> { + Angles.randLenVectors(e.id, 6, 5f + e.fin() * 8f, (x, y) -> { + Draw.color(Palette.plasticSmoke, Color.LIGHT_GRAY, e.fin()); + Fill.square(e.x + x, e.y + y, 0.2f + e.fout() * 2f, 45); + Draw.reset(); + }); + }); + blastsmoke = new Effect(26, e -> { + Angles.randLenVectors(e.id, 12, 1f + e.fin() * 23f, (x, y) -> { + float size = 2f + e.fout() * 6f; + Draw.color(Color.LIGHT_GRAY, Color.DARK_GRAY, e.fin()); + Draw.rect("circle", e.x + x, e.y + y, size, size); + Draw.reset(); + }); + }); + lava = new Effect(18, e -> { + Angles.randLenVectors(e.id, 3, 1f + e.fin() * 10f, (x, y) -> { + float size = e.fslope() * 4f; + Draw.color(Color.ORANGE, Color.GRAY, e.fin()); + Draw.rect("circle", e.x + x, e.y + y, size, size); + Draw.reset(); + }); + }); + dooropen = new Effect(10, e -> { + Lines.stroke(e.fout() * 1.6f); + Lines.square(e.x, e.y, tilesize / 2f + e.fin() * 2f); + Draw.reset(); + }); + doorclose = new Effect(10, e -> { + Lines.stroke(e.fout() * 1.6f); + Lines.square(e.x, e.y, tilesize / 2f + e.fout() * 2f); + Draw.reset(); + }); + dooropenlarge = new Effect(10, e -> { + Lines.stroke(e.fout() * 1.6f); + Lines.square(e.x, e.y, tilesize + e.fin() * 2f); + Draw.reset(); + }); + doorcloselarge = new Effect(10, e -> { + Lines.stroke(e.fout() * 1.6f); + Lines.square(e.x, e.y, tilesize + e.fout() * 2f); + Draw.reset(); + }); + purify = new Effect(10, e -> { + Draw.color(Color.ROYAL, Color.GRAY, e.fin()); + Lines.stroke(2f); + Lines.spikes(e.x, e.y, e.fin() * 4f, 2, 6); + Draw.reset(); + }); + purifyoil = new Effect(10, e -> { + Draw.color(Color.BLACK, Color.GRAY, e.fin()); + Lines.stroke(2f); + Lines.spikes(e.x, e.y, e.fin() * 4f, 2, 6); + Draw.reset(); + }); + purifystone = new Effect(10, e -> { + Draw.color(Color.ORANGE, Color.GRAY, e.fin()); + Lines.stroke(2f); + Lines.spikes(e.x, e.y, e.fin() * 4f, 2, 6); + Draw.reset(); + }); + generate = new Effect(11, e -> { + Draw.color(Color.ORANGE, Color.YELLOW, e.fin()); + Lines.stroke(1f); + Lines.spikes(e.x, e.y, e.fin() * 5f, 2, 8); + Draw.reset(); + }); + mine = new Effect(20, e -> { + Angles.randLenVectors(e.id, 6, 3f + e.fin() * 6f, (x, y) -> { + Draw.color(e.color, Color.LIGHT_GRAY, e.fin()); + Fill.square(e.x + x, e.y + y, e.fout() * 2f, 45); + Draw.reset(); + }); + }); + mineBig = new Effect(30, e -> { + Angles.randLenVectors(e.id, 6, 4f + e.fin() * 8f, (x, y) -> { + Draw.color(e.color, Color.LIGHT_GRAY, e.fin()); + Fill.square(e.x + x, e.y + y, e.fout() * 2f + 0.2f, 45); + Draw.reset(); + }); + }); + mineHuge = new Effect(40, e -> { + Angles.randLenVectors(e.id, 8, 5f + e.fin() * 10f, (x, y) -> { + Draw.color(e.color, Color.LIGHT_GRAY, e.fin()); + Fill.square(e.x + x, e.y + y, e.fout() * 2f + 0.5f, 45); + Draw.reset(); + }); + }); + smelt = new Effect(20, e -> { + Angles.randLenVectors(e.id, 6, 2f + e.fin() * 5f, (x, y) -> { + Draw.color(Color.WHITE, e.color, e.fin()); + Fill.square(e.x + x, e.y + y, 0.5f + e.fout() * 2f, 45); + Draw.reset(); + }); + }); + teleportActivate = new Effect(50, e -> { + Draw.color(e.color); + + e.scaled(8f, e2 -> { + Lines.stroke(e2.fout() * 4f); + Lines.circle(e2.x, e2.y, 4f + e2.fin() * 27f); + }); + + Lines.stroke(e.fout() * 2f); + + Angles.randLenVectors(e.id, 30, 4f + 40f * e.fin(), (x, y) -> { + Lines.lineAngle(e.x + x, e.y + y, Mathf.angle(x, y), e.fin() * 4f + 1f); + }); + + Draw.reset(); + }); + teleport = new Effect(60, e -> { + Draw.color(e.color); + Lines.stroke(e.fin() * 2f); + Lines.circle(e.x, e.y, 7f + e.fout() * 8f); + + Angles.randLenVectors(e.id, 20, 6f + 20f * e.fout(), (x, y) -> { + Lines.lineAngle(e.x + x, e.y + y, Mathf.angle(x, y), e.fin() * 4f + 1f); + }); + + Draw.reset(); + }); + teleportOut = new Effect(20, e -> { + Draw.color(e.color); + Lines.stroke(e.fout() * 2f); + Lines.circle(e.x, e.y, 7f + e.fin() * 8f); + + Angles.randLenVectors(e.id, 20, 4f + 20f * e.fin(), (x, y) -> { + Lines.lineAngle(e.x + x, e.y + y, Mathf.angle(x, y), e.fslope() * 4f + 1f); + }); + + Draw.reset(); + }); + ripple = new GroundEffect(false, 30, e -> { + Draw.color(Tmp.c1.set(e.color).shiftValue(0.1f)); + Lines.stroke(e.fout() + 0.4f); + Lines.circle(e.x, e.y, 2f + e.fin() * 4f); + Draw.reset(); + }); + + bubble = new Effect(20, e -> { + Draw.color(Tmp.c1.set(e.color).shiftValue(0.1f)); + Lines.stroke(e.fout() + 0.2f); + Angles.randLenVectors(e.id, 2, 8f, (x, y) -> { + Lines.circle(e.x + x, e.y + y, 1f + e.fin() * 3f); + }); + Draw.reset(); + }); + + commandSend = new Effect(28, e -> { + Draw.color(Palette.command); + Lines.stroke(e.fout() * 2f); + Lines.poly(e.x, e.y, 40, 4f + e.finpow() * 120f); + Draw.color(); + }); + + healWaveMend = new Effect(40, e -> { + Draw.color(e.color); + Lines.stroke(e.fout() * 2f); + Lines.poly(e.x, e.y, 30, e.finpow() * e.rotation); + Draw.color(); + }); + + overdriveWave = new Effect(50, e -> { + Draw.color(e.color); + Lines.stroke(e.fout() * 1f); + Lines.poly(e.x, e.y, 30, e.finpow() * e.rotation); + Draw.color(); + }); + + healBlock = new Effect(20, e -> { + Draw.color(Palette.heal); + Lines.stroke(2f * e.fout() + 0.5f); + Lines.square(e.x, e.y, 1f + (e.fin() * e.rotation * tilesize/2f-1f)); + Draw.color(); + }); + + healBlockFull = new Effect(20, e -> { + Draw.color(e.color); + Draw.alpha(e.fout()); + Fill.square(e.x, e.y, e.rotation * tilesize / 2f); + Draw.color(); + }); + + overdriveBlockFull = new Effect(60, e -> { + Draw.color(e.color); + Draw.alpha(e.fslope() * 0.4f); + Fill.square(e.x, e.y, e.rotation * tilesize); + Draw.color(); + }); + + shieldBreak = new Effect(40, e -> { + Draw.color(Palette.accent); + Lines.stroke(3f * e.fout()); + Lines.poly(e.x, e.y, 6, e.rotation + e.fin(), 90); + Draw.reset(); + }); } } diff --git a/core/src/io/anuke/mindustry/world/blocks/OreBlock.java b/core/src/io/anuke/mindustry/world/blocks/OreBlock.java index 4eb4687cca..873a2bbd74 100644 --- a/core/src/io/anuke/mindustry/world/blocks/OreBlock.java +++ b/core/src/io/anuke/mindustry/world/blocks/OreBlock.java @@ -55,8 +55,7 @@ public class OreBlock extends Floor{ public static Block get(Block floor, Item item){ if(!oreBlockMap.containsKey(item)) throw new IllegalArgumentException("Item '" + item + "' is not an ore!"); - if(!oreBlockMap.get(item).containsKey(floor)) - throw new IllegalArgumentException("Block '" + floor.name + "' does not support ores!"); + if(!oreBlockMap.get(item).containsKey(floor)) throw new IllegalArgumentException("Block '" + floor.name + "' does not support ores!"); return oreBlockMap.get(item).get(floor); } }