Merge remote-tracking branch 'origin/master'

This commit is contained in:
Anuken
2024-03-14 18:53:35 -04:00
44 changed files with 544 additions and 305 deletions

View File

@@ -2315,6 +2315,8 @@ lst.getblock = Get tile data at any location.
lst.setblock = Set tile data at any location. lst.setblock = Set tile data at any location.
lst.spawnunit = Spawn unit at a location. lst.spawnunit = Spawn unit at a location.
lst.applystatus = Apply or clear a status effect from a unit. lst.applystatus = Apply or clear a status effect from a unit.
lst.weathersensor = Check if a type of weather is active.
lst.weatherset = Set the current state of a type of weather.
lst.spawnwave = Spawn a wave. lst.spawnwave = Spawn a wave.
lst.explosion = Create an explosion at a location. lst.explosion = Create an explosion at a location.
lst.setrate = Set processor execution speed in instructions/tick. lst.setrate = Set processor execution speed in instructions/tick.

View File

@@ -2264,6 +2264,8 @@ lst.getblock = Get tile data at any location.
lst.setblock = Set tile data at any location. lst.setblock = Set tile data at any location.
lst.spawnunit = Spawn unit at a location. lst.spawnunit = Spawn unit at a location.
lst.applystatus = Apply or clear a status effect from a uniut. lst.applystatus = Apply or clear a status effect from a uniut.
lst.weathersensor = Check if a type of weather is active.
lst.weatherset = Set the current state of a type of weather.
lst.spawnwave = Simulate a wave being spawned at a arbitrary location.\nWill not increment the wave counter. 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.explosion = Create an explosion at a location.
lst.setrate = Set processor execution speed in instructions/tick. lst.setrate = Set processor execution speed in instructions/tick.

View File

@@ -2278,6 +2278,8 @@ lst.getblock = Get tile data at any location.
lst.setblock = Set tile data at any location. lst.setblock = Set tile data at any location.
lst.spawnunit = Spawn unit at a location. lst.spawnunit = Spawn unit at a location.
lst.applystatus = Apply or clear a status effect from a uniut. lst.applystatus = Apply or clear a status effect from a uniut.
lst.weathersensor = Check if a type of weather is active.
lst.weatherset = Set the current state of a type of weather.
lst.spawnwave = Simulate a wave being spawned at a arbitrary location.\nWill not increment the wave counter. 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.explosion = Create an explosion at a location.
lst.setrate = Set processor execution speed in instructions/tick. lst.setrate = Set processor execution speed in instructions/tick.

View File

