mirrors/Mindustry
1
0
Fork 0
mirror of https://github.com/Anuken/Mindustry.git synced 2025-01-10 23:28:52 +07:00
Code Issues Packages Projects Releases Wiki Activity

Fixed #2476

Browse Source
This commit is contained in:
Anuken 2020-09-02 09:35:03 -04:00
parent c1cc11c7cb
commit 6de1920042
3 changed files with 22 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
core/assets-raw/sprites/units/toxopid-joint-base.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 617 B

8
core/src/mindustry/content/Blocks.java
View File

@ -1504,12 +1504,13 @@ public class Blocks implements ContentList{
hasPower = true; hasPower = true;
size = 2; size = 2;
force = 3f; force = 4f;
scaledForce = 5.5f; scaledForce = 5.5f;
range = 170f; range = 170f;
damage = 0.08f; damage = 0.1f;
health = 160 * size * size; health = 160 * size * size;
rotateSpeed = 10; rotateSpeed = 10;
range = 85f;
consumes.powerCond(3f, (TractorBeamEntity e) -> e.target != null); consumes.powerCond(3f, (TractorBeamEntity e) -> e.target != null);
}}; }};
@ -1560,11 +1561,12 @@ public class Blocks implements ContentList{
segment = new PointDefenseTurret("segment"){{ segment = new PointDefenseTurret("segment"){{
requirements(Category.turret, with(Items.silicon, 130, Items.thorium, 80, Items.phasefabric, 25)); requirements(Category.turret, with(Items.silicon, 130, Items.thorium, 80, Items.phasefabric, 25));
range = 95f;
hasPower = true; hasPower = true;
consumes.power(3f); consumes.power(3f);
size = 2; size = 2;
shootLength = 5f; shootLength = 5f;
bulletDamage = 12f; bulletDamage = 16f;
reloadTime = 20f; reloadTime = 20f;
health = 190 * size * size; health = 190 * size * size;
}}; }};

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

@ -44,6 +44,17 @@ public class BeControl{
} }
}, updateInterval, updateInterval); }, updateInterval, updateInterval);
} }
if(System.getProperties().contains("becopy")){
try{
Fi dest = Fi.get(System.getProperty("becopy"));
Fi self = Fi.get(BeControl.class.getProtectionDomain().getCodeSource().getLocation().toURI().getPath());
self.copyTo(dest);
}catch(Throwable e){
e.printStackTrace();
}
}
} }
/** asynchronously checks for updates. */ /** asynchronously checks for updates. */
@ -87,14 +98,17 @@ public class BeControl{
boolean[] cancel = {false}; boolean[] cancel = {false};
float[] progress = {0}; float[] progress = {0};
int[] length = {0}; int[] length = {0};
Fi file = Fi.get(BeControl.class.getProtectionDomain().getCodeSource().getLocation().toURI().getPath()); Fi file = bebuildDirectory.child("client-be-" + updateBuild + ".jar");
Fi fileDest = System.getProperties().contains("becopy") ?
Fi.get(System.getProperty("becopy")) :
Fi.get(BeControl.class.getProtectionDomain().getCodeSource().getLocation().toURI().getPath());
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(OS.isMac ? Runtime.getRuntime().exec(OS.isMac ?
new String[]{"java", "-XstartOnFirstThread", "-DlastBuild=" + Version.build, "-Dberestart", "-jar", file.absolutePath()} : new String[]{"java", "-XstartOnFirstThread", "-DlastBuild=" + Version.build, "-Dberestart", "-Dbecopy=" + fileDest.absolutePath(), "-jar", file.absolutePath()} :
new String[]{"java", "-DlastBuild=" + Version.build, "-Dberestart", "-jar", file.absolutePath()} new String[]{"java", "-DlastBuild=" + Version.build, "-Dberestart", "-Dbecopy=" + fileDest.absolutePath(), "-jar", file.absolutePath()}
); );
System.exit(0); System.exit(0);
}catch(IOException e){ }catch(IOException e){