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

Minor bugfixes / Added block names to bundle/ Autogen ore names

Browse Source
This commit is contained in:
Anuken
2018-08-09 17:44:52 -04:00
parent 15778b2ca5
commit fe6f98ec5a
6 changed files with 40 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
core/assets/bundles/bundle.properties
View File

@@ -431,6 +431,21 @@ text.liquid.heatcapacity=[LIGHT_GRAY]Heat Capacity: {0}
text.liquid.viscosity=[LIGHT_GRAY]Viscosity: {0} text.liquid.viscosity=[LIGHT_GRAY]Viscosity: {0}
text.liquid.temperature=[LIGHT_GRAY]Temperature: {0} text.liquid.temperature=[LIGHT_GRAY]Temperature: {0}
block.deepwater.name=deepwater
block.water.name=water
block.lava.name=lava
block.oil.name=oil
block.blackstone.name=blackstone
block.stone.name=stone
block.dirt.name=dirt
block.sand.name=sand
block.ice.name=ice
block.snow.name=snow
block.grass.name=grass
block.shrub.name=shrub
block.rock.name=rock
block.blackrock.name=blackrock
block.icerock.name=icerock
block.tungsten-wall.name=Tungsten Wall block.tungsten-wall.name=Tungsten Wall
block.tungsten-wall-large.name=Large Tungsten Wall block.tungsten-wall-large.name=Large Tungsten Wall
block.carbide-wall.name=Carbide Wall block.carbide-wall.name=Carbide Wall

30
core/src/io/anuke/mindustry/content/blocks/CraftingBlocks.java
View File

