Merge remote-tracking branch 'origin/master'

This commit is contained in:
Anuken 2022-08-29 18:57:27 -04:00
commit 2f6ef4cefe
37 changed files with 39 additions and 0 deletions

View File

@ -756,6 +756,7 @@ sector.split.name = Split
sector.basin.name = Basin
sector.marsh.name = Marsh
sector.peaks.name = Peaks
sector.ravine.name = Ravine
sector.onset.description = The tutorial sector. This objective has not been created yet. Await further information.
sector.aegis.description = The enemy is protected by shields. An experimental shield breaker module has been detected in this sector.\nLocate this structure. Supply it with tungsten ammunition and destroy the enemy base.

View File

@ -738,6 +738,7 @@ sector.split.name = Split
sector.basin.name = Basin
sector.marsh.name = Marsh
sector.peaks.name = Peaks
sector.ravine.name = Ravine
sector.onset.description = The tutorial sector. This objective has not been created yet. Await further information.
sector.aegis.description = The enemy is protected by shields. An experimental shield breaker module has been detected in this sector.\nLocate this structure. Supply it with tungsten ammunition and destroy the enemy base.
sector.lake.description = This sector's slag lake greatly limits viable units. A hover unit is the only option.\nResearch the [accent]ship fabricator[] and produce an [accent]elude[] unit as soon as possible.

View File

@ -747,6 +747,7 @@ sector.split.name = Split
sector.basin.name = Basin
sector.marsh.name = Marsh
sector.peaks.name = Peaks
sector.ravine.name = Ravine
sector.onset.description = The tutorial sector. This objective has not been created yet. Await further information.
sector.aegis.description = The enemy is protected by shields. An experimental shield breaker module has been detected in this sector.\nLocate this structure. Supply it with tungsten ammunition and destroy the enemy base.
sector.lake.description = This sector's slag lake greatly limits viable units. A hover unit is the only option.\nResearch the [accent]ship fabricator[] and produce an [accent]elude[] unit as soon as possible.

View File

@ -752,6 +752,7 @@ sector.split.name = Separació
sector.basin.name = La conca
sector.marsh.name = Marsh
sector.peaks.name = Peaks
sector.ravine.name = Ravine
sector.onset.description = El sector del tutorial. Encara no sha establert cap objectiu. Manteniu-vos a lespera per rebre més informació.
sector.aegis.description = Lenemic està protegit per escuts. Sha detectat un mòdul experimental antiescuts al sector.\nLocalitzeu-lo i abastiu-lo amb tungstè per destruir la base enemiga.
sector.lake.description = El llac de residus daquest sector limita el nombre dunitats viables. Les unitats aèries són lúnica via possible.\nRecerqueu la tecnologia per construir [accent]muntadores de naus[] i produïu una unitat [accent]Elude[] tan aviat com pugueu.

View File

@ -749,6 +749,7 @@ sector.split.name = Split
sector.basin.name = Basin
sector.marsh.name = Marsh
sector.peaks.name = Peaks
sector.ravine.name = Ravine
sector.onset.description = The tutorial sector. This objective has not been created yet. Await further information.
sector.aegis.description = The enemy is protected by shields. An experimental shield breaker module has been detected in this sector.\nLocate this structure. Supply it with tungsten ammunition and destroy the enemy base.
sector.lake.description = This sector's slag lake greatly limits viable units. A hover unit is the only option.\nResearch the [accent]ship fabricator[] and produce an [accent]elude[] unit as soon as possible.

View File

@ -738,6 +738,7 @@ sector.split.name = Split
sector.basin.name = Basin
sector.marsh.name = Marsh
sector.peaks.name = Peaks
sector.ravine.name = Ravine
sector.onset.description = The tutorial sector. This objective has not been created yet. Await further information.
sector.aegis.description = The enemy is protected by shields. An experimental shield breaker module has been detected in this sector.\nLocate this structure. Supply it with tungsten ammunition and destroy the enemy base.
sector.lake.description = This sector's slag lake greatly limits viable units. A hover unit is the only option.\nResearch the [accent]ship fabricator[] and produce an [accent]elude[] unit as soon as possible.

View File

