mirrors/Mindustry
1
0
Fork 0
mirror of https://github.com/Anuken/Mindustry.git synced 2025-02-11 11:17:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

Bugfixes

Browse Source
This commit is contained in:
Anuken 2020-07-28 17:19:57 -04:00
parent 3251dde4a8
commit 81265500a5
4 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1150,13 +1150,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.06f; powerProduction = 0.07f;
}}; }};
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, 100, Items.silicon, 145, Items.phasefabric, 15));
size = 3; size = 3;
powerProduction = 0.9f; powerProduction = 0.95f;
}}; }};
thoriumReactor = new NuclearReactor("thorium-reactor"){{ thoriumReactor = new NuclearReactor("thorium-reactor"){{

2
core/src/mindustry/editor/WaveGraph.java
View File

@ -139,7 +139,7 @@ public class WaveGraph extends Table{
for(Mode m : Mode.all){ for(Mode m : Mode.all){
t.button("$wavemode." + m.name(), Styles.fullTogglet, () -> { t.button("$wavemode." + m.name(), Styles.fullTogglet, () -> {
mode = m; mode = m;
}).group(group).height(32f).update(b -> b.setChecked(m == mode)).width(130f); }).group(group).height(35f).update(b -> b.setChecked(m == mode)).width(130f);
} }
}).growX(); }).growX();
} }

8
core/src/mindustry/world/blocks/power/SolarGenerator.java
View File

@ -4,7 +4,7 @@ import arc.math.*;
import arc.struct.*; import arc.struct.*;
import mindustry.world.meta.*; import mindustry.world.meta.*;
import static mindustry.Vars.state; import static mindustry.Vars.*;
public class SolarGenerator extends PowerGenerator{ public class SolarGenerator extends PowerGenerator{
@ -25,9 +25,11 @@ public class SolarGenerator extends PowerGenerator{
@Override @Override
public void updateTile(){ public void updateTile(){
productionEfficiency = productionEfficiency =
Mathf.maxZero(Attribute.light.env() + state.rules.solarPowerMultiplier < 0 ? Mathf.maxZero(Attribute.light.env() +
(state.rules.solarPowerMultiplier < 0 ?
(state.rules.lighting ? 1f - state.rules.ambientLight.a : 1f) : (state.rules.lighting ? 1f - state.rules.ambientLight.a : 1f) :
state.rules.solarPowerMultiplier); state.rules.solarPowerMultiplier
));
} }
} }
} }

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=e731db5f9be2004fab0b3b23206f6c2211d01176 archash=d2dcaa6c88e82ee1958b1e019f63f6c64d3f843b