diff --git a/core/assets-raw/sprites/units/neoplasm/latum-segment0.png b/core/assets-raw/sprites/units/neoplasm/latum-segment0.png new file mode 100644 index 0000000000..694b491924 Binary files /dev/null and b/core/assets-raw/sprites/units/neoplasm/latum-segment0.png differ diff --git a/core/assets-raw/sprites/units/neoplasm/latum-segment1.png b/core/assets-raw/sprites/units/neoplasm/latum-segment1.png new file mode 100644 index 0000000000..9764ace4f0 Binary files /dev/null and b/core/assets-raw/sprites/units/neoplasm/latum-segment1.png differ diff --git a/core/assets-raw/sprites/units/neoplasm/latum-segment2.png b/core/assets-raw/sprites/units/neoplasm/latum-segment2.png new file mode 100644 index 0000000000..cca25fc655 Binary files /dev/null and b/core/assets-raw/sprites/units/neoplasm/latum-segment2.png differ diff --git a/core/assets-raw/sprites/units/neoplasm/latum-segment3.png b/core/assets-raw/sprites/units/neoplasm/latum-segment3.png new file mode 100644 index 0000000000..ffad71d540 Binary files /dev/null and b/core/assets-raw/sprites/units/neoplasm/latum-segment3.png differ diff --git a/core/src/mindustry/Vars.java b/core/src/mindustry/Vars.java index 584b76cc7d..76b50034c8 100644 --- a/core/src/mindustry/Vars.java +++ b/core/src/mindustry/Vars.java @@ -54,7 +54,7 @@ public class Vars implements Loadable{ public static final int defaultEnv = Env.terrestrial | Env.spores | Env.groundOil | Env.groundWater | Env.oxygen; /** Wall darkness radius. */ public static final int darkRadius = 4; - /** Maximum extra padding around deployment schematics. TODO 4, or 5?*/ + /** Maximum extra padding around deployment schematics. */ public static final int maxLoadoutSchematicPad = 4; /** All schematic base64 starts with this string.*/ public static final String schematicBaseStart ="bXNjaA"; diff --git a/core/src/mindustry/content/UnitTypes.java b/core/src/mindustry/content/UnitTypes.java index 0fba6af0d4..3e29bd67c8 100644 --- a/core/src/mindustry/content/UnitTypes.java +++ b/core/src/mindustry/content/UnitTypes.java @@ -3906,26 +3906,25 @@ public class UnitTypes{ //endregion //region erekir - neoplasm - if(false) - latum = new NeoplasmUnitType("latum"){{ - health = 20000; - armor = 12; - hitSize = 48f; - omniMovement = false; - rotateSpeed = 1.7f; - drownTimeMultiplier = 4f; - drawCell = false; - segments = 4; - drawBody = false; - hidden = true; - crushDamage = 2f; - aiController = HugAI::new; - targetAir = false; + latum = new NeoplasmUnitType("latum"){{ + health = 20000; + armor = 12; + hitSize = 48f; + omniMovement = false; + rotateSpeed = 1.7f; + drownTimeMultiplier = 4f; + drawCell = false; + segments = 4; + drawBody = false; + hidden = true; + crushDamage = 2f; + aiController = HugAI::new; + targetAir = false; - segmentScl = 4f; - segmentPhase = 5f; - speed = 1f; - }}; + segmentScl = 4f; + segmentPhase = 5f; + speed = 1f; + }}; //endregion //region erekir - core diff --git a/core/src/mindustry/mod/ContentParser.java b/core/src/mindustry/mod/ContentParser.java index 23cd8da414..69810ab76e 100644 --- a/core/src/mindustry/mod/ContentParser.java +++ b/core/src/mindustry/mod/ContentParser.java @@ -470,8 +470,8 @@ public class ContentParser{ } - if(value.has("controller")){ - unit.aiController = supply(resolve(value.getString("controller"), FlyingAI.class)); + if(value.has("controller") || value.has("aiController")){ + unit.aiController = supply(resolve(value.getString("controller", value.getString("aiController", "")), FlyingAI.class)); value.remove("controller"); }