Skip to content

Commit

Permalink
...
Browse files Browse the repository at this point in the history
  • Loading branch information
xzxADIxzx committed Sep 14, 2021
1 parent 7169cbc commit 07de748
Show file tree
Hide file tree
Showing 7 changed files with 9 additions and 21 deletions.
1 change: 1 addition & 0 deletions assets/bundles/bundle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -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
1 change: 1 addition & 0 deletions assets/bundles/bundle_es.properties
Original file line number Diff line number Diff line change
Expand Up @@ -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
1 change: 1 addition & 0 deletions assets/bundles/bundle_ru.properties
Original file line number Diff line number Diff line change
Expand Up @@ -7,4 +7,5 @@ setting.breaksize.name = Макс. размер разрушения
setting.copyshow.name = Показывать размер во время выбора области
setting.breakshow.name = Показывать размер во время разрушения области

category.mod.name = Модификация
keybind.toggle_core_items.name = Отображение предметов из ядра
1 change: 1 addition & 0 deletions assets/bundles/bundle_uk_UA.properties
Original file line number Diff line number Diff line change
Expand Up @@ -7,4 +7,5 @@ setting.breaksize.name = Макс. розмір руйнування
setting.copyshow.name = Показувати розмір під час вибору ділянку
setting.breakshow.name = Показувати розмір під час руйнування ділянку

category.mod.name = Модифікація
keybind.toggle_core_items.name = Показувати предмети в ядрі
18 changes: 1 addition & 17 deletions src/game/SchemeSize.java
Original file line number Diff line number Diff line change
Expand Up @@ -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.*;
Expand Down Expand Up @@ -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<KeyBind> binds = new Seq((KeyBind[])Binding.values());
// Seq<KeyBind> 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);
Expand Down
6 changes: 3 additions & 3 deletions src/input/DesktopInput512.java
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion src/input/ModBinding.java
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down

0 comments on commit 07de748

Please sign in to comment.