@ -752,6 +752,7 @@ sector.split.name = Split
sector.basin.name = Basin
sector.marsh.name = Marsh
sector.peaks.name = Peaks
sector.ravine.name = Ravine
sector.onset.description = Der Tutorial-Sektor. Dieser Sektor hat noch kein Ziel. Erwarte weitere Informationen.
sector.aegis.description = The enemy is protected by shields. An experimental shield breaker module has been detected in this sector.\nLocate this structure. Supply it with tungsten ammunition and destroy the enemy base.
sector.lake.description = This sector's slag lake greatly limits viable units. A hover unit is the only option.\nResearch the [accent]ship fabricator[] and produce an [accent]elude[] unit as soon as possible.

View File

@ -756,6 +756,7 @@ sector.split.name = División
sector.basin.name = Declive
sector.marsh.name = Marsh
sector.peaks.name = Peaks
sector.ravine.name = Ravine
sector.onset.description = Este es el sector de tutorial. Aún no se ha definido un objetivo para esta zona. Mantente a la espera para recibir nueva información.
sector.aegis.description = El enemigo usa escudos para protegerse. Se ha detectado un módulo destructor de escudos experimental en este sector.\nLocaliza esta estructura. Suminístrale munición de tungsteno y destruye la base enemiga.

View File

@ -738,6 +738,7 @@ sector.split.name = Split
sector.basin.name = Basin
sector.marsh.name = Marsh
sector.peaks.name = Peaks
sector.ravine.name = Ravine
sector.onset.description = The tutorial sector. This objective has not been created yet. Await further information.
sector.aegis.description = The enemy is protected by shields. An experimental shield breaker module has been detected in this sector.\nLocate this structure. Supply it with tungsten ammunition and destroy the enemy base.
sector.lake.description = This sector's slag lake greatly limits viable units. A hover unit is the only option.\nResearch the [accent]ship fabricator[] and produce an [accent]elude[] unit as soon as possible.

View File

@ -738,6 +738,7 @@ sector.split.name = Split
sector.basin.name = Basin
sector.marsh.name = Marsh
sector.peaks.name = Peaks
sector.ravine.name = Ravine
sector.onset.description = The tutorial sector. This objective has not been created yet. Await further information.
sector.aegis.description = The enemy is protected by shields. An experimental shield breaker module has been detected in this sector.\nLocate this structure. Supply it with tungsten ammunition and destroy the enemy base.
sector.lake.description = This sector's slag lake greatly limits viable units. A hover unit is the only option.\nResearch the [accent]ship fabricator[] and produce an [accent]elude[] unit as soon as possible.

View File

@ -738,6 +738,7 @@ sector.split.name = Split
sector.basin.name = Basin
sector.marsh.name = Marsh
sector.peaks.name = Peaks
sector.ravine.name = Ravine
sector.onset.description = Tutoriaalisektori. Tätä tehtävää ei ole vielä luotu. Odota myöhempää tietoa.
sector.aegis.description = The enemy is protected by shields. An experimental shield breaker module has been detected in this sector.\nLocate this structure. Supply it with tungsten ammunition and destroy the enemy base.
sector.lake.description = This sector's slag lake greatly limits viable units. A hover unit is the only option.\nResearch the [accent]ship fabricator[] and produce an [accent]elude[] unit as soon as possible.

View File

@ -738,6 +738,7 @@ sector.split.name = Split
sector.basin.name = Basin
sector.marsh.name = Marsh
sector.peaks.name = Peaks
sector.ravine.name = Ravine
sector.onset.description = Ang tutorial sector. Ang objective ay hindi pa nagawa. Maghintay para sa kinabukasang impormasyon.
sector.aegis.description = The enemy is protected by shields. An experimental shield breaker module has been detected in this sector.\nLocate this structure. Supply it with tungsten ammunition and destroy the enemy base.
sector.lake.description = This sector's slag lake greatly limits viable units. A hover unit is the only option.\nResearch the [accent]ship fabricator[] and produce an [accent]elude[] unit as soon as possible.

View File

