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

Fixed #2427 / Fixed #2429

Browse Source
This commit is contained in:
Anuken
2020-08-26 09:21:18 -04:00
parent 1461673168
commit be74e954fa
4 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
core/src/mindustry/content/UnitTypes.java
View File

@@ -406,7 +406,7 @@ public class UnitTypes implements ContentList{
BulletType sapper = new SapBulletType(){{ BulletType sapper = new SapBulletType(){{
sapStrength = 0.8f; sapStrength = 0.8f;
length = 55f; length = 55f;
damage = 35; damage = 34;
shootEffect = Fx.shootSmall; shootEffect = Fx.shootSmall;
hitColor = color = Color.valueOf("bf92f9"); hitColor = color = Color.valueOf("bf92f9");
despawnEffect = Fx.none; despawnEffect = Fx.none;
@@ -663,7 +663,7 @@ public class UnitTypes implements ContentList{
BulletType fragBullet = new FlakBulletType(4f, 5){{ BulletType fragBullet = new FlakBulletType(4f, 5){{
shootEffect = Fx.shootBig; shootEffect = Fx.shootBig;
ammoMultiplier = 4f; ammoMultiplier = 4f;
splashDamage = 40f; splashDamage = 42f;
splashDamageRadius = 25f; splashDamageRadius = 25f;
collidesGround = true; collidesGround = true;
lifetime = 38f; lifetime = 38f;
@@ -700,7 +700,7 @@ public class UnitTypes implements ContentList{
x = 11f; x = 11f;
y = 27f; y = 27f;
rotateSpeed = 2f; rotateSpeed = 2f;
reload = 10f; reload = 9f;
shootSound = Sounds.flame; shootSound = Sounds.flame;
occlusion = 7f; occlusion = 7f;
rotate = true; rotate = true;

5
core/src/mindustry/net/BeControl.java
View File

@@ -97,7 +97,10 @@ public class BeControl{
BaseDialog dialog = new BaseDialog("@be.updating"); BaseDialog dialog = new BaseDialog("@be.updating");
download(updateUrl, file, i -> length[0] = i, v -> progress[0] = v, () -> cancel[0], () -> { download(updateUrl, file, i -> length[0] = i, v -> progress[0] = v, () -> cancel[0], () -> {
try{ try{
Runtime.getRuntime().exec(new String[]{"java", "-DlastBuild=" + Version.build, "-Dberestart", "-jar", file.absolutePath()}); Runtime.getRuntime().exec(OS.isMac ?
new String[]{"java", "-XstartOnFirstThread", "-DlastBuild=" + Version.build, "-Dberestart", "-jar", file.absolutePath()} :
new String[]{"java", "-DlastBuild=" + Version.build, "-Dberestart", "-jar", file.absolutePath()}
);
System.exit(0); System.exit(0);
}catch(IOException e){ }catch(IOException e){
ui.showException(e); ui.showException(e);

1
core/src/mindustry/world/blocks/sandbox/ItemSource.java
View File

@@ -23,6 +23,7 @@ public class ItemSource extends Block{
group = BlockGroup.transportation; group = BlockGroup.transportation;
configurable = true; configurable = true;
saveConfig = true; saveConfig = true;
noUpdateDisabled = true;
config(Item.class, (ItemSourceBuild tile, Item item) -> tile.outputItem = item); config(Item.class, (ItemSourceBuild tile, Item item) -> tile.outputItem = item);
configClear((ItemSourceBuild tile) -> tile.outputItem = null); configClear((ItemSourceBuild tile) -> tile.outputItem = null);

1
core/src/mindustry/world/blocks/sandbox/LiquidSource.java
View File

@@ -24,6 +24,7 @@ public class LiquidSource extends Block{
configurable = true; configurable = true;
outputsLiquid = true; outputsLiquid = true;
saveConfig = true; saveConfig = true;
noUpdateDisabled = true;
config(Liquid.class, (LiquidSourceBuild tile, Liquid l) -> tile.source = l); config(Liquid.class, (LiquidSourceBuild tile, Liquid l) -> tile.source = l);
configClear((LiquidSourceBuild tile) -> tile.source = null); configClear((LiquidSourceBuild tile) -> tile.source = null);