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

Fixed #4337 / Fixed #4336

Browse Source
This commit is contained in:
Anuken
2021-01-15 17:09:12 -05:00
parent 718a40d742
commit 2d3a9b605a
2 changed files with 3 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
core/src/mindustry/maps/Map.java
View File

@@ -62,7 +62,7 @@ public class Map implements Comparable<Map>, Publishable{
} }
public int getHightScore(){ 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(){ public Texture safeTexture(){
@@ -78,7 +78,7 @@ public class Map implements Comparable<Map>, Publishable{
} }
public void setHighScore(int score){ 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.*/ /** Returns the result of applying this map's rules to the specified gamemode.*/

4
core/src/mindustry/world/blocks/storage/CoreBlock.java
View File

@@ -34,8 +34,6 @@ public class CoreBlock extends StorageBlock{
public final int timerResupply = timers++; public final int timerResupply = timers++;
public int launchRange = 1;
public int ammoAmount = 5; public int ammoAmount = 5;
public float resupplyRate = 10f; public float resupplyRate = 10f;
public float resupplyRange = 60f; public float resupplyRange = 60f;
@@ -114,7 +112,7 @@ public class CoreBlock extends StorageBlock{
if(tile == null) return false; if(tile == null) return false;
CoreBuild core = team.core(); CoreBuild core = team.core();
//must have all requirements //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; return tile.block() instanceof CoreBlock && size > tile.block().size;
} }