diff --git a/core/assets/bundles/bundle.properties b/core/assets/bundles/bundle.properties index 4ca589abed..89e8370499 100644 --- a/core/assets/bundles/bundle.properties +++ b/core/assets/bundles/bundle.properties @@ -2158,18 +2158,28 @@ gz.zone2 = Anything built in the radius is destroyed when a wave starts. gz.zone3 = A wave will begin now.\nGet ready. gz.finish = Build more turrets, mine more resources,\nand defend against all the waves to [accent]capture the sector[]. -atolls.dropunits = After picking up ground units, command :mega:[accent]Mega[] units to this location. -atolls.unitpayload.command = Select the  [accent]Unload Payload[] command. -atolls.unitpayload.drop = While this command is active, the [accent]Mega[] units will drop the units they are carrying. -atolls.unitpayload.warn = Use the ground units to attack the enemy base. - -atolls.selectunits = Enter command mode. Select the :mega:[accent]Mega[] units. -atolls.loadunits = Select the  [accent]Load Units[] command. -atolls.loadunitsabove = Move the :mega:[accent]Mega[] units above ground units to pick them up. +atolls.destroy1 = Destroy the 2 enemy [accent]foundation cores[] first.\n[accent]Gain access to thorium[]. +atolls.destroy2 = The enemy base to the south is fragile to naval units. \nConstruct [accent]naval units[]   to proceed. +atolls.destroy3 = The enemy base to the east is fragile to air units. \nConstruct [accent]air units[]   to proceed. +atolls.mega1 = Enter [accent]command mode[] and select the :mega:[accent]Mega[] units. +atolls.mega2 = Select the  [accent]Load Units[] command to have Mega units to pick up ground units. +atolls.mega3 = Move the Mega units [accent]above[] ground units to load them in. +atolls.mega4 = [accent]Drop ground units here to attack. +atolls.mega5 = Select the  [accent]Unload Payload[] command to have Mega units drop their carried units. +atolls.mega6 = Units will be [accent]automatically dropped[] while the  Unload Payload command is selected. +atolls.mega7 = Mega units [accent]will not[] drop ground units while they are above walls or deep water. +atolls.mega8 = [accent]Drop naval units here to attack.[] +atolls.attack1 = 1: Drop ground units here to attack from this location. +atolls.attack2 = 2: Alternatively, drop naval units here to launch a surprise attack. +atolls.carry1 = Carrying ground units requires :mega:[accent]Mega[] units. +atolls.carry2 = 1: Command Mega units to [accent]move over[] the ground units. +atolls.carry3 = 2: Select the  [accent]Load Units[] command in order to pick up the ground units with the Mega units. +atolls.carry4 = 3: Command and move the Mega carriers [accent]loaded with units[]. +atolls.carry5 = 4: Select the  [accent]'Unload Payload'[] command in order for the Mega units to drop the ground units. +atolls.carry6 = These steps can be reviewed [accent]here[]. +atolls.carry7 = Follow these instructions to airdrop more units near the enemy base. atolls.noairunit = This base is too well-fortified to destroy with air units. -atolls.nonavalunit = Naval units cannot access this base. -atolls.groundunit = In order to destroy this base, [accent]Mega[] units\nmust be used to carry ground units over terrain. -atolls.producemegas = Produce :mega:[accent]Mega[] units for this purpose. +atolls.2strategies = There are two strategies to destroy this base. onset.mine = Click to mine :beryllium: [accent]beryllium[] from walls.\n\nUse [accent][[WASD] to move. onset.mine.mobile = Tap to mine :beryllium: [accent]beryllium[] from walls. diff --git a/core/assets/maps/atolls.msav b/core/assets/maps/atolls.msav index b5aa96c417..8081a6ed44 100644 Binary files a/core/assets/maps/atolls.msav and b/core/assets/maps/atolls.msav differ diff --git a/core/src/mindustry/logic/LogicDialog.java b/core/src/mindustry/logic/LogicDialog.java index 38211fd1ab..7c0f49a5d0 100644 --- a/core/src/mindustry/logic/LogicDialog.java +++ b/core/src/mindustry/logic/LogicDialog.java @@ -282,7 +282,7 @@ public class LogicDialog extends BaseDialog{ search.keyDown(KeyCode.enter, () -> { if(!searchText[0].isEmpty() && matched[0] != null){ - canvas.add((LStatement)matched[0].get()); + canvas.addAt(position == -1 ? canvas.statements.getChildren().size : position, (LStatement)matched[0].get()); dialog.hide(); } });