diff --git a/core/assets/bundles/bundle.properties b/core/assets/bundles/bundle.properties index 19703a139c32..cdfe2330f277 100644 --- a/core/assets/bundles/bundle.properties +++ b/core/assets/bundles/bundle.properties @@ -822,6 +822,7 @@ sector.biomassFacility.name = Biomass Synthesis Facility sector.windsweptIslands.name = Windswept Islands sector.extractionOutpost.name = Extraction Outpost sector.facility32m.name = Facility 32 M +sector.taintedWoods.name = Tainted Woods sector.planetaryTerminal.name = Planetary Launch Terminal sector.coastline.name = Coastline sector.navalFortress.name = Naval Fortress @@ -846,6 +847,7 @@ sector.coastline.description = Remnants of naval unit technology have been detec sector.navalFortress.description = The enemy has established a base on a remote, naturally-fortified island. Destroy this outpost. Acquire their advanced naval craft technology, and research it. #do not translate sector.facility32m.description = WIP, map submission by Stormride_R +sector.taintedWoods.description = WIP, map submission by Stormride_R sector.onset.name = The Onset sector.aegis.name = Aegis diff --git a/core/assets/bundles/bundle_be.properties b/core/assets/bundles/bundle_be.properties index e2c8ba9ce9fb..b41f75efc9a6 100644 --- a/core/assets/bundles/bundle_be.properties +++ b/core/assets/bundles/bundle_be.properties @@ -796,6 +796,7 @@ sector.biomassFacility.name = Аб'ект Сінтэзу Біямасы sector.windsweptIslands.name = Абветраныя Астравы sector.extractionOutpost.name = Здабвываючы Фарпост sector.facility32m.name = Facility 32 M +sector.taintedWoods.name = Tainted Woods sector.planetaryTerminal.name = Планетарны Пускавы Тэрмінал sector.coastline.name = Берагавая Лінія sector.navalFortress.name = Марская Крэпасць @@ -819,6 +820,7 @@ sector.planetaryTerminal.description = The final target.\n\nThis coastal base co sector.coastline.description = Remnants of naval unit technology have been detected at this location. Repel the enemy attacks, capture this sector, and acquire the technology. sector.navalFortress.description = The enemy has established a base on a remote, naturally-fortified island. Destroy this outpost. Acquire their advanced naval craft technology, and research it. sector.facility32m.description = WIP, map submission by Stormride_R +sector.taintedWoods.description = WIP, map submission by Stormride_R sector.onset.name = Пачатак sector.aegis.name = Ахова sector.lake.name = Рака diff --git a/core/assets/bundles/bundle_bg.properties b/core/assets/bundles/bundle_bg.properties index 7eef226edeca..af1ddc4aada5 100644 --- a/core/assets/bundles/bundle_bg.properties +++ b/core/assets/bundles/bundle_bg.properties @@ -805,6 +805,7 @@ sector.biomassFacility.name = Биосинтезиращо Съоръжение sector.windsweptIslands.name = Ветровитите Острови sector.extractionOutpost.name = Добивен лагер sector.facility32m.name = Facility 32 M +sector.taintedWoods.name = Tainted Woods sector.planetaryTerminal.name = Терминал за космически мисии sector.coastline.name = Coastline sector.navalFortress.name = Naval Fortress @@ -828,6 +829,7 @@ sector.planetaryTerminal.description = Крайна цел.\n\nТази край sector.coastline.description = Remnants of naval unit technology have been detected at this location. Repel the enemy attacks, capture this sector, and acquire the technology. sector.navalFortress.description = The enemy has established a base on a remote, naturally-fortified island. Destroy this outpost. Acquire their advanced naval craft technology, and research it. sector.facility32m.description = WIP, map submission by Stormride_R +sector.taintedWoods.description = WIP, map submission by Stormride_R sector.onset.name = The Onset sector.aegis.name = Aegis sector.lake.name = Lake diff --git a/core/assets/bundles/bundle_ca.properties b/core/assets/bundles/bundle_ca.properties index a49b12ca1517..da7897be0b00 100644 --- a/core/assets/bundles/bundle_ca.properties +++ b/core/assets/bundles/bundle_ca.properties @@ -809,6 +809,7 @@ sector.biomassFacility.name = Centre de síntesi de biomassa sector.windsweptIslands.name = Les illes escombrades pel vent sector.extractionOutpost.name = Post avançat d’extracció sector.facility32m.name = Facility 32 M +sector.taintedWoods.name = Tainted Woods sector.planetaryTerminal.name = Terminal de llançament interplanetari sector.coastline.name = Línia de costa sector.navalFortress.name = Fortalesa naval @@ -832,6 +833,7 @@ sector.planetaryTerminal.description = L’objectiu final.\n\nAquesta base coste sector.coastline.description = S’han detectat restes de tecnologia naval a prop. Repel·liu els atacs enemics, captureu el sector i aconseguiu la tecnologia. sector.navalFortress.description = L’enemic ha establert una base en una illa distant amb defenses geològiques naturals. Destruïu el post avançat i aconseguiu i investigueu les seves tecnologies navals avançades. sector.facility32m.description = WIP, map submission by Stormride_R +sector.taintedWoods.description = WIP, map submission by Stormride_R sector.onset.name = El principi sector.aegis.name = L’ègida diff --git a/core/assets/bundles/bundle_cs.properties b/core/assets/bundles/bundle_cs.properties index 3de90b7a2f27..ff886b4edf5f 100644 --- a/core/assets/bundles/bundle_cs.properties +++ b/core/assets/bundles/bundle_cs.properties @@ -807,6 +807,7 @@ sector.biomassFacility.name = Zařízení pro syntézu biomasy sector.windsweptIslands.name = Větrné ostrovy sector.extractionOutpost.name = Extrakční základna sector.facility32m.name = Facility 32 M +sector.taintedWoods.name = Tainted Woods sector.planetaryTerminal.name = Planetární odpalovací terminál sector.coastline.name = Pobřežní čára sector.navalFortress.name = Námořní pevnost @@ -830,6 +831,7 @@ sector.planetaryTerminal.description = Konečný cíl.\n\nTato pobřežní zákl sector.coastline.description = V této lokaci byly objeveny pozůstatky techniky námořních jednotek. Odražte nepřátelské útoky, dobijte tento sektor a získejte technologii. sector.navalFortress.description = Nepřítel si vybudoval základnu na odlehlém, přírodou opevněném ostrově. Zničte tuto základnu. Získejte jejich pokročilou technologii námořních plavidel a vyzkoumejte ji. sector.facility32m.description = WIP, map submission by Stormride_R +sector.taintedWoods.description = WIP, map submission by Stormride_R sector.onset.name = Nástup sector.aegis.name = Aegis sector.lake.name = Jezero diff --git a/core/assets/bundles/bundle_da.properties b/core/assets/bundles/bundle_da.properties index 10d1b38a19f7..355639616a7d 100644 --- a/core/assets/bundles/bundle_da.properties +++ b/core/assets/bundles/bundle_da.properties @@ -797,6 +797,7 @@ sector.biomassFacility.name = Biomass Synthesis Facility sector.windsweptIslands.name = Windswept Islands sector.extractionOutpost.name = Extraction Outpost sector.facility32m.name = Facility 32 M +sector.taintedWoods.name = Tainted Woods sector.planetaryTerminal.name = Planetary Launch Terminal sector.coastline.name = Coastline sector.navalFortress.name = Naval Fortress @@ -820,6 +821,7 @@ sector.planetaryTerminal.description = The final target.\n\nThis coastal base co sector.coastline.description = Remnants of naval unit technology have been detected at this location. Repel the enemy attacks, capture this sector, and acquire the technology. sector.navalFortress.description = The enemy has established a base on a remote, naturally-fortified island. Destroy this outpost. Acquire their advanced naval craft technology, and research it. sector.facility32m.description = WIP, map submission by Stormride_R +sector.taintedWoods.description = WIP, map submission by Stormride_R sector.onset.name = The Onset sector.aegis.name = Aegis sector.lake.name = Lake diff --git a/core/assets/bundles/bundle_de.properties b/core/assets/bundles/bundle_de.properties index 780c1574ee3b..56af34297404 100644 --- a/core/assets/bundles/bundle_de.properties +++ b/core/assets/bundles/bundle_de.properties @@ -817,6 +817,7 @@ sector.biomassFacility.name = Biomassensyntheselabor sector.windsweptIslands.name = Windgepeitschte Inseln sector.extractionOutpost.name = Extraktionsaußenposten sector.facility32m.name = Facility 32 M +sector.taintedWoods.name = Tainted Woods sector.planetaryTerminal.name = Planetares Launchterminal sector.coastline.name = Küstenlinie sector.navalFortress.name = Wasserfestung @@ -840,6 +841,7 @@ sector.planetaryTerminal.description = Das Endziel.\n\nDiese Uferbasis besitzt e sector.coastline.description = Überreste alter Schiffstechnologien wurden hier entdeckt. Wehre dich gegen die gegnischen Angriffe, erobere den Sektor und erforsche diese Technologie. sector.navalFortress.description = Der Gegner hat auf einer abgelegenen, von Natur aus sicheren Insel eine Basis aufgebaut. Zerstöre diesen Außenposten. Finde deren fortgeschrittene Schiffstechnologien und erforsche diese weiter. sector.facility32m.description = WIP, map submission by Stormride_R +sector.taintedWoods.description = WIP, map submission by Stormride_R sector.onset.name = Der Anfang sector.aegis.name = Aegis diff --git a/core/assets/bundles/bundle_es.properties b/core/assets/bundles/bundle_es.properties index 4ec7e82b6ca0..58a8196c8c13 100644 --- a/core/assets/bundles/bundle_es.properties +++ b/core/assets/bundles/bundle_es.properties @@ -813,6 +813,7 @@ sector.biomassFacility.name = Centro de Sintetización de Biomasa sector.windsweptIslands.name = Islas Windswept sector.extractionOutpost.name = Puesto avanzado de Extracción sector.facility32m.name = Facility 32 M +sector.taintedWoods.name = Tainted Woods sector.planetaryTerminal.name = Terminal de Lanzamiento Interplanetario sector.coastline.name = Ruta Costera sector.navalFortress.name = Fortaleza Naval @@ -836,6 +837,7 @@ sector.planetaryTerminal.description = El objetivo final.\n\nEsta base costera a sector.coastline.description = Se han detectado restos de tecnología de unidades navales en esta ubicación. Repele los ataques enemigos, captura este sector, y consigue esa tecnología. sector.navalFortress.description = El enemigo ha establecido una base en una remota isla naturalmente fortificada. Destruye este puesto de avanzada. Hazte con su tecnología naval avanzada, e investígala. sector.facility32m.description = WIP, map submission by Stormride_R +sector.taintedWoods.description = WIP, map submission by Stormride_R sector.onset.name = El Inicio sector.aegis.name = Égida diff --git a/core/assets/bundles/bundle_et.properties b/core/assets/bundles/bundle_et.properties index e9c8ab209d8b..4377ccd1a569 100644 --- a/core/assets/bundles/bundle_et.properties +++ b/core/assets/bundles/bundle_et.properties @@ -797,6 +797,7 @@ sector.biomassFacility.name = Biomass Synthesis Facility sector.windsweptIslands.name = Windswept Islands sector.extractionOutpost.name = Extraction Outpost sector.facility32m.name = Facility 32 M +sector.taintedWoods.name = Tainted Woods sector.planetaryTerminal.name = Planetary Launch Terminal sector.coastline.name = Coastline sector.navalFortress.name = Naval Fortress @@ -820,6 +821,7 @@ sector.planetaryTerminal.description = The final target.\n\nThis coastal base co sector.coastline.description = Remnants of naval unit technology have been detected at this location. Repel the enemy attacks, capture this sector, and acquire the technology. sector.navalFortress.description = The enemy has established a base on a remote, naturally-fortified island. Destroy this outpost. Acquire their advanced naval craft technology, and research it. sector.facility32m.description = WIP, map submission by Stormride_R +sector.taintedWoods.description = WIP, map submission by Stormride_R sector.onset.name = The Onset sector.aegis.name = Aegis sector.lake.name = Lake diff --git a/core/assets/bundles/bundle_eu.properties b/core/assets/bundles/bundle_eu.properties index 17b3fddb016a..de6448193e35 100644 --- a/core/assets/bundles/bundle_eu.properties +++ b/core/assets/bundles/bundle_eu.properties @@ -799,6 +799,7 @@ sector.biomassFacility.name = Biomass Synthesis Facility sector.windsweptIslands.name = Windswept Islands sector.extractionOutpost.name = Extraction Outpost sector.facility32m.name = Facility 32 M +sector.taintedWoods.name = Tainted Woods sector.planetaryTerminal.name = Planetary Launch Terminal sector.coastline.name = Coastline sector.navalFortress.name = Naval Fortress @@ -822,6 +823,7 @@ sector.planetaryTerminal.description = The final target.\n\nThis coastal base co sector.coastline.description = Remnants of naval unit technology have been detected at this location. Repel the enemy attacks, capture this sector, and acquire the technology. sector.navalFortress.description = The enemy has established a base on a remote, naturally-fortified island. Destroy this outpost. Acquire their advanced naval craft technology, and research it. sector.facility32m.description = WIP, map submission by Stormride_R +sector.taintedWoods.description = WIP, map submission by Stormride_R sector.onset.name = The Onset sector.aegis.name = Aegis sector.lake.name = Lake diff --git a/core/assets/bundles/bundle_fi.properties b/core/assets/bundles/bundle_fi.properties index 291913d11872..25f27aa47054 100644 --- a/core/assets/bundles/bundle_fi.properties +++ b/core/assets/bundles/bundle_fi.properties @@ -797,6 +797,7 @@ sector.biomassFacility.name = Biomassasynteesilaitos sector.windsweptIslands.name = Tuulenpieksemät saaret sector.extractionOutpost.name = Kaivostukikohta sector.facility32m.name = Facility 32 M +sector.taintedWoods.name = Tainted Woods sector.planetaryTerminal.name = Planetaarinen laukaisuterminaali sector.coastline.name = Rantaviiva sector.navalFortress.name = Laivastolinnoitus @@ -820,6 +821,7 @@ sector.planetaryTerminal.description = Viimeinen kohde.\n\nTämä rannikkotukiko sector.coastline.description = Remnants of naval unit technology have been detected at this location. Repel the enemy attacks, capture this sector, and acquire the technology. sector.navalFortress.description = The enemy has established a base on a remote, naturally-fortified island. Destroy this outpost. Acquire their advanced naval craft technology, and research it. sector.facility32m.description = WIP, map submission by Stormride_R +sector.taintedWoods.description = WIP, map submission by Stormride_R sector.onset.name = Alku sector.aegis.name = Aegis sector.lake.name = Lake diff --git a/core/assets/bundles/bundle_fil.properties b/core/assets/bundles/bundle_fil.properties index cbaec38d223b..3ca24199ba4d 100644 --- a/core/assets/bundles/bundle_fil.properties +++ b/core/assets/bundles/bundle_fil.properties @@ -797,6 +797,7 @@ sector.biomassFacility.name = Biomass Synthesis Facility sector.windsweptIslands.name = Windswept Islands sector.extractionOutpost.name = Extraction Outpost sector.facility32m.name = Facility 32 M +sector.taintedWoods.name = Tainted Woods sector.planetaryTerminal.name = Planetary Launch Terminal sector.coastline.name = Coastline sector.navalFortress.name = Naval Fortress @@ -820,6 +821,7 @@ sector.planetaryTerminal.description = Ang huling target.\n\nAng coastal base na sector.coastline.description = Remnants of naval unit technology have been detected at this location. Repel the enemy attacks, capture this sector, and acquire the technology. sector.navalFortress.description = The enemy has established a base on a remote, naturally-fortified island. Destroy this outpost. Acquire their advanced naval craft technology, and research it. sector.facility32m.description = WIP, map submission by Stormride_R +sector.taintedWoods.description = WIP, map submission by Stormride_R sector.onset.name = The Onset sector.aegis.name = Aegis sector.lake.name = Lake diff --git a/core/assets/bundles/bundle_fr.properties b/core/assets/bundles/bundle_fr.properties index 8d95950cddbe..3f4628da562f 100644 --- a/core/assets/bundles/bundle_fr.properties +++ b/core/assets/bundles/bundle_fr.properties @@ -820,6 +820,7 @@ sector.biomassFacility.name = Biomass Synthesis Facility sector.windsweptIslands.name = Windswept Islands sector.extractionOutpost.name = Extraction Outpost sector.facility32m.name = Facility 32 M +sector.taintedWoods.name = Tainted Woods sector.planetaryTerminal.name = Planetary Launch Terminal sector.coastline.name = Coastline sector.navalFortress.name = Naval Fortress @@ -843,6 +844,7 @@ sector.planetaryTerminal.description = La cible finale.\n\nCette base côtière sector.coastline.description = Des restes d’unités navales ont été détectés à cet endroit. Repoussez les attaques ennemies, capturez ce secteur, et obtenez cette technologie. sector.navalFortress.description = L’ennemi a établi une base sur une île isolée, avec des défenses naturelles. Détruisez cet avant-poste. Acquérez leur technologie navale avancée. sector.facility32m.description = WIP, map submission by Stormride_R +sector.taintedWoods.description = WIP, map submission by Stormride_R sector.onset.name = The Onset sector.aegis.name = Aegis diff --git a/core/assets/bundles/bundle_hu.properties b/core/assets/bundles/bundle_hu.properties index 8429675e21f1..f00af475ca01 100644 --- a/core/assets/bundles/bundle_hu.properties +++ b/core/assets/bundles/bundle_hu.properties @@ -821,8 +821,10 @@ sector.fungalPass.name = Gombahágó sector.biomassFacility.name = Biomassza szintetizáló létesítmény sector.windsweptIslands.name = Szélfútta szigetek sector.extractionOutpost.name = Kivonási helyőrség + sector.facility32m.name = 32M-es létesítmény sector.taintedWoods.name = Fertőzött fák + sector.planetaryTerminal.name = Bolygó körüli kilövőállás sector.coastline.name = Partvonal sector.navalFortress.name = Haditengerészeti erőd diff --git a/core/assets/bundles/bundle_id_ID.properties b/core/assets/bundles/bundle_id_ID.properties index a8f2bc2864b2..188886533e9a 100644 --- a/core/assets/bundles/bundle_id_ID.properties +++ b/core/assets/bundles/bundle_id_ID.properties @@ -822,6 +822,7 @@ sector.biomassFacility.name = Pabrik Sintesis Biomassa sector.windsweptIslands.name = Pulau Bersemilir sector.extractionOutpost.name = Pos Ekstraksi Terdepan sector.facility32m.name = Facility 32 M +sector.taintedWoods.name = Tainted Woods sector.planetaryTerminal.name = Pusat Peluncuran Planet sector.coastline.name = Tepi Pantai sector.navalFortress.name = Benteng Laut @@ -845,6 +846,7 @@ sector.planetaryTerminal.description = Target terakhir.\n\nMarkas pesisir pantai sector.coastline.description = Sisa-sisa teknologi Unit Laut telah terdeteksi di lokasi ini. Tolak serangan musuh, rebut sektor ini, dan dapatkan teknologinya. sector.navalFortress.description = Musuh telah mendirikan markas di sebuah pulau terpencil, dibentengi secara alami. Hancurkan pangkalan ini. Dapatkan teknologi Unit Laut mereka yang canggih, dan telitilah sector.facility32m.description = WIP, map submission by Stormride_R +sector.taintedWoods.description = WIP, map submission by Stormride_R sector.onset.name = Serangan Awal sector.aegis.name = Aegis diff --git a/core/assets/bundles/bundle_it.properties b/core/assets/bundles/bundle_it.properties index d1c9f9dbcdb5..cee159124739 100644 --- a/core/assets/bundles/bundle_it.properties +++ b/core/assets/bundles/bundle_it.properties @@ -803,6 +803,7 @@ sector.biomassFacility.name = Struttura di Sintesi di Biomassa sector.windsweptIslands.name = Isole Ventose sector.extractionOutpost.name = Avamposto di Estrazione Mineraria sector.facility32m.name = Facility 32 M +sector.taintedWoods.name = Tainted Woods sector.planetaryTerminal.name = Terminale di Lancio Planetario sector.coastline.name = Coastline sector.navalFortress.name = Fortezza navale @@ -826,6 +827,7 @@ sector.planetaryTerminal.description = Il bersaglio finale.\n\nQuesta base costi sector.coastline.description = In questo settore sono stati rilevati resti di tecnologia di unità navali. Respingi gli attacchi nemici, cattura il settore e acquisisci la tecnologia. sector.navalFortress.description = Il nemico ha stabilito una base su un'isola remota e fortificata naturalmente. Distruggi questo avamposto. Acquisisci la loro tecnologia navale avanzata e fate ricerche. sector.facility32m.description = WIP, map submission by Stormride_R +sector.taintedWoods.description = WIP, map submission by Stormride_R sector.onset.name = The Onset sector.aegis.name = Aegis sector.lake.name = Nome diff --git a/core/assets/bundles/bundle_ja.properties b/core/assets/bundles/bundle_ja.properties index 2e661b7fd44c..13021e768eb4 100644 --- a/core/assets/bundles/bundle_ja.properties +++ b/core/assets/bundles/bundle_ja.properties @@ -807,6 +807,7 @@ sector.biomassFacility.name = バイオマス研究施設 sector.windsweptIslands.name = 吹きさらしの列島 sector.extractionOutpost.name = 資源搬出前哨基地 sector.facility32m.name = Facility 32 M +sector.taintedWoods.name = Tainted Woods sector.planetaryTerminal.name = 惑星間発射ターミナル sector.coastline.name = 海岸線 sector.navalFortress.name = 海軍要塞 @@ -830,6 +831,7 @@ sector.planetaryTerminal.description = 最終目標です。\n\nこの沿岸基 sector.coastline.description = ここで、海軍の技術の残骸が発見されました。\n敵の攻撃を退け、占領し、その技術を獲得しましょう。 sector.navalFortress.description = 敵は、自然要塞化した離島に基地を設けています。この前哨基地を破壊しましょう。\n彼らの高度な艦艇技術を入手し、研究しましょう。 sector.facility32m.description = WIP, map submission by Stormride_R +sector.taintedWoods.description = WIP, map submission by Stormride_R sector.onset.name = オンセット sector.aegis.name = イージス sector.lake.name = レイク diff --git a/core/assets/bundles/bundle_ko.properties b/core/assets/bundles/bundle_ko.properties index dd10547cd457..515240d96bd9 100644 --- a/core/assets/bundles/bundle_ko.properties +++ b/core/assets/bundles/bundle_ko.properties @@ -808,6 +808,7 @@ sector.biomassFacility.name = 유기물 합성 시설 sector.windsweptIslands.name = 폭풍의 격전지 sector.extractionOutpost.name = 자원 추출기지 sector.facility32m.name = Facility 32 M +sector.taintedWoods.name = Tainted Woods sector.planetaryTerminal.name = 대행성 출격단지 sector.coastline.name = 해안선 sector.navalFortress.name = 해군 요새 @@ -831,6 +832,7 @@ sector.planetaryTerminal.description = 이 행성에서의 마지막 전투를 sector.coastline.description = 이 장소에서 해상 기체 기술의 잔재가 발견되었습니다. 적의 공격을 격퇴하고, 이 지역을 점령하고, 기술을 습득하십시오. sector.navalFortress.description = 적은 자연적으로 요새화된 외딴 섬에 기지를 세웠습니다. 이 전초기지를 파괴하여 적의 발전된 함선 건조 기술을 습득하고 연구하십시오. sector.facility32m.description = WIP, map submission by Stormride_R +sector.taintedWoods.description = WIP, map submission by Stormride_R sector.onset.name = 시작 sector.aegis.name = 보호 sector.lake.name = 호수 diff --git a/core/assets/bundles/bundle_lt.properties b/core/assets/bundles/bundle_lt.properties index 64137e966b39..98ee63f027a7 100644 --- a/core/assets/bundles/bundle_lt.properties +++ b/core/assets/bundles/bundle_lt.properties @@ -797,6 +797,7 @@ sector.biomassFacility.name = Biomass Synthesis Facility sector.windsweptIslands.name = Windswept Islands sector.extractionOutpost.name = Extraction Outpost sector.facility32m.name = Facility 32 M +sector.taintedWoods.name = Tainted Woods sector.planetaryTerminal.name = Planetary Launch Terminal sector.coastline.name = Coastline sector.navalFortress.name = Naval Fortress @@ -820,6 +821,7 @@ sector.planetaryTerminal.description = The final target.\n\nThis coastal base co sector.coastline.description = Remnants of naval unit technology have been detected at this location. Repel the enemy attacks, capture this sector, and acquire the technology. sector.navalFortress.description = The enemy has established a base on a remote, naturally-fortified island. Destroy this outpost. Acquire their advanced naval craft technology, and research it. sector.facility32m.description = WIP, map submission by Stormride_R +sector.taintedWoods.description = WIP, map submission by Stormride_R sector.onset.name = The Onset sector.aegis.name = Aegis sector.lake.name = Lake diff --git a/core/assets/bundles/bundle_nl.properties b/core/assets/bundles/bundle_nl.properties index 46e6293c66d9..eafff27fdd28 100644 --- a/core/assets/bundles/bundle_nl.properties +++ b/core/assets/bundles/bundle_nl.properties @@ -808,6 +808,7 @@ sector.biomassFacility.name = Biomass Synthesis Facility sector.windsweptIslands.name = Windswept Islands sector.extractionOutpost.name = Extraction Outpost sector.facility32m.name = Facility 32 M +sector.taintedWoods.name = Tainted Woods sector.planetaryTerminal.name = Planetery Launch Terminal sector.coastline.name = Coastline sector.navalFortress.name = Naval Fortress @@ -831,6 +832,7 @@ sector.planetaryTerminal.description = Het einddoel.\n\nDeze kustbasis bevat een sector.coastline.description = Op deze locatie zijn resten van marinetechnologie gedetecteerd. Sla de vijandelijke aanvallen af, verover deze sector en verkrijg de technologie. sector.navalFortress.description = De vijand heeft een basis gevestigd op een afgelegen, natuurlijk versterkt eiland. Vernietig deze voorpost. Verkrijg hun geavanceerde marinetechnologie en onderzoek die. sector.facility32m.description = WIP, map submission by Stormride_R +sector.taintedWoods.description = WIP, map submission by Stormride_R sector.onset.name = The Onset sector.aegis.name = Aegis diff --git a/core/assets/bundles/bundle_nl_BE.properties b/core/assets/bundles/bundle_nl_BE.properties index d417c4cdaebe..16e2f967acb6 100644 --- a/core/assets/bundles/bundle_nl_BE.properties +++ b/core/assets/bundles/bundle_nl_BE.properties @@ -797,6 +797,7 @@ sector.biomassFacility.name = Biomass Synthesis Facility sector.windsweptIslands.name = Windswept Islands sector.extractionOutpost.name = Extraction Outpost sector.facility32m.name = Facility 32 M +sector.taintedWoods.name = Tainted Woods sector.planetaryTerminal.name = Planetary Launch Terminal sector.coastline.name = Coastline sector.navalFortress.name = Naval Fortress @@ -820,6 +821,7 @@ sector.planetaryTerminal.description = The final target.\n\nThis coastal base co sector.coastline.description = Remnants of naval unit technology have been detected at this location. Repel the enemy attacks, capture this sector, and acquire the technology. sector.navalFortress.description = The enemy has established a base on a remote, naturally-fortified island. Destroy this outpost. Acquire their advanced naval craft technology, and research it. sector.facility32m.description = WIP, map submission by Stormride_R +sector.taintedWoods.description = WIP, map submission by Stormride_R sector.onset.name = The Onset sector.aegis.name = Aegis sector.lake.name = Lake diff --git a/core/assets/bundles/bundle_pl.properties b/core/assets/bundles/bundle_pl.properties index 8d43ea9eb01f..667a670e2859 100644 --- a/core/assets/bundles/bundle_pl.properties +++ b/core/assets/bundles/bundle_pl.properties @@ -805,6 +805,7 @@ sector.biomassFacility.name = Obiekt Syntezy Biomasy sector.windsweptIslands.name = Wyspy Wiatru sector.extractionOutpost.name = Placówka Ekstrakcji sector.facility32m.name = Facility 32 M +sector.taintedWoods.name = Tainted Woods sector.planetaryTerminal.name = Planetarny Terminal Startowy sector.coastline.name = Linia Brzegowa sector.navalFortress.name = Morska Forteca @@ -828,6 +829,7 @@ sector.planetaryTerminal.description = Ostatni cel.\n\nTa baza przybrzeżna zawi sector.coastline.description = W tej lokalizacji zostały znalezione resztki technologii jednostek morskich. Odeprzyj ataki wroga, przejmij ten sektor i zdobądź technologię. sector.navalFortress.description = Wróg założył bazę na odległej, naturalnie ufortyfikowanej wyspie. Zniszcz tę bazę. Zdobądź zaawansowaną technologię statków morskich i zbadaj ją. sector.facility32m.description = WIP, map submission by Stormride_R +sector.taintedWoods.description = WIP, map submission by Stormride_R sector.onset.name = Początek sector.aegis.name = Egida diff --git a/core/assets/bundles/bundle_pt_BR.properties b/core/assets/bundles/bundle_pt_BR.properties index 146b74bf4a8f..2049a8f94952 100644 --- a/core/assets/bundles/bundle_pt_BR.properties +++ b/core/assets/bundles/bundle_pt_BR.properties @@ -813,6 +813,7 @@ sector.biomassFacility.name = Instalação de Síntese de Biomassa sector.windsweptIslands.name = Ilhas Ventadas sector.extractionOutpost.name = Posto Avançado de Extração sector.facility32m.name = Facility 32 M +sector.taintedWoods.name = Tainted Woods sector.planetaryTerminal.name = Terminal de Lançamento Planetário. sector.coastline.name = Litoral sector.navalFortress.name = Fortaleza Naval @@ -836,6 +837,7 @@ sector.planetaryTerminal.description = O último alvo.\n\nEssa base costeira con sector.coastline.description = Remnants of naval unit technology have been detected at this location. Repel the enemy attacks, capture this sector, and acquire the technology. sector.navalFortress.description = The enemy has established a base on a remote, naturally-fortified island. Destroy this outpost. Acquire their advanced naval craft technology, and research it. sector.facility32m.description = WIP, map submission by Stormride_R +sector.taintedWoods.description = WIP, map submission by Stormride_R sector.onset.name = O Começo sector.aegis.name = Aegis diff --git a/core/assets/bundles/bundle_pt_PT.properties b/core/assets/bundles/bundle_pt_PT.properties index da47be4e1f02..c3a5d3a6b2e1 100644 --- a/core/assets/bundles/bundle_pt_PT.properties +++ b/core/assets/bundles/bundle_pt_PT.properties @@ -797,6 +797,7 @@ sector.biomassFacility.name = Biomass Synthesis Facility sector.windsweptIslands.name = Windswept Islands sector.extractionOutpost.name = Extraction Outpost sector.facility32m.name = Facility 32 M +sector.taintedWoods.name = Tainted Woods sector.planetaryTerminal.name = Planetary Launch Terminal sector.coastline.name = Coastline sector.navalFortress.name = Naval Fortress @@ -820,6 +821,7 @@ sector.planetaryTerminal.description = The final target.\n\nThis coastal base co sector.coastline.description = Remnants of naval unit technology have been detected at this location. Repel the enemy attacks, capture this sector, and acquire the technology. sector.navalFortress.description = The enemy has established a base on a remote, naturally-fortified island. Destroy this outpost. Acquire their advanced naval craft technology, and research it. sector.facility32m.description = WIP, map submission by Stormride_R +sector.taintedWoods.description = WIP, map submission by Stormride_R sector.onset.name = The Onset sector.aegis.name = Aegis sector.lake.name = Lake diff --git a/core/assets/bundles/bundle_ro.properties b/core/assets/bundles/bundle_ro.properties index 1330fe70f2d8..77b98a508a54 100644 --- a/core/assets/bundles/bundle_ro.properties +++ b/core/assets/bundles/bundle_ro.properties @@ -807,6 +807,7 @@ sector.biomassFacility.name = Facilitatea de Sinteză a Biomasei sector.windsweptIslands.name = Insulele Măturate de Vânt sector.extractionOutpost.name = Avanpostul de Extracție sector.facility32m.name = Facility 32 M +sector.taintedWoods.name = Tainted Woods sector.planetaryTerminal.name = Terminalul de Lansare Planetară sector.coastline.name = Zona de Coastă sector.navalFortress.name = Fortăreața Navală @@ -830,6 +831,7 @@ sector.planetaryTerminal.description = Ținta finală.\n\nAceastă bază de coas sector.coastline.description = Remnants of naval unit technology have been detected at this location. Repel the enemy attacks, capture this sector, and acquire the technology. sector.navalFortress.description = The enemy has established a base on a remote, naturally-fortified island. Destroy this outpost. Acquire their advanced naval craft technology, and research it. sector.facility32m.description = WIP, map submission by Stormride_R +sector.taintedWoods.description = WIP, map submission by Stormride_R sector.onset.name = The Onset sector.aegis.name = Aegis sector.lake.name = Lake diff --git a/core/assets/bundles/bundle_ru.properties b/core/assets/bundles/bundle_ru.properties index 7844448c3eb3..8a71c6d1e40f 100644 --- a/core/assets/bundles/bundle_ru.properties +++ b/core/assets/bundles/bundle_ru.properties @@ -808,6 +808,7 @@ sector.biomassFacility.name = Центр исследования биомасс sector.windsweptIslands.name = Штормовой архипелаг sector.extractionOutpost.name = Добывающая база sector.facility32m.name = Facility 32 M +sector.taintedWoods.name = Tainted Woods sector.planetaryTerminal.name = Планетарный пусковой терминал sector.coastline.name = Береговая линия sector.navalFortress.name = Прибрежная крепость @@ -831,6 +832,7 @@ sector.planetaryTerminal.description = Конечная цель.\n\nЭта бе sector.coastline.description = В этом месте были обнаружены остатки древней военно-морской технологии. Отбейте атаки противника, захватите этот сектор и изучите эту технологию. sector.navalFortress.description = Враг возвел базу на удаленном острове с естественными укреплениями. Уничтожьте её. Овладейте их технологией по производству кораблей и изучите ее. sector.facility32m.description = WIP, map submission by Stormride_R +sector.taintedWoods.description = WIP, map submission by Stormride_R sector.onset.name = Начало sector.aegis.name = Защита diff --git a/core/assets/bundles/bundle_sr.properties b/core/assets/bundles/bundle_sr.properties index 969b09697d08..c3dddff0909b 100644 --- a/core/assets/bundles/bundle_sr.properties +++ b/core/assets/bundles/bundle_sr.properties @@ -808,6 +808,7 @@ sector.biomassFacility.name = Biosintetičko Postrojenje sector.windsweptIslands.name = Vetrovita Ostrva sector.extractionOutpost.name = Lansirna Utvrda sector.facility32m.name = Facility 32 M +sector.taintedWoods.name = Tainted Woods sector.planetaryTerminal.name = Planetarno Lansirni Terminal sector.coastline.name = Obala sector.navalFortress.name = Pomorska Tvrđava @@ -831,6 +832,7 @@ sector.planetaryTerminal.description = Krajnji cilj.\n\nOva obalska struktura im sector.coastline.description = Ostaci tehnologije pomorskih jedinica su detektovani u ovom sektoru. Odbijte neprijateljske napade, zauzmite ovaj sektor, i preuzmite tehnologiju. sector.navalFortress.description = Neprijatelj je sagradio bazu na dalekom, prirodno-formiranom ostrvu. Uništite ovu bazu. Preuzmite njihovu naprednu pomorsku tehnologiju, i izuči te je. sector.facility32m.description = WIP, map submission by Stormride_R +sector.taintedWoods.description = WIP, map submission by Stormride_R sector.onset.name = Žačetak sector.aegis.name = Okrilje diff --git a/core/assets/bundles/bundle_sv.properties b/core/assets/bundles/bundle_sv.properties index cb47cf30c587..cbe03b0f1dff 100644 --- a/core/assets/bundles/bundle_sv.properties +++ b/core/assets/bundles/bundle_sv.properties @@ -797,6 +797,7 @@ sector.biomassFacility.name = Biomass Synthesis Facility sector.windsweptIslands.name = Windswept Islands sector.extractionOutpost.name = Extraction Outpost sector.facility32m.name = Facility 32 M +sector.taintedWoods.name = Tainted Woods sector.planetaryTerminal.name = Planetary Launch Terminal sector.coastline.name = Coastline sector.navalFortress.name = Naval Fortress @@ -820,6 +821,7 @@ sector.planetaryTerminal.description = The final target.\n\nThis coastal base co sector.coastline.description = Remnants of naval unit technology have been detected at this location. Repel the enemy attacks, capture this sector, and acquire the technology. sector.navalFortress.description = The enemy has established a base on a remote, naturally-fortified island. Destroy this outpost. Acquire their advanced naval craft technology, and research it. sector.facility32m.description = WIP, map submission by Stormride_R +sector.taintedWoods.description = WIP, map submission by Stormride_R sector.onset.name = The Onset sector.aegis.name = Aegis sector.lake.name = Lake diff --git a/core/assets/bundles/bundle_th.properties b/core/assets/bundles/bundle_th.properties index fda1a8d4af63..71e3070fdc9c 100644 --- a/core/assets/bundles/bundle_th.properties +++ b/core/assets/bundles/bundle_th.properties @@ -808,6 +808,7 @@ sector.biomassFacility.name = สถานสังเคราะห์ชี sector.windsweptIslands.name = หมู่เกาะพหุวายุ sector.extractionOutpost.name = ด่านส่งทรัพยากร sector.facility32m.name = Facility 32 M +sector.taintedWoods.name = Tainted Woods sector.planetaryTerminal.name = ท่าปล่อยจรวดอวกาศยาน sector.coastline.name = แนวชายฝั่ง sector.navalFortress.name = ปราการแห่งวารี @@ -831,6 +832,7 @@ sector.planetaryTerminal.description = เป้าหมายสุดท้ sector.coastline.description = ถัดมาจากที่ราบเกลือ เป็นที่ตั้งของแนวชายฝั่ง พบเศษซากของเทคโนโลยียูนิตเรือที่ล้ำหน้าอยู่ในพื้นที่แห่งนี้\nขับไล่ศัตรูออกไป ยึดพื้นที่นี้มา วิจัยเทคโนโลยีนั้น sector.navalFortress.description = ศัตรูได้ตั้งฐานทัพอยู๋บนเกาะห่างไกลที่มีกำแพงธรรมชาติปกป้องฐานเอาไว้ ทำลายฐานทัพ ยึดและวิจัยเทคโนโลยีเรือรบที่ล้ำหน้านั้นมา sector.facility32m.description = WIP, map submission by Stormride_R +sector.taintedWoods.description = WIP, map submission by Stormride_R sector.onset.name = การเริ่มต้น sector.aegis.name = เกราะกำบัง diff --git a/core/assets/bundles/bundle_tk.properties b/core/assets/bundles/bundle_tk.properties index 6cd44cfd7cf6..e8f4e59a61ec 100644 --- a/core/assets/bundles/bundle_tk.properties +++ b/core/assets/bundles/bundle_tk.properties @@ -797,6 +797,7 @@ sector.biomassFacility.name = Biomass Synthesis Facility sector.windsweptIslands.name = Windswept Islands sector.extractionOutpost.name = Extraction Outpost sector.facility32m.name = Facility 32 M +sector.taintedWoods.name = Tainted Woods sector.planetaryTerminal.name = Planetary Launch Terminal sector.coastline.name = Coastline sector.navalFortress.name = Naval Fortress @@ -820,6 +821,7 @@ sector.planetaryTerminal.description = The final target.\n\nThis coastal base co sector.coastline.description = Remnants of naval unit technology have been detected at this location. Repel the enemy attacks, capture this sector, and acquire the technology. sector.navalFortress.description = The enemy has established a base on a remote, naturally-fortified island. Destroy this outpost. Acquire their advanced naval craft technology, and research it. sector.facility32m.description = WIP, map submission by Stormride_R +sector.taintedWoods.description = WIP, map submission by Stormride_R sector.onset.name = The Onset sector.aegis.name = Aegis sector.lake.name = Lake diff --git a/core/assets/bundles/bundle_tr.properties b/core/assets/bundles/bundle_tr.properties index 70b6dc857039..bdbb01894336 100644 --- a/core/assets/bundles/bundle_tr.properties +++ b/core/assets/bundles/bundle_tr.properties @@ -807,6 +807,7 @@ sector.biomassFacility.name = Sentetik BioMadde Santrali sector.windsweptIslands.name = Rüzgarlı Adalar sector.extractionOutpost.name = Kazı Üssü sector.facility32m.name = Facility 32 M +sector.taintedWoods.name = Tainted Woods sector.planetaryTerminal.name = Gezegenler Arası Terminal sector.coastline.name = Kıyı Şeridi sector.navalFortress.name = Deniz Kalesi @@ -830,6 +831,7 @@ sector.planetaryTerminal.description = Son aşama.\n\nBu üs, başka gezegenlere sector.coastline.description = Bu bölgede denizel birim teknoloji kalıntıları tespit edildi. Düşman saldırılarını püskürt, sektörü ele geçir ve teknolojiyi kurtar. sector.navalFortress.description = Düşman bu uzak adaya doğal olarak korunan bir üs kurmuş. Bu üssü yok et. Onların gelişmiş savaş gemisi teknolojilerini elde et ve araştır. sector.facility32m.description = WIP, map submission by Stormride_R +sector.taintedWoods.description = WIP, map submission by Stormride_R sector.onset.name = Yeni Başlangıç sector.aegis.name = Siper sector.lake.name = Göletçik diff --git a/core/assets/bundles/bundle_uk_UA.properties b/core/assets/bundles/bundle_uk_UA.properties index dee565d7edc5..5796ad9f4ec9 100644 --- a/core/assets/bundles/bundle_uk_UA.properties +++ b/core/assets/bundles/bundle_uk_UA.properties @@ -816,6 +816,7 @@ sector.biomassFacility.name = Центр дослідження синтезу sector.windsweptIslands.name = Вітряні острови sector.extractionOutpost.name = Видобувна застава sector.facility32m.name = Facility 32 M +sector.taintedWoods.name = Tainted Woods sector.planetaryTerminal.name = Термінал планетарного запуску sector.coastline.name = Узбережжя sector.navalFortress.name = Морська фортеця @@ -839,6 +840,7 @@ sector.planetaryTerminal.description = Кінцева мета.\n\nЦя приб sector.coastline.description = На цьому місці виявлено залишки військово-морських одиниць. Відбийте атаки супротивника, захопіть цей сектор та заволодійте технологією. sector.navalFortress.description = Ворог створив базу на віддаленому, природно-укріпленому острові. Знищте цей форпост. Заволодійте їхніми передовими технологіями морських кораблів і дослідіть їх. sector.facility32m.description = WIP, map submission by Stormride_R +sector.taintedWoods.description = WIP, map submission by Stormride_R sector.onset.name = Перший наступ sector.aegis.name = Егіда diff --git a/core/assets/bundles/bundle_vi.properties b/core/assets/bundles/bundle_vi.properties index 6b96174544b3..d0a50f18cd3a 100644 --- a/core/assets/bundles/bundle_vi.properties +++ b/core/assets/bundles/bundle_vi.properties @@ -822,6 +822,7 @@ sector.biomassFacility.name = Biomass Synthesis Facility sector.windsweptIslands.name = Windswept Islands sector.extractionOutpost.name = Extraction Outpost sector.facility32m.name = Facility 32 M +sector.taintedWoods.name = Tainted Woods sector.planetaryTerminal.name = Planetary Launch Terminal sector.coastline.name = Coastline sector.navalFortress.name = Naval Fortress @@ -845,6 +846,7 @@ sector.planetaryTerminal.description = Mục tiêu cuối cùng.\n\nCăn cứ ve sector.coastline.description = Phát hiện tàn dư công nghệ của các đơn vị hải quân tại địa điểm này. Đẩy lùi các cuộc tấn công của kẻ địch, chiếm khu vực này, và lấy công nghệ. sector.navalFortress.description = Kẻ địch đã thiết lập một căn cứ từ xa, trên đảo tự nhiên. Phá hủy tiền đồn này. Chiếm công nghệ chế tạo đơn vị hải quân tiên tiến của địch và nghiên cứu nó. sector.facility32m.description = WIP, map submission by Stormride_R +sector.taintedWoods.description = WIP, map submission by Stormride_R sector.onset.name = The Onset sector.aegis.name = Aegis diff --git a/core/assets/bundles/bundle_zh_CN.properties b/core/assets/bundles/bundle_zh_CN.properties index ff3675da8fd0..afb13ccb7541 100644 --- a/core/assets/bundles/bundle_zh_CN.properties +++ b/core/assets/bundles/bundle_zh_CN.properties @@ -817,6 +817,7 @@ sector.biomassFacility.name = 生物质合成区 sector.windsweptIslands.name = 风吹群岛 sector.extractionOutpost.name = 萃取前哨 sector.facility32m.name = Facility 32 M +sector.taintedWoods.name = Tainted Woods sector.planetaryTerminal.name = 行星发射终端 sector.coastline.name = 边际海湾 sector.navalFortress.name = 海军要塞 @@ -840,6 +841,7 @@ sector.planetaryTerminal.description = 最终目标。\n这座滨海基地有一 sector.coastline.description = 这里探测到了海军单位科技的遗迹。 击退敌人的进攻，占领区块，获取技术。 sector.navalFortress.description = 敌人在一个有天然防御屏障的偏远岛屿上建立了基地。 摧毁它，并研究高级海军科技。 sector.facility32m.description = WIP, map submission by Stormride_R +sector.taintedWoods.description = WIP, map submission by Stormride_R sector.onset.name = 始发地区 sector.aegis.name = 庇护前哨 diff --git a/core/assets/bundles/bundle_zh_TW.properties b/core/assets/bundles/bundle_zh_TW.properties index 3c0b0cb43f1f..298e48aca11b 100644 --- a/core/assets/bundles/bundle_zh_TW.properties +++ b/core/assets/bundles/bundle_zh_TW.properties @@ -813,6 +813,7 @@ sector.biomassFacility.name = 生物質合成工廠 sector.windsweptIslands.name = 風之島 sector.extractionOutpost.name = 萃取哨站 sector.facility32m.name = Facility 32 M +sector.taintedWoods.name = Tainted Woods sector.planetaryTerminal.name = 星際發射站 sector.coastline.name = 海岸 sector.navalFortress.name = 海上要塞 @@ -836,6 +837,7 @@ sector.planetaryTerminal.description = 最終目標。\n\n這麼濱海基地具 sector.coastline.description = Remnants of naval unit technology have been detected at this location. Repel the enemy attacks, capture this sector, and acquire the technology. sector.navalFortress.description = The enemy has established a base on a remote, naturally-fortified island. Destroy this outpost. Acquire their advanced naval craft technology, and research it. sector.facility32m.description = WIP, map submission by Stormride_R +sector.taintedWoods.description = WIP, map submission by Stormride_R sector.onset.name = 著陸點 sector.aegis.name = 神盾 diff --git a/core/assets/maps/facility32m.msav b/core/assets/maps/facility32m.msav index a690d9022f09..0cea5d1b0a7b 100644 Binary files a/core/assets/maps/facility32m.msav and b/core/assets/maps/facility32m.msav differ diff --git a/core/assets/maps/taintedWoods.msav b/core/assets/maps/taintedWoods.msav new file mode 100644 index 000000000000..f77ad5c488d1 Binary files /dev/null and b/core/assets/maps/taintedWoods.msav differ diff --git a/core/src/mindustry/content/SectorPresets.java b/core/src/mindustry/content/SectorPresets.java index af3c58fda798..286d6c1404ed 100644 --- a/core/src/mindustry/content/SectorPresets.java +++ b/core/src/mindustry/content/SectorPresets.java @@ -7,7 +7,7 @@ public class SectorPresets{ public static SectorPreset groundZero, - craters, biomassFacility, frozenForest, ruinousShores, facility32m, windsweptIslands, stainedMountains, tarFields, + craters, biomassFacility, taintedWoods, frozenForest, ruinousShores, facility32m, windsweptIslands, stainedMountains, tarFields, fungalPass, extractionOutpost, saltFlats, overgrowth, impact0078, desolateRift, nuclearComplex, planetaryTerminal, coastline, navalFortress, @@ -42,6 +42,11 @@ public static void load(){ difficulty = 3; }}; + taintedWoods = new SectorPreset("taintedWoods", serpulo, 221){{ + captureWave = 32; + difficulty = 4; + }}; + craters = new SectorPreset("craters", serpulo, 18){{ captureWave = 20; difficulty = 2; diff --git a/core/src/mindustry/content/SerpuloTechTree.java b/core/src/mindustry/content/SerpuloTechTree.java index e8b212791a1d..a89ad87b9b59 100644 --- a/core/src/mindustry/content/SerpuloTechTree.java +++ b/core/src/mindustry/content/SerpuloTechTree.java @@ -123,7 +123,7 @@ public static void load(){ }); node(pyratiteMixer, () -> { - node(blastMixer, () -> { + node(blastMixer, Seq.with(new SectorComplete(facility32m)), () -> { }); }); @@ -503,11 +503,12 @@ public static void load(){ }); node(facility32m, Seq.with( - new Research(pneumaticDrill) + new Research(pneumaticDrill), + new SectorComplete(stainedMountains) ), () -> { node(extractionOutpost, Seq.with( - new SectorComplete(stainedMountains), new SectorComplete(windsweptIslands), + new SectorComplete(facility32m), new Research(groundFactory), new Research(nova), new Research(airFactory), @@ -565,6 +566,13 @@ public static void load(){ new Research(scatter), new Research(graphitePress) ), () -> { + node(taintedWoods, Seq.with( + new SectorComplete(biomassFacility), + new Research(Items.sporePod) + ), () -> { + + }); + node(stainedMountains, Seq.with( new SectorComplete(biomassFacility), new Research(pneumaticDrill), diff --git a/core/src/mindustry/entities/bullet/BulletType.java b/core/src/mindustry/entities/bullet/BulletType.java index 74fb8a736520..e3e025bd3635 100644 --- a/core/src/mindustry/entities/bullet/BulletType.java +++ b/core/src/mindustry/entities/bullet/BulletType.java @@ -346,7 +346,7 @@ public float estimateDPS(){ return spawnUnit.estimateDps(); } - float sum = damage * (pierce ? pierceCap == -1 ? 2 : Mathf.clamp(pierceCap, 1, 2) : 1f) * splashDamage*0.75f; + float sum = (damage + splashDamage*0.75f) * (pierce ? pierceCap == -1 ? 2 : Mathf.clamp(pierceCap, 1, 2) : 1f); if(fragBullet != null && fragBullet != this){ sum += fragBullet.estimateDPS() * fragBullets / 2f; } @@ -549,7 +549,7 @@ public void despawned(Bullet b){ if(!fragOnHit){ createFrags(b, b.x, b.y); } - + despawnEffect.at(b.x, b.y, b.rotation(), hitColor); despawnSound.at(b); @@ -675,7 +675,7 @@ public void updateTrailEffects(Bullet b){ } } } - + public void updateTrail(Bullet b){ if(!headless && trailLength > 0){ if(b.trail == null){ @@ -716,7 +716,7 @@ public void init(){ if(lightRadius <= -1){ lightRadius = Math.max(18, hitSize * 5f); } - + drawSize = Math.max(drawSize, trailLength * speed * 2f); range = calculateRange(); } diff --git a/core/src/mindustry/game/SectorInfo.java b/core/src/mindustry/game/SectorInfo.java index c4ee046c6cc8..e0b18826fd43 100644 --- a/core/src/mindustry/game/SectorInfo.java +++ b/core/src/mindustry/game/SectorInfo.java @@ -82,7 +82,7 @@ public class SectorInfo{ public transient ItemSeq lastImported = new ItemSeq(); /** Special variables for simulation. */ - public float sumHealth, sumRps, sumDps, waveHealthBase, waveHealthSlope, waveDpsBase, waveDpsSlope, bossHealth, bossDps, curEnemyHealth, curEnemyDps; + public float sumHealth, sumRps, sumDps, bossHealth, bossDps, curEnemyHealth, curEnemyDps; /** Wave where first boss shows up. */ public int bossWave = -1; diff --git a/core/src/mindustry/logic/LogicDialog.java b/core/src/mindustry/logic/LogicDialog.java index d36a66ee6b5f..eaac0dd322ac 100644 --- a/core/src/mindustry/logic/LogicDialog.java +++ b/core/src/mindustry/logic/LogicDialog.java @@ -28,6 +28,7 @@ public class LogicDialog extends BaseDialog{ boolean privileged; @Nullable LExecutor executor; GlobalVarsDialog globalsDialog = new GlobalVarsDialog(); + boolean wasRows, wasPortrait; public LogicDialog(){ super("logic"); @@ -40,10 +41,18 @@ public LogicDialog(){ addCloseListener(); shown(this::setup); + shown(() -> { + wasRows = LCanvas.useRows(); + wasPortrait = Core.graphics.isPortrait(); + }); hidden(() -> consumer.get(canvas.save())); onResize(() -> { - setup(); - canvas.rebuild(); + if(wasRows != LCanvas.useRows() || wasPortrait != Core.graphics.isPortrait()){ + setup(); + canvas.rebuild(); + wasPortrait = Core.graphics.isPortrait(); + wasRows = LCanvas.useRows(); + } }); add(canvas).grow().name("canvas"); diff --git a/core/src/mindustry/maps/SectorDamage.java b/core/src/mindustry/maps/SectorDamage.java index de34be2753fc..db7136cdaed7 100644 --- a/core/src/mindustry/maps/SectorDamage.java +++ b/core/src/mindustry/maps/SectorDamage.java @@ -3,12 +3,11 @@ import arc.math.*; import arc.math.geom.*; import arc.struct.*; -import arc.util.*; import mindustry.ai.*; +import mindustry.ai.types.*; import mindustry.content.*; import mindustry.core.*; import mindustry.entities.*; -import mindustry.entities.abilities.*; import mindustry.game.*; import mindustry.gen.*; import mindustry.logic.*; @@ -22,7 +21,7 @@ import static mindustry.Vars.*; public class SectorDamage{ - public static final int maxRetWave = 40, maxWavesSimulated = 50; + public static final int maxRetWave = 50, maxWavesSimulated = 60; //direct damage is for testing only private static final boolean rubble = true; @@ -42,7 +41,7 @@ public static int getWavesSurvived(SectorInfo info){ return (int)getDamage(info, maxRetWave, true); } - /** @return calculated capture progress of the enemy if retWave if false, otherwise return the maximum waves survived as int. + /** @return calculated capture progress of the enemy if retWave is false, otherwise return the maximum waves survived as int. * if it survives all the waves, returns maxRetWave. */ public static float getDamage(SectorInfo info, int wavesPassed, boolean retWave){ float health = info.sumHealth; @@ -60,15 +59,29 @@ public static float getDamage(SectorInfo info, int wavesPassed, boolean retWave) waveBegin = waveEnd - maxWavesSimulated; } + int groundSpawns = Math.max(spawner.countFlyerSpawns(), 1), airSpawns = Math.max(spawner.countGroundSpawns(), 1); + for(int i = waveBegin; i <= waveEnd; i++){ + float enemyDps = 0f, enemyHealth = 0f; + + for(SpawnGroup group : state.rules.spawns){ + //calculate the amount of spawn points used + //if there's a spawn position override, there is only one potential place they spawn + //assume that all overridden positions are valid, should always be true in properly designed campaign maps + int spawnCount = group.spawn != -1 ? 1 : group.type.flying ? airSpawns : groundSpawns; + + float healthMult = 1f + Mathf.clamp(group.type.armor / 20f); + StatusEffect effect = (group.effect == null ? StatusEffects.none : group.effect); + int spawned = group.getSpawned(i) * spawnCount; + if(spawned <= 0) continue; + enemyHealth += spawned * (group.getShield(i) + group.type.health * effect.healthMultiplier * healthMult); + enemyDps += spawned * group.type.dpsEstimate * effect.damageMultiplier; + } float efficiency = health / info.sumHealth; float dps = info.sumDps * efficiency; float rps = info.sumRps * efficiency; - float enemyDps = info.waveDpsBase + info.waveDpsSlope * (i); - float enemyHealth = info.waveHealthBase + info.waveHealthSlope * (i); - if(info.bossWave == i){ enemyDps += info.bossDps; enemyHealth += info.bossHealth; @@ -320,13 +333,9 @@ public static void writeParameters(SectorInfo info){ if(unit.team == state.rules.defaultTeam){ sumHealth += unit.health*healthMult + unit.shield; sumDps += unit.type.dpsEstimate; - if(Structs.find(unit.abilities, a -> a instanceof RepairFieldAbility) instanceof RepairFieldAbility h){ - sumRps += h.amount / h.reload * 60f; - } - sumRps += unit.type.weapons.sumf(w -> w.shotsPerSec() * (w.bullet.healPercent * 60f + w.bullet.healAmount)); - if(unit.canBuild()){ - //assume it rebuilds 1 block with 'standard' build cost (20) and health (50) every 2 seconds - sumRps += unit.type.buildSpeed * (60f / 20f) * (1f / 2f) * 50f; + sumRps += unit.type.weapons.sumf(w -> w.shotsPerSec() * (w.bullet.healPercent/100f * 20f + w.bullet.healAmount)); + if(unit.controller() instanceof CommandAI ai && ai.command == UnitCommand.rebuildCommand){ + sumRps += unit.type.buildSpeed * 20f; } }else{ float bossMult = unit.isBoss() ? 3f : 1f; @@ -335,41 +344,11 @@ public static void writeParameters(SectorInfo info){ } } - //calculate DPS and health for the next few waves and store in list - var reg = new LinearRegression(); - SpawnGroup bossGroup = null; - Seq waveDps = new Seq<>(), waveHealth = new Seq<>(); - int groundSpawns = Math.max(spawner.countFlyerSpawns(), 1), airSpawns = Math.max(spawner.countGroundSpawns(), 1); - - //TODO storing all this is dumb when you can just calculate it exactly from the rules... - for(int wave = state.wave; wave < state.wave + 10; wave ++){ - float sumWaveDps = 0f, sumWaveHealth = 0f; - - for(SpawnGroup group : state.rules.spawns){ - //calculate the amount of spawn points used - //if there's a spawn position override, there is only one potential place they spawn - //assume that all overridden positions are valid, should always be true in properly designed campaign maps - int spawnCount = group.spawn != -1 ? 1 : group.type.flying ? airSpawns : groundSpawns; - - float healthMult = 1f + Mathf.clamp(group.type.armor / 20f); - StatusEffect effect = (group.effect == null ? StatusEffects.none : group.effect); - int spawned = group.getSpawned(wave) * spawnCount; - //save the boss group - if(group.effect == StatusEffects.boss){ - bossGroup = group; - continue; - } - if(spawned <= 0) continue; - sumWaveHealth += spawned * (group.getShield(wave) + group.type.health * effect.healthMultiplier * healthMult); - sumWaveDps += spawned * group.type.dpsEstimate * effect.damageMultiplier; - } - waveDps.add(new Vec2(wave, sumWaveDps)); - waveHealth.add(new Vec2(wave, sumWaveHealth)); - } + SpawnGroup bossGroup = state.rules.spawns.find(s -> s.effect == StatusEffects.boss); if(bossGroup != null){ float bossMult = 1.2f; - //calculate first boss appearaance + //calculate first boss appearance for(int wave = state.wave; wave < state.wave + 60; wave++){ int spawned = bossGroup.getSpawned(wave - 1); if(spawned > 0){ @@ -382,15 +361,6 @@ public static void writeParameters(SectorInfo info){ } } - //calculate linear regression of the wave data and store it - reg.calculate(waveHealth); - info.waveHealthBase = reg.intercept; - info.waveHealthSlope = reg.slope; - - reg.calculate(waveDps); - info.waveDpsBase = reg.intercept; - info.waveDpsSlope = reg.slope; - info.sumHealth = sumHealth * 0.9f; info.sumDps = sumDps; info.sumRps = sumRps; diff --git a/core/src/mindustry/type/UnitType.java b/core/src/mindustry/type/UnitType.java index 15ed66ce9c07..af3cd1b562c8 100644 --- a/core/src/mindustry/type/UnitType.java +++ b/core/src/mindustry/type/UnitType.java @@ -892,7 +892,7 @@ public float estimateDps(){ //suicide enemy if(weapons.contains(w -> w.bullet.killShooter)){ //scale down DPS to be insignificant - dpsEstimate /= 25f; + dpsEstimate /= 15f; } } @@ -1313,12 +1313,12 @@ public void draw(Unit unit){ Draw.reset(); } - + //...where do I put this public Color shieldColor(Unit unit){ return shieldColor == null ? unit.team.color : shieldColor; } - + public void drawMining(Unit unit){ if(!unit.mining()) return; diff --git a/core/src/mindustry/world/blocks/distribution/Conveyor.java b/core/src/mindustry/world/blocks/distribution/Conveyor.java index b41c2b733b41..cf1ab2088929 100644 --- a/core/src/mindustry/world/blocks/distribution/Conveyor.java +++ b/core/src/mindustry/world/blocks/distribution/Conveyor.java @@ -30,6 +30,7 @@ public class Conveyor extends Block implements Autotiler{ public float speed = 0f; public float displayedSpeed = 0f; + public boolean pushUnits = true; public @Nullable Block junctionReplacement, bridgeReplacement; @@ -223,7 +224,7 @@ public void onProximityUpdate(){ @Override public void unitOn(Unit unit){ - if(clogHeat > 0.5f || !enabled) return; + if(!pushUnits || clogHeat > 0.5f || !enabled) return; noSleep(); diff --git a/core/src/mindustry/world/blocks/payloads/PayloadConveyor.java b/core/src/mindustry/world/blocks/payloads/PayloadConveyor.java index e6c368d97eec..ec5523dd1c0a 100644 --- a/core/src/mindustry/world/blocks/payloads/PayloadConveyor.java +++ b/core/src/mindustry/world/blocks/payloads/PayloadConveyor.java @@ -21,6 +21,7 @@ public class PayloadConveyor extends Block{ public @Load("@-edge") TextureRegion edgeRegion; public Interp interp = Interp.pow5; public float payloadLimit = 3f; + public boolean pushUnits = true; public PayloadConveyor(String name){ super(name); @@ -257,7 +258,7 @@ public float time(){ @Override public void unitOn(Unit unit){ - if(!enabled) return; + if(!pushUnits || !enabled) return; //calculate derivative of units moved last frame float delta = (curInterp - lastInterp) * size * tilesize; diff --git a/servers_v7.json b/servers_v7.json index 252a535ed6e4..6a2520b88aeb 100644 --- a/servers_v7.json +++ b/servers_v7.json @@ -262,7 +262,7 @@ }, { "name": "Alex Multiverse", - "address": ["alexmindustryv7.servegame.com:25588", "172.234.80.96:6768", "139.162.41.78:6767", "172.245.187.143:6868", "172.245.187.143:6869", "92.119.127.171:6888", "181.215.58.8:1025", "181.215.58.8:1027", "181.215.58.7:1820"] + "address": ["alexmindustryv7.servegame.com:25588", "172.234.80.96:6768", "139.162.41.78:6767", "172.245.187.143:6868", "172.245.187.143:6869", "92.119.127.171:6888", "181.215.58.8:1025", "181.215.58.8:1027", "181.215.58.7:1820", "23.95.107.12"] }, { "name": "Open PVP", @@ -290,7 +290,7 @@ }, { "name": "Erepulo", - "address": ["95.84.198.97:5401", "95.84.198.97:5402", "95.84.198.97:5403", "95.84.198.97:5404", "95.84.198.97:2357", "95.84.198.97:5500", "199.83.103.251"] + "address": ["95.84.198.97:5401", "95.84.198.97:5402", "95.84.198.97:5403", "95.84.198.97:5404", "95.84.198.97:2357", "95.84.198.97:5500", "199.83.103.251", "frost-heaven.ru", "frost-heaven.ru:6568", "frost-heaven.ru:6569"] }, { "name": "MineCore",