@@ -674,11 +674,11 @@ objective.destroycore.name = Destrueix el nucli
objective.commandmode.name = Mode de comandament objective.commandmode.name = Mode de comandament
objective.flag.name = Bandera objective.flag.name = Bandera
marker.shapetext.name = Forma del text marker.shapetext.name = Forma del text
marker.point.name = Point marker.point.name = Punt
marker.shape.name = Forma marker.shape.name = Forma
marker.text.name = Text marker.text.name = Text
marker.line.name = Línia marker.line.name = Línia
marker.quad.name = Quad marker.quad.name = Rectangle
marker.background = Fons marker.background = Fons
marker.outline = Contorn marker.outline = Contorn
@@ -763,8 +763,8 @@ sector.curlost = Sector perdut
sector.missingresources = [scarlet]Recursos insuficients al nucli sector.missingresources = [scarlet]Recursos insuficients al nucli
sector.attacked = Ataquen el sector [accent]{0}[white]! sector.attacked = Ataquen el sector [accent]{0}[white]!
sector.lost = Heu perdut el sector [accent]{0}[white]! sector.lost = Heu perdut el sector [accent]{0}[white]!
sector.capture = Sector [accent]{0}[white]Captured! sector.capture = Sha capturat el sector [accent]{0}[white]!
sector.capture.current = Sector Captured! sector.capture.current = Sector capturat!
sector.changeicon = Canvia la icona sector.changeicon = Canvia la icona
sector.noswitch.title = Els sectors no es poden canviar. sector.noswitch.title = Els sectors no es poden canviar.
sector.noswitch = Potser no podeu canviar de sector perquè nataquen un altre.\n\nSector: [accent]{0}[] de [accent]{1}[] sector.noswitch = Potser no podeu canviar de sector perquè nataquen un altre.\n\nSector: [accent]{0}[] de [accent]{1}[]
@@ -1145,7 +1145,7 @@ setting.sfxvol.name = Volums dels efectes de so
setting.mutesound.name = Silencia el so setting.mutesound.name = Silencia el so
setting.crashreport.name = Envia informes derror anònims setting.crashreport.name = Envia informes derror anònims
setting.savecreate.name = Desa automàticament la partida setting.savecreate.name = Desa automàticament la partida
setting.steampublichost.name = Public Game Visibility setting.steampublichost.name = Visibilitat de la partida pública
setting.playerlimit.name = Límit de jugadors setting.playerlimit.name = Límit de jugadors
setting.chatopacity.name = Opacitat del xat setting.chatopacity.name = Opacitat del xat
setting.lasersopacity.name = Opacitat dels làsers denergia setting.lasersopacity.name = Opacitat dels làsers denergia
@@ -1550,7 +1550,7 @@ block.inverted-sorter.name = Classificador invers
block.message.name = Missatge block.message.name = Missatge
block.reinforced-message.name = Missatge destacat block.reinforced-message.name = Missatge destacat
block.world-message.name = Missatge mundial block.world-message.name = Missatge mundial
block.world-switch.name = World Switch block.world-switch.name = Interruptor mundial
block.illuminator.name = Il·luminador block.illuminator.name = Il·luminador
block.overflow-gate.name = Porta de desbordament block.overflow-gate.name = Porta de desbordament
block.underflow-gate.name = Porta de subdesbordament block.underflow-gate.name = Porta de subdesbordament
@@ -1911,7 +1911,7 @@ onset.turrets = Les unitats són efectives, però les [accent]torretes[] proporc
onset.turretammo = Subministreu [accent]munició de beril·li[] a la torreta. onset.turretammo = Subministreu [accent]munició de beril·li[] a la torreta.
onset.walls = Els [accent]murs[] poden evitar que el dany arribi a les estructures importants.\nConstruïu alguns \uf6ee [accent]murs de beril·li[] al voltant de la torreta. onset.walls = Els [accent]murs[] poden evitar que el dany arribi a les estructures importants.\nConstruïu alguns \uf6ee [accent]murs de beril·li[] al voltant de la torreta.
onset.enemies = Sapropa un enemic. Prepareu la defensa. onset.enemies = Sapropa un enemic. Prepareu la defensa.
onset.defenses = [accent]Set up defenses:[lightgray] {0} onset.defenses = [accent]Establiu defenses:[lightgray] {0}
onset.attack = Lenemic és vulnerable. Contraataqueu. onset.attack = Lenemic és vulnerable. Contraataqueu.
onset.cores = Els nuclis nous es poden construir en [accent]caselles de nucli[].\nEls nuclis nous funcionen com a bases i comparteixen un inventari de recursos amb altres nuclis.\nConstruïu un \uf725 nucli. onset.cores = Els nuclis nous es poden construir en [accent]caselles de nucli[].\nEls nuclis nous funcionen com a bases i comparteixen un inventari de recursos amb altres nuclis.\nConstruïu un \uf725 nucli.
onset.detect = Lenemic us detectarà daquí 2 minuts.\nEstabliu les defenses i les explotacions mineres i de producció. onset.detect = Lenemic us detectarà daquí 2 minuts.\nEstabliu les defenses i les explotacions mineres i de producció.
@@ -2288,6 +2288,8 @@ lst.getblock = Obtén les dades dun bloc en qualsevol posició.
lst.setblock = Estableix les dades dun bloc en qualsevol posició. lst.setblock = Estableix les dades dun bloc en qualsevol posició.
lst.spawnunit = Fes aparèixer una unitat en una posició. lst.spawnunit = Fes aparèixer una unitat en una posició.
lst.applystatus = Aplica o esborra un efecte destat duna unitat. lst.applystatus = Aplica o esborra un efecte destat duna unitat.
lst.weathersensor = Check if a type of weather is active.
lst.weatherset = Set the current state of a type of weather.
lst.spawnwave = Simula laparició duna onada enemiga en una posició arbitrària.\nEl comptador donades no sincrementarà. lst.spawnwave = Simula laparició duna onada enemiga en una posició arbitrària.\nEl comptador donades no sincrementarà.
lst.explosion = Crea una explosió en una posició. lst.explosion = Crea una explosió en una posició.
lst.setrate = Estableix la velocitat dexecució del processador en instruccions/tic. lst.setrate = Estableix la velocitat dexecució del processador en instruccions/tic.
@@ -2491,10 +2493,10 @@ lenum.build = Construeix una estructura.
lenum.getblock = Obté un bloc i el seu tipus a les coordenades indicades.\nLa posició escollida ha destar a labast de la unitat.\nEls blocs que no són construccions tindran el tipus [accent]@solid[]. lenum.getblock = Obté un bloc i el seu tipus a les coordenades indicades.\nLa posició escollida ha destar a labast de la unitat.\nEls blocs que no són construccions tindran el tipus [accent]@solid[].
lenum.within = Comprova si la unitat està a prop duna posició. lenum.within = Comprova si la unitat està a prop duna posició.
lenum.boost = Inicia/Detén el vol. lenum.boost = Inicia/Detén el vol.
lenum.flushtext = Flush print buffer's content to marker, if applicable.\nIf fetch is set to true, tries to fetch properties from map locale bundle or game's bundle. lenum.flushtext = Passa el contingut de la cua dimpressió al marcador, si es pot.\nSi sestableix «fetch» a vertader, sintentarà carregar les propietats de la traducció del mapa o del joc.
lenum.texture = Texture name straight from game's texture atlas (using kebab-case naming style).\nIf printFlush is set to true, consumes text buffer content as text argument. lenum.texture = Nom de la textura directa de latles de textures del joc (amb lestil de noms kebab-case).\nSi «printFlush» sestableix a vertader, consumeix el contingut de la cua dimpressió com a argument de text.
lenum.texturesize = Size of texture in tiles. Zero value scales marker width to original texture's size. lenum.texturesize = Mida de la textura a les caselles. Un valor de zero indica que sha d'escalar lamplada del marcador a la mida original de la textura.
lenum.autoscale = Whether to scale marker corresponding to player's zoom level. lenum.autoscale = Indica si cal escalar el marcador segons el nivell de zoom del jugador.
lenum.posi = Indexed position, used for line and quad markers with index zero being the first position. lenum.posi = Posició indexada que es fa servir per a marcadors de línia i de rectangles on líndex zero és la primera posició.
lenum.uvi = Texture's position ranging from zero to one, used for quad markers. lenum.uvi = Posició de la textura que va de zero a u i que es fa servir per a marcadors de tipus rectangle.
lenum.colori = Indexed position, used for line and quad markers with index zero being the first color. lenum.colori = Posició indexada que es fa servir per a marcadors de línies i rectangles on líndex zero és el primer color.

View File

@@ -2283,6 +2283,8 @@ lst.getblock = Get tile data at any location.
lst.setblock = Set tile data at any location. lst.setblock = Set tile data at any location.
lst.spawnunit = Spawn unit at a location. lst.spawnunit = Spawn unit at a location.
lst.applystatus = Apply or clear a status effect from a uniut. lst.applystatus = Apply or clear a status effect from a uniut.
lst.weathersensor = Check if a type of weather is active.
lst.weatherset = Set the current state of a type of weather.
lst.spawnwave = Simulate a wave being spawned at a arbitrary location.\nWill not increment the wave counter. 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.explosion = Create an explosion at a location.
lst.setrate = Set processor execution speed in instructions/tick. lst.setrate = Set processor execution speed in instructions/tick.

View File

@@ -2264,6 +2264,8 @@ lst.getblock = Get tile data at any location.
lst.setblock = Set tile data at any location. lst.setblock = Set tile data at any location.
lst.spawnunit = Spawn unit at a location. lst.spawnunit = Spawn unit at a location.
lst.applystatus = Apply or clear a status effect from a uniut. lst.applystatus = Apply or clear a status effect from a uniut.
lst.weathersensor = Check if a type of weather is active.
lst.weatherset = Set the current state of a type of weather.
lst.spawnwave = Simulate a wave being spawned at a arbitrary location.\nWill not increment the wave counter. 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.explosion = Create an explosion at a location.
lst.setrate = Set processor execution speed in instructions/tick. lst.setrate = Set processor execution speed in instructions/tick.

View File

