diff --git a/core/assets/bundles/bundle.properties b/core/assets/bundles/bundle.properties index 205579a9ef..39318ed99d 100644 --- a/core/assets/bundles/bundle.properties +++ b/core/assets/bundles/bundle.properties @@ -870,6 +870,8 @@ sector.seaPort.name = Sea Port sector.weatheredChannels.name = Weathered Channels sector.mycelialBastion.name = Mycelial Bastion sector.frontier.name = Frontier +sector.cruxscape.name = Cruxscape +sector.geothermalStronghold.name = Geothermal Stronghold sector.groundZero.description = The optimal location to begin once more. Low enemy threat. Few resources.\nGather as much lead and copper as possible.\nMove on. sector.frozenForest.description = Even here, closer to mountains, the spores have spread. The frigid temperatures cannot contain them forever.\n\nBegin the venture into power. Build combustion generators. Learn to use menders. @@ -889,8 +891,6 @@ sector.impact0078.description = Here lie remnants of the interstellar transport sector.planetaryTerminal.description = The final target.\n\nThis coastal base contains a structure capable of launching Cores to local planets. It is extremely well guarded.\n\nProduce naval units. Eliminate the enemy as quickly as possible. Research the launch structure. sector.coastline.description = Remnants of naval unit technology have been detected at this location. Repel the enemy attacks, capture this sector, and acquire the technology. sector.navalFortress.description = The enemy has established a base on a remote, naturally-fortified island. Destroy this outpost. Acquire their advanced naval craft technology, and research it. -sector.cruxscape.name = Cruxscape -sector.geothermalStronghold.name = Geothermal Stronghold #do not translate sector.facility32m.description = WIP, map submission by Stormride_R @@ -903,6 +903,8 @@ sector.testingGrounds.description = WIP, map submission by dnx2019 sector.seaPort.description = WIP, map submission by inkognito626 sector.weatheredChannels.description = WIP, map submission by Skeledragon sector.mycelialBastion.description = WIP, map submission by Skeledragon +sector.cruxscape.description = WIP, map submission by Stormride_R +sector.geothermalStronghold.description = WIP, map submission by Skeledragon sector.onset.name = The Onset sector.aegis.name = Aegis diff --git a/core/assets/maps/planetaryTerminal.msav b/core/assets/maps/planetaryTerminal.msav index 6ddbe77403..c7322b487f 100644 Binary files a/core/assets/maps/planetaryTerminal.msav and b/core/assets/maps/planetaryTerminal.msav differ diff --git a/core/src/mindustry/ui/dialogs/PlanetDialog.java b/core/src/mindustry/ui/dialogs/PlanetDialog.java index bd3c007924..5a9828ba9a 100644 --- a/core/src/mindustry/ui/dialogs/PlanetDialog.java +++ b/core/src/mindustry/ui/dialogs/PlanetDialog.java @@ -69,6 +69,7 @@ public class PlanetDialog extends BaseDialog implements PlanetInterfaceRenderer{ public Label hoverLabel = new Label(""); private Texture[] planetTextures; + private Element mainView; private CampaignRulesDialog campaignRules = new CampaignRulesDialog(); public PlanetDialog(){ @@ -163,7 +164,10 @@ public class PlanetDialog extends BaseDialog implements PlanetInterfaceRenderer{ public void tap(InputEvent event, float x, float y, int count, KeyCode button){ var hovered = getHoverPlanet(x, y); if(hovered != null){ - viewPlanet(hovered, false); + var hit = scene.hit(x, y, true); + if(hit == mainView){ + viewPlanet(hovered, false); + } } } }); @@ -593,7 +597,7 @@ public class PlanetDialog extends BaseDialog implements PlanetInterfaceRenderer{ margin(0f); stack( - new Element(){ + mainView = new Element(){ { //add listener to the background rect, so it doesn't get unnecessary touch input addListener(new ElementGestureListener(){