@ -756,6 +756,7 @@ sector.split.name = Split
sector.basin.name = Basin
sector.marsh.name = Marsh
sector.peaks.name = Peaks
sector.ravine.name = Ravine
sector.onset.description = Le secteur de tutoriel. Cet objectif n'a pas encore été créé. Attendez pour des informations futures.
sector.aegis.description = L'ennemi est protégé par des boucliers. Un module expérimental de briseur de bouclier a été détecté dans ce secteur.\nLocalisez cette structure, approvisionnez-la avec des munitions de tungstène et détruisez la base ennemie.

View File

@ -747,6 +747,7 @@ sector.split.name = Split
sector.basin.name = Basin
sector.marsh.name = Marsh
sector.peaks.name = Peaks
sector.ravine.name = Ravine
sector.onset.description = The tutorial sector. This objective has not been created yet. Await further information.
sector.aegis.description = The enemy is protected by shields. An experimental shield breaker module has been detected in this sector.\nLocate this structure. Supply it with tungsten ammunition and destroy the enemy base.
sector.lake.description = This sector's slag lake greatly limits viable units. A hover unit is the only option.\nResearch the [accent]ship fabricator[] and produce an [accent]elude[] unit as soon as possible.

View File

@ -756,6 +756,7 @@ sector.split.name = Split
sector.basin.name = Basin
sector.marsh.name = Marsh
sector.peaks.name = Peaks
sector.ravine.name = Ravine
sector.onset.description = Sektor latihan. Tujuan ini belum dibuat. Tunggu informasi selanjutnya.
sector.aegis.description = Musuh dilindungi oleh perisai. Modul pemutus pelindung eksperimental telah terdeteksi di sektor ini.\nTemukan struktur ini. Pasok dengan amunisi tungsten dan hancurkan markas musuh.

View File

@ -745,6 +745,7 @@ sector.split.name = Dividi
sector.basin.name = Basin
sector.marsh.name = Marsh
sector.peaks.name = Peaks
sector.ravine.name = Ravine
sector.onset.description = Settore di prova. Questo obbiettivo non è ancora stato creato. Aspetta ulteriori informazioni.
sector.aegis.description = The enemy is protected by shields. An experimental shield breaker module has been detected in this sector.\nLocate this structure. Supply it with tungsten ammunition and destroy the enemy base.
sector.lake.description = This sector's slag lake greatly limits viable units. A hover unit is the only option.\nResearch the [accent]ship fabricator[] and produce an [accent]elude[] unit as soon as possible.

View File

@ -749,6 +749,7 @@ sector.split.name = Split
sector.basin.name = Basin
sector.marsh.name = Marsh
sector.peaks.name = Peaks
sector.ravine.name = Ravine
sector.onset.description = The tutorial sector. This objective has not been created yet. Await further information.
sector.aegis.description = The enemy is protected by shields. An experimental shield breaker module has been detected in this sector.\nLocate this structure. Supply it with tungsten ammunition and destroy the enemy base.
sector.lake.description = This sector's slag lake greatly limits viable units. A hover unit is the only option.\nResearch the [accent]ship fabricator[] and produce an [accent]elude[] unit as soon as possible.

View File

@ -750,6 +750,7 @@ sector.split.name = 분열
sector.basin.name = 유역
sector.marsh.name = Marsh
sector.peaks.name = Peaks
sector.ravine.name = Ravine
sector.onset.description = 튜토리얼 지역. 아직 목표가 만들어지지 않았습니다. 정보를 더 기다리십시오.
sector.aegis.description = 적은 방어막으로 보호받고 있습니다. 이 구역에서 실험적인 방어막 차단기 모듈이 감지되었습니다.\n이 구조물을 찾으십시오. 텅스텐을 공급해 방어막 차단기를 가동하고 적의 기지를 파괴하십시오.
sector.lake.description = 이 지역의 광재 호수는 기체의 활동범위를 크게 제한시킵니다. 호버 유닛이 유일한 선택지입니다.\n[accent]함선 재구성기[]를 연구하고 [accent]일루드[]를 가능한 한 빨리 생산하십시오.

View File

