Astronand/Mindustry
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Possible research deselect fix / Updated map submissions

Browse Source
This commit is contained in:
Anuken
2025-05-09 22:05:02 -04:00
parent af0d0be294
commit 23c45154a9
5 changed files with 12 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
core/assets/maps/atolls.msav
View File

Binary file not shown.

BIN
core/assets/maps/infestedCanyons.msav
View File

Binary file not shown.

BIN
core/assets/maps/overgrowth.msav
View File

Binary file not shown.

1
core/src/mindustry/editor/MapEditorDialog.java
View File

@@ -377,6 +377,7 @@ public class MapEditorDialog extends Dialog implements Disposable{
public @Nullable Map save(){ public @Nullable Map save(){
boolean isEditor = state.rules.editor; boolean isEditor = state.rules.editor;
state.rules.editor = false; state.rules.editor = false;
state.rules.allowEditRules = false;
state.rules.objectiveFlags.clear(); state.rules.objectiveFlags.clear();
state.rules.objectives.each(MapObjective::reset); state.rules.objectives.each(MapObjective::reset);
String name = editor.tags.get("name", "").trim(); String name = editor.tags.get("name", "").trim();

16
core/src/mindustry/ui/dialogs/ResearchDialog.java
View File

@@ -488,12 +488,18 @@ public class ResearchDialog extends BaseDialog{
} }
if(mobile){ if(mobile){
tapped(() -> { addListener(new InputListener(){
Element e = Core.scene.getHoverElement(); @Override
if(e == this){ public boolean touchDown(InputEvent event, float x, float y, int pointer, KeyCode button){
if(pointer == -1) return false;
Element e = Core.scene.hit(Core.input.mouseX(pointer), Core.input.mouseY(pointer), true);
if(e == View.this){
hoverNode = null; hoverNode = null;
rebuild(); rebuild();
} }
return false;
}
}); });
} }
@@ -613,10 +619,6 @@ public class ResearchDialog extends BaseDialog{
Element e = Core.scene.hit(Core.input.mouseX(pointer == -1 ? 0 : pointer), Core.input.mouseY(pointer == -1 ? 0 : pointer), true); Element e = Core.scene.hit(Core.input.mouseX(pointer == -1 ? 0 : pointer), Core.input.mouseY(pointer == -1 ? 0 : pointer), true);
if(hoverNode == button && !(e != null && (e == infoTable || e.isDescendantOf(infoTable) || e == hoverNode || e.isDescendantOf(hoverNode))) && (Core.app.isDesktop() || pointer == 0)){ if(hoverNode == button && !(e != null && (e == infoTable || e.isDescendantOf(infoTable) || e == hoverNode || e.isDescendantOf(hoverNode))) && (Core.app.isDesktop() || pointer == 0)){
if(Core.app.isMobile()){
Log.info("hiding info table {x=@ y=@ mouseX=@ mouseY=@ pointer=@ overElement=@ isInfoTable=@ isDescendantOfInfo=@ isDescendantOfHover=@}", x, y,
Core.input.mouseX(pointer == -1 ? 0 : pointer), Core.input.mouseY(pointer == -1 ? 0 : pointer), pointer, (e != null ? e.getClass() : null), e == infoTable, e != null && e.isDescendantOf(infoTable), e != null && e.isDescendantOf(hoverNode));
}
hoverNode = null; hoverNode = null;
rebuild(); rebuild();
} }