@@ -2313,6 +2313,8 @@ lst.getblock = Lese Tile-Daten von jedem Standort.
lst.setblock = Setze Tile-Daten an jedem Standort. lst.setblock = Setze Tile-Daten an jedem Standort.
lst.spawnunit = Einheit an einem Standort erstellen. lst.spawnunit = Einheit an einem Standort erstellen.
lst.applystatus = Füge einer Einheit einen Effekt hinzu oder entferne ihn. lst.applystatus = Füge einer Einheit einen Effekt hinzu oder entferne ihn.
lst.weathersensor = Check if a type of weather is active.
lst.weatherset = Set the current state of a type of weather.
lst.spawnwave = Schickt die nächste Welle. lst.spawnwave = Schickt die nächste Welle.
lst.explosion = Erstellt an einer beliebigen Stelle eine Explosion. lst.explosion = Erstellt an einer beliebigen Stelle eine Explosion.
lst.setrate = Setzt die Ausführungsgeschwindigkeit von Prozessoren in Anweisungen/tick. lst.setrate = Setzt die Ausführungsgeschwindigkeit von Prozessoren in Anweisungen/tick.

View File

@@ -2306,6 +2306,8 @@ lst.getblock = Obtiene los datos de un bloque en cualquier lugar.
lst.setblock = Cambia los datos de un bloque en cualquier lugar. lst.setblock = Cambia los datos de un bloque en cualquier lugar.
lst.spawnunit = Crea una unidad en una localización. lst.spawnunit = Crea una unidad en una localización.
lst.applystatus = Aplica o elimina un efecto de alteración de estado a una unidad. lst.applystatus = Aplica o elimina un efecto de alteración de estado a una unidad.
lst.weathersensor = Check if a type of weather is active.
lst.weatherset = Set the current state of a type of weather.
lst.spawnwave = Simula la aparición de una oleada de enemigos en una localización arbitraria.\nNo incrementará el contador de oleadas. lst.spawnwave = Simula la aparición de una oleada de enemigos en una localización arbitraria.\nNo incrementará el contador de oleadas.
lst.explosion = Crea una explosión en una localización. lst.explosion = Crea una explosión en una localización.
lst.setrate = Establece la velocidad de ejecución de los procesadores lógicos en formato instrucción/tick. lst.setrate = Establece la velocidad de ejecución de los procesadores lógicos en formato instrucción/tick.

View File

@@ -2266,6 +2266,8 @@ lst.getblock = Get tile data at any location.
lst.setblock = Set tile data at any location. lst.setblock = Set tile data at any location.
lst.spawnunit = Spawn unit at a location. lst.spawnunit = Spawn unit at a location.
lst.applystatus = Apply or clear a status effect from a uniut. lst.applystatus = Apply or clear a status effect from a uniut.
lst.weathersensor = Check if a type of weather is active.
lst.weatherset = Set the current state of a type of weather.
lst.spawnwave = Simulate a wave being spawned at a arbitrary location.\nWill not increment the wave counter. 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.explosion = Create an explosion at a location.
lst.setrate = Set processor execution speed in instructions/tick. lst.setrate = Set processor execution speed in instructions/tick.

View File

@@ -2268,6 +2268,8 @@ lst.getblock = Get tile data at any location.
lst.setblock = Set tile data at any location. lst.setblock = Set tile data at any location.
lst.spawnunit = Spawn unit at a location. lst.spawnunit = Spawn unit at a location.
lst.applystatus = Apply or clear a status effect from a uniut. lst.applystatus = Apply or clear a status effect from a uniut.
lst.weathersensor = Check if a type of weather is active.
lst.weatherset = Set the current state of a type of weather.
lst.spawnwave = Simulate a wave being spawned at a arbitrary location.\nWill not increment the wave counter. 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.explosion = Create an explosion at a location.
lst.setrate = Set processor execution speed in instructions/tick. lst.setrate = Set processor execution speed in instructions/tick.

View File

@@ -2269,6 +2269,8 @@ lst.getblock = Selvitä laattadata missä tahansa sijainnissa.
lst.setblock = Aseta laattadata missä tahansa sijainnissa. lst.setblock = Aseta laattadata missä tahansa sijainnissa.
lst.spawnunit = Luo joukko tietyssä sijainnissa. lst.spawnunit = Luo joukko tietyssä sijainnissa.
lst.applystatus = Lisää tai poista statusefekti yksiköltä. lst.applystatus = Lisää tai poista statusefekti yksiköltä.
lst.weathersensor = Check if a type of weather is active.
lst.weatherset = Set the current state of a type of weather.
lst.spawnwave = Simuloi tason syntymistä mielivaltaisessa sijainnissa.\nEi vaikuta tasolaskuriin. lst.spawnwave = Simuloi tason syntymistä mielivaltaisessa sijainnissa.\nEi vaikuta tasolaskuriin.
lst.explosion = Luo räjähdys tietyssä sijainnissa. lst.explosion = Luo räjähdys tietyssä sijainnissa.
lst.setrate = Aseta prosessorin suoritusnopeus ohjeessa/sekunti. lst.setrate = Aseta prosessorin suoritusnopeus ohjeessa/sekunti.

View File

@@ -2265,6 +2265,8 @@ lst.getblock = Get tile data at any location.
lst.setblock = Set tile data at any location. lst.setblock = Set tile data at any location.
lst.spawnunit = Spawn unit at a location. lst.spawnunit = Spawn unit at a location.
lst.applystatus = Apply or clear a status effect from a uniut. lst.applystatus = Apply or clear a status effect from a uniut.
lst.weathersensor = Check if a type of weather is active.
lst.weatherset = Set the current state of a type of weather.
lst.spawnwave = Simulate a wave being spawned at a arbitrary location.\nWill not increment the wave counter. 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.explosion = Create an explosion at a location.
lst.setrate = Set processor execution speed in instructions/tick. lst.setrate = Set processor execution speed in instructions/tick.

View File

@@ -2314,6 +2314,8 @@ lst.getblock = Obtient les données d'une tuile à n'importe quel emplacement.
lst.setblock = Définit les données d'une tuile à n'importe quel emplacement. lst.setblock = Définit les données d'une tuile à n'importe quel emplacement.
lst.spawnunit = Fait apparaître une unité à un emplacement. lst.spawnunit = Fait apparaître une unité à un emplacement.
lst.applystatus = Ajoute ou enlève un effet de statut d'une unité. lst.applystatus = Ajoute ou enlève un effet de statut d'une unité.
lst.weathersensor = Check if a type of weather is active.
lst.weatherset = Set the current state of a type of weather.
lst.spawnwave = Simule un déclenchement de vague à n'importe quel emplacement.\nCela n'incrémente pas le compteur de vaugues. lst.spawnwave = Simule un déclenchement de vague à n'importe quel emplacement.\nCela n'incrémente pas le compteur de vaugues.
lst.explosion = Crée une explosion à un emplacement. lst.explosion = Crée une explosion à un emplacement.
lst.setrate = Définit la vitesse d'exécution d'un processeur en instructions/tick. lst.setrate = Définit la vitesse d'exécution d'un processeur en instructions/tick.

