diff --git a/assets/bundles/bundle.properties b/assets/bundles/bundle.properties index 4f82dd24..6600ebde 100644 --- a/assets/bundles/bundle.properties +++ b/assets/bundles/bundle.properties @@ -7,4 +7,5 @@ setting.breaksize.name = Max Break Size setting.copyshow.name = Show Size During Selection Region setting.breakshow.name = Show Size During Breaking Region +category.mod.name = Mod keybind.toggle_core_items.name = Toggle Core Items \ No newline at end of file diff --git a/assets/bundles/bundle_es.properties b/assets/bundles/bundle_es.properties index 033d7b49..ab3772b9 100644 --- a/assets/bundles/bundle_es.properties +++ b/assets/bundles/bundle_es.properties @@ -7,4 +7,5 @@ setting.breaksize.name = Tamaño máximo de deconstrucción setting.copyshow.name = Mostrar tamaño durante la región de selección setting.breakshow.name = Mostrar tamaño durante la región de deconstrucción +category.mod.name = Modificación keybind.toggle_core_items.name = Mostrar Objetos en el nucleo \ No newline at end of file diff --git a/assets/bundles/bundle_ru.properties b/assets/bundles/bundle_ru.properties index 17dab47a..c1d0eb79 100644 --- a/assets/bundles/bundle_ru.properties +++ b/assets/bundles/bundle_ru.properties @@ -7,4 +7,5 @@ setting.breaksize.name = Макс. размер разрушения setting.copyshow.name = Показывать размер во время выбора области setting.breakshow.name = Показывать размер во время разрушения области +category.mod.name = Модификация keybind.toggle_core_items.name = Отображение предметов из ядра \ No newline at end of file diff --git a/assets/bundles/bundle_uk_UA.properties b/assets/bundles/bundle_uk_UA.properties index ba123921..d8e7e07d 100644 --- a/assets/bundles/bundle_uk_UA.properties +++ b/assets/bundles/bundle_uk_UA.properties @@ -7,4 +7,5 @@ setting.breaksize.name = Макс. розмір руйнування setting.copyshow.name = Показувати розмір під час вибору ділянку setting.breakshow.name = Показувати розмір під час руйнування ділянку +category.mod.name = Модифікація keybind.toggle_core_items.name = Показувати предмети в ядрі \ No newline at end of file diff --git a/src/game/SchemeSize.java b/src/game/SchemeSize.java index 84a7418b..8aac94dd 100644 --- a/src/game/SchemeSize.java +++ b/src/game/SchemeSize.java @@ -3,7 +3,6 @@ import arc.*; import arc.util.*; import arc.input.*; -import arc.struct.*; import arc.KeyBinds.*; import arc.scene.ui.*; import arc.scene.ui.layout.*; @@ -56,24 +55,9 @@ public SchemeSize(){ System.arraycopy(origi, 0, binds, 0, origi.length); System.arraycopy(moded, 0, binds, origi.length, moded.length); Core.keybinds.setDefaults(binds); + Core.settings.load(); // Update controls Vars.ui.controls = new KeybindDialog(); // Update dialog - // Seq binds = new Seq((KeyBind[])Binding.values()); - // Seq moded = new Seq((KeyBind[])ModBinding.values()); - // binds.insert(51, (KeyBind)moded.get(0)); - // Core.keybinds.setDefaults((KeyBind[])binds.items); - // Vars.ui.controls = new KeybindDialog(); // Update dialog - - // KeyBind[] binds = (KeyBind[])Binding.values(); - // KeyBind[] moded = (KeyBind[])ModBinding.values(); - // binds.splice(3, 0, moded[0]); // Core Items - // Core.keybinds.setDefaults(binds.concat(moded)); - // Vars.ui.controls = new KeybindDialog(); // Update dialog - - // Core.keybinds.setDefaults(ExBinding.values()); - // KeybindLoader.load(); // copy of Core.keybinds.load() - // Vars.ui.controls = new KeybindDialog(); // Update dialog - // Add logs // Log.info(Vars.schematics); // Log.info(Vars.control.input); diff --git a/src/input/DesktopInput512.java b/src/input/DesktopInput512.java index eea94a9f..e188700b 100644 --- a/src/input/DesktopInput512.java +++ b/src/input/DesktopInput512.java @@ -214,9 +214,9 @@ public void update(){ float camSpeed = (!Core.input.keyDown(Binding.boost) ? panSpeed : panBoostSpeed) * Time.delta; // Toggle Core Items - // if(input.keyTap(Binding.toggle_core_items)){ - // Core.settings.put("coreitems", !Core.settings.getBool("coreitems")); - // } + if(input.keyTap(ModBinding.toggle_core_items) && state.isGame()){ + Core.settings.put("coreitems", !Core.settings.getBool("coreitems")); + } if(input.keyDown(Binding.pan) && !scene.hasField() && !scene.hasDialog()){ panCam = true; diff --git a/src/input/ModBinding.java b/src/input/ModBinding.java index 666794f2..28ebc1e1 100644 --- a/src/input/ModBinding.java +++ b/src/input/ModBinding.java @@ -6,7 +6,7 @@ import arc.input.*; public enum ModBinding implements KeyBind{ - toggle_core_items(KeyCode.f7); + toggle_core_items(KeyCode.f7, "mod"); private final KeybindValue defaultValue; private final String category;