diff --git a/core/assets/bundles/bundle.properties b/core/assets/bundles/bundle.properties index 103215d599..aff42cffbb 100644 --- a/core/assets/bundles/bundle.properties +++ b/core/assets/bundles/bundle.properties @@ -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 diff --git a/core/assets/bundles/bundle_be.properties b/core/assets/bundles/bundle_be.properties index 7fbe22eaa0..1d49153dc7 100644 --- a/core/assets/bundles/bundle_be.properties +++ b/core/assets/bundles/bundle_be.properties @@ -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 diff --git a/core/assets/bundles/bundle_bg.properties b/core/assets/bundles/bundle_bg.properties index 34e6b0976d..007a67c06f 100644 --- a/core/assets/bundles/bundle_bg.properties +++ b/core/assets/bundles/bundle_bg.properties @@ -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 diff --git a/core/assets/bundles/bundle_cs.properties b/core/assets/bundles/bundle_cs.properties index 66ddae1ca8..886fa221df 100644 --- a/core/assets/bundles/bundle_cs.properties +++ b/core/assets/bundles/bundle_cs.properties @@ -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 diff --git a/core/assets/bundles/bundle_da.properties b/core/assets/bundles/bundle_da.properties index a14bc09844..b314f74039 100644 --- a/core/assets/bundles/bundle_da.properties +++ b/core/assets/bundles/bundle_da.properties @@ -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 diff --git a/core/assets/bundles/bundle_de.properties b/core/assets/bundles/bundle_de.properties index 0b3bf0d3aa..523f5686b2 100644 --- a/core/assets/bundles/bundle_de.properties +++ b/core/assets/bundles/bundle_de.properties @@ -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 diff --git a/core/assets/bundles/bundle_es.properties b/core/assets/bundles/bundle_es.properties index 33b00c4956..6e68db370b 100644 --- a/core/assets/bundles/bundle_es.properties +++ b/core/assets/bundles/bundle_es.properties @@ -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 diff --git a/core/assets/bundles/bundle_et.properties b/core/assets/bundles/bundle_et.properties index 2bed8c27be..1f6c85267b 100644 --- a/core/assets/bundles/bundle_et.properties +++ b/core/assets/bundles/bundle_et.properties @@ -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 diff --git a/core/assets/bundles/bundle_eu.properties b/core/assets/bundles/bundle_eu.properties index 2ae1d09a5b..8cf402da2b 100644 --- a/core/assets/bundles/bundle_eu.properties +++ b/core/assets/bundles/bundle_eu.properties @@ -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 diff --git a/core/assets/bundles/bundle_fi.properties b/core/assets/bundles/bundle_fi.properties index 6c79ba74c2..4315c61012 100644 --- a/core/assets/bundles/bundle_fi.properties +++ b/core/assets/bundles/bundle_fi.properties @@ -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 diff --git a/core/assets/bundles/bundle_fil.properties b/core/assets/bundles/bundle_fil.properties index 48c1fa61a4..e86a388076 100644 --- a/core/assets/bundles/bundle_fil.properties +++ b/core/assets/bundles/bundle_fil.properties @@ -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 diff --git a/core/assets/bundles/bundle_fr.properties b/core/assets/bundles/bundle_fr.properties index 7872ecb594..6de3513fca 100644 --- a/core/assets/bundles/bundle_fr.properties +++ b/core/assets/bundles/bundle_fr.properties @@ -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 diff --git a/core/assets/bundles/bundle_hu.properties b/core/assets/bundles/bundle_hu.properties index 762e51d7d6..a14f48243e 100644 --- a/core/assets/bundles/bundle_hu.properties +++ b/core/assets/bundles/bundle_hu.properties @@ -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 diff --git a/core/assets/bundles/bundle_id_ID.properties b/core/assets/bundles/bundle_id_ID.properties index 2fd89ea687..747af0d874 100644 --- a/core/assets/bundles/bundle_id_ID.properties +++ b/core/assets/bundles/bundle_id_ID.properties @@ -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 diff --git a/core/assets/bundles/bundle_it.properties b/core/assets/bundles/bundle_it.properties index 3e63c12554..c719b547f2 100644 --- a/core/assets/bundles/bundle_it.properties +++ b/core/assets/bundles/bundle_it.properties @@ -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 diff --git a/core/assets/bundles/bundle_ja.properties b/core/assets/bundles/bundle_ja.properties index 71331c3400..6457f613df 100644 --- a/core/assets/bundles/bundle_ja.properties +++ b/core/assets/bundles/bundle_ja.properties @@ -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 diff --git a/core/assets/bundles/bundle_ko.properties b/core/assets/bundles/bundle_ko.properties index 132c68a6ce..ff498ab6d0 100644 --- a/core/assets/bundles/bundle_ko.properties +++ b/core/assets/bundles/bundle_ko.properties @@ -1101,6 +1101,7 @@ rules.blockdamagemultiplier = 블록 피해량 배수 rules.unitbuildspeedmultiplier = 기체 생산속도 배수 rules.unithealthmultiplier = 기체 체력 배수 rules.unitdamagemultiplier = 기체 피해량 배수 +rules.solarmultiplier = Solar Power Multiplier rules.unitcapvariable = 코어 기체수 제한 추가 rules.unitcap = 기본 기체 제한 rules.limitarea = 맵 영역 제한 diff --git a/core/assets/bundles/bundle_lt.properties b/core/assets/bundles/bundle_lt.properties index 8570bfd8dc..641da0c458 100644 --- a/core/assets/bundles/bundle_lt.properties +++ b/core/assets/bundles/bundle_lt.properties @@ -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 diff --git a/core/assets/bundles/bundle_nl.properties b/core/assets/bundles/bundle_nl.properties index c610d9000f..2b3c8791cd 100644 --- a/core/assets/bundles/bundle_nl.properties +++ b/core/assets/bundles/bundle_nl.properties @@ -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 diff --git a/core/assets/bundles/bundle_nl_BE.properties b/core/assets/bundles/bundle_nl_BE.properties index 7a443b6461..04e324829c 100644 --- a/core/assets/bundles/bundle_nl_BE.properties +++ b/core/assets/bundles/bundle_nl_BE.properties @@ -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 diff --git a/core/assets/bundles/bundle_pl.properties b/core/assets/bundles/bundle_pl.properties index 366a74b209..124d8f6d63 100644 --- a/core/assets/bundles/bundle_pl.properties +++ b/core/assets/bundles/bundle_pl.properties @@ -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 diff --git a/core/assets/bundles/bundle_pt_BR.properties b/core/assets/bundles/bundle_pt_BR.properties index 4d2e7d0121..4086278af0 100644 --- a/core/assets/bundles/bundle_pt_BR.properties +++ b/core/assets/bundles/bundle_pt_BR.properties @@ -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 diff --git a/core/assets/bundles/bundle_pt_PT.properties b/core/assets/bundles/bundle_pt_PT.properties index b5b99f03fa..0b905d9f04 100644 --- a/core/assets/bundles/bundle_pt_PT.properties +++ b/core/assets/bundles/bundle_pt_PT.properties @@ -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 diff --git a/core/assets/bundles/bundle_ro.properties b/core/assets/bundles/bundle_ro.properties index fe9987fb05..0d05a1a52c 100644 --- a/core/assets/bundles/bundle_ro.properties +++ b/core/assets/bundles/bundle_ro.properties @@ -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 diff --git a/core/assets/bundles/bundle_ru.properties b/core/assets/bundles/bundle_ru.properties index eeb9a51ebe..a0b0a55c96 100644 --- a/core/assets/bundles/bundle_ru.properties +++ b/core/assets/bundles/bundle_ru.properties @@ -1099,6 +1099,7 @@ rules.blockdamagemultiplier = Множитель урона блоков rules.unitbuildspeedmultiplier = Множитель скорости производства боев. ед. rules.unithealthmultiplier = Множитель прочности боев. ед. rules.unitdamagemultiplier = Множитель урона боев. ед. +rules.solarmultiplier = Solar Power Multiplier rules.unitcapvariable = Ядра увеличивают лимит единиц rules.unitcap = Начальный лимит единиц rules.limitarea = Ограничить область карты diff --git a/core/assets/bundles/bundle_sr.properties b/core/assets/bundles/bundle_sr.properties index 671d21a130..8bcfc325cc 100644 --- a/core/assets/bundles/bundle_sr.properties +++ b/core/assets/bundles/bundle_sr.properties @@ -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 diff --git a/core/assets/bundles/bundle_sv.properties b/core/assets/bundles/bundle_sv.properties index 548d20b996..0805109366 100644 --- a/core/assets/bundles/bundle_sv.properties +++ b/core/assets/bundles/bundle_sv.properties @@ -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 diff --git a/core/assets/bundles/bundle_th.properties b/core/assets/bundles/bundle_th.properties index b97bbd3c39..d05362c708 100644 --- a/core/assets/bundles/bundle_th.properties +++ b/core/assets/bundles/bundle_th.properties @@ -1100,6 +1100,7 @@ rules.blockdamagemultiplier = พหุคูณดาเมจของบล rules.unitbuildspeedmultiplier = พหุคูณความเร็วในการสร้างยูนิต rules.unithealthmultiplier = พหุคูณพลังชีวิตของยูนิต rules.unitdamagemultiplier = พหุคูณพลังโจมตีของยูนิต +rules.solarmultiplier = Solar Power Multiplier rules.unitcapvariable = เพิ่มจำนวนยูนิตสูงสุดต่อแกนกลาง rules.unitcap = ขีดกำจัดยูนิตสูงสุดพื้นฐาน rules.limitarea = จำกัดพื้นที่แมพ diff --git a/core/assets/bundles/bundle_tk.properties b/core/assets/bundles/bundle_tk.properties index 86ff39b444..e570cee9c1 100644 --- a/core/assets/bundles/bundle_tk.properties +++ b/core/assets/bundles/bundle_tk.properties @@ -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 diff --git a/core/assets/bundles/bundle_tr.properties b/core/assets/bundles/bundle_tr.properties index 3f929907df..a2a29bb4aa 100644 --- a/core/assets/bundles/bundle_tr.properties +++ b/core/assets/bundles/bundle_tr.properties @@ -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 diff --git a/core/assets/bundles/bundle_uk_UA.properties b/core/assets/bundles/bundle_uk_UA.properties index 6b7f1b9ee4..7c76675164 100644 --- a/core/assets/bundles/bundle_uk_UA.properties +++ b/core/assets/bundles/bundle_uk_UA.properties @@ -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 diff --git a/core/assets/bundles/bundle_vi.properties b/core/assets/bundles/bundle_vi.properties index ddd3c26d6b..59278a3832 100644 --- a/core/assets/bundles/bundle_vi.properties +++ b/core/assets/bundles/bundle_vi.properties @@ -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 diff --git a/core/assets/bundles/bundle_zh_CN.properties b/core/assets/bundles/bundle_zh_CN.properties index 9444ce9a40..271634ecf7 100644 --- a/core/assets/bundles/bundle_zh_CN.properties +++ b/core/assets/bundles/bundle_zh_CN.properties @@ -1099,6 +1099,7 @@ rules.blockdamagemultiplier = 建筑伤害倍率 rules.unitbuildspeedmultiplier = 单位生产速度倍率 rules.unithealthmultiplier = 单位生命值倍率 rules.unitdamagemultiplier = 单位伤害倍率 +rules.solarmultiplier = Solar Power Multiplier rules.unitcapvariable = 核心可增加单位上限 rules.unitcap = 基础单位上限 rules.limitarea = 限制地图有效区域 diff --git a/core/assets/bundles/bundle_zh_TW.properties b/core/assets/bundles/bundle_zh_TW.properties index 38dc41e5cd..e402888619 100644 --- a/core/assets/bundles/bundle_zh_TW.properties +++ b/core/assets/bundles/bundle_zh_TW.properties @@ -1104,6 +1104,7 @@ rules.blockdamagemultiplier = 建築物傷害倍數 rules.unitbuildspeedmultiplier = 單位建設速度倍數 rules.unithealthmultiplier = 單位生命值倍數 rules.unitdamagemultiplier = 單位傷害倍數 +rules.solarmultiplier = Solar Power Multiplier rules.unitcapvariable = 核心限制單位上限 rules.unitcap = 基礎單位上限 rules.limitarea = 限制地圖區域 diff --git a/core/src/mindustry/game/Rules.java b/core/src/mindustry/game/Rules.java index d78cceab71..a9854a3c81 100644 --- a/core/src/mindustry/game/Rules.java +++ b/core/src/mindustry/game/Rules.java @@ -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. */ diff --git a/core/src/mindustry/graphics/OverlayRenderer.java b/core/src/mindustry/graphics/OverlayRenderer.java index e64bccd89f..265761e0f6 100644 --- a/core/src/mindustry/graphics/OverlayRenderer.java +++ b/core/src/mindustry/graphics/OverlayRenderer.java @@ -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); diff --git a/core/src/mindustry/input/DesktopInput.java b/core/src/mindustry/input/DesktopInput.java index ebcaa14f3c..f818a6fa55 100644 --- a/core/src/mindustry/input/DesktopInput.java +++ b/core/src/mindustry/input/DesktopInput.java @@ -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(); diff --git a/core/src/mindustry/input/InputHandler.java b/core/src/mindustry/input/InputHandler.java index 97521737e0..35576d75a4 100644 --- a/core/src/mindustry/input/InputHandler.java +++ b/core/src/mindustry/input/InputHandler.java @@ -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."); } diff --git a/core/src/mindustry/input/MobileInput.java b/core/src/mindustry/input/MobileInput.java index 6f07dab9fc..a1fd45c99f 100644 --- a/core/src/mindustry/input/MobileInput.java +++ b/core/src/mindustry/input/MobileInput.java @@ -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)){ diff --git a/core/src/mindustry/logic/LExecutor.java b/core/src/mindustry/logic/LExecutor.java index 2a801d4e79..cf98ff3301 100644 --- a/core/src/mindustry/logic/LExecutor.java +++ b/core/src/mindustry/logic/LExecutor.java @@ -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){ diff --git a/core/src/mindustry/logic/LogicRule.java b/core/src/mindustry/logic/LogicRule.java index 6ebe489089..44329eb627 100644 --- a/core/src/mindustry/logic/LogicRule.java +++ b/core/src/mindustry/logic/LogicRule.java @@ -13,6 +13,7 @@ public enum LogicRule{ mapArea, lighting, ambientLight, + solarMultiplier, //team specific buildSpeed, diff --git a/core/src/mindustry/ui/dialogs/CustomRulesDialog.java b/core/src/mindustry/ui/dialogs/CustomRulesDialog.java index e331b04382..47726a6805 100644 --- a/core/src/mindustry/ui/dialogs/CustomRulesDialog.java +++ b/core/src/mindustry/ui/dialogs/CustomRulesDialog.java @@ -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 -> { diff --git a/core/src/mindustry/world/blocks/power/SolarGenerator.java b/core/src/mindustry/world/blocks/power/SolarGenerator.java index bac6345115..785151ad38 100644 --- a/core/src/mindustry/world/blocks/power/SolarGenerator.java +++ b/core/src/mindustry/world/blocks/power/SolarGenerator.java @@ -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