File diff suppressed because it is too large Load Diff

View File

@@ -2304,6 +2304,8 @@ lst.getblock = Mendapatkan data petak di lokasi manapun.
lst.setblock = Menentukan data petak di lokasi manapun. lst.setblock = Menentukan data petak di lokasi manapun.
lst.spawnunit = Munculkan unit pada tempat yang ditentukan. lst.spawnunit = Munculkan unit pada tempat yang ditentukan.
lst.applystatus = Menerapkan atau menghapus status efek dari sebuah unit. lst.applystatus = Menerapkan atau menghapus status efek dari sebuah unit.
lst.weathersensor = Check if a type of weather is active.
lst.weatherset = Set the current state of a type of weather.
lst.spawnwave = Simulasikan adanya gelombang pada lokasi acak.\nTidak akan ditambahkan pada jumlah gelombang keseluruhan. lst.spawnwave = Simulasikan adanya gelombang pada lokasi acak.\nTidak akan ditambahkan pada jumlah gelombang keseluruhan.
lst.explosion = Membuat sebuah ledakan pada lokasi yang ditentukan. lst.explosion = Membuat sebuah ledakan pada lokasi yang ditentukan.
lst.setrate = Menentukan kecepatan eksekusi prosesor dalam instruksi per tick. lst.setrate = Menentukan kecepatan eksekusi prosesor dalam instruksi per tick.

View File

@@ -2278,6 +2278,8 @@ lst.getblock = Get tile data at any location.
lst.setblock = Set tile data at any location. lst.setblock = Set tile data at any location.
lst.spawnunit = Spawn unit at a location. lst.spawnunit = Spawn unit at a location.
lst.applystatus = Apply or clear a status effect from a uniut. lst.applystatus = Apply or clear a status effect from a uniut.
lst.weathersensor = Check if a type of weather is active.
lst.weatherset = Set the current state of a type of weather.
lst.spawnwave = Simulate a wave being spawned at a arbitrary location.\nWill not increment the wave counter. 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.explosion = Create an explosion at a location.
lst.setrate = Set processor execution speed in instructions/tick. lst.setrate = Set processor execution speed in instructions/tick.

View File

@@ -2282,6 +2282,8 @@ lst.getblock = 任意の座標のタイルの情報を取得します。
lst.setblock = 任意の座標のタイルの情報を変更します。 lst.setblock = 任意の座標のタイルの情報を変更します。
lst.spawnunit = 任意の座標にユニットをスポーンさせます。 lst.spawnunit = 任意の座標にユニットをスポーンさせます。
lst.applystatus = ユニットからステータス効果を適用または削除する。 lst.applystatus = ユニットからステータス効果を適用または削除する。
lst.weathersensor = Check if a type of weather is active.
lst.weatherset = Set the current state of a type of weather.
lst.spawnwave = 任意の座標で発生するウェーブをシミュレーションします。\nウェーブを進めません。 lst.spawnwave = 任意の座標で発生するウェーブをシミュレーションします。\nウェーブを進めません。
lst.explosion = ある場所で爆発を起こします。 lst.explosion = ある場所で爆発を起こします。
lst.setrate = プロセッサーの実行速度を1命令/tickで設定します。 lst.setrate = プロセッサーの実行速度を1命令/tickで設定します。

View File

@@ -2281,6 +2281,8 @@ lst.getblock = 특정 위치의 타일 정보를 불러옴
lst.setblock = 특정 위치의 타일 정보 설정 lst.setblock = 특정 위치의 타일 정보 설정
lst.spawnunit = 특정 위치에 기체 소환 lst.spawnunit = 특정 위치에 기체 소환
lst.applystatus = 기체에게 상태이상을 적용하거나 삭제 lst.applystatus = 기체에게 상태이상을 적용하거나 삭제
lst.weathersensor = Check if a type of weather is active.
lst.weatherset = Set the current state of a type of weather.
lst.spawnwave = 특정 위치에 이전 단계를 실행\n실제 단계가 넘어가지 않습니다 lst.spawnwave = 특정 위치에 이전 단계를 실행\n실제 단계가 넘어가지 않습니다
lst.explosion = 특정 위치에 폭발 생성 lst.explosion = 특정 위치에 폭발 생성
lst.setrate = 프로세서 실행 속도를 틱당 연산량으로 설정 lst.setrate = 프로세서 실행 속도를 틱당 연산량으로 설정

View File

@@ -2266,6 +2266,8 @@ lst.getblock = Get tile data at any location.
lst.setblock = Set tile data at any location. lst.setblock = Set tile data at any location.
lst.spawnunit = Spawn unit at a location. lst.spawnunit = Spawn unit at a location.
lst.applystatus = Apply or clear a status effect from a uniut. lst.applystatus = Apply or clear a status effect from a uniut.
lst.weathersensor = Check if a type of weather is active.
lst.weatherset = Set the current state of a type of weather.
lst.spawnwave = Simulate a wave being spawned at a arbitrary location.\nWill not increment the wave counter. 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.explosion = Create an explosion at a location.
lst.setrate = Set processor execution speed in instructions/tick. lst.setrate = Set processor execution speed in instructions/tick.

View File

@@ -2279,6 +2279,8 @@ lst.getblock = Get tile data at any location.
lst.setblock = Set tile data at any location. lst.setblock = Set tile data at any location.
lst.spawnunit = Spawn unit at a location. lst.spawnunit = Spawn unit at a location.
lst.applystatus = Apply or clear a status effect from a uniut. lst.applystatus = Apply or clear a status effect from a uniut.
lst.weathersensor = Check if a type of weather is active.
lst.weatherset = Set the current state of a type of weather.
lst.spawnwave = Simulate a wave being spawned at a arbitrary location.\nWill not increment the wave counter. 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.explosion = Create an explosion at a location.
lst.setrate = Set processor execution speed in instructions/tick. lst.setrate = Set processor execution speed in instructions/tick.

