Merge remote-tracking branch 'origin/master'

2022-06-18 16:07:08 -04:00
parent 031af7c432 b59e519e0d
commit 077ee978f6
38 changed files with 492 additions and 393 deletions
@@ -755,6 +755,7 @@ error.title = [scarlet]An error has occured
 error.crashtitle = An error has occured
 unit.nobuild = [scarlet]Unit can't build
 lastaccessed = [lightgray]Last Accessed: {0}
+lastcommanded = [lightgray]Last Commanded: {0}
 block.unknown = [lightgray]???

 stat.showinmap = <load map to show>
@@ -739,6 +739,7 @@ error.title = [crimson]Адбылася памылка
 error.crashtitle = Адбылася памылка
 unit.nobuild = [scarlet]Unit can't build
 lastaccessed = [lightgray]Last Accessed: {0}
+lastcommanded = [lightgray]Last Commanded: {0}
 block.unknown = [lightgray]???
 stat.showinmap = <load map to show>
 stat.description = Purpose
@@ -749,6 +749,7 @@ error.title = [scarlet]Възникна грешка
 error.crashtitle = Възникна грешка
 unit.nobuild = [scarlet]Единицата не може да строи
 lastaccessed = [lightgray]Последно достъпван: {0}
+lastcommanded = [lightgray]Last Commanded: {0}
 block.unknown = [lightgray]???
 stat.showinmap = <load map to show>

@@ -751,6 +751,7 @@ error.title = [scarlet]Objevila se chyba[]
 error.crashtitle = Objevila se chyba
 unit.nobuild = [scarlet]Jednotka nemůže stavět
 lastaccessed = [lightgray]Naposledy použil: {0}
+lastcommanded = [lightgray]Last Commanded: {0}
 block.unknown = [lightgray]???[]

 stat.showinmap = <načti mapu pro zobrazení>
@@ -739,6 +739,7 @@ error.title = [crimson]Der er opstået en fejl.
 error.crashtitle = Der er opstået en fejl.
 unit.nobuild = [scarlet]Denne enhed kan ikke bygge
 lastaccessed = [lightgray]Sidst tilgået: {0}
+lastcommanded = [lightgray]Last Commanded: {0}
 block.unknown = [lightgray]???
 stat.showinmap = <load map to show>
 stat.description = Purpose
@@ -750,6 +750,7 @@ error.title = [crimson]Ein Fehler ist aufgetreten
 error.crashtitle = Ein Fehler ist aufgetreten!
 unit.nobuild = [scarlet]Einheit kann nicht bauen!
 lastaccessed = [lightgray]Zuletzt konfiguriert: {0}
+lastcommanded = [lightgray]Last Commanded: {0}
 block.unknown = [lightgray]???

 stat.showinmap = <öffne Spiel um zu zeigen>
@@ -755,6 +755,7 @@ error.title = [scarlet]Ha ocurrido un error
 error.crashtitle = Ha ocurrido un error
 unit.nobuild = [scarlet]Esta unidad no puede construir
 lastaccessed = [lightgray]Último uso: {0}
+lastcommanded = [lightgray]Last Commanded: {0}
 block.unknown = [lightgray]???

 stat.showinmap = <cargar mapa para mostrar>
@@ -739,6 +739,7 @@ error.title = [crimson]Viga
 error.crashtitle = Viga
 unit.nobuild = [scarlet]Unit can't build
 lastaccessed = [lightgray]Last Accessed: {0}
+lastcommanded = [lightgray]Last Commanded: {0}
 block.unknown = [lightgray]???
 stat.showinmap = <load map to show>
 stat.description = Purpose
@@ -739,6 +739,7 @@ error.title = [crimson]Errore bat gertatu da
 error.crashtitle = Errore bat gertatu da
 unit.nobuild = [scarlet]Unit can't build
 lastaccessed = [lightgray]Last Accessed: {0}
+lastcommanded = [lightgray]Last Commanded: {0}
 block.unknown = [lightgray]???
 stat.showinmap = <load map to show>
 stat.description = Purpose
