From 3866a9a8e75ebf5def3027b3d214d817455d30f9 Mon Sep 17 00:00:00 2001 From: Anuken Date: Fri, 17 Dec 2021 17:55:03 -0500 Subject: [PATCH] the obligatory daily commit --- core/assets/bundles/bundle.properties | 2 +- core/src/mindustry/core/Logic.java | 2 +- core/src/mindustry/world/blocks/payloads/PayloadRouter.java | 3 +-- gradle.properties | 2 +- 4 files changed, 4 insertions(+), 5 deletions(-) diff --git a/core/assets/bundles/bundle.properties b/core/assets/bundles/bundle.properties index 9291b82ecd..ade8b99f4a 100644 --- a/core/assets/bundles/bundle.properties +++ b/core/assets/bundles/bundle.properties @@ -1598,7 +1598,7 @@ block.silicon-crucible.description = Refines silicon from sand and coal, using p block.disassembler.description = Separates slag into trace amounts of exotic mineral components at low efficiency. Can produce thorium. block.overdrive-dome.description = Increases the speed of nearby buildings. Requires phase fabric and silicon to operate. block.payload-conveyor.description = Moves large payloads, such as units from factories. Magnetic. Usable in zero-G environments. -block.payload-router.description = Splits input payloads into 3 output directions. Magnetic. Usable in zero-G environments. +block.payload-router.description = Splits input payloads into 3 output directions. Functions as a sorter when a filter is set. Magnetic. Usable in zero-G environments. block.command-center.description = Controls unit behavior with several different commands. block.ground-factory.description = Produces ground units. Output units can be used directly, or moved into reconstructors for upgrading. block.air-factory.description = Produces air units. Output units can be used directly, or moved into reconstructors for upgrading. diff --git a/core/src/mindustry/core/Logic.java b/core/src/mindustry/core/Logic.java index 45d8121bcf..0a0ce51f2a 100644 --- a/core/src/mindustry/core/Logic.java +++ b/core/src/mindustry/core/Logic.java @@ -97,7 +97,7 @@ public class Logic implements ApplicationListener{ Events.on(PlayEvent.class, e -> { //reset weather on play - var randomWeather = state.rules.weather.copy().shuffle(); + var randomWeather = state.rules.weather.copy().shuffled(); float sum = 0f; for(var weather : randomWeather){ weather.cooldown = sum + Mathf.random(weather.maxFrequency); diff --git a/core/src/mindustry/world/blocks/payloads/PayloadRouter.java b/core/src/mindustry/world/blocks/payloads/PayloadRouter.java index be5a0144fc..9986937639 100644 --- a/core/src/mindustry/world/blocks/payloads/PayloadRouter.java +++ b/core/src/mindustry/world/blocks/payloads/PayloadRouter.java @@ -29,6 +29,7 @@ public class PayloadRouter extends PayloadConveyor{ outputsPayload = true; outputFacing = false; configurable = true; + clearOnDoubleTap = true; config(Block.class, (PayloadRouterBuild tile, Block item) -> tile.sorted = item); config(UnitType.class, (PayloadRouterBuild tile, UnitType item) -> tile.sorted = item); @@ -163,8 +164,6 @@ public class PayloadRouter extends PayloadConveyor{ if(item != null){ item.draw(); } - - //TODO draw sort item } @Override diff --git a/gradle.properties b/gradle.properties index bf6d009b07..6a75f14441 100644 --- a/gradle.properties +++ b/gradle.properties @@ -24,4 +24,4 @@ android.useAndroidX=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=de5a78a868 +archash=487418bc46