@@ -164,13 +164,13 @@ public class CraftingBlocks extends BlockList implements ContentList{
separator = new Separator("separator"){{ separator = new Separator("separator"){{
results = new Item[]{ results = new Item[]{
null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null,
Items.sand, Items.sand, Items.sand, Items.sand, Items.sand, Items.sand, Items.sand, Items.sand, Items.sand, Items.sand, Items.sand, Items.sand, Items.sand, Items.sand, Items.sand, Items.sand, Items.sand, Items.sand, Items.sand, Items.sand,
Items.stone, Items.stone, Items.stone, Items.stone, Items.stone, Items.stone, Items.stone, Items.stone, Items.stone, Items.stone, Items.stone, Items.stone, Items.stone, Items.stone, Items.stone, Items.stone, Items.stone, Items.stone,
Items.tungsten, Items.tungsten, Items.tungsten, Items.tungsten, Items.tungsten, Items.tungsten, Items.tungsten, Items.tungsten,
Items.lead, Items.lead, Items.lead, Items.lead,
Items.coal, Items.coal, Items.coal, Items.coal,
Items.titanium Items.titanium
}; };
filterTime = 40f; filterTime = 40f;
itemCapacity = 40; itemCapacity = 40;
@@ -182,14 +182,14 @@ public class CraftingBlocks extends BlockList implements ContentList{
centrifuge = new Separator("centrifuge"){{ centrifuge = new Separator("centrifuge"){{
results = new Item[]{ results = new Item[]{
null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null,
Items.sand, Items.sand, Items.sand, Items.sand, Items.sand, Items.sand, Items.sand, Items.sand, Items.sand, Items.sand, Items.sand, Items.sand, Items.sand, Items.sand, Items.sand, Items.sand, Items.sand, Items.sand, Items.sand, Items.sand, Items.sand, Items.sand, Items.sand, Items.sand,
Items.stone, Items.stone, Items.stone, Items.stone, Items.stone, Items.stone, Items.stone, Items.stone, Items.stone, Items.stone, Items.stone, Items.stone, Items.stone, Items.stone, Items.stone, Items.stone, Items.stone, Items.stone, Items.stone, Items.stone, Items.stone, Items.stone,
Items.tungsten, Items.tungsten, Items.tungsten, Items.tungsten, Items.tungsten, Items.tungsten, Items.tungsten, Items.tungsten, Items.tungsten, Items.tungsten,
Items.lead, Items.lead, Items.lead, Items.lead, Items.lead, Items.lead,
Items.coal, Items.coal, Items.coal, Items.coal, Items.coal, Items.coal,
Items.titanium, Items.titanium, Items.titanium, Items.titanium,
Items.thorium, Items.thorium,
}; };
hasPower = true; hasPower = true;

4
core/src/io/anuke/mindustry/content/bullets/TurretBullets.java
View File

@@ -179,13 +179,13 @@ public class TurretBullets extends BulletList implements ContentList{
} }
}; };
driverBolt = new BulletType(5f, 50){ driverBolt = new BulletType(5.3f, 50){
{ {
collidesTiles = false; collidesTiles = false;
lifetime = 200f; lifetime = 200f;
despawneffect = BlockFx.smeltsmoke; despawneffect = BlockFx.smeltsmoke;
hiteffect = BulletFx.hitBulletBig; hiteffect = BulletFx.hitBulletBig;
drag = 0.02f; drag = 0.01f;
} }
@Override @Override

12
core/src/io/anuke/mindustry/ui/dialogs/JoinDialog.java
View File

@@ -12,10 +12,7 @@ import io.anuke.mindustry.net.Net;
import io.anuke.ucore.core.Settings; import io.anuke.ucore.core.Settings;
import io.anuke.ucore.core.Timers; import io.anuke.ucore.core.Timers;
import io.anuke.ucore.scene.style.Drawable; import io.anuke.ucore.scene.style.Drawable;
import io.anuke.ucore.scene.ui.Dialog; import io.anuke.ucore.scene.ui.*;
import io.anuke.ucore.scene.ui.ImageButton;
import io.anuke.ucore.scene.ui.ScrollPane;
import io.anuke.ucore.scene.ui.TextButton;
import io.anuke.ucore.scene.ui.layout.Cell; import io.anuke.ucore.scene.ui.layout.Cell;
import io.anuke.ucore.scene.ui.layout.Table; import io.anuke.ucore.scene.ui.layout.Table;
import io.anuke.ucore.scene.utils.UIUtils; import io.anuke.ucore.scene.utils.UIUtils;
@@ -49,10 +46,12 @@ public class JoinDialog extends FloatingDialog{
add = new FloatingDialog("$text.joingame.title"); add = new FloatingDialog("$text.joingame.title");
add.content().add("$text.joingame.ip").padRight(5f).left(); add.content().add("$text.joingame.ip").padRight(5f).left();
Platform.instance.addDialog(add.content().addField(Settings.getString("ip"), text -> { TextField field = add.content().addField(Settings.getString("ip"), text -> {
Settings.putString("ip", text); Settings.putString("ip", text);
Settings.save(); Settings.save();
}).size(320f, 54f).get(), 100); }).size(320f, 54f).get();
Platform.instance.addDialog(field, 100);
add.content().row(); add.content().row();
add.buttons().defaults().size(140f, 60f).pad(4f); add.buttons().defaults().size(140f, 60f).pad(4f);
@@ -75,6 +74,7 @@ public class JoinDialog extends FloatingDialog{
add.shown(() -> { add.shown(() -> {
add.getTitleLabel().setText(renaming != null ? "$text.server.edit" : "$text.server.add"); add.getTitleLabel().setText(renaming != null ? "$text.server.edit" : "$text.server.add");
field.setText(renaming.ip);
}); });
shown(() -> { shown(() -> {

2
core/src/io/anuke/mindustry/world/Block.java
View File

@@ -42,7 +42,7 @@ public class Block extends BaseBlock implements Content{
/** internal ID */ /** internal ID */
public final int id; public final int id;
/** display name */ /** display name */
public final String formalName; public String formalName;
/** Detailed description of the block. Can be as long as necesary. */ /** Detailed description of the block. Can be as long as necesary. */
public final String fullDescription; public final String fullDescription;
/** whether this block has a tile entity that updates */ /** whether this block has a tile entity that updates */

1
core/src/io/anuke/mindustry/world/blocks/OreBlock.java
View File

@@ -14,6 +14,7 @@ public class OreBlock extends Floor{
public OreBlock(Item ore, Floor base){ public OreBlock(Item ore, Floor base){
super("ore-" + ore.name + "-" + base.name); super("ore-" + ore.name + "-" + base.name);
this.formalName = ore.name + " " + base.formalName;
this.drops = new ItemStack(ore, 1); this.drops = new ItemStack(ore, 1);
this.base = base; this.base = base;
this.variants = 3; this.variants = 3;