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

Bugfixes

Browse Source
This commit is contained in:
Anuken
2018-11-23 09:23:42 -05:00
parent 4f56bf3c3e
commit 8a0761cad8
5 changed files with 8 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -67,9 +67,9 @@ public class LiquidBlocks extends BlockList implements ContentList{
}}; }};
phaseConduit = new LiquidBridge("phase-conduit"){{ phaseConduit = new LiquidBridge("phase-conduit"){{
range = 11; range = 12;
hasPower = true; hasPower = true;
consumes.power(0.05f); consumes.power(0.03f);
}}; }};
} }
} }

21
core/src/io/anuke/mindustry/content/blocks/TurretBlocks.java
View File

@@ -32,24 +32,13 @@ public class TurretBlocks extends BlockList implements ContentList{
hail = new ArtilleryTurret("hail"){{ hail = new ArtilleryTurret("hail"){{
ammoTypes = new AmmoType[]{AmmoTypes.artilleryDense, AmmoTypes.artilleryHoming, AmmoTypes.artilleryIncindiary}; ammoTypes = new AmmoType[]{AmmoTypes.artilleryDense, AmmoTypes.artilleryHoming, AmmoTypes.artilleryIncindiary};
reload = 70f; reload = 60f;
recoil = 2f; recoil = 2f;
range = 230f; range = 230f;
inaccuracy = 1f; inaccuracy = 1f;
shootCone = 10f; shootCone = 10f;
health = 120; health = 120;
}}; }};
/*
scatter = new BurstTurret("scatter"){{
ammoTypes = new AmmoType[]{AmmoTypes.flakCopper};
reload = 70f;
recoil = 2f;
shots = 3;
range = 220f;
inaccuracy = 2f;
shootCone = 40f;
health = 120;
}};*/
scorch = new LiquidTurret("scorch"){ scorch = new LiquidTurret("scorch"){
protected TextureRegion shootRegion; protected TextureRegion shootRegion;
@@ -117,11 +106,11 @@ public class TurretBlocks extends BlockList implements ContentList{
arc = new PowerTurret("arc"){{ arc = new PowerTurret("arc"){{
shootType = AmmoTypes.arc; shootType = AmmoTypes.arc;
reload = 55f; reload = 80f;
shootShake = 1f; shootShake = 1f;
shootCone = 40f; shootCone = 40f;
rotatespeed = 8f; rotatespeed = 8f;
powerUsed = 7f; powerUsed = 9f;
powerCapacity = 30f; powerCapacity = 30f;
range = 150f; range = 150f;
shootEffect = ShootFx.lightningShoot; shootEffect = ShootFx.lightningShoot;
@@ -132,7 +121,7 @@ public class TurretBlocks extends BlockList implements ContentList{
swarmer = new BurstTurret("swarmer"){{ swarmer = new BurstTurret("swarmer"){{
ammoTypes = new AmmoType[]{AmmoTypes.missileExplosive, AmmoTypes.missileIncindiary, AmmoTypes.missileSurge}; ammoTypes = new AmmoType[]{AmmoTypes.missileExplosive, AmmoTypes.missileIncindiary, AmmoTypes.missileSurge};
reload = 60f; reload = 5f;
shots = 4; shots = 4;
burstSpacing = 5; burstSpacing = 5;
inaccuracy = 10f; inaccuracy = 10f;
@@ -156,7 +145,7 @@ public class TurretBlocks extends BlockList implements ContentList{
size = 2; size = 2;
range = 120f; range = 120f;
ammoTypes = new AmmoType[]{AmmoTypes.bulletCopper, AmmoTypes.bulletDense, AmmoTypes.bulletPyratite, AmmoTypes.bulletThorium, AmmoTypes.bulletSilicon}; ammoTypes = new AmmoType[]{AmmoTypes.bulletCopper, AmmoTypes.bulletDense, AmmoTypes.bulletPyratite, AmmoTypes.bulletThorium, AmmoTypes.bulletSilicon};
reload = 40f; reload = 35f;
restitution = 0.03f; restitution = 0.03f;
ammoEjectBack = 3f; ammoEjectBack = 3f;
cooldown = 0.03f; cooldown = 0.03f;

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

@@ -241,7 +241,7 @@ public class Tile implements PosTrait, TargetTrait{
if(link == 0){ if(link == 0){
return (block.destructible || block.breakable || block.update); return (block.destructible || block.breakable || block.update);
}else{ }else{
return getLinked() != this && getLinked().breakable(); return getLinked() != this && getLinked().getLinked() == null && getLinked().breakable();
} }
} }

1
desktop/src/io/anuke/mindustry/desktop/CrashHandler.java
View File

@@ -80,7 +80,6 @@ public class CrashHandler{
ex(() -> value.addChild("gamemode", new JsonValue(Vars.state.mode.name()))); ex(() -> value.addChild("gamemode", new JsonValue(Vars.state.mode.name())));
ex(() -> value.addChild("state", new JsonValue(Vars.state.getState().name()))); ex(() -> value.addChild("state", new JsonValue(Vars.state.getState().name())));
ex(() -> value.addChild("os", new JsonValue(System.getProperty("os.name")))); ex(() -> value.addChild("os", new JsonValue(System.getProperty("os.name"))));
ex(() -> value.addChild("multithreading", new JsonValue(Settings.getBool("multithread"))));
ex(() -> value.addChild("trace", new JsonValue(parseException(e)))); ex(() -> value.addChild("trace", new JsonValue(parseException(e))));
try{ try{

3
desktop/src/io/anuke/mindustry/desktop/DesktopPlatform.java
View File

@@ -17,8 +17,6 @@ import io.anuke.ucore.util.OS;
import io.anuke.ucore.util.Strings; import io.anuke.ucore.util.Strings;
import java.net.NetworkInterface; import java.net.NetworkInterface;
import java.text.DateFormat;
import java.text.SimpleDateFormat;
import java.util.Enumeration; import java.util.Enumeration;
import static io.anuke.mindustry.Vars.*; import static io.anuke.mindustry.Vars.*;
@@ -26,7 +24,6 @@ import static io.anuke.mindustry.Vars.*;
public class DesktopPlatform extends Platform{ public class DesktopPlatform extends Platform{
final static boolean useDiscord = OS.is64Bit; final static boolean useDiscord = OS.is64Bit;
final static String applicationId = "398246104468291591"; final static String applicationId = "398246104468291591";
final static DateFormat format = SimpleDateFormat.getDateTimeInstance();
String[] args; String[] args;
public DesktopPlatform(String[] args){ public DesktopPlatform(String[] args){