@@ -739,6 +739,7 @@ error.title = [crimson]An error has occured
 error.crashtitle = An error has occured
 unit.nobuild = [scarlet]Unit can't build
 lastaccessed = [lightgray]Last Accessed: {0}
+lastcommanded = [lightgray]Last Commanded: {0}
 block.unknown = [lightgray]???
 stat.showinmap = <load map to show>
 stat.description = Purpose
@@ -739,6 +739,7 @@ error.title = [scarlet]An error has occured
 error.crashtitle = An error has occured
 unit.nobuild = [scarlet]Unit can't build
 lastaccessed = [lightgray]Last Accessed: {0}
+lastcommanded = [lightgray]Last Commanded: {0}
 block.unknown = [lightgray]???
 stat.showinmap = <load map to show>
 stat.description = Purpose
@@ -752,6 +752,7 @@ error.title = [scarlet]Une erreur s'est produite
 error.crashtitle = Une erreur s'est produite
 unit.nobuild = [scarlet]Cette unité ne peut pas construire
 lastaccessed = [lightgray]Dernier accès : {0}
+lastcommanded = [lightgray]Last Commanded: {0}
 block.unknown = [lightgray]???

 stat.showinmap = <charger la carte à afficher>
@@ -748,6 +748,7 @@ error.title = [scarlet]Hiba történt
 error.crashtitle = Hiba történt
 unit.nobuild = [scarlet]Az egység nem tud építeni
 lastaccessed = [lightgray]Utoljára megtekintve: {0}
+lastcommanded = [lightgray]Last Commanded: {0}
 block.unknown = [lightgray]???
 stat.showinmap = <load map to show>

@@ -755,6 +755,7 @@ error.title = [scarlet]Sebuah kesalahan telah terjadi
 error.crashtitle = Sebuah kesalahan telah terjadi
 unit.nobuild = [scarlet]Unit tidak dapat membangun
 lastaccessed = [lightgray]Terakhir Diakses: {0}
+lastcommanded = [lightgray]Last Commanded: {0}
 block.unknown = [lightgray]???

 stat.showinmap = <muat peta untuk lihat>
@@ -746,6 +746,7 @@ error.title = [scarlet]Si è verificato un errore
 error.crashtitle = Si è verificato un errore
 unit.nobuild = [scarlet]L'unità non può costruire
 lastaccessed = [lightgray]Ultimo Accesso: {0}
+lastcommanded = [lightgray]Last Commanded: {0}
 block.unknown = [lightgray]???
 stat.showinmap = <load map to show>

@@ -751,6 +751,7 @@ error.title = [crimson]エラーが発生しました
 error.crashtitle = エラーが発生しました
 unit.nobuild = [scarlet]構築不可
 lastaccessed = [lightgray]最終アクセス {0}
+lastcommanded = [lightgray]Last Commanded: {0}
 block.unknown = [lightgray]???

 stat.showinmap = <表示のマップを読み込む>
@@ -752,6 +752,7 @@ error.title = [scarlet]오류가 발생했습니다[]
 error.crashtitle = 오류가 발생했습니다
 unit.nobuild = [scarlet]건설 불가[]
 lastaccessed = [lightgray]마지막 접근: {0}[]
+lastcommanded = [lightgray]Last Commanded: {0}
 block.unknown = [lightgray]???[]

 stat.showinmap = <맵을 먼저 불러와야 합니다>
@@ -739,6 +739,7 @@ error.title = [crimson]Įvyko klaida
 error.crashtitle = Įvyko klaida
 unit.nobuild = [scarlet]Unit can't build
 lastaccessed = [lightgray]Last Accessed: {0}
+lastcommanded = [lightgray]Last Commanded: {0}
 block.unknown = [lightgray]???
 stat.showinmap = <load map to show>
 stat.description = Purpose
@@ -739,6 +739,7 @@ error.title = [crimson]Een fout is opgetreden
 error.crashtitle = Een fout is opgetreden
 unit.nobuild = [scarlet]Unit can't build
 lastaccessed = [lightgray]Last Accessed: {0}
