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

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
Anuken
2022-06-13 21:42:16 -04:00
parent 2134762ed1 22c5002931
commit f5b38ccbba
43 changed files with 48 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/assets/bundles/bundle.properties
+1
View File
@@ -1104,6 +1104,7 @@ rules.blockdamagemultiplier = Block Damage Multiplier
rules.unitbuildspeedmultiplier = Unit Production Speed Multiplier
rules.unithealthmultiplier = Unit Health Multiplier
rules.unitdamagemultiplier = Unit Damage Multiplier
rules.solarmultiplier = Solar Power Multiplier
rules.unitcapvariable = Cores Contribute To Unit Cap
rules.unitcap = Base Unit Cap
rules.limitarea = Limit Map Area
core/assets/bundles/bundle_be.properties
+1
View File
@@ -1088,6 +1088,7 @@ rules.blockdamagemultiplier = Block Damage Multiplier
rules.unitbuildspeedmultiplier = Множнік хуткасці вытворчасці баёў. адз.
rules.unithealthmultiplier = Множнік здароўя баёў. адз.
rules.unitdamagemultiplier = Множнік страт баёў. адз.
rules.solarmultiplier = Solar Power Multiplier
rules.unitcapvariable = Cores Contribute To Unit Cap
rules.unitcap = Base Unit Cap
rules.limitarea = Limit Map Area
core/assets/bundles/bundle_bg.properties
+1
View File
@@ -1098,6 +1098,7 @@ rules.blockdamagemultiplier = Множител на Щетите на Блоко
rules.unitbuildspeedmultiplier = Множител на Скоростта на Производство на Единици
rules.unithealthmultiplier = Множител на Точките Живот на Единици
rules.unitdamagemultiplier = Множител на Щетите на Единици
rules.solarmultiplier = Solar Power Multiplier
rules.unitcapvariable = Ядрата Увеличават Максималния Брой Единици
rules.unitcap = Максимален Брой Единици
rules.limitarea = Limit Map Area
core/assets/bundles/bundle_cs.properties
+1
View File
@@ -1100,6 +1100,7 @@ rules.blockdamagemultiplier = Násobek poškození bloků
rules.unitbuildspeedmultiplier = Násobek rychlosti výroby jednotek
rules.unithealthmultiplier = Násobek zdraví jednotek
rules.unitdamagemultiplier = Násobek poškození jednotkami
rules.solarmultiplier = Solar Power Multiplier
rules.unitcapvariable = Jádra Zvýšujou Maximum Počtu Jednotek
rules.unitcap = Základní Maximum Počtu Jednotek
rules.limitarea = Limit Map Area
core/assets/bundles/bundle_da.properties
+1
View File
@@ -1088,6 +1088,7 @@ rules.blockdamagemultiplier = Blok-skade-forstærker.
rules.unitbuildspeedmultiplier = Enheds-produktionshastigheds-forstærker
rules.unithealthmultiplier = Enheds-helbreds-forstærker
rules.unitdamagemultiplier = Enheds-skade-forstærker
rules.solarmultiplier = Solar Power Multiplier
rules.unitcapvariable = Cores Contribute To Unit Cap
rules.unitcap = Base Unit Cap
rules.limitarea = Limit Map Area
core/assets/bundles/bundle_de.properties
+1
View File
@@ -1099,6 +1099,7 @@ rules.blockdamagemultiplier = Block-Schaden-Multiplikator
rules.unitbuildspeedmultiplier = Baugeschwindigkeit-Einheit Multiplikator
rules.unithealthmultiplier = Lebenspunkte-Einheit Multiplikator
rules.unitdamagemultiplier = Schaden-Einheit Multiplikator
rules.solarmultiplier = Solar Power Multiplier
rules.unitcapvariable = Kerne zählen zum Einheiten-Limit dazu
rules.unitcap = Einheiten-Limit
rules.limitarea = Limit Map Area
core/assets/bundles/bundle_es.properties
+1
View File
@@ -1100,6 +1100,7 @@ rules.blockdamagemultiplier = Multiplicador de Daño de Bloque
rules.unitbuildspeedmultiplier = Multiplicador de velocidad de creación de unidades
rules.unithealthmultiplier = Multiplicador de Vida de Unidades
rules.unitdamagemultiplier = Multiplicador de Daño de Unidades
rules.solarmultiplier = Solar Power Multiplier
rules.unitcapvariable = Núcleos alteran el Límite de Unidades
rules.unitcap = Límite Base de Unidades
rules.limitarea = Limitar área del mapa
core/assets/bundles/bundle_et.properties
+1
View File
@@ -1088,6 +1088,7 @@ rules.blockdamagemultiplier = Block Damage Multiplier
rules.unitbuildspeedmultiplier = Väeüksuste tootmiskiiruse kordaja
rules.unithealthmultiplier = Väeüksuste elude kordaja
rules.unitdamagemultiplier = Väeüksuste hävitusvõime kordaja
rules.solarmultiplier = Solar Power Multiplier
rules.unitcapvariable = Cores Contribute To Unit Cap
rules.unitcap = Base Unit Cap
rules.limitarea = Limit Map Area
core/assets/bundles/bundle_eu.properties
+1
View File
@@ -1088,6 +1088,7 @@ rules.blockdamagemultiplier = Block Damage Multiplier
rules.unitbuildspeedmultiplier = Unitateen sorrerarako abiadura-biderkatzailea
rules.unithealthmultiplier = Unitateen osasun-biderkatzailea
rules.unitdamagemultiplier = Unitateen kalte-biderkatzailea
rules.solarmultiplier = Solar Power Multiplier
rules.unitcapvariable = Cores Contribute To Unit Cap
rules.unitcap = Base Unit Cap
rules.limitarea = Limit Map Area
core/assets/bundles/bundle_fi.properties
+1
View File
@@ -1088,6 +1088,7 @@ rules.blockdamagemultiplier = Block Damage Multiplier
rules.unitbuildspeedmultiplier = Unit Production Speed Multiplier
rules.unithealthmultiplier = Unit Health Multiplier
rules.unitdamagemultiplier = Unit Damage Multiplier
rules.solarmultiplier = Solar Power Multiplier
rules.unitcapvariable = Cores Contribute To Unit Cap
rules.unitcap = Base Unit Cap
rules.limitarea = Limit Map Area
core/assets/bundles/bundle_fil.properties
+1
View File
@@ -1088,6 +1088,7 @@ rules.blockdamagemultiplier = Block Damage Multiplier
rules.unitbuildspeedmultiplier = Unit Production Speed Multiplier
rules.unithealthmultiplier = Unit Health Multiplier
rules.unitdamagemultiplier = Unit Damage Multiplier
rules.solarmultiplier = Solar Power Multiplier
rules.unitcapvariable = Cores Contribute To Unit Cap
rules.unitcap = Base Unit Cap
rules.limitarea = Limit Map Area
core/assets/bundles/bundle_fr.properties
+1
View File
@@ -1109,6 +1109,7 @@ rules.blockdamagemultiplier = Multiplicateur de Dégât des Blocs
rules.unitbuildspeedmultiplier = Multiplicateur de Vitesse de Construction des Unités
rules.unithealthmultiplier = Multiplicateur de Santé des Unités
rules.unitdamagemultiplier = Multiplicateur de Dégât des Unités
rules.solarmultiplier = Solar Power Multiplier
rules.unitcapvariable = Les Noyaux contribuent à la limite d'Unités actives
rules.unitcap = Limite d'Unités actives de Base
rules.limitarea = Limit Map Area
core/assets/bundles/bundle_hu.properties
+1
View File
@@ -1097,6 +1097,7 @@ rules.blockdamagemultiplier = Épület sebzés szorzó
rules.unitbuildspeedmultiplier = Egység gyártási sebesség szorzó
rules.unithealthmultiplier = Egység életpont szorzó
rules.unitdamagemultiplier = Egység sebzés szorzó
rules.solarmultiplier = Solar Power Multiplier
rules.unitcapvariable = Cores Contribute To Unit Cap
rules.unitcap = Base Unit Cap
rules.limitarea = Limit Map Area
core/assets/bundles/bundle_id_ID.properties
+1
View File
@@ -1104,6 +1104,7 @@ rules.blockdamagemultiplier = Penggandaan Kekuatan Blok
rules.unitbuildspeedmultiplier = Penggandaan Kecepatan Munculnya Unit
rules.unithealthmultiplier = Penggandaan Darah Unit
rules.unitdamagemultiplier = Penggandaan Kekuatan Unit
rules.solarmultiplier = Solar Power Multiplier
rules.unitcapvariable = Inti Memengaruhi Batas Unit
rules.unitcap = Batas Unit Dasar
rules.limitarea = Batas Area Peta
core/assets/bundles/bundle_it.properties
+1
View File
@@ -1095,6 +1095,7 @@ rules.blockdamagemultiplier = Moltiplicatore Danno Blocco
rules.unitbuildspeedmultiplier = Moltiplicatore Velocità Costruzione Unità
rules.unithealthmultiplier = Moltiplicatore Vita Unità
rules.unitdamagemultiplier = Moltiplicatore Danno Unità
rules.solarmultiplier = Solar Power Multiplier
rules.unitcapvariable = Cores Contribute To Unit Cap
rules.unitcap = Base Unit Cap
rules.limitarea = Limit Map Area
core/assets/bundles/bundle_ja.properties
+1
View File
@@ -1100,6 +1100,7 @@ rules.blockdamagemultiplier = ブロックのダメージ倍率
rules.unitbuildspeedmultiplier = ユニットの製造速度倍率
rules.unithealthmultiplier = ユニットの体力倍率
rules.unitdamagemultiplier = ユニットのダメージ倍率
rules.solarmultiplier = Solar Power Multiplier
rules.unitcapvariable = コア数によってユニット上限を変動
rules.unitcap = 基礎ユニット上限数
rules.limitarea = Limit Map Area
core/assets/bundles/bundle_ko.properties
+1
View File
@@ -1101,6 +1101,7 @@ rules.blockdamagemultiplier = 블록 피해량 배수
rules.unitbuildspeedmultiplier = 기체 생산속도 배수
rules.unithealthmultiplier = 기체 체력 배수
rules.unitdamagemultiplier = 기체 피해량 배수
rules.solarmultiplier = Solar Power Multiplier
rules.unitcapvariable = 코어 기체수 제한 추가
rules.unitcap = 기본 기체 제한
rules.limitarea = 맵 영역 제한
core/assets/bundles/bundle_lt.properties
+1
View File
@@ -1088,6 +1088,7 @@ rules.blockdamagemultiplier = Block Damage Multiplier
rules.unitbuildspeedmultiplier = Vienetų Gamybos Greičio Daugiklis
rules.unithealthmultiplier = Vienetų Gyvybių Daugiklis
rules.unitdamagemultiplier = Vienetų Žalos Daugiklis
rules.solarmultiplier = Solar Power Multiplier
rules.unitcapvariable = Cores Contribute To Unit Cap
rules.unitcap = Base Unit Cap
rules.limitarea = Limit Map Area
core/assets/bundles/bundle_nl.properties
+1
View File
@@ -1088,6 +1088,7 @@ rules.blockdamagemultiplier = Block Damage Multiplier
rules.unitbuildspeedmultiplier = Unit Spawn Snelheid Vermenigvulder
rules.unithealthmultiplier = Unit Health Vermenigvulder
rules.unitdamagemultiplier = Unit Damage Vermenigvulder
rules.solarmultiplier = Solar Power Multiplier
rules.unitcapvariable = Cores Contribute To Unit Cap
rules.unitcap = Base Unit Cap
rules.limitarea = Limit Map Area
core/assets/bundles/bundle_nl_BE.properties
+1
View File
@@ -1088,6 +1088,7 @@ rules.blockdamagemultiplier = Block Damage Multiplier
rules.unitbuildspeedmultiplier = Unit Creation Speed Multiplier
rules.unithealthmultiplier = Unit Health Multiplier
rules.unitdamagemultiplier = Unit Damage Multiplier
rules.solarmultiplier = Solar Power Multiplier
rules.unitcapvariable = Cores Contribute To Unit Cap
rules.unitcap = Base Unit Cap
rules.limitarea = Limit Map Area
core/assets/bundles/bundle_pl.properties
+1
View File
@@ -1098,6 +1098,7 @@ rules.blockdamagemultiplier = Mnożnik Uszkodzeń Bloków
rules.unitbuildspeedmultiplier = Mnożnik Prędkości Tworzenia Jednostek
rules.unithealthmultiplier = Mnożnik Życia Jednostek
rules.unitdamagemultiplier = Mnożnik Obrażeń jednostek
rules.solarmultiplier = Solar Power Multiplier
rules.unitcapvariable = Rdzenie mają wpływ na limit jednostek
rules.unitcap = Podstawowy limit jednostek
rules.limitarea = Limit Obszaru Mapy
core/assets/bundles/bundle_pt_BR.properties
+1
View File
@@ -1095,6 +1095,7 @@ rules.blockdamagemultiplier = Multiplicador de dano do bloco
rules.unitbuildspeedmultiplier = Multiplicador de velocidade de criação de unidade
rules.unithealthmultiplier = Multiplicador de vida de unidade
rules.unitdamagemultiplier = Multiplicador de dano de Unidade
rules.solarmultiplier = Solar Power Multiplier
rules.unitcapvariable = Cores Contribute To Unit Cap
rules.unitcap = Base Unit Cap
rules.limitarea = Limit Map Area
core/assets/bundles/bundle_pt_PT.properties
+1
View File
@@ -1088,6 +1088,7 @@ rules.blockdamagemultiplier = Block Damage Multiplier
rules.unitbuildspeedmultiplier = Multiplicador de velocidade de criação de unidade
rules.unithealthmultiplier = Multiplicador de vida de unidade
rules.unitdamagemultiplier = Multiplicador de dano de Unidade
rules.solarmultiplier = Solar Power Multiplier
rules.unitcapvariable = Cores Contribute To Unit Cap
rules.unitcap = Base Unit Cap
rules.limitarea = Limit Map Area
core/assets/bundles/bundle_ro.properties
+1
View File
@@ -1100,6 +1100,7 @@ rules.blockdamagemultiplier = Multiplicatorul Deteriorării Blocurilor
rules.unitbuildspeedmultiplier = Multiplicatorul Vitezei de Producere a Unităților
rules.unithealthmultiplier = Multiplicatorul Vieții Unităților
rules.unitdamagemultiplier = Multiplicatorul Deteriorării Unităților
rules.solarmultiplier = Solar Power Multiplier
rules.unitcapvariable = Nucleele Contribuie la Limita Unităților
rules.unitcap = Limita de Bază a Unităților
rules.limitarea = Limit Map Area
core/assets/bundles/bundle_ru.properties
+1
View File
@@ -1099,6 +1099,7 @@ rules.blockdamagemultiplier = Множитель урона блоков
rules.unitbuildspeedmultiplier = Множитель скорости производства боев. ед.
rules.unithealthmultiplier = Множитель прочности боев. ед.
rules.unitdamagemultiplier = Множитель урона боев. ед.
rules.solarmultiplier = Solar Power Multiplier
rules.unitcapvariable = Ядра увеличивают лимит единиц
rules.unitcap = Начальный лимит единиц
rules.limitarea = Ограничить область карты
core/assets/bundles/bundle_sr.properties
+1
View File
@@ -1100,6 +1100,7 @@ rules.blockdamagemultiplier = Block Damage Multiplier
rules.unitbuildspeedmultiplier = Unit Production Speed Multiplier
rules.unithealthmultiplier = Unit Health Multiplier
rules.unitdamagemultiplier = Unit Damage Multiplier
rules.solarmultiplier = Solar Power Multiplier
rules.unitcapvariable = Cores Contribute To Unit Cap
rules.unitcap = Base Unit Cap
rules.limitarea = Limit Map Area
core/assets/bundles/bundle_sv.properties
+1
View File
@@ -1088,6 +1088,7 @@ rules.blockdamagemultiplier = Block Damage Multiplier
rules.unitbuildspeedmultiplier = Unit Production Speed Multiplier
rules.unithealthmultiplier = Unit Health Multiplier
rules.unitdamagemultiplier = Unit Damage Multiplier
rules.solarmultiplier = Solar Power Multiplier
rules.unitcapvariable = Cores Contribute To Unit Cap
rules.unitcap = Base Unit Cap
rules.limitarea = Limit Map Area
core/assets/bundles/bundle_th.properties
+1
View File
@@ -1100,6 +1100,7 @@ rules.blockdamagemultiplier = พหุคูณดาเมจของบล
rules.unitbuildspeedmultiplier = พหุคูณความเร็วในการสร้างยูนิต
rules.unithealthmultiplier = พหุคูณพลังชีวิตของยูนิต
rules.unitdamagemultiplier = พหุคูณพลังโจมตีของยูนิต
rules.solarmultiplier = Solar Power Multiplier
rules.unitcapvariable = เพิ่มจำนวนยูนิตสูงสุดต่อแกนกลาง
rules.unitcap = ขีดกำจัดยูนิตสูงสุดพื้นฐาน
rules.limitarea = จำกัดพื้นที่แมพ
core/assets/bundles/bundle_tk.properties
+1
View File
@@ -1088,6 +1088,7 @@ rules.blockdamagemultiplier = Block Damage Multiplier
rules.unitbuildspeedmultiplier = Unit Creation Speed Multiplier
rules.unithealthmultiplier = Unit Health Multiplier
rules.unitdamagemultiplier = Unit Damage Multiplier
rules.solarmultiplier = Solar Power Multiplier
rules.unitcapvariable = Cores Contribute To Unit Cap
rules.unitcap = Base Unit Cap
rules.limitarea = Limit Map Area
core/assets/bundles/bundle_tr.properties
+1
View File
@@ -1100,6 +1100,7 @@ rules.blockdamagemultiplier = Blok Hasarı Çarpanı
rules.unitbuildspeedmultiplier = Birim Üretim Hızı Çarpanı
rules.unithealthmultiplier = Birim Canı Çarpanı
rules.unitdamagemultiplier = Birim Hasarı Çapanı
rules.solarmultiplier = Solar Power Multiplier
rules.unitcapvariable = Çekirdekler Eleman Sınırını Etkiler
rules.unitcap = Sabit eleman Sınırı
rules.limitarea = Haritayı Sınırla
core/assets/bundles/bundle_uk_UA.properties
+1
View File
@@ -1067,6 +1067,7 @@ rules.blockdamagemultiplier = Множник шкоди блоків
rules.unitbuildspeedmultiplier = Множник швидкості виробництва бойових одиниць
rules.unithealthmultiplier = Множник здоров’я бойових одиниць
rules.unitdamagemultiplier = Множник шкоди бойових одиниць
rules.solarmultiplier = Solar Power Multiplier
rules.unitcapvariable = Ядра збільшують обмеження на кількість одиниць
rules.unitcap = Початкове обмеження одиниць
rules.limitarea = Limit Map Area
core/assets/bundles/bundle_vi.properties
+1
View File
@@ -1100,6 +1100,7 @@ rules.blockdamagemultiplier = Hệ số sát thương của khối
rules.unitbuildspeedmultiplier = Hệ số tốc độ sản xuất lính
rules.unithealthmultiplier = Hệ số máu của quân lính
rules.unitdamagemultiplier = Hệ số sát thương của quân lính
rules.solarmultiplier = Solar Power Multiplier
rules.unitcapvariable = Căn cứ tăng giới hạn quân lính
rules.unitcap = Giới hạn quân lính
rules.limitarea = Limit Map Area
core/assets/bundles/bundle_zh_CN.properties
+1
View File
@@ -1099,6 +1099,7 @@ rules.blockdamagemultiplier = 建筑伤害倍率
rules.unitbuildspeedmultiplier = 单位生产速度倍率
rules.unithealthmultiplier = 单位生命值倍率
rules.unitdamagemultiplier = 单位伤害倍率
rules.solarmultiplier = Solar Power Multiplier
rules.unitcapvariable = 核心可增加单位上限
rules.unitcap = 基础单位上限
rules.limitarea = 限制地图有效区域
core/assets/bundles/bundle_zh_TW.properties
+1
View File
@@ -1104,6 +1104,7 @@ rules.blockdamagemultiplier = 建築物傷害倍數
rules.unitbuildspeedmultiplier = 單位建設速度倍數
rules.unithealthmultiplier = 單位生命值倍數
rules.unitdamagemultiplier = 單位傷害倍數
rules.solarmultiplier = Solar Power Multiplier
rules.unitcapvariable = 核心限制單位上限
rules.unitcap = 基礎單位上限
rules.limitarea = 限制地圖區域
core/src/mindustry/game/Rules.java
+4
View File
@@ -42,6 +42,8 @@ public class Rules{
public boolean coreCapture = false;
/** Whether reactors can explode and damage other blocks. */
public boolean reactorExplosions = true;
/** Whether to allow manual unit control. */
public boolean possessionAllowed = true;
/** Whether schematics are allowed. */
public boolean schematicsAllowed = true;
/** Whether friendly explosions can occur and set fire/damage other blocks. */
@@ -56,6 +58,8 @@ public class Rules{
public boolean unitCapVariable = true;
/** If true, unit spawn points are shown. */
public boolean showSpawns = false;
/** Multiplies power output of solar panels. */
public float solarMultiplier = 1f;
/** How fast unit factories build units. */
public float unitBuildSpeedMultiplier = 1f;
/** How much damage any other units deal. */
core/src/mindustry/graphics/OverlayRenderer.java
+1 -1
View File
@@ -127,7 +127,7 @@ public class OverlayRenderer{
Sized select = input.selectedUnit();
if(select == null) select = input.selectedControlBuild();
if(!Core.input.keyDown(Binding.control)) select = null;
if(!Core.input.keyDown(Binding.control) || !state.rules.possessionAllowed) select = null;
unitFade = Mathf.lerpDelta(unitFade, Mathf.num(select != null), 0.1f);
core/src/mindustry/input/DesktopInput.java
+1 -1
View File
@@ -254,7 +254,7 @@ public class DesktopInput extends InputHandler{
//validate commanding units
selectedUnits.removeAll(u -> !u.isCommandable() || !u.isValid());
if(!scene.hasMouse() && !locked){
if(!scene.hasMouse() && !locked && state.rules.possessionAllowed){
if(Core.input.keyDown(Binding.control) && Core.input.keyTap(Binding.select)){
Unit on = selectedUnit();
var build = selectedControlBuild();
core/src/mindustry/input/InputHandler.java
+1 -1
View File
@@ -475,7 +475,7 @@ public abstract class InputHandler implements InputProcessor, GestureListener{
if(player == null) return;
//make sure player is allowed to control the unit
if(net.server() && !netServer.admins.allowAction(player, ActionType.control, action -> action.unit = unit)){
if(net.server() && (!state.rules.possessionAllowed || !netServer.admins.allowAction(player, ActionType.control, action -> action.unit = unit))){
throw new ValidateException(player, "Player cannot control a unit.");
}
core/src/mindustry/input/MobileInput.java
+2 -2
View File
@@ -658,10 +658,10 @@ public class MobileInput extends InputHandler implements GestureListener{
payloadTarget = null;
//control a unit/block detected on first tap of double-tap
if(unitTapped != null){
if(unitTapped != null && state.rules.possessionAllowed){
Call.unitControl(player, unitTapped);
recentRespawnTimer = 1f;
}else if(buildingTapped != null){
}else if(buildingTapped != null && state.rules.possessionAllowed){
Call.buildingControlSelect(player, buildingTapped);
recentRespawnTimer = 1f;
}else if(!checkConfigTap() && !tryBeginMine(cursor)){
core/src/mindustry/logic/LExecutor.java
+1
View File
@@ -1401,6 +1401,7 @@ public class LExecutor{
}
}
case ambientLight -> state.rules.ambientLight.fromDouble(exec.num(value));
case solarMultiplier -> state.rules.solarMultiplier = exec.numf(value);
case unitBuildSpeed, unitDamage, blockHealth, blockDamage, buildSpeed, rtsMinSquad, rtsMinWeight -> {
Team team = exec.team(p1);
if(team != null){
core/src/mindustry/logic/LogicRule.java
+1
View File
@@ -13,6 +13,7 @@ public enum LogicRule{
mapArea,
lighting,
ambientLight,
solarMultiplier,
//team specific
buildSpeed,
core/src/mindustry/ui/dialogs/CustomRulesDialog.java
+2
View File
@@ -208,6 +208,8 @@ public class CustomRulesDialog extends BaseDialog{
numberi("h", h -> state.rules.limitHeight = h, () -> state.rules.limitHeight, () -> state.rules.limitMapArea, 0, 10000);
}
number("@rules.solarmultiplier", f -> rules.solarMultiplier = f, () -> rules.solarMultiplier);
main.button(b -> {
b.left();
b.table(Tex.pane, in -> {
core/src/mindustry/world/blocks/power/SolarGenerator.java
+1 -1
View File
@@ -26,7 +26,7 @@ public class SolarGenerator extends PowerGenerator{
@Override
public void updateTile(){
productionEfficiency = enabled ?
Mathf.maxZero(Attribute.light.env() +
state.rules.solarMultiplier * Mathf.maxZero(Attribute.light.env() +
(state.rules.lighting ?
1f - state.rules.ambientLight.a :
1f