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

Bugfixes

Browse Source
This commit is contained in:
Anuken
2020-11-25 15:42:51 -05:00
parent 40b67349d9
commit c874089f27
4 changed files with 6 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
core/src/mindustry/content/Blocks.java
View File

@@ -1221,13 +1221,13 @@ public class Blocks implements ContentList{
solarPanel = new SolarGenerator("solar-panel"){{ solarPanel = new SolarGenerator("solar-panel"){{
requirements(Category.power, with(Items.lead, 10, Items.silicon, 15)); requirements(Category.power, with(Items.lead, 10, Items.silicon, 15));
powerProduction = 0.08f; powerProduction = 0.1f;
}}; }};
largeSolarPanel = new SolarGenerator("solar-panel-large"){{ largeSolarPanel = new SolarGenerator("solar-panel-large"){{
requirements(Category.power, with(Items.lead, 100, Items.silicon, 145, Items.phaseFabric, 15)); requirements(Category.power, with(Items.lead, 80, Items.silicon, 110, Items.phaseFabric, 15));
size = 3; size = 3;
powerProduction = 1f; powerProduction = 1.3f;
}}; }};
thoriumReactor = new NuclearReactor("thorium-reactor"){{ thoriumReactor = new NuclearReactor("thorium-reactor"){{

2
core/src/mindustry/ctype/UnlockableContent.java
View File

@@ -110,7 +110,7 @@ public abstract class UnlockableContent extends MappableContent{
/** Makes this piece of content unlocked; if it already unlocked, nothing happens. */ /** Makes this piece of content unlocked; if it already unlocked, nothing happens. */
public void unlock(){ public void unlock(){
if(!unlocked()){ if(!net.client() && !unlocked()){
unlocked = true; unlocked = true;
Core.settings.put(name + "-unlocked", true); Core.settings.put(name + "-unlocked", true);

3
desktop/src/mindustry/desktop/steam/SAchievement.java
View File

@@ -3,8 +3,7 @@ package mindustry.desktop.steam;
public enum SAchievement{ public enum SAchievement{
kill1kEnemies(SStat.unitsDestroyed, 1000), kill1kEnemies(SStat.unitsDestroyed, 1000),
kill100kEnemies(SStat.unitsDestroyed, 100_000), kill100kEnemies(SStat.unitsDestroyed, 100_000),
launch10kItems(SStat.itemsLaunched, 10_000), launch100kItems(SStat.itemsLaunched, 100_000),
launch1milItems(SStat.itemsLaunched, 1_000_000),
produce1kMin(SStat.maxProduction, 1000), produce1kMin(SStat.maxProduction, 1000),
produce20kMin(SStat.maxProduction, 20_000), produce20kMin(SStat.maxProduction, 20_000),

2
gradle.properties
View File

@@ -1,3 +1,3 @@
org.gradle.daemon=true org.gradle.daemon=true
org.gradle.jvmargs=-Xms256m -Xmx1024m org.gradle.jvmargs=-Xms256m -Xmx1024m
archash=6742c2b110eeecd1934c42b5b1c87b00c911ecc4 archash=7a2a357f6cfdc3725ce581093a0ced91f4474222