+lastcommanded = [lightgray]Last Commanded: {0}
 block.unknown = [lightgray]???
 stat.showinmap = <load map to show>
 stat.description = Purpose
@@ -739,6 +739,7 @@ error.title = [crimson]An error has occured
 error.crashtitle = An error has occured
 unit.nobuild = [scarlet]Unit can't build
 lastaccessed = [lightgray]Last Accessed: {0}
+lastcommanded = [lightgray]Last Commanded: {0}
 block.unknown = [lightgray]???
 stat.showinmap = <load map to show>
 stat.description = Purpose
@@ -749,6 +749,7 @@ error.title = [crimson]Wystąpił błąd
 error.crashtitle = Wystąpił błąd
 unit.nobuild = [scarlet]Jednostka nie może budować
 lastaccessed = [lightgray]Ostatnia interakcja: {0}
+lastcommanded = [lightgray]Last Commanded: {0}
 block.unknown = [lightgray]???
 stat.showinmap = <załaduj mapę do pokazania>

@@ -745,6 +745,7 @@ error.title = [crimson]Ocorreu um Erro.
 error.crashtitle = Ocorreu um Erro
 unit.nobuild = [scarlet]Unidades não podem construir
 lastaccessed = [lightgray]Último Acesso: {0}
+lastcommanded = [lightgray]Last Commanded: {0}
 block.unknown = [lightgray]???
 stat.showinmap = <load map to show>
 stat.description = Purpose
@@ -739,6 +739,7 @@ error.title = [crimson]Ocorreu um Erro.
 error.crashtitle = Ocorreu um Erro
 unit.nobuild = [scarlet]Unit can't build
 lastaccessed = [lightgray]Last Accessed: {0}
+lastcommanded = [lightgray]Last Commanded: {0}
 block.unknown = [lightgray]???
 stat.showinmap = <load map to show>
 stat.description = Purpose
@@ -751,6 +751,7 @@ error.title = [scarlet]A apărut o eroare.
 error.crashtitle = A apărut o eroare.
 unit.nobuild = [scarlet]Unitatea nu poate construi.
 lastaccessed = [lightgray]Ultima Accesare: {0}
+lastcommanded = [lightgray]Last Commanded: {0}
 block.unknown = [lightgray]???

 stat.showinmap = <vezi pe hartă>
@@ -750,6 +750,7 @@ error.title = [scarlet]Произошла ошибка
 error.crashtitle = Произошла ошибка
 unit.nobuild = [scarlet]Единица не может строить
 lastaccessed = [lightgray]Последняя конфигурация от {0}
+lastcommanded = [lightgray]Last Commanded: {0}
 block.unknown = [lightgray]???

 stat.showinmap = <загрузите карту для отображения>
@@ -751,6 +751,7 @@ error.title = [scarlet]An error has occured
 error.crashtitle = An error has occured
 unit.nobuild = [scarlet]Unit can't build
 lastaccessed = [lightgray]Last Accessed: {0}
+lastcommanded = [lightgray]Last Commanded: {0}
 block.unknown = [lightgray]???

 stat.showinmap = <Učitajte mapu da se vidi>
@@ -739,6 +739,7 @@ error.title = [crimson]An error has occured
 error.crashtitle = An error has occured
 unit.nobuild = [scarlet]Unit can't build
 lastaccessed = [lightgray]Last Accessed: {0}
+lastcommanded = [lightgray]Last Commanded: {0}
 block.unknown = [lightgray]???
 stat.showinmap = <load map to show>
 stat.description = Purpose
@@ -751,6 +751,7 @@ error.title = [crimson]มีบางอย่างผิดพลาดเก
 error.crashtitle = มีบางอย่างผิดพลาดเกิดขึ้น
 unit.nobuild = [scarlet]ยูนิตนี้ไม่สามารถสร้างได้
 lastaccessed = [lightgray]คนสุดท้ายที่แตะ: {0}
+lastcommanded = [lightgray]Last Commanded: {0}
 block.unknown = [lightgray]???

 stat.showinmap = <โหลดแมพเพื่อแสดง>
