From 01f06cd0f7816b4067ab8e4d4063f9f5110ea036 Mon Sep 17 00:00:00 2001 From: Anuken Date: Wed, 22 Sep 2021 18:04:21 -0400 Subject: [PATCH] NeoplasmUnitType --- core/src/mindustry/content/UnitTypes.java | 5 +---- core/src/mindustry/type/NeoplasmUnitType.java | 19 +++++++++++++++++++ gradle.properties | 2 +- 3 files changed, 21 insertions(+), 5 deletions(-) create mode 100644 core/src/mindustry/type/NeoplasmUnitType.java diff --git a/core/src/mindustry/content/UnitTypes.java b/core/src/mindustry/content/UnitTypes.java index b8ca3df1f2..0acffcef5a 100644 --- a/core/src/mindustry/content/UnitTypes.java +++ b/core/src/mindustry/content/UnitTypes.java @@ -2422,10 +2422,9 @@ public class UnitTypes implements ContentList{ //endregion //region neoplasm - scuttler = new UnitType("scuttler"){{ + scuttler = new NeoplasmUnitType("scuttler"){{ health = 20000; armor = 17; - outlineColor = Pal.neoplasmOutline; hitSize = 48f; omniMovement = false; rotateSpeed = 1.7f; @@ -2438,8 +2437,6 @@ public class UnitTypes implements ContentList{ segmentScl = 4f; segmentPhase = 5f; speed = 1f; - - immunities.addAll(StatusEffects.burning, StatusEffects.melting); }}; //endregion diff --git a/core/src/mindustry/type/NeoplasmUnitType.java b/core/src/mindustry/type/NeoplasmUnitType.java new file mode 100644 index 0000000000..c403b49047 --- /dev/null +++ b/core/src/mindustry/type/NeoplasmUnitType.java @@ -0,0 +1,19 @@ +package mindustry.type; + +import mindustry.content.*; +import mindustry.graphics.*; + +/** This is just a preset. Contains no new behavior. */ +public class NeoplasmUnitType extends UnitType{ + + public NeoplasmUnitType(String name){ + super(name); + + outlineColor = Pal.neoplasmOutline; + immunities.addAll(StatusEffects.burning, StatusEffects.melting); + + //TODO + //- liquid regen ability + //- liquid/neoplasm explode ability + } +} diff --git a/gradle.properties b/gradle.properties index ed17ac9ae6..ddfe321771 100644 --- a/gradle.properties +++ b/gradle.properties @@ -11,4 +11,4 @@ android.useAndroidX=true #used for slow jitpack builds; TODO see if this actually works http.socketTimeout=80000 http.connectionTimeout=80000 -archash=6f56e0a3a33c0c7752c8aff868df035cf242e7aa +archash=3400de3323150ba91c94fc07a6d4ca1958f4d943