From 39f32af50043edcdf39ffa8ba53a74312740a503 Mon Sep 17 00:00:00 2001 From: Anuken Date: Fri, 20 May 2022 10:53:07 -0400 Subject: [PATCH] might as well uncomment this hidden unit --- .../sprites/units/neoplasm/latum-segment0.png | Bin 0 -> 3588 bytes .../sprites/units/neoplasm/latum-segment1.png | Bin 0 -> 4145 bytes .../sprites/units/neoplasm/latum-segment2.png | Bin 0 -> 3994 bytes .../sprites/units/neoplasm/latum-segment3.png | Bin 0 -> 4162 bytes core/src/mindustry/Vars.java | 2 +- core/src/mindustry/content/UnitTypes.java | 37 +++++++++--------- core/src/mindustry/mod/ContentParser.java | 4 +- 7 files changed, 21 insertions(+), 22 deletions(-) create mode 100644 core/assets-raw/sprites/units/neoplasm/latum-segment0.png create mode 100644 core/assets-raw/sprites/units/neoplasm/latum-segment1.png create mode 100644 core/assets-raw/sprites/units/neoplasm/latum-segment2.png create mode 100644 core/assets-raw/sprites/units/neoplasm/latum-segment3.png 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 0000000000000000000000000000000000000000..694b491924aab052a040059cde10b348699a9c68 GIT binary patch literal 3588 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 literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..9764ace4f03716d99ef2b6c4de2ce7f742d9838b GIT binary patch literal 4145 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 literal 0 HcmV?d00001 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"); }