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

Drownable tar and lava

Browse Source
This commit is contained in:
Anuken
2018-12-12 10:10:15 -05:00
parent 97d54868e9
commit df44f82198
3 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -16,7 +16,8 @@ import io.anuke.ucore.graphics.Lines;
import io.anuke.ucore.util.Mathf; import io.anuke.ucore.util.Mathf;
public class Blocks extends BlockList implements ContentList{ public class Blocks extends BlockList implements ContentList{
public static Block air, blockpart, spawn, space, metalfloor, deepwater, water, lava, tar, stone, blackstone, dirt, sand, ice, snow, grass, shrub, rock, icerock, blackrock; public static Block air, blockpart, spawn, space, metalfloor, deepwater, water, lava, tar, stone,
blackstone, dirt, sand, ice, snow, grass, shrub, rock, icerock, blackrock;
@Override @Override
@@ -90,6 +91,7 @@ public class Blocks extends BlockList implements ContentList{
}}; }};
lava = new Floor("lava"){{ lava = new Floor("lava"){{
drownTime = 100f;
liquidColor = Color.valueOf("ed5334"); liquidColor = Color.valueOf("ed5334");
speedMultiplier = 0.2f; speedMultiplier = 0.2f;
damageTaken = 0.5f; damageTaken = 0.5f;
@@ -103,6 +105,7 @@ public class Blocks extends BlockList implements ContentList{
}}; }};
tar = new Floor("tar"){{ tar = new Floor("tar"){{
drownTime = 150f;
liquidColor = Color.valueOf("292929"); liquidColor = Color.valueOf("292929");
status = StatusEffects.tarred; status = StatusEffects.tarred;
statusIntensity = 1f; statusIntensity = 1f;

9
core/src/io/anuke/mindustry/editor/MapEditorDialog.java
View File

@@ -40,7 +40,6 @@ import io.anuke.ucore.util.Mathf;
import io.anuke.ucore.util.Strings; import io.anuke.ucore.util.Strings;
import java.io.DataInputStream; import java.io.DataInputStream;
import java.io.IOException;
import java.io.InputStream; import java.io.InputStream;
import static io.anuke.mindustry.Vars.*; import static io.anuke.mindustry.Vars.*;
@@ -171,8 +170,7 @@ public class MapEditorDialog extends Dialog implements Disposable{
} }
}); });
loadDialog = new MapLoadDialog(map -> { loadDialog = new MapLoadDialog(map ->
ui.loadGraphics(() -> { ui.loadGraphics(() -> {
try(DataInputStream stream = new DataInputStream(map.stream.get())){ try(DataInputStream stream = new DataInputStream(map.stream.get())){
MapMeta meta = MapIO.readMapMeta(stream); MapMeta meta = MapIO.readMapMeta(stream);
@@ -180,12 +178,11 @@ public class MapEditorDialog extends Dialog implements Disposable{
editor.beginEdit(data, meta.tags, false); editor.beginEdit(data, meta.tags, false);
view.clearStack(); view.clearStack();
}catch(IOException e){ }catch(Exception e){
ui.showError(Bundles.format("text.editor.errormapload", Strings.parseException(e, false))); ui.showError(Bundles.format("text.editor.errormapload", Strings.parseException(e, false)));
Log.err(e); Log.err(e);
} }
}); }));
});
setFillParent(true); setFillParent(true);

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

@@ -64,7 +64,7 @@ public class PlacementFragment extends Fragment{
} }
boolean gridUpdate(InputHandler input){ boolean gridUpdate(InputHandler input){
if(!Inputs.keyDown("gridMode")) return false; if(!Inputs.keyDown("gridMode") || ui.chatfrag.chatOpen()) return false;
if(Inputs.keyDown("gridModeShift")){ //select category if(Inputs.keyDown("gridModeShift")){ //select category
int i = 0; int i = 0;
for(Input key : inputCatGrid){ for(Input key : inputCatGrid){