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

Add 'Show Block Select Keys' graphics option, implement requested changes

Browse Source
This commit is contained in:
Joshua Fan
2019-11-09 07:59:00 -05:00
parent 8a6d39d5d0
commit 4a987677ac
4 changed files with 20 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
core/src/io/anuke/mindustry/content/Blocks.java
View File

@@ -79,7 +79,7 @@ public class Blocks implements ContentList{
dartPad, deltaPad, tauPad, omegaPad, javelinPad, tridentPad, glaivePad,
//sandbox
powerVoid, powerSource, itemSource, liquidSource, itemVoid, message;
powerSource, powerVoid, itemSource, itemVoid, liquidSource, message;
@Override
public void load(){
@@ -1781,11 +1781,11 @@ public class Blocks implements ContentList{
//endregion
//region sandbox
powerVoid = new PowerVoid("power-void"){{
powerSource = new PowerSource("power-source"){{
requirements(Category.power, BuildVisibility.sandboxOnly, ItemStack.with());
alwaysUnlocked = true;
}};
powerSource = new PowerSource("power-source"){{
powerVoid = new PowerVoid("power-void"){{
requirements(Category.power, BuildVisibility.sandboxOnly, ItemStack.with());
alwaysUnlocked = true;
}};

3
core/src/io/anuke/mindustry/ui/dialogs/SettingsMenuDialog.java
View File

@@ -298,6 +298,9 @@ public class SettingsMenuDialog extends SettingsDialog{
graphics.checkPref("minimap", !mobile);
graphics.checkPref("position", false);
graphics.checkPref("fps", false);
if(!mobile){
graphics.checkPref("blockselectkeys", true);
}
graphics.checkPref("indicators", true);
graphics.checkPref("animatedwater", !mobile);
if(Shaders.shield != null){

13
core/src/io/anuke/mindustry/ui/fragments/PlacementFragment.java
View File

@@ -26,7 +26,7 @@ import static io.anuke.mindustry.Vars.*;
public class PlacementFragment extends Fragment{
final int rowWidth = 4;
public Category currentCategory = Category.turret;
public Category currentCategory = Category.distribution;
Array<Block> returnArray = new Array<>();
Array<Category> returnCatArray = new Array<>();
boolean[] categoryEmpty = new boolean[Category.all.length];
@@ -253,13 +253,14 @@ public class PlacementFragment extends Fragment{
lastGround = false;
topTable.table(header -> {
String keyCombo = new String();
if(!mobile){
keyCombo = " [accent][" + Core.keybinds.get(blockSelect[currentCategory.ordinal()]).key.toString();
String keyCombo = "";
if(!mobile && Core.settings.getBool("blockselectkeys")){
Array<Block> blocks = getByCategory(currentCategory);
for(int i = 0; i < blocks.size; i++){
if(blocks.get(i) == lastDisplay){
keyCombo += (i < 10 ? "" : "," + Core.keybinds.get(blockSelect[(i + 1) / 10 - 1]).key.toString()) + "," + Core.keybinds.get(blockSelect[i % 10]).key.toString() + "]";
keyCombo = Core.bundle.format("placement.blockselectkeys", Core.keybinds.get(blockSelect[currentCategory.ordinal()]).key.toString())
+ (i < 10 ? "" : Core.keybinds.get(blockSelect[(i + 1) / 10 - 1]).key.toString() + ",")
+ Core.keybinds.get(blockSelect[i % 10]).key.toString() + "]";
break;
}
}
@@ -267,7 +268,7 @@ public class PlacementFragment extends Fragment{
final String keyComboFinal = keyCombo;
header.left();
header.add(new Image(lastDisplay.icon(Cicon.medium))).size(8 * 4);
header.labelWrap(() -> !unlocked(lastDisplay) ? Core.bundle.get("block.unknown") : lastDisplay.localizedName + (mobile ? "" : keyComboFinal))
header.labelWrap(() -> !unlocked(lastDisplay) ? Core.bundle.get("block.unknown") : lastDisplay.localizedName + keyComboFinal)
.left().width(190f).padLeft(5);
header.add().growX();
if(unlocked(lastDisplay)){