@ -738,6 +738,7 @@ sector.split.name = Split
sector.basin.name = Basin
sector.marsh.name = Marsh
sector.peaks.name = Peaks
sector.ravine.name = Ravine
sector.onset.description = The tutorial sector. This objective has not been created yet. Await further information.
sector.aegis.description = The enemy is protected by shields. An experimental shield breaker module has been detected in this sector.\nLocate this structure. Supply it with tungsten ammunition and destroy the enemy base.
sector.lake.description = This sector's slag lake greatly limits viable units. A hover unit is the only option.\nResearch the [accent]ship fabricator[] and produce an [accent]elude[] unit as soon as possible.

View File

@ -738,6 +738,7 @@ sector.split.name = Split
sector.basin.name = Basin
sector.marsh.name = Marsh
sector.peaks.name = Peaks
sector.ravine.name = Ravine
sector.onset.description = The tutorial sector. This objective has not been created yet. Await further information.
sector.aegis.description = The enemy is protected by shields. An experimental shield breaker module has been detected in this sector.\nLocate this structure. Supply it with tungsten ammunition and destroy the enemy base.
sector.lake.description = This sector's slag lake greatly limits viable units. A hover unit is the only option.\nResearch the [accent]ship fabricator[] and produce an [accent]elude[] unit as soon as possible.

View File

@ -738,6 +738,7 @@ sector.split.name = Split
sector.basin.name = Basin
sector.marsh.name = Marsh
sector.peaks.name = Peaks
sector.ravine.name = Ravine
sector.onset.description = The tutorial sector. This objective has not been created yet. Await further information.
sector.aegis.description = The enemy is protected by shields. An experimental shield breaker module has been detected in this sector.\nLocate this structure. Supply it with tungsten ammunition and destroy the enemy base.
sector.lake.description = This sector's slag lake greatly limits viable units. A hover unit is the only option.\nResearch the [accent]ship fabricator[] and produce an [accent]elude[] unit as soon as possible.

View File

@ -748,6 +748,7 @@ sector.split.name = Split
sector.basin.name = Basin
sector.marsh.name = Marsh
sector.peaks.name = Peaks
sector.ravine.name = Ravine
sector.onset.description = Samouczkowy sektor. Cel nie został jeszcze ustalony. Oczekuj dalszych informacji.
sector.aegis.description = The enemy is protected by shields. An experimental shield breaker module has been detected in this sector.\nLocate this structure. Supply it with tungsten ammunition and destroy the enemy base.
sector.lake.description = This sector's slag lake greatly limits viable units. A hover unit is the only option.\nResearch the [accent]ship fabricator[] and produce an [accent]elude[] unit as soon as possible.

View File

@ -743,6 +743,7 @@ sector.split.name = Split
sector.basin.name = Basin
sector.marsh.name = Marsh
sector.peaks.name = Peaks
sector.ravine.name = Ravine
sector.onset.description = The tutorial sector. This objective has not been created yet. Await further information.
sector.aegis.description = The enemy is protected by shields. An experimental shield breaker module has been detected in this sector.\nLocate this structure. Supply it with tungsten ammunition and destroy the enemy base.
sector.lake.description = This sector's slag lake greatly limits viable units. A hover unit is the only option.\nResearch the [accent]ship fabricator[] and produce an [accent]elude[] unit as soon as possible.

View File

@ -738,6 +738,7 @@ sector.split.name = Split
sector.basin.name = Basin
sector.marsh.name = Marsh
sector.peaks.name = Peaks
sector.ravine.name = Ravine
sector.onset.description = The tutorial sector. This objective has not been created yet. Await further information.
sector.aegis.description = The enemy is protected by shields. An experimental shield breaker module has been detected in this sector.\nLocate this structure. Supply it with tungsten ammunition and destroy the enemy base.
sector.lake.description = This sector's slag lake greatly limits viable units. A hover unit is the only option.\nResearch the [accent]ship fabricator[] and produce an [accent]elude[] unit as soon as possible.

View File

