Astronand/Mindustry
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Moved entity package from Arc / Entity code cleanup

Browse Source
This commit is contained in:
Anuken
2019-02-02 15:53:35 -05:00
parent 6b2f2d0664
commit 0dd9d2b460
177 changed files with 1872 additions and 666 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
core/src/io/anuke/mindustry/content/Bullets.java
View File

@@ -1,6 +1,6 @@
package io.anuke.mindustry.content;
import io.anuke.arc.entities.Effects;
import io.anuke.mindustry.entities.Effects;
import io.anuke.arc.graphics.Color;
import io.anuke.arc.graphics.g2d.CapStyle;
import io.anuke.arc.graphics.g2d.Draw;
@@ -10,7 +10,7 @@ import io.anuke.arc.math.Mathf;
import io.anuke.arc.util.Time;
import io.anuke.arc.util.Tmp;
import io.anuke.mindustry.entities.Damage;
import io.anuke.mindustry.entities.Unit;
import io.anuke.mindustry.entities.type.Unit;
import io.anuke.mindustry.entities.bullet.*;
import io.anuke.mindustry.entities.effect.Fire;
import io.anuke.mindustry.entities.effect.Lightning;

4
core/src/io/anuke/mindustry/content/Fx.java
View File

@@ -1,7 +1,7 @@
package io.anuke.mindustry.content;
import io.anuke.arc.Core;
import io.anuke.arc.entities.Effects.Effect;
import io.anuke.mindustry.entities.Effects.Effect;
import io.anuke.arc.graphics.Color;
import io.anuke.arc.graphics.g2d.Draw;
import io.anuke.arc.graphics.g2d.Fill;
@@ -10,7 +10,7 @@ import io.anuke.arc.math.Angles;
import io.anuke.arc.math.Mathf;
import io.anuke.arc.util.Tmp;
import io.anuke.mindustry.entities.effect.GroundEffectEntity.GroundEffect;
import io.anuke.mindustry.entities.units.BaseUnit;
import io.anuke.mindustry.entities.type.BaseUnit;
import io.anuke.mindustry.game.ContentList;
import io.anuke.mindustry.graphics.Palette;
import io.anuke.mindustry.graphics.Shapes;

20
core/src/io/anuke/mindustry/content/Mechs.java
View File

