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

Destructible grey blocks / Content cleanup / Wave fixes / Impact balance

Browse Source
This commit is contained in:
Anuken
2019-02-16 11:10:01 -05:00
parent fbcbca6f24
commit 4677de80c1
51 changed files with 1077 additions and 728 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
core/src/io/anuke/mindustry/ui/ContentDisplay.java
View File

@@ -25,7 +25,7 @@ public class ContentDisplay{
int size = 8 * 6;
title.addImage(block.icon(Icon.large)).size(size);
title.add("[accent]" + block.formalName).padLeft(5);
title.add("[accent]" + block.localizedName).padLeft(5);
});
table.row();
@@ -34,8 +34,8 @@ public class ContentDisplay{
table.row();
if(block.fullDescription != null){
table.add(block.fullDescription).padLeft(5).padRight(5).width(400f).wrap().fillX();
if(block.description != null){
table.add(block.description).padLeft(5).padRight(5).width(400f).wrap().fillX();
table.row();
table.addImage("white").height(3).color(Color.LIGHT_GRAY).pad(8).padLeft(0).padRight(0).fillX();

2
core/src/io/anuke/mindustry/ui/dialogs/DeployDialog.java
View File

@@ -182,7 +182,7 @@ public class DeployDialog extends FloatingDialog{
r.row();
for(Block block : zone.blockRequirements){
r.addImage(block.icon(Icon.small)).size(8 * 3).padRight(4);
r.add(block.formalName).color(Color.LIGHT_GRAY);
r.add(block.localizedName).color(Color.LIGHT_GRAY);
r.addImage(data.isUnlocked(block) ? "icon-check-2" : "icon-cancel-2")
.color(data.isUnlocked(block) ? Color.LIGHT_GRAY : Color.SCARLET).padLeft(3);
r.row();

4
core/src/io/anuke/mindustry/ui/dialogs/TechTreeDialog.java
View File

@@ -166,7 +166,7 @@ public class TechTreeDialog extends FloatingDialog{
void unlock(TechNode node){
data.unlockContent(node.block);
data.removeItems(node.requirements);
showToast(Core.bundle.format("researched", node.block.formalName));
showToast(Core.bundle.format("researched", node.block.localizedName));
checkNodes(root);
hoverNode = null;
rebuild();
@@ -201,7 +201,7 @@ public class TechTreeDialog extends FloatingDialog{
infoTable.table(desc -> {
desc.left().defaults().left();
desc.add(node.block.formalName);
desc.add(node.block.localizedName);
desc.row();
if(locked(node)){
desc.table(t -> {

4
core/src/io/anuke/mindustry/ui/dialogs/TraceDialog.java
View File

@@ -37,7 +37,7 @@ public class TraceDialog extends FloatingDialog{
table.row();
table.add(Core.bundle.format("trace.structureblocksbroken", info.structureBlocksBroken));
table.row();
table.add(Core.bundle.format("trace.lastblockbroken", info.lastBlockBroken.formalName));
table.add(Core.bundle.format("trace.lastblockbroken", info.lastBlockBroken.localizedName));
table.row();
table.add().pad(5);
@@ -45,7 +45,7 @@ public class TraceDialog extends FloatingDialog{
table.add(Core.bundle.format("trace.totalblocksplaced", info.totalBlocksPlaced));
table.row();
table.add(Core.bundle.format("trace.lastblockplaced", info.lastBlockPlaced.formalName));
table.add(Core.bundle.format("trace.lastblockplaced", info.lastBlockPlaced.localizedName));
table.row();
cont.add(table);

22
core/src/io/anuke/mindustry/ui/dialogs/ZoneInfoDialog.java
View File

@@ -21,6 +21,11 @@ public class ZoneInfoDialog extends FloatingDialog{
addCloseButton();
}
@Override
protected void drawBackground(float x, float y){
drawDefaultBackground(x, y);
}
public void show(Zone zone){
setup(zone);
show();
@@ -61,7 +66,7 @@ public class ZoneInfoDialog extends FloatingDialog{
r.row();
for(Block block : zone.blockRequirements){
r.addImage(block.icon(Icon.small)).size(8 * 3).padRight(4);
r.add(block.formalName).color(Color.LIGHT_GRAY);
r.add(block.localizedName).color(Color.LIGHT_GRAY);
r.addImage(data.isUnlocked(block) ? "icon-check-2" : "icon-cancel-2")
.color(data.isUnlocked(block) ? Color.LIGHT_GRAY : Color.SCARLET).padLeft(3);
r.row();
@@ -91,11 +96,26 @@ public class ZoneInfoDialog extends FloatingDialog{
cont.row();
cont.add(Core.bundle.format("bestwave", data.getWaveScore(zone)));
}
cont.row();
cont.table(t -> {
t.left();
for(ItemStack stack : zone.startingItems){
t.addImage(stack.item.icon(Item.Icon.medium)).size(8 * 3).padRight(4);
t.label(() -> stack.amount + "");
}
}).growX().left();
}
});
cont.row();
cont.addButton(!zone.canConfigure() ? Core.bundle.format("configure.locked", zone.configureWave) : "$configure", () -> {
}).disabled(b -> !zone.canConfigure()).size(300f, 70f).padTop(5).get();
cont.row();
Button button = cont.addButton(zone.locked() ? "$uncover" : "$launch", () -> {
if(!data.isUnlocked(zone)){
data.removeItems(zone.itemRequirements);

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

@@ -194,7 +194,7 @@ public class PlacementFragment extends Fragment{
topTable.table(header -> {
header.left();
header.add(new Image(lastDisplay.icon(Icon.medium))).size(8 * 4);
header.labelWrap(() -> !unlocked(lastDisplay) ? Core.bundle.get("blocks.unknown") : lastDisplay.formalName)
header.labelWrap(() -> !unlocked(lastDisplay) ? Core.bundle.get("blocks.unknown") : lastDisplay.localizedName)
.left().width(190f).padLeft(5);
header.add().growX();
if(unlocked(lastDisplay)){