@ -749,6 +749,7 @@ sector.split.name = Split
sector.basin.name = Basin
sector.marsh.name = Marsh
sector.peaks.name = Peaks
sector.ravine.name = Ravine
sector.onset.description = The tutorial sector. This objective has not been created yet. Await further information.
sector.aegis.description = The enemy is protected by shields. An experimental shield breaker module has been detected in this sector.\nLocate this structure. Supply it with tungsten ammunition and destroy the enemy base.
sector.lake.description = This sector's slag lake greatly limits viable units. A hover unit is the only option.\nResearch the [accent]ship fabricator[] and produce an [accent]elude[] unit as soon as possible.

View File

@ -748,6 +748,7 @@ sector.split.name = Split
sector.basin.name = Basin
sector.marsh.name = Marsh
sector.peaks.name = Peaks
sector.ravine.name = Ravine
sector.onset.description = Учебный сектор. Эта цель еще не создана. Ждите дальнейшей информации.
sector.aegis.description = The enemy is protected by shields. An experimental shield breaker module has been detected in this sector.\nLocate this structure. Supply it with tungsten ammunition and destroy the enemy base.
sector.lake.description = This sector's slag lake greatly limits viable units. A hover unit is the only option.\nResearch the [accent]ship fabricator[] and produce an [accent]elude[] unit as soon as possible.

View File

@ -749,6 +749,7 @@ sector.split.name = Split
sector.basin.name = Sliv
sector.marsh.name = Marsh
sector.peaks.name = Peaks
sector.ravine.name = Ravine
sector.onset.description = Tutorijalni sektor. Ovaj zadatak još nije izrađen. Sakečajte za dodatne informacije.
sector.aegis.description = Neprijatelj je zaštićen pomoću štita. Eksperimentalni razbijač štitova je uočen u sektoru.\nLocirajte ovu građevinu. Transportujte je sa volframskom municijom i uništite neprijateljsku bazu.
sector.lake.description = Istopljen metali u ovom sektoru smanjuje količinu korisnih jedinica. Lebdeća jedinica je jedina opcija.\nIzuči [accent]fabrikator brodova[] i proizvedi [accent]izvrda[] jedinicu što pre moguće.

View File

@ -738,6 +738,7 @@ sector.split.name = Split
sector.basin.name = Basin
sector.marsh.name = Marsh
sector.peaks.name = Peaks
sector.ravine.name = Ravine
sector.onset.description = The tutorial sector. This objective has not been created yet. Await further information.
sector.aegis.description = The enemy is protected by shields. An experimental shield breaker module has been detected in this sector.\nLocate this structure. Supply it with tungsten ammunition and destroy the enemy base.
sector.lake.description = This sector's slag lake greatly limits viable units. A hover unit is the only option.\nResearch the [accent]ship fabricator[] and produce an [accent]elude[] unit as soon as possible.

View File

@ -749,6 +749,7 @@ sector.split.name = Split
sector.basin.name = Basin
sector.marsh.name = Marsh
sector.peaks.name = Peaks
sector.ravine.name = Ravine
sector.onset.description = The tutorial sector. This objective has not been created yet. Await further information.
sector.aegis.description = The enemy is protected by shields. An experimental shield breaker module has been detected in this sector.\nLocate this structure. Supply it with tungsten ammunition and destroy the enemy base.
sector.lake.description = This sector's slag lake greatly limits viable units. A hover unit is the only option.\nResearch the [accent]ship fabricator[] and produce an [accent]elude[] unit as soon as possible.

View File

@ -738,6 +738,7 @@ sector.split.name = Split
sector.basin.name = Basin
sector.marsh.name = Marsh
sector.peaks.name = Peaks
sector.ravine.name = Ravine
sector.onset.description = The tutorial sector. This objective has not been created yet. Await further information.
sector.aegis.description = The enemy is protected by shields. An experimental shield breaker module has been detected in this sector.\nLocate this structure. Supply it with tungsten ammunition and destroy the enemy base.
sector.lake.description = This sector's slag lake greatly limits viable units. A hover unit is the only option.\nResearch the [accent]ship fabricator[] and produce an [accent]elude[] unit as soon as possible.

View File

