diff --git a/core/assets-raw/sprites/units/obviate-cell.png b/core/assets-raw/sprites/units/obviate-cell.png new file mode 100644 index 0000000000..80c3606926 Binary files /dev/null and b/core/assets-raw/sprites/units/obviate-cell.png differ diff --git a/core/assets-raw/sprites/units/obviate.png b/core/assets-raw/sprites/units/obviate.png new file mode 100644 index 0000000000..4a58a31657 Binary files /dev/null and b/core/assets-raw/sprites/units/obviate.png differ diff --git a/core/assets/icons/icons.properties b/core/assets/icons/icons.properties index 44aa449427..e0c43b51df 100755 --- a/core/assets/icons/icons.properties +++ b/core/assets/icons/icons.properties @@ -550,3 +550,4 @@ 63142=anthicus|unit-anthicus-ui 63141=anthicus-missile|unit-anthicus-missile-ui 63140=shield-breaker|block-shield-breaker-ui +63139=obviate|unit-obviate-ui diff --git a/core/assets/logicids.dat b/core/assets/logicids.dat index 534e2a396b..5e29923c9e 100644 Binary files a/core/assets/logicids.dat and b/core/assets/logicids.dat differ diff --git a/core/src/mindustry/content/UnitTypes.java b/core/src/mindustry/content/UnitTypes.java index f1d320e3b8..b5031900be 100644 --- a/core/src/mindustry/content/UnitTypes.java +++ b/core/src/mindustry/content/UnitTypes.java @@ -46,7 +46,7 @@ public class UnitTypes{ //air public static @EntityDef({Unitc.class}) UnitType flare, eclipse, horizon, zenith, antumbra, - evoke, avert; + evoke, avert, obviate; //air, legacy public static @EntityDef(value = {Unitc.class}, legacy = true) UnitType mono; @@ -3338,6 +3338,26 @@ public class UnitTypes{ }}); }}; + obviate = new ErekirUnitType("obviate"){{ + lowAltitude = false; + flying = true; + drag = 0.08f; + speed = 1.9f; + rotateSpeed = 4f; + accel = 0.09f; + health = 2300f; + armor = 3f; + hitSize = 18f; + engineSize = 4.3f; + engineOffset = 54f / 4f; + fogRadius = 25; + itemCapacity = 0; + + setEnginesMirror( + new UnitEngine(59 / 4f, -25 / 4f, 3.1f, 315f) + ); + }}; + quell = new ErekirUnitType("quell"){{ aiController = FlyingFollowAI::new; envDisabled = 0;