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

Updated uCore

Browse Source
This commit is contained in:
Anuken
2018-01-23 21:31:17 -05:00
parent 66f7557770
commit 257335ebaf
6 changed files with 7 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
build.gradle
View File

@@ -21,7 +21,7 @@ allprojects {
appName = "Mindustry" appName = "Mindustry"
gdxVersion = '1.9.8' gdxVersion = '1.9.8'
aiVersion = '1.8.1' aiVersion = '1.8.1'
uCoreVersion = '2650ef8'; uCoreVersion = 'e78aec7';
} }
repositories { repositories {

BIN
core/assets/sprites/sprites.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 81 KiB

After

Width:  |  Height:  |  Size: 123 KiB

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

@@ -546,7 +546,7 @@ public class Control extends Module{
Entities.initPhysics(); Entities.initPhysics();
Entities.setCollider(tilesize, world::solid); Entities.collisions().setCollider(tilesize, world::solid);
Mindustry.platforms.updateRPC(); Mindustry.platforms.updateRPC();
} }

7
core/src/io/anuke/mindustry/entities/enemies/EnemyType.java
View File

@@ -31,8 +31,7 @@ public class EnemyType {
public final static Color[] tierColors = { public final static Color[] tierColors = {
Color.valueOf("ffe451"), Color.valueOf("f48e20"), Color.valueOf("ff6757"), Color.valueOf("ffe451"), Color.valueOf("f48e20"), Color.valueOf("ff6757"),
Color.valueOf("ff2d86"), Color.valueOf("cb2dff"), Color.valueOf("c83333"), Color.valueOf("ff2d86"), Color.valueOf("cb2dff"), Color.valueOf("362020") };
Color.valueOf("251616") };
public final static int maxtier = tierColors.length; public final static int maxtier = tierColors.length;
public final static float maxIdleLife = 60f*2f; //2 seconds idle = death public final static float maxIdleLife = 60f*2f; //2 seconds idle = death
public final static float hitDuration = 5f; public final static float hitDuration = 5f;
@@ -106,7 +105,7 @@ public class EnemyType {
float minv = 0.07f; float minv = 0.07f;
if(enemy.timer.get(timerReset, 60)){ if(enemy.timer.get(timerReset, 80)){
enemy.totalMove.setZero(); enemy.totalMove.setZero();
} }
@@ -116,7 +115,7 @@ public class EnemyType {
enemy.idletime = 0; enemy.idletime = 0;
} }
if(enemy.timer.getTime(timerReset) > 40 && enemy.totalMove.len() < 0.3f && enemy.node > 0 && enemy.target == null){ if(enemy.timer.getTime(timerReset) > 50 && enemy.totalMove.len() < 0.2f && enemy.node > 0 && enemy.target == null){
enemy.idletime = 999999f; enemy.idletime = 999999f;
} }

2
core/src/io/anuke/mindustry/game/EnemySpawn.java
View File

@@ -14,7 +14,7 @@ public class EnemySpawn{
/**The spacing, in waves, of spawns. 2 = spawns every other wave*/ /**The spacing, in waves, of spawns. 2 = spawns every other wave*/
protected int spacing = 1; protected int spacing = 1;
/**How many waves need to pass after the start of this spawn for the tier to increase by one*/ /**How many waves need to pass after the start of this spawn for the tier to increase by one*/
protected int tierscale = 14; protected int tierscale = 17;
/**How many more enemies there are, every time the tier increases*/ /**How many more enemies there are, every time the tier increases*/
protected int tierscaleback = 0; protected int tierscaleback = 0;
/**The tier this spawn starts at.*/ /**The tier this spawn starts at.*/

2
core/src/io/anuke/mindustry/ui/dialogs/JoinDialog.java
View File

@@ -142,7 +142,7 @@ public class JoinDialog extends FloatingDialog {
if(!Vars.gwt) { if(!Vars.gwt) {
local.clear(); local.clear();
local.background("button"); local.background("button");
local.label(() -> "[accent]" + Bundles.get("text.hosts.discovering") + new String(new char[(int) (Timers.time() / 10) % 4]).replace("\0", ".")).pad(10f); local.label(() -> "[accent]" + Bundles.get("text.hosts.discovering") + Strings.animated(4, 10f, ".")).pad(10f);
Net.discoverServers(this::addLocalHosts); Net.discoverServers(this::addLocalHosts);
} }
} }