View File

@@ -2266,6 +2266,8 @@ lst.getblock = Get tile data at any location.
lst.setblock = Set tile data at any location. lst.setblock = Set tile data at any location.
lst.spawnunit = Spawn unit at a location. lst.spawnunit = Spawn unit at a location.
lst.applystatus = Apply or clear a status effect from a uniut. lst.applystatus = Apply or clear a status effect from a uniut.
lst.weathersensor = Check if a type of weather is active.
lst.weatherset = Set the current state of a type of weather.
lst.spawnwave = Simulate a wave being spawned at a arbitrary location.\nWill not increment the wave counter. 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.explosion = Create an explosion at a location.
lst.setrate = Set processor execution speed in instructions/tick. lst.setrate = Set processor execution speed in instructions/tick.

View File

@@ -2300,6 +2300,8 @@ lst.getblock = Uzyskaj dane dla dowolnej lokalizacji.
lst.setblock = Ustaw dane dla dowolnej lokalizacji. lst.setblock = Ustaw dane dla dowolnej lokalizacji.
lst.spawnunit = Odródź jednostkę w lokalizacji. lst.spawnunit = Odródź jednostkę w lokalizacji.
lst.applystatus = Zastosuj lub wyczyść efekty statusu jednostki. lst.applystatus = Zastosuj lub wyczyść efekty statusu jednostki.
lst.weathersensor = Check if a type of weather is active.
lst.weatherset = Set the current state of a type of weather.
lst.spawnwave = Symuluj falę odradzającą się w dowolnym miejscu.\nNie zwiększy licznika fali. lst.spawnwave = Symuluj falę odradzającą się w dowolnym miejscu.\nNie zwiększy licznika fali.
lst.explosion = Stwórz eksplozję w lokalizacji. lst.explosion = Stwórz eksplozję w lokalizacji.
lst.setrate = Ustaw szybkość wykonywania procesora w instrukcjach/tick. lst.setrate = Ustaw szybkość wykonywania procesora w instrukcjach/tick.

View File

@@ -2299,6 +2299,8 @@ lst.getblock = Obtenha dados de blocos em qualquer local.
lst.setblock = Defina os dados do bloco em qualquer local. lst.setblock = Defina os dados do bloco em qualquer local.
lst.spawnunit = Gere uma unidade em um local. lst.spawnunit = Gere uma unidade em um local.
lst.applystatus = Aplique ou elimine um efeito de status de uma unidade. lst.applystatus = Aplique ou elimine um efeito de status de uma unidade.
lst.weathersensor = Check if a type of weather is active.
lst.weatherset = Set the current state of a type of weather.
lst.spawnwave = Gerar uma onda. lst.spawnwave = Gerar uma onda.
lst.explosion = Crie uma explosão em um local. lst.explosion = Crie uma explosão em um local.
lst.setrate = Defina a velocidade de execução do processador em instruções/tick. lst.setrate = Defina a velocidade de execução do processador em instruções/tick.

View File

@@ -2266,6 +2266,8 @@ lst.getblock = Get tile data at any location.
lst.setblock = Set tile data at any location. lst.setblock = Set tile data at any location.
lst.spawnunit = Spawn unit at a location. lst.spawnunit = Spawn unit at a location.
lst.applystatus = Apply or clear a status effect from a uniut. lst.applystatus = Apply or clear a status effect from a uniut.
lst.weathersensor = Check if a type of weather is active.
lst.weatherset = Set the current state of a type of weather.
lst.spawnwave = Simulate a wave being spawned at a arbitrary location.\nWill not increment the wave counter. 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.explosion = Create an explosion at a location.
lst.setrate = Set processor execution speed in instructions/tick. lst.setrate = Set processor execution speed in instructions/tick.

View File

@@ -2283,6 +2283,8 @@ lst.getblock = Get tile data at any location.
lst.setblock = Set tile data at any location. lst.setblock = Set tile data at any location.
lst.spawnunit = Spawn unit at a location. lst.spawnunit = Spawn unit at a location.
lst.applystatus = Apply or clear a status effect from a uniut. lst.applystatus = Apply or clear a status effect from a uniut.
lst.weathersensor = Check if a type of weather is active.
lst.weatherset = Set the current state of a type of weather.
lst.spawnwave = Simulate a wave being spawned at a arbitrary location.\nWill not increment the wave counter. 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.explosion = Create an explosion at a location.
lst.setrate = Set processor execution speed in instructions/tick. lst.setrate = Set processor execution speed in instructions/tick.

View File

@@ -2285,6 +2285,8 @@ lst.getblock = Получает данные о плитке в любом ме
lst.setblock = Устанавливает плитку в любом месте. lst.setblock = Устанавливает плитку в любом месте.
lst.spawnunit = Создает боевую единицу на локации. lst.spawnunit = Создает боевую единицу на локации.
lst.applystatus = Применяет или снимает эффект статуса с боевой единицы. lst.applystatus = Применяет или снимает эффект статуса с боевой единицы.
lst.weathersensor = Check if a type of weather is active.
lst.weatherset = Set the current state of a type of weather.
lst.spawnwave = Имитация волны, создаваемой в произвольном месте.\nСчетчик волн не увеличивается. lst.spawnwave = Имитация волны, создаваемой в произвольном месте.\nСчетчик волн не увеличивается.
lst.explosion = Создает взрыв на локации. lst.explosion = Создает взрыв на локации.
lst.setrate = Устанавливает скорость выполнения процессора в инструкциях/тиках. lst.setrate = Устанавливает скорость выполнения процессора в инструкциях/тиках.

View File

@@ -2286,6 +2286,8 @@ lst.getblock = Get tile data at any location.
lst.setblock = Set tile data at any location. lst.setblock = Set tile data at any location.
lst.spawnunit = Prizovi jedinicu na mestu. lst.spawnunit = Prizovi jedinicu na mestu.
lst.applystatus = Dodaj ili ukloni statusni efekat na jedinicu/e. lst.applystatus = Dodaj ili ukloni statusni efekat na jedinicu/e.
lst.weathersensor = Check if a type of weather is active.
lst.weatherset = Set the current state of a type of weather.
lst.spawnwave = Simulate a wave being spawned at a arbitrary location.\nWill not increment the wave counter. lst.spawnwave = Simulate a wave being spawned at a arbitrary location.\nWill not increment the wave counter.
lst.explosion = Izazovi eksploziju na mestu. lst.explosion = Izazovi eksploziju na mestu.
lst.setrate = Set processor execution speed in instructions/tick. lst.setrate = Set processor execution speed in instructions/tick.

