diff --git a/core/assets/bundles/bundle.properties b/core/assets/bundles/bundle.properties index e8394127ba..cf79d16140 100644 --- a/core/assets/bundles/bundle.properties +++ b/core/assets/bundles/bundle.properties @@ -774,7 +774,7 @@ sector.missingresources = [scarlet]Insufficient Core Resources sector.attacked = Sector [accent]{0}[white] under attack! sector.lost = Sector [accent]{0}[white] lost! #note: the missing space in the line below is intentional -sector.captured = Sector [accent]{0}[white]captured! +sector.captured = Sector [accent]{0}[white]Captured! sector.changeicon = Change Icon sector.noswitch.title = Unable to Switch Sectors sector.noswitch = You may not switch sectors while an existing sector is under attack.\n\nSector: [accent]{0}[] on [accent]{1}[] @@ -1865,7 +1865,7 @@ hint.unitControl = Hold [accent][[L-ctrl][] and [accent]click[] to manually cont hint.unitControl.mobile = [accent][[Double-tap][] to manually control friendly units or turrets. hint.unitSelectControl = To control units, enter [accent]command mode[] by holding [accent]L-shift.[]\nWhile in command mode, click and drag to select units. [accent]Right-click[] a location or target to command units there. hint.unitSelectControl.mobile = To control units, enter [accent]command mode[] by pressing the [accent]command[] button in the bottom left.\nWhile in command mode, long-press and drag to select units. Tap a location or target to command units there. -hint.launch = Once enough resources are collected, you can [accent]Launch[] to the next sector by opening the \uE827 [accent]Map[] in the bottom right. +hint.launch = Once enough resources are collected, you can [accent]Launch[] to the next sector by opening the \uE827 [accent]Map[] in the bottom right, and panning over to the new location. hint.launch.mobile = Once enough resources are collected, you can [accent]Launch[] by selecting nearby sectors from the \uE827 [accent]Map[] in the \uE88C [accent]Menu[]. hint.schematicSelect = Hold [accent][[F][] and drag to select blocks to copy and paste.\n\n[accent][[Middle Click][] to copy a single block type. hint.rebuildSelect = Hold [accent][[B][] and drag to select destroyed block plans.\nThis will rebuild them automatically. diff --git a/core/src/mindustry/game/Teams.java b/core/src/mindustry/game/Teams.java index 9abcf0b4e5..9fb472bf50 100644 --- a/core/src/mindustry/game/Teams.java +++ b/core/src/mindustry/game/Teams.java @@ -347,7 +347,7 @@ public class Teams{ } for(var build : builds){ - if(build.within(x, y, range) && !cores.contains(c -> c.within(x, y, range))){ + if(build.within(x, y, range) && !cores.contains(c -> c.within(build, range))){ //TODO GPU driver bugs? build.kill(); //Time.run(Mathf.random(0f, 60f * 6f), build::kill); diff --git a/core/src/mindustry/ui/fragments/HudFragment.java b/core/src/mindustry/ui/fragments/HudFragment.java index b97b59f1b1..e964aa5fdf 100644 --- a/core/src/mindustry/ui/fragments/HudFragment.java +++ b/core/src/mindustry/ui/fragments/HudFragment.java @@ -71,7 +71,11 @@ public class HudFragment{ }); Events.on(SectorCaptureEvent.class, e -> { - showToast(Core.bundle.format("sector.captured", e.sector.isBeingPlayed() ? "" : e.sector.name() + " ")); + if(e.sector.isBeingPlayed()){ + ui.announce(Core.bundle.format("sector.capture", ""), 5f); + }else{ + showToast(Core.bundle.format("sector.capture", e.sector.name() + " ")); + } }); Events.on(SectorLoseEvent.class, e -> { diff --git a/gradle.properties b/gradle.properties index 4a66b15a49..5baefb5b6a 100644 --- a/gradle.properties +++ b/gradle.properties @@ -25,4 +25,4 @@ org.gradle.caching=true #used for slow jitpack builds; TODO see if this actually works org.gradle.internal.http.socketTimeout=100000 org.gradle.internal.http.connectionTimeout=100000 -archash=d7512241d0 +archash=e5a3dd82b8