From 2d3a9b605aab36554866bfcc7796996c81c07c12 Mon Sep 17 00:00:00 2001 From: Anuken Date: Fri, 15 Jan 2021 17:09:12 -0500 Subject: [PATCH] Fixed #4337 / Fixed #4336 --- core/src/mindustry/maps/Map.java | 4 ++-- core/src/mindustry/world/blocks/storage/CoreBlock.java | 4 +--- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/core/src/mindustry/maps/Map.java b/core/src/mindustry/maps/Map.java index 1f9ab65cdd..f1cc24d5f4 100644 --- a/core/src/mindustry/maps/Map.java +++ b/core/src/mindustry/maps/Map.java @@ -62,7 +62,7 @@ public class Map implements Comparable, Publishable{ } public int getHightScore(){ - return Core.settings.getInt("hiscore" + file.nameWithoutExtension(), 0); + return Core.settings.getInt("hiscore" + file.nameWithoutExtension() + tags.get("steamid", ""), 0); } public Texture safeTexture(){ @@ -78,7 +78,7 @@ public class Map implements Comparable, Publishable{ } public void setHighScore(int score){ - Core.settings.put("hiscore" + file.nameWithoutExtension(), score); + Core.settings.put("hiscore" + file.nameWithoutExtension() + tags.get("steamid", ""), score); } /** Returns the result of applying this map's rules to the specified gamemode.*/ diff --git a/core/src/mindustry/world/blocks/storage/CoreBlock.java b/core/src/mindustry/world/blocks/storage/CoreBlock.java index da2ac30b8f..7e271d798c 100644 --- a/core/src/mindustry/world/blocks/storage/CoreBlock.java +++ b/core/src/mindustry/world/blocks/storage/CoreBlock.java @@ -34,8 +34,6 @@ public class CoreBlock extends StorageBlock{ public final int timerResupply = timers++; - public int launchRange = 1; - public int ammoAmount = 5; public float resupplyRate = 10f; public float resupplyRange = 60f; @@ -114,7 +112,7 @@ public class CoreBlock extends StorageBlock{ if(tile == null) return false; CoreBuild core = team.core(); //must have all requirements - if(core == null || (!state.rules.infiniteResources && !core.items.has(requirements))) return false; + if(core == null || (!state.rules.infiniteResources && !core.items.has(requirements, state.rules.buildCostMultiplier))) return false; return tile.block() instanceof CoreBlock && size > tile.block().size; }