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

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
Anuken
2018-10-26 22:53:23 -04:00
parent 008df649f0 a810e704ad
commit ebf6f6782f
18 changed files with 774 additions and 650 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -16,7 +16,7 @@ import io.anuke.ucore.graphics.Lines;
import io.anuke.ucore.util.Mathf;
public class Blocks extends BlockList implements ContentList{
public static Block air, blockpart, spawn, space, metalfloor, deepwater, water, lava, oil, 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
@@ -100,11 +100,11 @@ public class Blocks extends BlockList implements ContentList{
minimapColor = Color.valueOf("ed5334");
}};
oil = new Floor("oil"){{
tar = new Floor("tar"){{
liquidColor = Color.valueOf("292929");
status = StatusEffects.tarred;
statusIntensity = 1f;
speedMultiplier = 0.2f;
speedMultiplier = 0.19f;
variants = 0;
liquidDrop = Liquids.oil;
isLiquid = true;

4
core/src/io/anuke/mindustry/core/World.java
View File

@@ -243,7 +243,7 @@ public class World extends Module{
EntityQuery.resizeTree(0, 0, width * tilesize, height * tilesize);
try{
generator.loadTileData(tiles, MapIO.readTileData(map, true), map.meta.hasOreGen(), 0);
generator.loadTileData(tiles, MapIO.readTileData(map, true), map.meta.hasOreGen(), Mathf.random(99999));
} catch(Exception e){
Log.err(e);
if(!headless){
@@ -257,6 +257,8 @@ public class World extends Module{
endMapLoad();
invalidMap = false;
if(!headless){
if(state.teams.get(players[0].getTeam()).cores.size == 0){
ui.showError("$text.map.nospawn");

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

@@ -175,7 +175,7 @@ public class FileChooser extends FloatingDialog{
Arrays.sort(handles, (a, b) -> {
if(a.isDirectory() && !b.isDirectory()) return -1;
if(!a.isDirectory() && b.isDirectory()) return 1;
return a.name().toUpperCase().compareTo(b.name().toUpperCase());
return String.CASE_INSENSITIVE_ORDER.compare(a.name(), b.name());
});
return handles;
}

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

@@ -38,7 +38,7 @@ public class LegacyColorMapper implements ContentList{
map("f7feff", Blocks.snow, 1);
map("6e501e", Blocks.dirt, 0);
map("ed5334", Blocks.lava, 0);
map("292929", Blocks.oil, 0);
map("292929", Blocks.tar, 0);
map("c3a490", OreBlocks.get(Blocks.stone, Items.copper), 0);
map("161616", OreBlocks.get(Blocks.stone, Items.coal), 0);
map("6277bc", OreBlocks.get(Blocks.stone, Items.titanium), 0);

4
core/src/io/anuke/mindustry/world/blocks/defense/ForceProjector.java
View File

@@ -33,9 +33,9 @@ import static io.anuke.mindustry.Vars.*;
public class ForceProjector extends Block {
protected int timerUse = timers ++;
protected float phaseUseTime = 250f;
protected float phaseUseTime = 350f;
protected float phaseRadiusBoost = 60f;
protected float phaseRadiusBoost = 80f;
protected float radius = 100f;
protected float breakage = 550f;
protected float cooldownNormal = 1.75f;

4
core/src/io/anuke/mindustry/world/blocks/defense/MendProjector.java
View File

@@ -35,8 +35,8 @@ public class MendProjector extends Block{
protected float range = 50f;
protected float healPercent = 6f;
protected float phaseBoost = 12f;
protected float phaseRangeBoost = 40f;
protected float useTime = 300f;
protected float phaseRangeBoost = 50f;
protected float useTime = 400f;
public MendProjector(String name){
super(name);

4
core/src/io/anuke/mindustry/world/blocks/defense/OverdriveProjector.java
View File

@@ -34,8 +34,8 @@ public class OverdriveProjector extends Block{
protected float reload = 260f;
protected float range = 80f;
protected float speedBoost = 1.5f;
protected float speedBoostPhase = 0.5f;
protected float useTime = 300f;
protected float speedBoostPhase = 0.75f;
protected float useTime = 400f;
public OverdriveProjector(String name){
super(name);