@@ -1,7 +1,7 @@
package io.anuke.mindustry.content;
import io.anuke.arc.Core;
import io.anuke.arc.entities.Effects;
import io.anuke.mindustry.entities.Effects;
import io.anuke.arc.graphics.Blending;
import io.anuke.arc.graphics.Color;
import io.anuke.arc.graphics.g2d.Draw;
@@ -9,7 +9,7 @@ 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.entities.Player;
import io.anuke.mindustry.entities.type.Player;
import io.anuke.mindustry.entities.Units;
import io.anuke.mindustry.entities.effect.Lightning;
import io.anuke.mindustry.game.ContentList;
@@ -36,7 +36,7 @@ public class Mechs implements ContentList{
boostSpeed = 0.85f;
weapon = Weapons.blaster;
trailColorTo = Color.valueOf("ffd37f");
armor = 20f;
health = 250f;
}
@Override
@@ -54,7 +54,7 @@ public class Mechs implements ContentList{
boostSpeed = 0.95f;
itemCapacity = 15;
mass = 0.9f;
armor = 30f;
health = 220f;
weaponOffsetX = -1;
weaponOffsetY = -1;
weapon = Weapons.shockgun;
@@ -92,7 +92,7 @@ public class Mechs implements ContentList{
boostSpeed = 0.8f;
canHeal = true;
weapon = Weapons.healBlaster;
armor = 15f;
health = 200f;
trailColorTo = Palette.heal;
}
@@ -135,7 +135,7 @@ public class Mechs implements ContentList{
weaponOffsetY = 0;
weapon = Weapons.swarmer;
trailColorTo = Color.valueOf("feb380");
armor = 45f;
health = 300f;
}
@Override
@@ -188,7 +188,7 @@ public class Mechs implements ContentList{
mineSpeed = 0.9f;
speed = 0.4f;
drag = 0.1f;
armor = 10f;
health = 180f;
weapon = Weapons.blasterSmall;
weaponOffsetX = -1;
weaponOffsetY = -1;
@@ -211,7 +211,7 @@ public class Mechs implements ContentList{
speed = 0.11f;
drag = 0.01f;
mass = 2f;
armor = 5f;
health = 170f;
weapon = Weapons.missiles;
trailColor = Color.valueOf("d3ddff");
cellTrnsY = 1f;
@@ -266,7 +266,7 @@ public class Mechs implements ContentList{
drag = 0.034f;
mass = 2.5f;
turnCursor = false;
armor = 20f;
health = 220f;
itemCapacity = 30;
trailColor = Color.valueOf("84f491");
weapon = Weapons.bomberTrident;
@@ -287,7 +287,7 @@ public class Mechs implements ContentList{
speed = 0.32f;
drag = 0.06f;
mass = 3f;
armor = 30f;
health = 240f;
itemCapacity = 60;
trailColor = Color.valueOf("feb380");
cellTrnsY = 1f;

2
core/src/io/anuke/mindustry/content/StatusEffects.java
View File

@@ -1,6 +1,6 @@
package io.anuke.mindustry.content;
import io.anuke.arc.entities.Effects;
import io.anuke.mindustry.entities.Effects;
import io.anuke.arc.math.Mathf;
import io.anuke.mindustry.game.ContentList;
import io.anuke.mindustry.type.StatusEffect;

24
core/src/io/anuke/mindustry/content/UnitTypes.java
View File

@@ -1,8 +1,8 @@
package io.anuke.mindustry.content;
import io.anuke.arc.collection.ObjectSet;
import io.anuke.mindustry.entities.units.UnitType;
import io.anuke.mindustry.entities.units.types.*;
import io.anuke.mindustry.entities.type.types.Crawler;
import io.anuke.mindustry.type.UnitType;
import io.anuke.mindustry.game.ContentList;
public class UnitTypes implements ContentList{
@@ -13,7 +13,7 @@ public class UnitTypes implements ContentList{
@Override
public void load(){
spirit = new UnitType("spirit", Spirit.class, Spirit::new){{
spirit = new UnitType("spirit", io.anuke.mindustry.entities.type.types.Spirit.class, io.anuke.mindustry.entities.type.types.Spirit::new){{
weapon = Weapons.healBlasterDrone;
isFlying = true;
drag = 0.01f;
@@ -23,7 +23,7 @@ public class UnitTypes implements ContentList{
health = 60;
}};
dagger = new UnitType("dagger", Dagger.class, Dagger::new){{
dagger = new UnitType("dagger", io.anuke.mindustry.entities.type.types.Dagger.class, io.anuke.mindustry.entities.type.types.Dagger::new){{
maxVelocity = 1.1f;
speed = 0.2f;
drag = 0.4f;
@@ -33,7 +33,7 @@ public class UnitTypes implements ContentList{
health = 130;
}};
crawler = new UnitType("crawler", Crawler.class, Crawler::new){{
crawler = new UnitType("crawler", io.anuke.mindustry.entities.type.types.Crawler.class, Crawler::new){{
maxVelocity = 1.1f;
speed = 0.22f;
drag = 0.4f;
@@ -43,7 +43,7 @@ public class UnitTypes implements ContentList{
health = 100;
}};
titan = new UnitType("titan", Titan.class, Titan::new){{
titan = new UnitType("titan", io.anuke.mindustry.entities.type.types.Titan.class, io.anuke.mindustry.entities.type.types.Titan::new){{
maxVelocity = 0.8f;
speed = 0.18f;
drag = 0.4f;
@@ -55,7 +55,7 @@ public class UnitTypes implements ContentList{
immunities.add(StatusEffects.burning);
}};
fortress = new UnitType("fortress", Fortress.class, Fortress::new){{
fortress = new UnitType("fortress", io.anuke.mindustry.entities.type.types.Fortress.class, io.anuke.mindustry.entities.type.types.Fortress::new){{
maxVelocity = 0.78f;
speed = 0.15f;
drag = 0.4f;
@@ -68,7 +68,7 @@ public class UnitTypes implements ContentList{
health = 800;
}};
eruptor = new UnitType("eruptor", Eruptor.class, Eruptor::new){{
eruptor = new UnitType("eruptor", io.anuke.mindustry.entities.type.types.Eruptor.class, io.anuke.mindustry.entities.type.types.Eruptor::new){{
maxVelocity = 0.81f;
speed = 0.16f;
drag = 0.4f;
@@ -82,7 +82,7 @@ public class UnitTypes implements ContentList{
immunities = ObjectSet.with(StatusEffects.burning, StatusEffects.melting);
}};
wraith = new UnitType("wraith", Wraith.class, Wraith::new){{
wraith = new UnitType("wraith", io.anuke.mindustry.entities.type.types.Wraith.class, io.anuke.mindustry.entities.type.types.Wraith::new){{
speed = 0.3f;
maxVelocity = 1.9f;
drag = 0.01f;
@@ -92,7 +92,7 @@ public class UnitTypes implements ContentList{
health = 70;
}};
ghoul = new UnitType("ghoul", Ghoul.class, Ghoul::new){{
ghoul = new UnitType("ghoul", io.anuke.mindustry.entities.type.types.Ghoul.class, io.anuke.mindustry.entities.type.types.Ghoul::new){{
health = 250;
speed = 0.2f;
maxVelocity = 1.4f;
@@ -103,7 +103,7 @@ public class UnitTypes implements ContentList{
weapon = Weapons.bomber;
}};
revenant = new UnitType("revenant", Revenant.class, Revenant::new){{
revenant = new UnitType("revenant", io.anuke.mindustry.entities.type.types.Revenant.class, io.anuke.mindustry.entities.type.types.Revenant::new){{
health = 250;
mass = 5f;
hitsize = 12f;
@@ -115,7 +115,7 @@ public class UnitTypes implements ContentList{
weapon = Weapons.laserBurster;
}};
phantom = new UnitType("phantom", Phantom.class, Phantom::new){{
phantom = new UnitType("phantom", io.anuke.mindustry.entities.type.types.Phantom.class, io.anuke.mindustry.entities.type.types.Phantom::new){{
weapon = Weapons.healBlasterDrone2;
isFlying = true;
drag = 0.01f;