@ -749,6 +749,7 @@ sector.split.name = Ayrılım
sector.basin.name = Havza
sector.marsh.name = Marsh
sector.peaks.name = Peaks
sector.ravine.name = Ravine
sector.onset.description = Öğretici Sektör. Bu Sektörün Görevleri daha belirlenmedi. Daha fazla bilgi için beklemede kal.
sector.aegis.description = Düşman Kalkanların arkasına Sığınmış Durumda! Bu Sektörde Deneysel bir Kalkan Kırıcı Bulunmakta.\nBu Yapıyı Bul, Tungsten ile çalıştır ve Düşman Base i Fethet!
sector.lake.description = Bu Sektörün Cürüf Gölü, birimleri büyük oranda engelliyor. Bir Hovercraft tek seçeneğin.\n[accent]Gemi Fabrikatörünü[] araştır ve [accent]elude[] birimini olabildiğince kısa sürede üret!

View File

@ -752,6 +752,7 @@ sector.split.name = Розколина
sector.basin.name = Ставок
sector.marsh.name = Marsh
sector.peaks.name = Peaks
sector.ravine.name = Ravine
sector.onset.description = Навчальний сектор. Це завдання ще не створено. Чекайте додаткової інформації.
sector.aegis.description = Ворог захищений щитами. У цьому секторі виявлено експериментальний модуль зламувача щитів.\nЗнайдіть цю будівлю. Забезпечте її вольфрамовими боєприпасами та знищіть ворожу базу.
sector.lake.description = Шлакове озеро в цьому секторі значно обмежує вибір одиниць. Єдиний варіант — одиниця, що може підтримувати себе над землею.\nДослідіть [accent]корабельний виробник[] і виготовте одиницю [accent]Ухиляч[] якомога швидше.

View File

@ -749,6 +749,7 @@ sector.split.name = Split
sector.basin.name = Basin
sector.marsh.name = Marsh
sector.peaks.name = Peaks
sector.ravine.name = Ravine
sector.onset.description = The tutorial sector. This objective has not been created yet. Await further information.
sector.aegis.description = The enemy is protected by shields. An experimental shield breaker module has been detected in this sector.\nLocate this structure. Supply it with tungsten ammunition and destroy the enemy base.
sector.lake.description = This sector's slag lake greatly limits viable units. A hover unit is the only option.\nResearch the [accent]ship fabricator[] and produce an [accent]elude[] unit as soon as possible.

View File

@ -750,6 +750,7 @@ sector.split.name = 横断山谷
sector.basin.name = 芳油盆地
sector.marsh.name = Marsh
sector.peaks.name = Peaks
sector.ravine.name = Ravine
sector.onset.description = 教学区块。区块目标未设立,等待进一步指示。
sector.aegis.description = 敌人被护盾保护着,不过这里也探测到一台实验性的护盾破坏器。\n找到它并为它输送一些钨作为弹药然后摧毁敌方基地。
sector.lake.description = 这个区块的岩浆湖限制了大部分单位的移动,悬浮单位是唯一选择。\n尽快研究[accent]飞船制造厂[]并生产一个[accent]挣脱[]。

View File

@ -756,6 +756,7 @@ sector.split.name = 分岔點
sector.basin.name = 搖籃
sector.marsh.name = Marsh
sector.peaks.name = Peaks
sector.ravine.name = Ravine
sector.onset.description = 新手教學地區。尚無作戰目標,請等候後續指示。
sector.aegis.description = 敵人受護盾保護。一個在實驗階段的護盾破壞器坐落在此區域,找到並提供鎢原料啟用它。摧毀敵方基地。

Binary file not shown.

View File

@ -51,6 +51,8 @@ public class Weapon implements Cloneable{
public boolean alwaysContinuous;
/** whether this weapon can be aimed manually by players */
public boolean controllable = true;
/** whether this weapon is always shooting, regardless of targets ore cone */
public boolean alwaysShooting = false;
/** whether to automatically target relevant units in update(); only works when controllable = false. */
public boolean autoTarget = false;
/** whether to perform target trajectory prediction */
@ -323,6 +325,8 @@ public class Weapon implements Cloneable{
//logic will return shooting as false even if these return true, which is fine
}
if(alwaysShooting) mount.shoot = true;
//update continuous state
if(continuous && mount.bullet != null){
if(!mount.bullet.isAdded() || mount.bullet.time >= mount.bullet.lifetime || mount.bullet.type != bullet){