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

Possible save fix / Place arrow de-mushroomified / Fixed descriptions

Browse Source
This commit is contained in:
Anuken
2019-02-10 11:46:18 -05:00
parent a9778e6e68
commit 897b90f044
13 changed files with 779 additions and 814 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -445,11 +445,11 @@ public class Blocks implements ContentList{
results = new ItemStack[]{
new ItemStack(Items.copper, 5),
new ItemStack(Items.lead, 3),
new ItemStack(Items.graphite, 2),
new ItemStack(Items.titanium, 2)
};
hasPower = true;
filterTime = 30f;
health = 50 * 4;
spinnerLength = 1.5f;
spinnerRadius = 3.5f;
spinnerThickness = 1.5f;
@@ -457,7 +457,7 @@ public class Blocks implements ContentList{
size = 2;
consumes.power(1f);
consumes.liquid(Liquids.slag, 0.1f);
consumes.liquid(Liquids.slag, 0.09f);
}};
cultivator = new Cultivator("cultivator"){{

10
core/src/io/anuke/mindustry/core/Control.java
View File

@@ -301,6 +301,11 @@ public class Control implements ApplicationListener{
inputHandler.updateController();
}
//autosave global data every second if it's modified
if(timer.get(1, 60)){
data.checkSave();
}
if(!state.is(State.menu)){
for(InputHandler input : inputs){
input.update();
@@ -316,11 +321,6 @@ public class Control implements ApplicationListener{
}
}
//autosave global data every second if it's modified
if(timer.get(1, 60)){
data.checkSave();
}
//auto-update rpc every 5 seconds
if(timer.get(0, 60 * 5)){
Platform.instance.updateRPC();

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

@@ -19,7 +19,7 @@ public class ItemImage extends Stack{
}
public ItemImage(ItemStack stack){
add(new Image(stack.item.icon(Icon.large)));
add(new Image(stack.item.icon(Icon.medium)));
if(stack.amount != 0){
Table t = new Table().left().bottom();

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

@@ -211,7 +211,7 @@ public class TechTreeDialog extends FloatingDialog{
list.left();
list.addImage(req.item.getContentIcon()).size(8 * 3).padRight(3);
list.add(req.item.localizedName()).color(Color.LIGHT_GRAY);
list.add(" " + Math.min(data.items().get(req.item, 0), req.amount) + " / " + req.amount)
list.add(" " + Math.min(data.getItem(req.item), req.amount) + " / " + req.amount)
.color(data.has(req.item, req.amount) ? Color.LIGHT_GRAY : Color.SCARLET);
}).fillX().left();
t.row();