View File

@@ -2266,6 +2266,8 @@ lst.getblock = Get tile data at any location.
lst.setblock = Set tile data at any location. lst.setblock = Set tile data at any location.
lst.spawnunit = Spawn unit at a location. lst.spawnunit = Spawn unit at a location.
lst.applystatus = Apply or clear a status effect from a uniut. lst.applystatus = Apply or clear a status effect from a uniut.
lst.weathersensor = Check if a type of weather is active.
lst.weatherset = Set the current state of a type of weather.
lst.spawnwave = Simulate a wave being spawned at a arbitrary location.\nWill not increment the wave counter. 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.explosion = Create an explosion at a location.
lst.setrate = Set processor execution speed in instructions/tick. lst.setrate = Set processor execution speed in instructions/tick.

View File

@@ -2303,6 +2303,8 @@ lst.getblock = รับข้อมูลของช่องที่ตำ
lst.setblock = ปรับแต่งข้อมูลของช่องที่ตำแหน่งใดๆ lst.setblock = ปรับแต่งข้อมูลของช่องที่ตำแหน่งใดๆ
lst.spawnunit = เสกยูนิตมาที่ตำแหน่งที่กำหนดไว้ lst.spawnunit = เสกยูนิตมาที่ตำแหน่งที่กำหนดไว้
lst.applystatus = ใส่หรือล้างเอฟเฟกต์สถานะจากยูนิต lst.applystatus = ใส่หรือล้างเอฟเฟกต์สถานะจากยูนิต
lst.weathersensor = Check if a type of weather is active.
lst.weatherset = Set the current state of a type of weather.
lst.spawnwave = จำลองคลื่นที่ตำแหน่งใดๆ lst.spawnwave = จำลองคลื่นที่ตำแหน่งใดๆ
lst.explosion = เสกระเบิดที่ตำแหน่ง lst.explosion = เสกระเบิดที่ตำแหน่ง
lst.setrate = ตั้งค่าความเร็วการสั่งเป็นคำสั่งใน คำสั่ง/ติก lst.setrate = ตั้งค่าความเร็วการสั่งเป็นคำสั่งใน คำสั่ง/ติก

View File

@@ -2266,6 +2266,8 @@ lst.getblock = Get tile data at any location.
lst.setblock = Set tile data at any location. lst.setblock = Set tile data at any location.
lst.spawnunit = Spawn unit at a location. lst.spawnunit = Spawn unit at a location.
lst.applystatus = Apply or clear a status effect from a uniut. lst.applystatus = Apply or clear a status effect from a uniut.
lst.weathersensor = Check if a type of weather is active.
lst.weatherset = Set the current state of a type of weather.
lst.spawnwave = Simulate a wave being spawned at a arbitrary location.\nWill not increment the wave counter. 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.explosion = Create an explosion at a location.
lst.setrate = Set processor execution speed in instructions/tick. lst.setrate = Set processor execution speed in instructions/tick.

View File

@@ -2283,6 +2283,8 @@ lst.getblock = Herhangi bir yerdeki blok bilgisini al.
lst.setblock = Herhangi bir yerdeki blok bilgisini değiştir. lst.setblock = Herhangi bir yerdeki blok bilgisini değiştir.
lst.spawnunit = Herhangi bir yerde birim var et. lst.spawnunit = Herhangi bir yerde birim var et.
lst.applystatus = Bir Birime Durum Etkisi ekle. lst.applystatus = Bir Birime Durum Etkisi ekle.
lst.weathersensor = Check if a type of weather is active.
lst.weatherset = Set the current state of a type of weather.
lst.spawnwave = Bellir bir noktada dalga başlat.\nDalga Zamanlayıcı Oluşturmaz! lst.spawnwave = Bellir bir noktada dalga başlat.\nDalga Zamanlayıcı Oluşturmaz!
lst.explosion = Bir Noktada Patlama oluştur. lst.explosion = Bir Noktada Patlama oluştur.
lst.setrate = İşlemci Hızını Ayarla (işlem/tick) lst.setrate = İşlemci Hızını Ayarla (işlem/tick)

View File

@@ -2310,6 +2310,8 @@ lst.getblock = Отримує дані плитки в будь-якому мі
lst.setblock = Установлює дані плитки в будь-якому місці. lst.setblock = Установлює дані плитки в будь-якому місці.
lst.spawnunit = Породжує одиницю на певному місці. lst.spawnunit = Породжує одиницю на певному місці.
lst.applystatus = Застосовує або видаляє ефект стану з одиниці. lst.applystatus = Застосовує або видаляє ефект стану з одиниці.
lst.weathersensor = Check if a type of weather is active.
lst.weatherset = Set the current state of a type of weather.
lst.spawnwave = Змодельовує хвилю, що виникає у довільному місці.\nНе збільшує лічильник хвиль. lst.spawnwave = Змодельовує хвилю, що виникає у довільному місці.\nНе збільшує лічильник хвиль.
lst.explosion = Створює вибух у певному місці. lst.explosion = Створює вибух у певному місці.
lst.setrate = Установлює швидкість виконання процесора в інструкціях за такт. lst.setrate = Установлює швидкість виконання процесора в інструкціях за такт.

View File

@@ -2284,6 +2284,8 @@ lst.getblock = Lấy dữ liệu từ ô từ vị trí bất kì.
lst.setblock = Chỉnh sửa dữ liệu từ ô từ vị trí bất kì. lst.setblock = Chỉnh sửa dữ liệu từ ô từ vị trí bất kì.
lst.spawnunit = Tạo ra quân từ vị trí. lst.spawnunit = Tạo ra quân từ vị trí.
lst.applystatus = Áp dụng hoặc loại bỏ một hiệu ứng trạng thái cho một đơn vị. lst.applystatus = Áp dụng hoặc loại bỏ một hiệu ứng trạng thái cho một đơn vị.
lst.weathersensor = Check if a type of weather is active.
lst.weatherset = Set the current state of a type of weather.
lst.spawnwave = Mô phỏng một lượt xuất hiện ở vị trí tùy ý.\nSẽ không tăng số đếm lượt. lst.spawnwave = Mô phỏng một lượt xuất hiện ở vị trí tùy ý.\nSẽ không tăng số đếm lượt.
lst.explosion = Tạo ra một vụ nổ tại vị trí đó. lst.explosion = Tạo ra một vụ nổ tại vị trí đó.
lst.setrate = Đặt tốc độ thực thi khối xử lý theo chỉ thị/tíc-tắc. lst.setrate = Đặt tốc độ thực thi khối xử lý theo chỉ thị/tíc-tắc.

