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

A few minor bugfixes, updated version to 3.3 release

Browse Source
This commit is contained in:
Anuken
2018-02-21 15:07:49 -05:00
parent 26a472d31d
commit 621ec4ee0f
4 changed files with 54 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
build.gradle
View File

@@ -18,9 +18,10 @@ allprojects {
apply plugin: "idea" apply plugin: "idea"
version = 'release' version = 'release'
ext { ext {
versionNumber = '3.3' versionNumber = '3.3'
versionType = 'beta' versionType = 'release'
appName = 'Mindustry' appName = 'Mindustry'
gdxVersion = '1.9.8' gdxVersion = '1.9.8'
aiVersion = '1.8.1' aiVersion = '1.8.1'

8
core/assets/version.properties
View File

@@ -1,7 +1,7 @@
#Autogenerated file. Do not modify. #Autogenerated file. Do not modify.
#Tue Feb 20 23:46:44 EST 2018 #Wed Feb 21 15:00:37 EST 2018
version=beta version=release
androidBuildCode=250 androidBuildCode=257
name=Mindustry name=Mindustry
code=3.3 code=3.3
build=26 build=custom build

1
core/src/io/anuke/mindustry/core/Control.java
View File

@@ -167,6 +167,7 @@ public class Control extends Module{
ui.hudfrag.updateItems(); ui.hudfrag.updateItems();
ui.hudfrag.updateWeapons(); ui.hudfrag.updateWeapons();
ui.hudfrag.fadeRespawn(false);
}); });
Events.on(WaveEvent.class, () -> { Events.on(WaveEvent.class, () -> {

18
core/src/io/anuke/mindustry/world/blocks/types/distribution/Router.java
View File

@@ -6,6 +6,7 @@ import io.anuke.mindustry.resource.Item;
import io.anuke.mindustry.world.Block; import io.anuke.mindustry.world.Block;
import io.anuke.mindustry.world.BlockBar; import io.anuke.mindustry.world.BlockBar;
import io.anuke.mindustry.world.Tile; import io.anuke.mindustry.world.Tile;
import io.anuke.ucore.core.Timers;
import io.anuke.ucore.util.Mathf; import io.anuke.ucore.util.Mathf;
public class Router extends Block{ public class Router extends Block{
@@ -35,13 +36,18 @@ public class Router extends Block{
public void update(Tile tile){ public void update(Tile tile){
tile.setRotation((byte)Mathf.mod(tile.getRotation(), 4)); tile.setRotation((byte)Mathf.mod(tile.getRotation(), 4));
if(tile.entity.totalItems() > 0){ int iterations = Math.max(1, (int) (Timers.delta() + 0.4f));
if(tile.getExtra() != tile.getRotation()
|| Mathf.chance(0.35)){ //sometimes dump backwards at a 1/4 chance... this somehow works?
tryDump(tile, tile.getRotation(), null);
}
tile.setRotation((byte)((tile.getRotation() + 1) % 4)); for(int i = 0; i < iterations; i ++) {
if (tile.entity.totalItems() > 0) {
if (tile.getExtra() != tile.getRotation()
|| Mathf.chance(0.35)) { //sometimes dump backwards at a 1/4 chance... this somehow works?
tryDump(tile, tile.getRotation(), null);
}
tile.setRotation((byte) ((tile.getRotation() + 1) % 4));
}
} }
} }