diff --git a/core/assets/maps/two.msav b/core/assets/maps/two.msav index ba78b1bf5f..b173d8b4b1 100644 Binary files a/core/assets/maps/two.msav and b/core/assets/maps/two.msav differ diff --git a/core/src/mindustry/core/Logic.java b/core/src/mindustry/core/Logic.java index 3074080e4b..34626b9b7a 100644 --- a/core/src/mindustry/core/Logic.java +++ b/core/src/mindustry/core/Logic.java @@ -106,7 +106,7 @@ public class Logic implements ApplicationListener{ Events.on(PlayEvent.class, e -> { //reset weather on play - var randomWeather = state.rules.weather.copy().shuffled(); + var randomWeather = state.rules.weather.copy().shuffle(); float sum = 0f; for(var weather : randomWeather){ weather.cooldown = sum + Mathf.random(weather.maxFrequency); diff --git a/core/src/mindustry/entities/TargetPriority.java b/core/src/mindustry/entities/TargetPriority.java index 6785ccc5f0..f8d361bfac 100644 --- a/core/src/mindustry/entities/TargetPriority.java +++ b/core/src/mindustry/entities/TargetPriority.java @@ -3,10 +3,14 @@ package mindustry.entities; /** Higher priority blocks will always get targeted over those of lower priority, regardless of distance. */ public class TargetPriority{ public static final float + //nobody cares about walls wall = -2f, + //transport infrastructure isn't as important as factories transport = -1f, + //most blocks base = 0f, - constructing = 1f, - turret = 2f, - core = 3f; + //turrets deal damage so they are more important + turret = 1f, + //core is always the most important thing to destroy + core = 2f; } diff --git a/core/src/mindustry/world/blocks/ConstructBlock.java b/core/src/mindustry/world/blocks/ConstructBlock.java index da823fe764..a9aa29c122 100644 --- a/core/src/mindustry/world/blocks/ConstructBlock.java +++ b/core/src/mindustry/world/blocks/ConstructBlock.java @@ -44,7 +44,6 @@ public class ConstructBlock extends Block{ inEditor = false; consBlocks[size - 1] = this; sync = true; - priority = TargetPriority.constructing; } /** Returns a ConstructBlock by size. */ diff --git a/gradle.properties b/gradle.properties index 7444ced2c4..1d16b9e5d8 100644 --- a/gradle.properties +++ b/gradle.properties @@ -25,4 +25,4 @@ org.gradle.caching=true #used for slow jitpack builds; TODO see if this actually works org.gradle.internal.http.socketTimeout=100000 org.gradle.internal.http.connectionTimeout=100000 -archash=bb89034d9f +archash=55e089a16f