From d03049799e0164e3fcff050d88e7bb22f81bd928 Mon Sep 17 00:00:00 2001 From: Anuken Date: Fri, 20 Aug 2021 00:06:37 -0400 Subject: [PATCH 1/3] Gradle 7.2 --- gradle/wrapper/gradle-wrapper.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 05679dc3c1..ffed3a254e 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-7.1.1-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-7.2-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists From 6730954a2e56d86cf218d8571972cccd216b40ca Mon Sep 17 00:00:00 2001 From: Anuken Date: Fri, 20 Aug 2021 00:16:03 -0400 Subject: [PATCH 2/3] Fixed particle effect icon offset --- tools/src/mindustry/tools/Generators.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/src/mindustry/tools/Generators.java b/tools/src/mindustry/tools/Generators.java index b1468997f2..416656cd33 100644 --- a/tools/src/mindustry/tools/Generators.java +++ b/tools/src/mindustry/tools/Generators.java @@ -380,7 +380,7 @@ public class Generators{ base.each((x, y) -> tint.setRaw(x, y, Color.muli(tint.getRaw(x, y), stat.color.rgba()))); //outline the image - Pixmap container = new Pixmap(38, 38); + Pixmap container = new Pixmap(tint.width + 6, tint.height + 6); container.draw(base, 3, 3, true); base = container.outline(Pal.gray, 3); } From 465afc3128b87bb0262f8d699ca0b3e7b6993ab4 Mon Sep 17 00:00:00 2001 From: Anuken Date: Fri, 20 Aug 2021 08:54:02 -0400 Subject: [PATCH 3/3] Sound fixes --- core/src/mindustry/content/Blocks.java | 6 ++++++ core/src/mindustry/maps/filters/SpawnPathFilter.java | 6 +++--- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/core/src/mindustry/content/Blocks.java b/core/src/mindustry/content/Blocks.java index b15d24ae7a..b783221cbc 100644 --- a/core/src/mindustry/content/Blocks.java +++ b/core/src/mindustry/content/Blocks.java @@ -509,6 +509,8 @@ public class Blocks implements ContentList{ hasPower = true; hasLiquids = false; drawer = new DrawSmelter(Color.valueOf("ffef99")); + ambientSound = Sounds.smelter; + ambientSoundVolume = 0.07f; consumes.items(with(Items.coal, 1, Items.sand, 2)); consumes.power(0.50f); @@ -525,6 +527,8 @@ public class Blocks implements ContentList{ itemCapacity = 30; boostScale = 0.15f; drawer = new DrawSmelter(Color.valueOf("ffef99")); + ambientSound = Sounds.smelter; + ambientSoundVolume = 0.07f; consumes.items(with(Items.coal, 4, Items.sand, 6, Items.pyratite, 1)); consumes.power(4f); @@ -538,6 +542,8 @@ public class Blocks implements ContentList{ size = 2; hasPower = hasItems = true; drawer = new DrawSmelter(Color.valueOf("ffc099")); + ambientSound = Sounds.smelter; + ambientSoundVolume = 0.07f; consumes.items(with(Items.lead, 1, Items.sand, 1)); consumes.power(0.60f); diff --git a/core/src/mindustry/maps/filters/SpawnPathFilter.java b/core/src/mindustry/maps/filters/SpawnPathFilter.java index 09d453e513..0495baa839 100644 --- a/core/src/mindustry/maps/filters/SpawnPathFilter.java +++ b/core/src/mindustry/maps/filters/SpawnPathFilter.java @@ -31,7 +31,7 @@ public class SpawnPathFilter extends GenerateFilter{ @Override public void apply(Tiles tiles, GenerateInput in){ - Tile core = null; + var cores = new Seq(); var spawns = new Seq(); for(Tile tile : tiles){ @@ -39,11 +39,11 @@ public class SpawnPathFilter extends GenerateFilter{ spawns.add(tile); } if(tile.block() instanceof CoreBlock && tile.team() != Vars.state.rules.waveTeam){ - core = tile; + cores.add(tile); } } - if(core != null && spawns.any()){ + for(var core : cores){ for(var spawn : spawns){ var path = Astar.pathfind(core.x, core.y, spawn.x, spawn.y, t -> t.solid() ? 100 : 1, Astar.manhattan, tile -> !tile.floor().isDeep()); for(var tile : path){