View File

@@ -2309,6 +2309,8 @@ lst.getblock = 获取任意位置的地块数据
lst.setblock = 设置任意位置的地块数据 lst.setblock = 设置任意位置的地块数据
lst.spawnunit = 在指定位置生成单位 lst.spawnunit = 在指定位置生成单位
lst.applystatus = 添加或清除单位的一个状态效果 lst.applystatus = 添加或清除单位的一个状态效果
lst.weathersensor = Check if a type of weather is active.
lst.weatherset = Set the current state of a type of weather.
lst.spawnwave = 在任意位置生成一波敌人\n并不记录在波数计数器中 lst.spawnwave = 在任意位置生成一波敌人\n并不记录在波数计数器中
lst.explosion = 在某个位置生成爆炸 lst.explosion = 在某个位置生成爆炸
lst.setrate = 在指令/时间刻的时间下设置处理器处理速度 lst.setrate = 在指令/时间刻的时间下设置处理器处理速度

View File

@@ -2295,6 +2295,8 @@ lst.getblock = 由位置取方塊數據
lst.setblock = 由位置設置方塊數據 lst.setblock = 由位置設置方塊數據
lst.spawnunit = 在某一位置生成單位 lst.spawnunit = 在某一位置生成單位
lst.applystatus = 爲單位添加或移除狀態效果 lst.applystatus = 爲單位添加或移除狀態效果
lst.weathersensor = Check if a type of weather is active.
lst.weatherset = Set the current state of a type of weather.
lst.spawnwave = 在某一位置生成一波敵人\n不計入波數 lst.spawnwave = 在某一位置生成一波敵人\n不計入波數
lst.explosion = 在某一位置製造爆炸 lst.explosion = 在某一位置製造爆炸
lst.setrate = 以指令/每時刻設置處理器速度 lst.setrate = 以指令/每時刻設置處理器速度

View File