@@ -739,6 +739,7 @@ error.title = [crimson]Bir hata olustu
 error.crashtitle = Bir hata olustu
 unit.nobuild = [scarlet]Unit can't build
 lastaccessed = [lightgray]Last Accessed: {0}
+lastcommanded = [lightgray]Last Commanded: {0}
 block.unknown = [lightgray]???
 stat.showinmap = <load map to show>
 stat.description = Purpose
@@ -751,6 +751,7 @@ error.title = [crimson]Bir hata oldu
 error.crashtitle = Bir hata oldu
 unit.nobuild = [scarlet]Birlik inşa edemiyor
 lastaccessed = [lightgray]Son Erişme: {0}
+lastcommanded = [lightgray]Son Kontrol Edilen: {0}
 block.unknown = [lightgray]???

 stat.showinmap = <görüntülenecek haritayı yükle>
@@ -966,7 +967,7 @@ setting.borderlesswindow.name = Kenarsız Pencere
 setting.borderlesswindow.name.windows = Kenrasız TamEkran
 setting.borderlesswindow.description = Oyunu baştan açman gerekebilir.
 setting.fps.name = FPS Göster
-setting.console.name = Enable Console
+setting.console.name = Konsolu Aktifleştir
 setting.smoothcamera.name = Yumuşak Geçişli Kamera
 setting.vsync.name = VSync
 setting.pixelate.name = Pixelleştir [lightgray](animasyonları kapatır)
@@ -1100,7 +1101,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.solarmultiplier = Güneş Paneli Üretim Çarpanı
 rules.unitcapvariable = Çekirdekler Eleman Sınırını Etkiler
 rules.unitcap = Sabit eleman Sınırı
 rules.limitarea = Haritayı Sınırla
@@ -1739,17 +1740,17 @@ lst.unitlocate = Etraftaki blokları algılar.\nBağlı birim gerektirir.
 lst.getblock = Herhangi bir yerdeki blok bilgisini al.
 lst.setblock = Herhangi bir yerdeki blok bilgisini değiştir.
 lst.spawnunit = Herhangi bir yerde birim var et.
-lst.applystatus = Apply or clear a status effect from a uniut.
-lst.spawnwave = Simulate a wave being spawned at a arbitrary location.\nWill not increment the wave counter.
-lst.explosion = Create an explosion at a location.
-lst.setrate = Set processor execution speed in instructions/tick.
-lst.fetch = Lookup units, cores, players or buildings by index.\nIndices start at 0 and end at their returned count.
+lst.applystatus = Bir Birime Durum Etkisi ekle.
+lst.spawnwave = Bellir bir noktada dalga başlat.\nDalga Zamanlayıcı Oluşturmaz!
+lst.explosion = Bir Noktada Patlama oluştur.
+lst.setrate = İşlemci Hızını Ayarla (işlem/tick)
+lst.fetch = Numara ile Çekirdek, Birim veya Oyuncu Ara.\nNumaralar, 0dan başlar ve birim sayısında biter.
 lst.packcolor = Derle [0, 1] RGBA bileşenleri, çizim veya kural belirleme için tek bir sayıya dönüştürülür.
 lst.setrule = Bir Oyun Kuralı Ata.
 lst.flushmessage = Ekranda bir yazı göster.\nBir önceki yazı kaybolana kadar bekler.
-lst.cutscene = Manipulate the player camera.
-lst.setflag = Set a global flag that can be read by all processors.
-lst.getflag = Check if a global flag is set.
+lst.cutscene = Oyuncu Kamerasını hareket ettir.
+lst.setflag = Tüm İşlemciler tarafından okunabilen bir Numara İşaretle.
+lst.getflag = Evrensel İşaretli Numara Oku.

 logic.nounitbuild = [red]Birim İnşası Yasak!

@@ -2002,9 +2003,9 @@ block.titan.name = Titan
 block.disperse.name = Disperse
 block.afflict.name = Afflict
 block.fabricator.name = Fabrikatör
