diff --git a/core/assets-raw/sprites/statuses/status-melting.png b/core/assets-raw/sprites/statuses/status-melting.png index e3b4e54b54..579bc741a4 100644 Binary files a/core/assets-raw/sprites/statuses/status-melting.png and b/core/assets-raw/sprites/statuses/status-melting.png differ diff --git a/core/assets/icons/icons.properties b/core/assets/icons/icons.properties index 5948ada1ec..4cc7ed0c38 100755 --- a/core/assets/icons/icons.properties +++ b/core/assets/icons/icons.properties @@ -310,25 +310,25 @@ 63418=legacy-unit-factory-ground|block-legacy-unit-factory-ground-ui 63417=interplanetary-accelerator|block-interplanetary-accelerator-ui 63416=basalt-boulder|block-basalt-boulder-ui -63415=none|status-none-ui -63414=burning|status-burning-ui -63413=freezing|status-freezing-ui -63412=unmoving|status-unmoving-ui -63411=slow|status-slow-ui -63410=wet|status-wet-ui -63409=muddy|status-muddy-ui -63408=melting|status-melting-ui -63407=sapped|status-sapped-ui -63406=spore-slowed|status-spore-slowed-ui -63405=tarred|status-tarred-ui -63404=overdrive|status-overdrive-ui -63403=overclock|status-overclock-ui -63402=shielded|status-shielded-ui -63401=boss|status-boss-ui -63400=shocked|status-shocked-ui -63399=blasted|status-blasted-ui -63398=corroded|status-corroded-ui -63397=disarmed|status-disarmed-ui +63415=none|status-none +63414=burning|status-burning +63413=freezing|status-freezing +63412=unmoving|status-unmoving +63411=slow|status-slow +63410=wet|status-wet +63409=muddy|status-muddy +63408=melting|status-melting +63407=sapped|status-sapped +63406=spore-slowed|status-spore-slowed +63405=tarred|status-tarred +63404=overdrive|status-overdrive +63403=overclock|status-overclock +63402=shielded|status-shielded +63401=boss|status-boss +63400=shocked|status-shocked +63399=blasted|status-blasted +63398=corroded|status-corroded +63397=disarmed|status-disarmed 63385=duct|block-duct-ui 63376=repair-turret|block-repair-turret-ui 63374=payload-incinerator|block-payload-incinerator-ui @@ -340,11 +340,11 @@ 63364=oxynoe|unit-oxynoe-ui 63363=cyerce|unit-cyerce-ui 63362=aegires|unit-aegires-ui -63361=electrified|status-electrified-ui +63361=electrified|status-electrified 63360=navanax|unit-navanax-ui 63353=silicon-arc-furnace|block-silicon-arc-furnace-ui 63352=metal-floor-4|block-metal-floor-4-ui -63351=invincible|status-invincible-ui +63351=invincible|status-invincible 63356=sharded|team-sharded 63357=crux|team-crux 63358=derelict|team-derelict @@ -583,11 +583,11 @@ 63099=large-payload-mass-driver|block-large-payload-mass-driver-ui 63098=reinforced-message|block-reinforced-message-ui 63097=world-message|block-world-message-ui -63096=fast|status-fast-ui +63096=fast|status-fast 63095=ranai|ranai 63094=cat|cat 63093=world-switch|block-world-switch-ui -63092=dynamic|status-dynamic-ui +63092=dynamic|status-dynamic 63091=remove-wall|block-remove-wall-ui 63090=remove-ore|block-remove-ore-ui 63089=small-heat-redirector|block-small-heat-redirector-ui diff --git a/core/src/mindustry/type/StatusEffect.java b/core/src/mindustry/type/StatusEffect.java index d76b9e7b29..408c7d5f25 100644 --- a/core/src/mindustry/type/StatusEffect.java +++ b/core/src/mindustry/type/StatusEffect.java @@ -67,6 +67,10 @@ public class StatusEffect extends UnlockableContent{ public ObjectSet affinities = new ObjectSet<>(), opposites = new ObjectSet<>(); /** Set to false to disable outline generation. */ public boolean outline = true; + /** Padding applied when outline is generated. */ + public int outlinePadding = 0; + /** Color of generated outline. */ + public Color outlineColor = Pal.gray; /** True to tint the sprite by the color. Always applied in vanilla. */ public boolean applyTint = false; /** Transition handler map. */ @@ -250,7 +254,8 @@ public class StatusEffect extends UnlockableContent{ } if(outline){ - makeOutline(packer, uiIcon, false, Pal.gray, 3); + //vanilla needs extra padding and I don't want to fix every sprite or set every outline padding value + makeOutline(packer, uiIcon, false, outlineColor, 3, isVanilla() ? 2 : outlinePadding); } }