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
2020-08-18 19:30:11 -04:00
parent 3d5236dfd3
commit f31b1ed8d0
6 changed files with 14 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1310,7 +1310,7 @@ public class Blocks implements ContentList{
itemCapacity = 9000; itemCapacity = 9000;
size = 4; size = 4;
unitCapModifier = 16; unitCapModifier = 14;
}}; }};
coreNucleus = new CoreBlock("core-nucleus"){{ coreNucleus = new CoreBlock("core-nucleus"){{
@@ -1321,7 +1321,7 @@ public class Blocks implements ContentList{
itemCapacity = 13000; itemCapacity = 13000;
size = 5; size = 5;
unitCapModifier = 24; unitCapModifier = 20;
}}; }};
vault = new StorageBlock("vault"){{ vault = new StorageBlock("vault"){{
@@ -1452,7 +1452,7 @@ public class Blocks implements ContentList{
recoilAmount = 2f; recoilAmount = 2f;
reloadTime = 90f; reloadTime = 90f;
cooldown = 0.03f; cooldown = 0.03f;
powerUse = 2.5f; powerUse = 6f;
shootShake = 2f; shootShake = 2f;
shootEffect = Fx.lancerLaserShoot; shootEffect = Fx.lancerLaserShoot;
smokeEffect = Fx.none; smokeEffect = Fx.none;

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

@@ -42,7 +42,7 @@ public class BeControl{
if(checkUpdates && !mobile){ if(checkUpdates && !mobile){
checkUpdate(t -> {}); checkUpdate(t -> {});
} }
}, 1, updateInterval); }, updateInterval, updateInterval);
} }
} }

4
core/src/mindustry/world/blocks/defense/Door.java
View File

@@ -84,7 +84,7 @@ public class Door extends Wall{
if(type == LAccess.enabled){ if(type == LAccess.enabled){
boolean shouldOpen = !Mathf.zero(p1); boolean shouldOpen = !Mathf.zero(p1);
if(net.client() || open == shouldOpen || (Units.anyEntities(tile) && !shouldOpen) || !origin().timer(timerToggle, 60f)){ if(net.client() || open == shouldOpen || (Units.anyEntities(tile) && !shouldOpen) || !origin().timer(timerToggle, 80f)){
return; return;
} }
@@ -134,7 +134,7 @@ public class Door extends Wall{
@Override @Override
public void tapped(){ public void tapped(){
if((Units.anyEntities(tile) && open) || !origin().timer(timerToggle, 50f)){ if((Units.anyEntities(tile) && open) || !origin().timer(timerToggle, 60f)){
return; return;
} }

7
core/src/mindustry/world/blocks/logic/LogicBlock.java
View File

@@ -165,7 +165,7 @@ public class LogicBlock extends Block{
} }
} }
public class LogicBuild extends Building{ public class LogicBuild extends Building implements Ranged{
/** logic "source code" as list of asm statements */ /** logic "source code" as list of asm statements */
public String code = ""; public String code = "";
public LExecutor executor = new LExecutor(); public LExecutor executor = new LExecutor();
@@ -304,6 +304,11 @@ public class LogicBlock extends Block{
} }
} }
@Override
public float range(){
return range;
}
@Override @Override
public void updateTile(){ public void updateTile(){

2
gradle.properties
View File

@@ -1,3 +1,3 @@
org.gradle.daemon=true org.gradle.daemon=true
org.gradle.jvmargs=-Xms256m -Xmx1024m org.gradle.jvmargs=-Xms256m -Xmx1024m
archash=71e03be946af9ec8e9f61fbc289e7c75acbfc184 archash=0fafa5b7159c2a6c11f03ebd378a47736101b46e

2
server/src/mindustry/server/ServerControl.java
View File

@@ -154,7 +154,7 @@ public class ServerControl implements ApplicationListener{
nextMapOverride = null; nextMapOverride = null;
if(map != null){ if(map != null){
Call.infoMessage((state.rules.pvp Call.infoMessage((state.rules.pvp
? "[yellow]The " + event.winner.name + " team is victorious![]" : "[scarlet]Game over![]") ? "[accent]The " + event.winner.name + " team is victorious![]\n" : "[scarlet]Game over![]\n")
+ "\nNext selected map:[accent] " + map.name() + "[]" + "\nNext selected map:[accent] " + map.name() + "[]"
+ (map.tags.containsKey("author") && !map.tags.get("author").trim().isEmpty() ? " by[accent] " + map.author() + "[white]" : "") + "." + + (map.tags.containsKey("author") && !map.tags.get("author").trim().isEmpty() ? " by[accent] " + map.author() + "[white]" : "") + "." +
"\nNew game begins in " + roundExtraTime + " seconds."); "\nNew game begins in " + roundExtraTime + " seconds.");