-block.tank-refabricator.name = Tank Refabricator
-block.mech-refabricator.name = Mech Refabricator
-block.ship-refabricator.name = Ship Refabricator
+block.tank-refabricator.name = Tank Yeniden Yapılandırıcı
+block.mech-refabricator.name = Robot Yeniden Yapılandırıcı
+block.ship-refabricator.name = Gemi Yeniden Yapılandırıcı
 block.tank-assembler.name = Tank İnşaatcı
 block.ship-assembler.name = Gemi İnşaatcı
 block.mech-assembler.name = Robot İnşaatcı
@@ -751,6 +751,7 @@ error.title = [scarlet]Đã xảy ra lỗi
 error.crashtitle = Đã xảy ra lỗi
 unit.nobuild = [scarlet]Quân lính/Công trình không thể xây dựng
 lastaccessed = [lightgray]Truy cập lần cuối: {0}
+lastcommanded = [lightgray]Last Commanded: {0}
 block.unknown = [lightgray]???

 stat.showinmap = <Mở bản đồ để hiện thị>
@@ -750,6 +750,7 @@ error.title = [scarlet]发生了一个错误
 error.crashtitle = 发生了一个错误
 unit.nobuild = [scarlet]无法进行建造
 lastaccessed = [lightgray]上次操作：{0}
+lastcommanded = [lightgray]Last Commanded: {0}
 block.unknown = [lightgray]？？

 stat.showinmap = <进入地图后显示>
@@ -755,6 +755,7 @@ error.title = [crimson]發生錯誤
 error.crashtitle = 發生錯誤
 unit.nobuild = [scarlet]單位不能建造
 lastaccessed = [lightgray]最後使用：{0}
+lastcommanded = [lightgray]Last Commanded: {0}
 block.unknown = [lightgray]？？？

 stat.showinmap = <加載地圖以顯示>
@@ -1250,7 +1250,7 @@ abstract class BuildingComp implements Posc, Teamc, Healthc, Buildingc, Timerc,
        if(value instanceof UnitType) type = UnitType.class;
        
        if(builder != null && builder.isPlayer()){
-            lastAccessed = builder.getPlayer().name;
+            lastAccessed = builder.getPlayer().coloredName();
        }

        if(block.configurations.containsKey(type)){
@@ -51,6 +51,7 @@ abstract class UnitComp implements Healthc, Physicsc, Hitboxc, Statusc, Teamc, I
    //TODO could be better represented as a unit
    transient @Nullable UnitType dockedType;

+    transient String lastCommanded;
    transient float shadowAlpha = -1f, healTime;
    transient int lastFogPos;
    private transient float resupplyTime = Mathf.random(10f);
@@ -233,6 +233,7 @@ public abstract class InputHandler implements InputProcessor, GestureListener{
                }else if(posTarget != null){
                    ai.commandPosition(posTarget);
                }
+                unit.lastCommanded = player.coloredName();
            }
        }

@@ -512,13 +512,24 @@ public class UnitType extends UnlockableContent{
            }
        }).growX();

-        if(unit.controller() instanceof LogicAI){
+        if(unit.controller() instanceof LogicAI ai){
            table.row();
            table.add(Blocks.microProcessor.emoji() + " " + Core.bundle.get("units.processorcontrol")).growX().wrap().left();
+            if(ai.controller != null && (Core.settings.getBool("mouseposition") || Core.settings.getBool("position"))){
+                table.row();
+                table.add("[lightgray](" + ai.controller.tileX() + ", " + ai.controller.tileY() + ")").growX().wrap().left();
+            }
            table.row();
            table.label(() -> Iconc.settings + " " + (long)unit.flag + "").color(Color.lightGray).growX().wrap().left();
+            if(net.active() && ai.controller != null && ai.controller.lastAccessed != null){
+                table.row();
+                table.add(Core.bundle.format("lastaccessed", ai.controller.lastAccessed)).growX().wrap().left();
+            }
+        }else if(net.active() && unit.lastCommanded != null){
+            table.row();
+            table.add(Core.bundle.format("lastcommanded", unit.lastCommanded)).growX().wrap().left();
        }
-        
+
        table.row();
    }