@@ -17,7 +17,7 @@ public class Weathers{
suspendParticles; suspendParticles;
public static void load(){ public static void load(){
snow = new ParticleWeather("snow"){{ snow = new ParticleWeather("snowing"){{
particleRegion = "particle"; particleRegion = "particle";
sizeMax = 13f; sizeMax = 13f;
sizeMin = 2.6f; sizeMin = 2.6f;

View File

@@ -314,6 +314,14 @@ public class ContentLoader{
return getByName(ContentType.planet, name); return getByName(ContentType.planet, name);
} }
public Seq<Weather> weathers(){
return getBy(ContentType.weather);
}
public Weather weather(String name){
return getByName(ContentType.weather, name);
}
public Seq<UnitStance> unitStances(){ public Seq<UnitStance> unitStances(){
return getBy(ContentType.unitStance); return getBy(ContentType.unitStance);
} }

View File

@@ -125,6 +125,10 @@ public class GlobalVars{
put("@" + type.name, type); put("@" + type.name, type);
} }
for(Weather weather : Vars.content.weathers()){
put("@" + weather.name, weather);
}
//store sensor constants //store sensor constants
for(LAccess sensor : LAccess.all){ for(LAccess sensor : LAccess.all){
put("@" + sensor.name(), sensor); put("@" + sensor.name(), sensor);

View File

@@ -13,8 +13,8 @@ import mindustry.content.*;
import mindustry.core.*; import mindustry.core.*;
import mindustry.ctype.*; import mindustry.ctype.*;
import mindustry.entities.*; import mindustry.entities.*;
import mindustry.game.*;
import mindustry.game.EventType.*; import mindustry.game.EventType.*;
import mindustry.game.*;
import mindustry.game.MapObjectives.*; import mindustry.game.MapObjectives.*;
import mindustry.game.Teams.*; import mindustry.game.Teams.*;
import mindustry.gen.*; import mindustry.gen.*;
@@ -1511,6 +1511,47 @@ public class LExecutor{
} }
} }
public static class SenseWeatherI implements LInstruction{
public int type, to;
public SenseWeatherI(int type, int to){
this.type = type;
this.to = to;
}
@Override
public void run(LExecutor exec){
exec.setbool(to, exec.obj(type) instanceof Weather weather && weather.isActive());
}
}
public static class SetWeatherI implements LInstruction{
public int type, state;
public SetWeatherI(int type, int state){
this.type = type;
this.state = state;
}
@Override
public void run(LExecutor exec){
if(exec.obj(type) instanceof Weather weather){
if(exec.bool(state)){
if(!weather.isActive()){ //Create is not already active
Tmp.v1.setToRandomDirection();
Call.createWeather(weather, 1f, WeatherState.fadeTime, Tmp.v1.x, Tmp.v1.y);
}else{
weather.instance().life(WeatherState.fadeTime);
}
}else{
if(weather.isActive() && weather.instance().life > WeatherState.fadeTime){
weather.instance().life(WeatherState.fadeTime);
}
}
}
}
}
public static class ApplyEffectI implements LInstruction{ public static class ApplyEffectI implements LInstruction{
public boolean clear; public boolean clear;
public String effect; public String effect;

View File

@@ -16,7 +16,7 @@ import mindustry.logic.LCanvas.*;
import mindustry.logic.LExecutor.*; import mindustry.logic.LExecutor.*;
import mindustry.ui.*; import mindustry.ui.*;
import static mindustry.Vars.ui; import static mindustry.Vars.*;
import static mindustry.logic.LCanvas.*; import static mindustry.logic.LCanvas.*;
/** /**

View File

@@ -1380,6 +1380,115 @@ public class LStatements{
} }
} }
@RegisterStatement("weathersensor")
public static class WeatherSenseStatement extends LStatement{
public String to = "result";
public String weather = "@rain";
private transient TextField tfield;
@Override
public void build(Table table){
field(table, to, str -> to = str);
table.add(" = weather ");
row(table);
tfield = field(table, weather, str -> weather = str).padRight(0f).get();
table.button(b -> {
b.image(Icon.pencilSmall);
b.clicked(() -> showSelectTable(b, (t, hide) -> {
t.row();
t.table(i -> {
i.left();
int c = 0;
for(Weather w : Vars.content.weathers()){
i.button(w.name, Styles.flatt, () -> {
weather = "@" + w.name;
tfield.setText(weather);
hide.run();
}).height(40f).uniformX().wrapLabel(false).growX();
if(++c % 2 == 0) i.row();
}
}).left();
}));
}, Styles.logict, () -> {}).size(40f).padLeft(-1).color(table.color);
}
@Override
public boolean privileged(){
return true;
}
@Override
public LInstruction build(LAssembler builder){
return new SenseWeatherI(builder.var(weather), builder.var(to));
}
@Override
public LCategory category(){
return LCategory.world;
}
}
@RegisterStatement("weatherset")
public static class WeatherSetStatement extends LStatement{
public String weather = "@rain", state = "true";
private transient TextField tfield;
@Override
public void build(Table table){
table.add(" set weather ");
tfield = field(table, weather, str -> weather = str).padRight(0f).get();
table.button(b -> {
b.image(Icon.pencilSmall);
b.clicked(() -> showSelectTable(b, (t, hide) -> {
t.row();
t.table(i -> {
i.left();
int c = 0;
for(Weather w : Vars.content.weathers()){
i.button(w.name, Styles.flatt, () -> {
weather = "@" + w.name;
tfield.setText(weather);
hide.run();
}).height(40f).uniformX().wrapLabel(false).growX();
if(++c % 2 == 0) i.row();
}
}).left();
}));
}, Styles.logict, () -> {}).size(40f).padLeft(-1).color(table.color);
table.add(" state ");
fields(table, state, str -> state = str);
}
@Override
public boolean privileged(){
return true;
}
@Override
public LInstruction build(LAssembler builder){
return new SetWeatherI(builder.var(weather), builder.var(state));
}
@Override
public LCategory category(){
return LCategory.world;
}
}
@RegisterStatement("spawnwave") @RegisterStatement("spawnwave")
public static class SpawnWaveStatement extends LStatement{ public static class SpawnWaveStatement extends LStatement{
public String x = "10", y = "10", natural = "false"; public String x = "10", y = "10", natural = "false";

View File

@@ -218,7 +218,10 @@ public class Mods implements Loadable{
} }
//this returns a *runnable* which actually packs the resulting pixmap; this has to be done synchronously outside the method //this returns a *runnable* which actually packs the resulting pixmap; this has to be done synchronously outside the method
return () -> { return () -> {
String fullName = (prefix ? mod.name + "-" : "") + baseName; //don't prefix with mod name if it's already prefixed by a category, e.g. `block-modname-content-full`.
int hyphen = baseName.indexOf('-');
String fullName = ((prefix && !(hyphen != -1 && baseName.substring(hyphen + 1).startsWith(mod.name + "-"))) ? mod.name + "-" : "") + baseName;
packer.add(getPage(file), fullName, new PixmapRegion(pix)); packer.add(getPage(file), fullName, new PixmapRegion(pix));
if(textureScale != 1.0f){ if(textureScale != 1.0f){
textureResize.put(fullName, textureScale); textureResize.put(fullName, textureScale);

View File

@@ -314,7 +314,7 @@ public class Weather extends UnlockableContent{
@EntityDef(value = {WeatherStatec.class}, pooled = true, isFinal = false) @EntityDef(value = {WeatherStatec.class}, pooled = true, isFinal = false)
@Component(base = true) @Component(base = true)
abstract static class WeatherStateComp implements Drawc, Syncc{ abstract static class WeatherStateComp implements Drawc, Syncc{
private static final float fadeTime = 60 * 4; public static final float fadeTime = 60 * 4;
Weather weather; Weather weather;
float intensity = 1f, opacity = 0f, life, effectTimer; float intensity = 1f, opacity = 0f, life, effectTimer;

View File

@@ -1,4 +1,8 @@
[ [
{
"name": "gods field",
"address": ["n2.akiracloud.net:10225"]
},
{ {
"name": "STP", "name": "STP",
"address": ["23.88.73.88:25617"] "address": ["23.88.73.88:25617"]
@@ -94,7 +98,7 @@
}, },
{ {
"name": "Chaotic Neutral", "name": "Chaotic Neutral",
"address": ["c-n.ddns.net:7012", "c-n.ddns.net:7013", "c-n.ddns.net:7014", "c-n.ddns.net:7015", "c-n.ddns.net:7016", "c-n.ddns.net:7017", "c-n.ddns.net:7003", "37.187.73.180:7021"] "address": ["37.187.73.180:7011", "37.187.73.180:7012", "37.187.73.180:7013", "37.187.73.180:7014", "37.187.73.180:7015", "37.187.73.180:7016", "37.187.73.180:7017"]
}, },
{ {
"name": "io", "name": "io",
@@ -108,10 +112,6 @@
"name": "Phoenix Network", "name": "Phoenix Network",
"address": ["phoenix-network.dev", "phoenix-network.dev:6464", "phoenix-network.dev:2023"] "address": ["phoenix-network.dev", "phoenix-network.dev:6464", "phoenix-network.dev:2023"]
}, },
{
"name": "Xpdustry",
"address": ["37.187.73.180", "37.187.73.180:7000", "37.187.73.180:7001", "37.187.73.180:7002", "37.187.73.180:7003", "37.187.73.180:7004", "37.187.73.180:7005"]
},
{ {
"name": "LatamDustry", "name": "LatamDustry",
"address": ["45.158.9.23:5532", "45.158.9.23:5422", "45.158.9.23:5463", "45.158.9.23:5520"] "address": ["45.158.9.23:5532", "45.158.9.23:5422", "45.158.9.23:5463", "45.158.9.23:5520"]
@@ -126,7 +126,7 @@
}, },
{ {
"name": "Fish", "name": "Fish",
"address": ["162.248.101.95", "162.248.100.98", "162.248.100.133", "162.248.102.204", "c-n.ddns.net:7003"] "address": ["162.248.101.95", "162.248.100.98", "162.248.100.133", "162.248.102.204", "37.187.73.180:7012"]
}, },
{ {
"name": "OmniCorp Classic", "name": "OmniCorp Classic",
@@ -288,5 +288,9 @@
{ {
"name": "Sever.VN", "name": "Sever.VN",
"address": ["srv24.godlike.club:26189"] "address": ["srv24.godlike.club:26189"]
},
{
"name": "NPTS",
"address": ["81.94.159.242"]
} }
] ]