From aa645fe67c886538373bff21486e213de72787a6 Mon Sep 17 00:00:00 2001
From: Anuken <arnukren@gmail.com>
Date: Sat, 6 Jul 2024 14:57:49 -0400
Subject: [PATCH 01/15] Updated Gradle and AGP to 8

---
 android/build.gradle                               | 13 ++++++++-----
 android/proguard-rules.pro                         |  5 +++--
 android/src/mindustry/android/AndroidLauncher.java |  2 ++
 gradle.properties                                  |  1 +
 gradle/wrapper/gradle-wrapper.properties           |  2 +-
 5 files changed, 15 insertions(+), 8 deletions(-)

diff --git a/android/build.gradle b/android/build.gradle
index f7f1ce377b..e73cace96d 100644
--- a/android/build.gradle
+++ b/android/build.gradle
@@ -7,7 +7,7 @@ buildscript{
     }
 
     dependencies{
-        classpath 'com.android.tools.build:gradle:7.2.1'
+        classpath 'com.android.tools.build:gradle:8.5.0'
     }
 }
 
@@ -29,8 +29,9 @@ task deploy(type: Copy){
 }
 
 android{
-    buildToolsVersion '33.0.2'
-    compileSdkVersion 33
+    namespace = "io.anuke.mindustry"
+    buildToolsVersion = '34.0.0'
+    compileSdk = 34
     sourceSets{
         main{
             manifest.srcFile 'AndroidManifest.xml'
@@ -56,7 +57,7 @@ android{
 
         applicationId "io.anuke.mindustry"
         minSdkVersion 14
-        targetSdkVersion 33
+        targetSdkVersion 34
         
         versionName versionNameResult
         versionCode = vcode
@@ -65,6 +66,8 @@ android{
             props['androidBuildCode'] = (vcode + 1).toString()
         }
         props.store(file('../core/assets/version.properties').newWriter(), null)
+
+        multiDexEnabled true
     }
 
     compileOptions{
@@ -72,7 +75,7 @@ android{
         targetCompatibility JavaVersion.VERSION_1_8
     }
 
-    flavorDimensions "google"
+    flavorDimensions = ["google"]
 
     signingConfigs{
         release{
diff --git a/android/proguard-rules.pro b/android/proguard-rules.pro
index 368b7f4e1e..ebda968ae6 100644
--- a/android/proguard-rules.pro
+++ b/android/proguard-rules.pro
@@ -1,11 +1,12 @@
 -dontobfuscate
 
-#these are essential packages that should not be "optimized" in any way
-#the main purpose of d8 here is to shrink the absurdly-large google play games libraries
 -keep class mindustry.** { *; }
 -keep class arc.** { *; }
 -keep class net.jpountz.** { *; }
 -keep class rhino.** { *; }
 -keep class com.android.dex.** { *; }
+-keepattributes Signature,*Annotation*,InnerClasses,EnclosingMethod
+
+-dontwarn javax.naming.**
 
 #-printusage out.txt
\ No newline at end of file
diff --git a/android/src/mindustry/android/AndroidLauncher.java b/android/src/mindustry/android/AndroidLauncher.java
index fdb8a4ec56..c8175aa4f0 100644
--- a/android/src/mindustry/android/AndroidLauncher.java
+++ b/android/src/mindustry/android/AndroidLauncher.java
@@ -72,6 +72,8 @@ public class AndroidLauncher extends AndroidApplication{
 
             @Override
             public ClassLoader loadJar(Fi jar, ClassLoader parent) throws Exception{
+                //Required to load jar files in Android 14: https://developer.android.com/about/versions/14/behavior-changes-14#safer-dynamic-code-loading
+                jar.file().setReadOnly();
                 return new DexClassLoader(jar.file().getPath(), getFilesDir().getPath(), null, parent){
                     @Override
                     protected Class<?> loadClass(String name, boolean resolve) throws ClassNotFoundException{
diff --git a/gradle.properties b/gradle.properties
index a72d1e7346..a87b03065c 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -25,4 +25,5 @@ org.gradle.caching=true
 #used for slow jitpack builds; TODO see if this actually works
 org.gradle.internal.http.socketTimeout=100000
 org.gradle.internal.http.connectionTimeout=100000
+android.enableR8.fullMode=false
 archash=b857594d11
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 3994438e22..0d1842103b 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.6.4-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.8-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

From 4c93a7fad48b188e6fbf4b9d9d7f0c35a41fbbfa Mon Sep 17 00:00:00 2001
From: Anuken <arnukren@gmail.com>
Date: Sat, 6 Jul 2024 17:14:10 -0400
Subject: [PATCH 02/15] Removed package in manifest

---
 android/AndroidManifest.xml | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/android/AndroidManifest.xml b/android/AndroidManifest.xml
index 8cae20eee7..25602c4ab4 100644
--- a/android/AndroidManifest.xml
+++ b/android/AndroidManifest.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-          package="io.anuke.mindustry">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
 
     <uses-feature android:glEsVersion="0x00020000" android:required="true"/>
     <uses-feature android:name="android.hardware.type.pc" android:required="false" />

From 2b5e3ec4aafcbff0614a5136de0e5c8d47c148a8 Mon Sep 17 00:00:00 2001
From: Anuken <arnukren@gmail.com>
Date: Sun, 7 Jul 2024 11:18:13 -0400
Subject: [PATCH 03/15] Fixed #9974

---
 .../src/mindustry/world/blocks/distribution/StackConveyor.java | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/core/src/mindustry/world/blocks/distribution/StackConveyor.java b/core/src/mindustry/world/blocks/distribution/StackConveyor.java
index 357c3f8705..334261712e 100644
--- a/core/src/mindustry/world/blocks/distribution/StackConveyor.java
+++ b/core/src/mindustry/world/blocks/distribution/StackConveyor.java
@@ -259,7 +259,8 @@ public class StackConveyor extends Block implements Autotiler{
 
         @Override
         public void updateTile(){
-            float eff = enabled ? (efficiency + baseEfficiency) : 0f;
+            //the item still needs to be "reeled" in when disabled
+            float eff = enabled ? (efficiency + baseEfficiency) : 1f;
 
             //reel in crater
             if(cooldown > 0f) cooldown = Mathf.clamp(cooldown - speed * eff * delta(), 0f, recharge);

From 9772c6e95700da1e66447a2ad9f4826c53400c5d Mon Sep 17 00:00:00 2001
From: StalkerBaran <120944331+StalkerBaran@users.noreply.github.com>
Date: Sun, 7 Jul 2024 22:22:11 +0700
Subject: [PATCH 04/15] Update servers_v7.json (#9975)

Add a new ~~very sus hex-like~~ server (MeowIsland)
---
 servers_v7.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/servers_v7.json b/servers_v7.json
index 3f5e3c4cf1..315995bcec 100644
--- a/servers_v7.json
+++ b/servers_v7.json
@@ -238,7 +238,7 @@
   },
   {
     "name": "MeowIsland",
-    "address": ["jupiter.minerent.net:25651", "nexus.minerent.net:25596", "nexus.minerent.net:25598", "pandora.minerent.net:25620"]
+    "address": ["jupiter.minerent.net:25651", "nexus.minerent.net:25596", "nexus.minerent.net:25598", "pandora.minerent.net:25620", "vega.minerent.net:25635"]
   },
   {
     "name": "3MIDustry",

From e06803601d87517a870bd628871c313627858bf7 Mon Sep 17 00:00:00 2001
From: SITUVNgcd <44901211+SITUVNgcd@users.noreply.github.com>
Date: Sun, 7 Jul 2024 22:23:04 +0700
Subject: [PATCH 05/15] Add VNM Community server (#9980)

---
 servers_v7.json | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/servers_v7.json b/servers_v7.json
index 315995bcec..2127985e3f 100644
--- a/servers_v7.json
+++ b/servers_v7.json
@@ -319,5 +319,9 @@
   {
     "name": "Vndustry",
     "address": ["vndustry.ddns.net"]
+  },
+  {
+    "name": "VNM",
+    "address": ["server.mindustry-tool.app"]
   }
 ]

From ae268e7b2c83edc5f4db15ea4b9fc0fe8a455f77 Mon Sep 17 00:00:00 2001
From: 3MIDEV <112279985+3midev@users.noreply.github.com>
Date: Sun, 7 Jul 2024 16:23:25 +0100
Subject: [PATCH 06/15] Update servers_v7.json (#10004)

---
 servers_v7.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/servers_v7.json b/servers_v7.json
index 2127985e3f..550ad4cfd0 100644
--- a/servers_v7.json
+++ b/servers_v7.json
@@ -241,8 +241,8 @@
     "address": ["jupiter.minerent.net:25651", "nexus.minerent.net:25596", "nexus.minerent.net:25598", "pandora.minerent.net:25620", "vega.minerent.net:25635"]
   },
   {
-    "name": "3MIDustry",
-    "address": ["play.3midustry.octane.lol:6001", "play.3midustry.octane.lol:6002", "play.3midustry.octane.lol:6003", "play.3midustry.octane.lol:6004", "play.3midustry.octane.lol:6005", "play.3midustry.octane.lol:6006", "play.3midustry.octane.lol:6007", "play.3midustry.octane.lol:6008", "play.3midustry.octane.lol:6009", "play.3midustry.octane.lol:6010"]
+    "name": "Exdustry",
+    "address": ["uk1.noxia.cloud:6001", "uk1.noxia.cloud:6002", "uk1.noxia.cloud:6003", "uk1.noxia.cloud:6004", "uk1.noxia.cloud:6005", "uk1.noxia.cloud:6006", "uk1.noxia.cloud:6007", "uk1.noxia.cloud:6008", "uk1.noxia.cloud:6009", "uk1.noxia.cloud:6010"]
   },
   {
     "name": "abcxyz remaster",

From 5c10f7fc064b116241dba2dad1c246f0f8311cf8 Mon Sep 17 00:00:00 2001
From: WayZer <himc.wicp@gmail.com>
Date: Sun, 7 Jul 2024 23:23:34 +0800
Subject: [PATCH 07/15] Update servers_be.json (#10002)

---
 servers_be.json | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/servers_be.json b/servers_be.json
index 1417b44b17..6ba3d25ad2 100644
--- a/servers_be.json
+++ b/servers_be.json
@@ -24,5 +24,9 @@
   {
     "name": "Darkdustry",
     "address": ["darkdustry.tk"]
+  },
+  {
+    "name": "TinyLake",
+    "address": ["cn.mindustry.top:40500"]
   }
 ]

From a34433c5ce4467478f8ba5829f79a6dbf89e3534 Mon Sep 17 00:00:00 2001
From: alex <67626131+alexpvpmindustry@users.noreply.github.com>
Date: Sun, 7 Jul 2024 08:23:43 -0700
Subject: [PATCH 08/15] add UK servers (#9993)

---
 servers_v7.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/servers_v7.json b/servers_v7.json
index 550ad4cfd0..d999dc89a1 100644
--- a/servers_v7.json
+++ b/servers_v7.json
@@ -258,7 +258,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" ]
+    "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", "45.84.59.51:1025", "45.84.59.51:1027"]
   },
   {
     "name": "Open PVP",

From 642db09dd91668784517099197fe57de2ac51838 Mon Sep 17 00:00:00 2001
From: Vainer <57346251+Vainer-prog@users.noreply.github.com>
Date: Sun, 7 Jul 2024 22:24:24 +0700
Subject: [PATCH 09/15] Update servers_v7.json (#9989)

Co-authored-by: Anuken <arnukren@gmail.com>
---
 servers_v7.json | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/servers_v7.json b/servers_v7.json
index d999dc89a1..fd39dc35a9 100644
--- a/servers_v7.json
+++ b/servers_v7.json
@@ -320,6 +320,10 @@
     "name": "Vndustry",
     "address": ["vndustry.ddns.net"]
   },
+  {
+    "name": "ChillOut",
+    "address": ["87.228.8.133"]
+  },
   {
     "name": "VNM",
     "address": ["server.mindustry-tool.app"]

From 41f590d50111736fcc4f62eae6545ecb904284d6 Mon Sep 17 00:00:00 2001
From: Joan Josep <juanjo.ng.83@gmail.com>
Date: Sun, 7 Jul 2024 17:26:09 +0200
Subject: [PATCH 10/15] Update bundle_ca.properties (#9987)

---
 core/assets/bundles/bundle_ca.properties | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/core/assets/bundles/bundle_ca.properties b/core/assets/bundles/bundle_ca.properties
index fec327393f..18400fdfc6 100644
--- a/core/assets/bundles/bundle_ca.properties
+++ b/core/assets/bundles/bundle_ca.properties
@@ -1319,10 +1319,10 @@ rules.disableworldprocessors = Desactiva els processadors integrats
 rules.schematic = Permetre l’ús d’esquemes
 rules.wavetimer = Temporitzador d’onades
 rules.wavesending = Enviament d’onades
-rules.allowedit = Allow Editing Rules
-rules.allowedit.info = When enabled, the player can edit rules in-game via the button in the bottom left corner of the Pause menu.
+rules.allowedit = Permet editar les regles
+rules.allowedit.info = Quan està activat, el jugador pot editar les regles de la partida amb el botó que hi ha a la part inferior esquerra del menú de pausa.
 rules.waves = Onades
-rules.airUseSpawns = Air units use spawn points
+rules.airUseSpawns = Les unitats aèries fan servir els punts d’aparició
 rules.attack = Mode d’atac
 rules.buildai = IA constructora de bases
 rules.buildaitier = Nivell de construcció de la IA
@@ -2540,7 +2540,7 @@ lenum.payenter = Entra o apareix al bloc on es troba la unitat.
 lenum.flag = Identificador numèric de la unitat.
 lenum.mine = Extreu recursos en una posició.
 lenum.build = Construeix una estructura.
-lenum.getblock = Fetch building, floor and block type at coordinates.\nUnit must be in range of the position, otherwise null is returned.
+lenum.getblock = Obté el bloc, el seu tipus i el terra a les coordenades indicades.\nLa posició escollida ha d’estar a l’abast de la unitat; altrament es retornarà un valor buit.
 lenum.within = Comprova si la unitat està a prop d’una posició.
 lenum.boost = Inicia/Detén el vol.
 lenum.flushtext = Passa el contingut de la cua d’impressió al marcador, si es pot.\nSi s’estableix «fetch» a vertader, s’intentarà carregar les propietats de la traducció del mapa o del joc.

From 20792b0253fc097eca009822292c430de02e0ee0 Mon Sep 17 00:00:00 2001
From: summoner001 <summoner001@users.noreply.github.com>
Date: Sun, 7 Jul 2024 17:26:17 +0200
Subject: [PATCH 11/15] Update bundle_hu.properties (#9982)

Hungaria translations for the new strings.
---
 core/assets/bundles/bundle_hu.properties | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/core/assets/bundles/bundle_hu.properties b/core/assets/bundles/bundle_hu.properties
index 300a066012..0151974670 100644
--- a/core/assets/bundles/bundle_hu.properties
+++ b/core/assets/bundles/bundle_hu.properties
@@ -1337,8 +1337,8 @@ rules.disableworldprocessors = Világprocesszorok letiltása
 rules.schematic = Vázlatok engedélyezése
 rules.wavetimer = Hullámok időzítése
 rules.wavesending = Hullámok küldése
-rules.allowedit = Allow Editing Rules
-rules.allowedit.info = When enabled, the player can edit rules in-game via the button in the bottom left corner of the Pause menu.
+rules.allowedit = Szabályok szerkesztésének engedélyezése
+rules.allowedit.info = Ha engedélyezve van, a játékos szerkesztheti a szabályokat a játékban a Szünet menü bal alsó sarkában található gomb segítségével.
 rules.waves = Hullámok
 rules.airUseSpawns = A légi egységek használjanak kezdőpontokat
 rules.attack = Támadási mód

From 252399a7d88293311ac766a3ac635f01a90d214b Mon Sep 17 00:00:00 2001
From: SITUVNgcd <44901211+SITUVNgcd@users.noreply.github.com>
Date: Sun, 7 Jul 2024 22:26:26 +0700
Subject: [PATCH 12/15] Update Vietnamese translation (#9981)

* Update Vietnamese translation

- Minor fixes.
- Translate new strings from https://github.com/Anuken/Mindustry/commit/2ab2b03bf8281b31efc08c771acb78f9d8880afc.

* Translate new strings

https://github.com/Anuken/Mindustry/commit/c91f51f8d27c7a25fcb00609a0a105ccdf1d3e29

* Fix "intervals" translation
---
 core/assets/bundles/bundle_vi.properties | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/core/assets/bundles/bundle_vi.properties b/core/assets/bundles/bundle_vi.properties
index 7c03a68890..cd61f3d6cb 100644
--- a/core/assets/bundles/bundle_vi.properties
+++ b/core/assets/bundles/bundle_vi.properties
@@ -1136,8 +1136,8 @@ category.items = Vật phẩm
 category.crafting = Đầu vào/ra
 category.function = Chức năng
 category.optional = Cải tiến tùy chọn
-setting.alwaysmusic.name = Always Play Music
-setting.alwaysmusic.description = When enabled, music will always play on loop in-game.\nWhen disabled, it only plays at random intervals.
+setting.alwaysmusic.name = Luôn phát nhạc
+setting.alwaysmusic.description = Khi bật, âm nhạc sẽ luôn phát lặp lại khi chơi.\nKhi tắt, nó chỉ phát tại các khoảng thời gian ngẫu nhiên.
 setting.skipcoreanimation.name = Bỏ qua hiệu ứng phóng/đáp lõi
 setting.landscape.name = Khóa ngang
 setting.shadows.name = Đổ bóng
@@ -1337,8 +1337,8 @@ rules.disableworldprocessors = Vô hiệu hoá bộ xử lý thế giới
 rules.schematic = Cho phép dùng bản thiết kế
 rules.wavetimer = Đếm ngược đợt
 rules.wavesending = Gửi đợt
-rules.allowedit = Allow Editing Rules
-rules.allowedit.info = When enabled, the player can edit rules in-game via the button in the bottom left corner of the Pause menu.
+rules.allowedit = Cho phép sửa quy tắc
+rules.allowedit.info = Khi được bật, người chơi có thể chỉnh sửa các quy tắc trong lúc chơi thông qua nút ở góc dưới bên trái của Trình đơn tạm dừng.
 rules.waves = Đợt
 rules.airUseSpawns = Các đơn vị không quân dùng điểm xuất hiện
 rules.attack = Chế độ tấn công
@@ -1793,7 +1793,7 @@ block.red-stone-boulder.name = Tảng đá đỏ
 block.graphitic-wall.name = Tường than chì
 block.silicon-arc-furnace.name = Lò tinh luyện Silicon
 block.electrolyzer.name = Máy điện phân
-block.atmospheric-concentrator.name = Máy tập trung khí quyển
+block.atmospheric-concentrator.name = Máy ngưng tụ khí quyển
 block.oxidation-chamber.name = Bể Oxy hoá
 block.electric-heater.name = Máy nhiệt từ điện
 block.slag-heater.name = Máy nhiệt từ xỉ
@@ -1848,8 +1848,8 @@ block.vent-condenser.name = Máy ngưng tụ hơi nước
 block.cliff-crusher.name = Máy nghiền vách đá
 block.plasma-bore.name = Khoan plasma
 block.large-plasma-bore.name = Khoan plasma lớn
-block.impact-drill.name = Máy khoan thủy lực
-block.eruption-drill.name = Máy khoan siêu thủy lực
+block.impact-drill.name = Máy khoan động lực
+block.eruption-drill.name = Máy khoan siêu động lực
 block.core-bastion.name = Lõi: Pháo đài
 block.core-citadel.name = Lõi: Thủ phủ
 block.core-acropolis.name = Lõi: Đại đô
@@ -2180,7 +2180,7 @@ block.exponential-reconstructor.description = Nâng cấp đơn vị đầu vào
 block.tetrative-reconstructor.description = Nâng cấp đơn vị đầu vào lên cấp thứ năm và là cấp cuối cùng.
 block.switch.description = Công tắc có thể bật/tắt. Trạng thái có thể được đọc và điều khiển với xử lý logic.
 block.micro-processor.description = Chạy tập hợp các chỉ lệnh trong một vòng lặp. Có thể dùng để điều khiển đơn vị và công trình.
-block.logic-processor.description = Chạy tập hợp các chỉ lệnh trong một vòng lặp. Có thể dùng để điều khiển đơn vị và công trình. Nhanh hơn bộ xử lý tiểu cấp.
+block.logic-processor.description = Chạy tập hợp các chỉ lệnh trong một vòng lặp. Có thể dùng để điều khiển đơn vị và công trình. Nhanh hơn bộ xử lý vi cấp.
 block.hyper-processor.description = Chạy tập hợp các chỉ lệnh trong một vòng lặp. Có thể dùng để điều khiển đơn vị và công trình. Nhanh hơn bộ xử lý trung cấp.
 block.memory-cell.description = Lưu trữ thông tin cho bộ xử lý.
 block.memory-bank.description = Lưu trữ thông tin cho bộ xử lý. Dung lượng cao.

From e07a739ae2c80996856be6ee01b57e951bd8c481 Mon Sep 17 00:00:00 2001
From: Ilya246 <57039557+Ilya246@users.noreply.github.com>
Date: Sun, 7 Jul 2024 15:27:05 +0000
Subject: [PATCH 13/15] randomise same-playercount team assignment (#9985)

---
 core/src/mindustry/core/NetServer.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/src/mindustry/core/NetServer.java b/core/src/mindustry/core/NetServer.java
index b80f828362..6d26174479 100644
--- a/core/src/mindustry/core/NetServer.java
+++ b/core/src/mindustry/core/NetServer.java
@@ -59,7 +59,7 @@ public class NetServer implements ApplicationListener{
                         count++;
                     }
                 }
-                return count;
+                return (float)count + Mathf.random(-0.1f, 0.1f); //if several have the same playercount pick random
             });
             return re == null ? null : re.team;
         }

From 82bcf5966ebffbe6a8ba47b2928f5fe17ee2bdf0 Mon Sep 17 00:00:00 2001
From: TripleToxic <84622061+TripleToxic@users.noreply.github.com>
Date: Sun, 7 Jul 2024 11:28:19 -0400
Subject: [PATCH 14/15] Sensors, SetProp, and SetRule (#9943)

* some fun things for world proc only

* fix the format artifact

* SetProp and reformating

* Wildcard imports

* Wildcard imports

* velocity conversion

* compacting description

Co-authored-by: Anuken <arnukren@gmail.com>

* Update core/src/mindustry/world/blocks/defense/turrets/Turret.java

---------

Co-authored-by: Anuken <arnukren@gmail.com>
---
 core/assets/bundles/bundle.properties                    | 1 +
 core/src/mindustry/entities/comp/UnitComp.java           | 4 ++++
 core/src/mindustry/logic/LAccess.java                    | 6 ++++--
 core/src/mindustry/logic/LExecutor.java                  | 1 +
 core/src/mindustry/logic/LogicRule.java                  | 1 +
 .../blocks/defense/turrets/ContinuousLiquidTurret.java   | 9 +++++++++
 .../world/blocks/defense/turrets/ItemTurret.java         | 9 +++++++++
 .../world/blocks/defense/turrets/LiquidTurret.java       | 9 +++++++++
 8 files changed, 38 insertions(+), 2 deletions(-)

diff --git a/core/assets/bundles/bundle.properties b/core/assets/bundles/bundle.properties
index f58a7d3d7b..fd1b5e118d 100644
--- a/core/assets/bundles/bundle.properties
+++ b/core/assets/bundles/bundle.properties
@@ -2438,6 +2438,7 @@ lenum.shootp = Shoot at a unit/building with velocity prediction.
 lenum.config = Building configuration, e.g. sorter item.
 lenum.enabled = Whether the block is enabled.
 
+laccess.currentammotype = Current ammo item/liquid of a turret.
 laccess.color = Illuminator color.
 laccess.controller = Unit controller. If processor controlled, returns processor.\nOtherwise, returns the unit itself.
 laccess.dead = Whether a unit/building is dead or no longer valid.
diff --git a/core/src/mindustry/entities/comp/UnitComp.java b/core/src/mindustry/entities/comp/UnitComp.java
index 1b4e095909..63f30a4fc8 100644
--- a/core/src/mindustry/entities/comp/UnitComp.java
+++ b/core/src/mindustry/entities/comp/UnitComp.java
@@ -214,6 +214,8 @@ abstract class UnitComp implements Healthc, Physicsc, Hitboxc, Statusc, Teamc, I
             case ammoCapacity -> type.ammoCapacity;
             case x -> World.conv(x);
             case y -> World.conv(y);
+            case velocityX -> vel.x * 60f / tilesize;
+            case velocityY -> vel.y * 60f / tilesize;
             case dead -> dead || !isAdded() ? 1 : 0;
             case team -> team.id;
             case shooting -> isShooting() ? 1 : 0;
@@ -282,6 +284,8 @@ abstract class UnitComp implements Healthc, Physicsc, Hitboxc, Statusc, Teamc, I
                 y = World.unconv((float)value);
                 if(!isLocal()) snapInterpolation();
             }
+            case velocityX -> vel.x = (float)(value * tilesize / 60d);
+            case velocityY -> vel.y = (float)(value * tilesize / 60d);
             case rotation -> rotation = (float)value;
             case team -> {
                 if(!net.client()){
diff --git a/core/src/mindustry/logic/LAccess.java b/core/src/mindustry/logic/LAccess.java
index 46044562d6..a4d242e27c 100644
--- a/core/src/mindustry/logic/LAccess.java
+++ b/core/src/mindustry/logic/LAccess.java
@@ -17,6 +17,7 @@ public enum LAccess{
     powerNetOut,
     ammo,
     ammoCapacity,
+    currentAmmoType,
     health,
     maxHealth,
     heat,
@@ -28,6 +29,8 @@ public enum LAccess{
     rotation,
     x,
     y,
+    velocityX,
+    velocityY,
     shootX,
     shootY,
     cameraX,
@@ -68,7 +71,7 @@ public enum LAccess{
         all = values(),
         senseable = Seq.select(all, t -> t.params.length <= 1).toArray(LAccess.class),
         controls = Seq.select(all, t -> t.params.length > 0).toArray(LAccess.class),
-        settable = {x, y, rotation, speed, armor, health, shield, team, flag, totalPower, payloadType};
+        settable = {x, y, velocityX, velocityY, rotation, speed, armor, health, shield, team, flag, totalPower, payloadType};
 
     LAccess(String... params){
         this.params = params;
@@ -79,5 +82,4 @@ public enum LAccess{
         this.params = params;
         isObj = obj;
     }
-
 }
diff --git a/core/src/mindustry/logic/LExecutor.java b/core/src/mindustry/logic/LExecutor.java
index f06cac9e1e..8ccfd4627f 100644
--- a/core/src/mindustry/logic/LExecutor.java
+++ b/core/src/mindustry/logic/LExecutor.java
@@ -1497,6 +1497,7 @@ public class LExecutor{
                 }
                 case ambientLight -> state.rules.ambientLight.fromDouble(value.num());
                 case solarMultiplier -> state.rules.solarMultiplier = Math.max(value.numf(), 0f);
+                case dragMultiplier -> state.rules.dragMultiplier = Math.max(value.numf(), 0f);
                 case ban -> {
                     Object cont = value.obj();
                     if(cont instanceof Block b){
diff --git a/core/src/mindustry/logic/LogicRule.java b/core/src/mindustry/logic/LogicRule.java
index 0c05fcd033..6ce8de4b35 100644
--- a/core/src/mindustry/logic/LogicRule.java
+++ b/core/src/mindustry/logic/LogicRule.java
@@ -15,6 +15,7 @@ public enum LogicRule{
     lighting,
     ambientLight,
     solarMultiplier,
+    dragMultiplier,
     ban,
     unban,
 
diff --git a/core/src/mindustry/world/blocks/defense/turrets/ContinuousLiquidTurret.java b/core/src/mindustry/world/blocks/defense/turrets/ContinuousLiquidTurret.java
index a843a3e985..ffd50d5b3d 100644
--- a/core/src/mindustry/world/blocks/defense/turrets/ContinuousLiquidTurret.java
+++ b/core/src/mindustry/world/blocks/defense/turrets/ContinuousLiquidTurret.java
@@ -4,6 +4,7 @@ import arc.struct.*;
 import mindustry.content.*;
 import mindustry.entities.bullet.*;
 import mindustry.gen.*;
+import mindustry.logic.*;
 import mindustry.type.*;
 import mindustry.world.consumers.*;
 import mindustry.world.meta.*;
@@ -77,6 +78,14 @@ public class ContinuousLiquidTurret extends ContinuousTurret{
             super.updateTile();
         }
 
+        @Override
+        public Object senseObject(LAccess sensor){
+            return switch(sensor){
+                case currentAmmoType -> liquids.current();
+                default -> super.senseObject(sensor);
+            };
+        }
+
         @Override
         public boolean canConsume(){
             return hasCorrectAmmo() && super.canConsume();
diff --git a/core/src/mindustry/world/blocks/defense/turrets/ItemTurret.java b/core/src/mindustry/world/blocks/defense/turrets/ItemTurret.java
index 93a77b644f..51c07de96f 100644
--- a/core/src/mindustry/world/blocks/defense/turrets/ItemTurret.java
+++ b/core/src/mindustry/world/blocks/defense/turrets/ItemTurret.java
@@ -11,6 +11,7 @@ import mindustry.entities.bullet.*;
 import mindustry.game.EventType.*;
 import mindustry.gen.*;
 import mindustry.graphics.*;
+import mindustry.logic.*;
 import mindustry.type.*;
 import mindustry.ui.*;
 import mindustry.world.consumers.*;
@@ -107,6 +108,14 @@ public class ItemTurret extends Turret{
             }
         }
 
+        @Override
+        public Object senseObject(LAccess sensor){
+            return switch(sensor){
+                case currentAmmoType -> ammo.size > 0 ? ((ItemEntry)ammo.peek()).item : null;
+                default -> super.senseObject(sensor);
+            };
+        }
+
         @Override
         public void updateTile(){
             unit.ammo((float)unit.type().ammoCapacity * totalAmmo / maxAmmo);
diff --git a/core/src/mindustry/world/blocks/defense/turrets/LiquidTurret.java b/core/src/mindustry/world/blocks/defense/turrets/LiquidTurret.java
index c0087eee5f..82a9cf6d9e 100644
--- a/core/src/mindustry/world/blocks/defense/turrets/LiquidTurret.java
+++ b/core/src/mindustry/world/blocks/defense/turrets/LiquidTurret.java
@@ -6,6 +6,7 @@ import mindustry.core.*;
 import mindustry.entities.*;
 import mindustry.entities.bullet.*;
 import mindustry.gen.*;
+import mindustry.logic.*;
 import mindustry.type.*;
 import mindustry.world.*;
 import mindustry.world.consumers.*;
@@ -72,6 +73,14 @@ public class LiquidTurret extends Turret{
             super.updateTile();
         }
 
+        @Override
+        public Object senseObject(LAccess sensor){
+            return switch(sensor){
+                case currentAmmoType -> liquids.current();
+                default -> super.senseObject(sensor);
+            };
+        }
+
         @Override
         protected void findTarget(){
             if(extinguish && liquids.current().canExtinguish()){

From 41aea39a80ff8d9cf56e9af132e2eed5b435323c Mon Sep 17 00:00:00 2001
From: Github Actions <actions@github.com>
Date: Sun, 7 Jul 2024 15:29:11 +0000
Subject: [PATCH 15/15] Automatic bundle update

---
 core/assets/bundles/bundle_be.properties    | 1 +
 core/assets/bundles/bundle_bg.properties    | 1 +
 core/assets/bundles/bundle_ca.properties    | 1 +
 core/assets/bundles/bundle_cs.properties    | 1 +
 core/assets/bundles/bundle_da.properties    | 1 +
 core/assets/bundles/bundle_de.properties    | 1 +
 core/assets/bundles/bundle_es.properties    | 1 +
 core/assets/bundles/bundle_et.properties    | 1 +
 core/assets/bundles/bundle_eu.properties    | 1 +
 core/assets/bundles/bundle_fi.properties    | 1 +
 core/assets/bundles/bundle_fil.properties   | 1 +
 core/assets/bundles/bundle_fr.properties    | 1 +
 core/assets/bundles/bundle_hu.properties    | 1 +
 core/assets/bundles/bundle_id_ID.properties | 1 +
 core/assets/bundles/bundle_it.properties    | 1 +
 core/assets/bundles/bundle_ja.properties    | 1 +
 core/assets/bundles/bundle_ko.properties    | 1 +
 core/assets/bundles/bundle_lt.properties    | 1 +
 core/assets/bundles/bundle_nl.properties    | 1 +
 core/assets/bundles/bundle_nl_BE.properties | 1 +
 core/assets/bundles/bundle_pl.properties    | 1 +
 core/assets/bundles/bundle_pt_BR.properties | 1 +
 core/assets/bundles/bundle_pt_PT.properties | 1 +
 core/assets/bundles/bundle_ro.properties    | 1 +
 core/assets/bundles/bundle_ru.properties    | 1 +
 core/assets/bundles/bundle_sr.properties    | 1 +
 core/assets/bundles/bundle_sv.properties    | 1 +
 core/assets/bundles/bundle_th.properties    | 1 +
 core/assets/bundles/bundle_tk.properties    | 1 +
 core/assets/bundles/bundle_tr.properties    | 1 +
 core/assets/bundles/bundle_uk_UA.properties | 1 +
 core/assets/bundles/bundle_vi.properties    | 1 +
 core/assets/bundles/bundle_zh_CN.properties | 1 +
 core/assets/bundles/bundle_zh_TW.properties | 1 +
 34 files changed, 34 insertions(+)

diff --git a/core/assets/bundles/bundle_be.properties b/core/assets/bundles/bundle_be.properties
index 35d26ddb08..442b6afcdd 100644
--- a/core/assets/bundles/bundle_be.properties
+++ b/core/assets/bundles/bundle_be.properties
@@ -2374,6 +2374,7 @@ lenum.shoot = Shoot at a position.
 lenum.shootp = Shoot at a unit/building with velocity prediction.
 lenum.config = Building configuration, e.g. sorter item.
 lenum.enabled = Whether the block is enabled.
+laccess.currentammotype = Current ammo item/liquid of a turret.
 laccess.color = Illuminator color.
 laccess.controller = Unit controller. If processor controlled, returns processor.\nIf in a formation, returns leader.\nOtherwise, returns the unit itself.
 laccess.dead = Whether a unit/building is dead or no longer valid.
diff --git a/core/assets/bundles/bundle_bg.properties b/core/assets/bundles/bundle_bg.properties
index e80430fa25..7e895bada1 100644
--- a/core/assets/bundles/bundle_bg.properties
+++ b/core/assets/bundles/bundle_bg.properties
@@ -2390,6 +2390,7 @@ lenum.shoot = Стреля към позиция.
 lenum.shootp = Прицелва се в единица/сграда, изчислявайки нейната скорост.
 lenum.config = Building configuration, e.g. sorter item.
 lenum.enabled = Дали блокът е активиран или забранен.
+laccess.currentammotype = Current ammo item/liquid of a turret.
 
 laccess.color = Цвят на осветителя.
 laccess.controller = Връща кой контролира единицата.\nАко е управляване от процесор, връща процесора.\nАко е във формация, връща лидера.\nИначе, връща самата единица.
diff --git a/core/assets/bundles/bundle_ca.properties b/core/assets/bundles/bundle_ca.properties
index 18400fdfc6..bcee969240 100644
--- a/core/assets/bundles/bundle_ca.properties
+++ b/core/assets/bundles/bundle_ca.properties
@@ -2400,6 +2400,7 @@ lenum.shoot = Dispara a una posició.
 lenum.shootp = Dispara a una unitat/bloc tenint en compte la seva velocitat a l’hora d’apuntar.
 lenum.config = Configuració de l’estructura, com ara el classificador.
 lenum.enabled = Retorna si el bloc està activat.
+laccess.currentammotype = Current ammo item/liquid of a turret.
 
 laccess.color = Color de l’il·luminador.
 laccess.controller = Controlador de la unitat. Si es controla per processador, retorna el processador.\nAltrament, retorna la mateixa unitat.
diff --git a/core/assets/bundles/bundle_cs.properties b/core/assets/bundles/bundle_cs.properties
index c7f2bbcc1e..66acc27401 100644
--- a/core/assets/bundles/bundle_cs.properties
+++ b/core/assets/bundles/bundle_cs.properties
@@ -2395,6 +2395,7 @@ lenum.shoot = Vystřelí na určitou pozici.
 lenum.shootp = Vystřelí na jednotku/budovu s rychlostní předpovědí.
 lenum.config = Konfigurace budovy, např. třídící věc pro třídičku.
 lenum.enabled = Zda je blok povolen.
+laccess.currentammotype = Current ammo item/liquid of a turret.
 
 laccess.color = Barva osvětlovače.
 laccess.controller = Kontroler jednotky. Pokud procesor je kontrolován, vrátí procesor\nPokud je ve formaci, vrací vůdce.\nJinak vrací jednotku.
diff --git a/core/assets/bundles/bundle_da.properties b/core/assets/bundles/bundle_da.properties
index 6eda50457c..caac178e24 100644
--- a/core/assets/bundles/bundle_da.properties
+++ b/core/assets/bundles/bundle_da.properties
@@ -2374,6 +2374,7 @@ lenum.shoot = Shoot at a position.
 lenum.shootp = Shoot at a unit/building with velocity prediction.
 lenum.config = Building configuration, e.g. sorter item.
 lenum.enabled = Whether the block is enabled.
+laccess.currentammotype = Current ammo item/liquid of a turret.
 laccess.color = Illuminator color.
 laccess.controller = Unit controller. If processor controlled, returns processor.\nIf in a formation, returns leader.\nOtherwise, returns the unit itself.
 laccess.dead = Whether a unit/building is dead or no longer valid.
diff --git a/core/assets/bundles/bundle_de.properties b/core/assets/bundles/bundle_de.properties
index f3c1a3e1d6..6bd88461d2 100644
--- a/core/assets/bundles/bundle_de.properties
+++ b/core/assets/bundles/bundle_de.properties
@@ -2425,6 +2425,7 @@ lenum.shoot = Schießt auf eine Position.
 lenum.shootp = Schießt auf eine Einheit / einen Block und sagt deren Position voraus.
 lenum.config = Blockkonfiguration, z.B. das ausgewählte Item in einem Sortierer.
 lenum.enabled = Ob der Block an oder aus ist.
+laccess.currentammotype = Current ammo item/liquid of a turret.
 
 laccess.color = Illuminiererfarbe.
 laccess.controller = Einheitensteurer. Gibt "processor" zurück, wenn die Einheit prozessorgesteuert ist,.\nGibt den Steuerer zurück, wenn die Einheit Teil einer Formation ist.\nSonst wird einfach die Einheit zurückgegeben.
diff --git a/core/assets/bundles/bundle_es.properties b/core/assets/bundles/bundle_es.properties
index 810d6a676d..93a2f0f3a4 100644
--- a/core/assets/bundles/bundle_es.properties
+++ b/core/assets/bundles/bundle_es.properties
@@ -2418,6 +2418,7 @@ lenum.shoot = Dispara a una posición.
 lenum.shootp = Dispara a una unidad/estructura con predicción de velocidad.
 lenum.config = Configuración de estructura, por ejemplo: el objeto seleccionado en un clasificador.
 lenum.enabled = Si el bloque está activado.
+laccess.currentammotype = Current ammo item/liquid of a turret.
 
 laccess.color = Color del iluminador.
 laccess.controller = Controlador de unidad. Si se controla mediante un procesador, devuelve dicho procesador.\nSi está en formación, devuelve su líder.\nDe otra forma, devuelve la misma unidad.
diff --git a/core/assets/bundles/bundle_et.properties b/core/assets/bundles/bundle_et.properties
index 6744f93c71..f7fd198ab3 100644
--- a/core/assets/bundles/bundle_et.properties
+++ b/core/assets/bundles/bundle_et.properties
@@ -2376,6 +2376,7 @@ lenum.shoot = Shoot at a position.
 lenum.shootp = Shoot at a unit/building with velocity prediction.
 lenum.config = Building configuration, e.g. sorter item.
 lenum.enabled = Whether the block is enabled.
+laccess.currentammotype = Current ammo item/liquid of a turret.
 laccess.color = Illuminator color.
 laccess.controller = Unit controller. If processor controlled, returns processor.\nIf in a formation, returns leader.\nOtherwise, returns the unit itself.
 laccess.dead = Whether a unit/building is dead or no longer valid.
diff --git a/core/assets/bundles/bundle_eu.properties b/core/assets/bundles/bundle_eu.properties
index c2d3f84cb3..c2f4e97364 100644
--- a/core/assets/bundles/bundle_eu.properties
+++ b/core/assets/bundles/bundle_eu.properties
@@ -2378,6 +2378,7 @@ lenum.shoot = Shoot at a position.
 lenum.shootp = Shoot at a unit/building with velocity prediction.
 lenum.config = Building configuration, e.g. sorter item.
 lenum.enabled = Whether the block is enabled.
+laccess.currentammotype = Current ammo item/liquid of a turret.
 laccess.color = Illuminator color.
 laccess.controller = Unit controller. If processor controlled, returns processor.\nIf in a formation, returns leader.\nOtherwise, returns the unit itself.
 laccess.dead = Whether a unit/building is dead or no longer valid.
diff --git a/core/assets/bundles/bundle_fi.properties b/core/assets/bundles/bundle_fi.properties
index 8705c201f3..06da2a8ea5 100644
--- a/core/assets/bundles/bundle_fi.properties
+++ b/core/assets/bundles/bundle_fi.properties
@@ -2379,6 +2379,7 @@ lenum.shoot = Ammu tiettyä sijaintia.
 lenum.shootp = Ammu yksikköä/rakennusta nopeudenennustus päällä.
 lenum.config = Rakennuksen säätö, esim. lajittelijan valinta.
 lenum.enabled = Selvitä, onko palikka päällä.
+laccess.currentammotype = Current ammo item/liquid of a turret.
 laccess.color = Lampun väri.
 laccess.controller = Yksikön hallitsija. Jos yksikköä hallitsee prosessori, palauttaa prosessorin.\nJos yksikkö on muodostelmassa, palauttaa johtajan.\nPalauttaa muulloin itse yksikön.
 laccess.dead = Selvitä, onko yksikkö/rakennus tuhoutunut tai ei enää kelvollinen.
diff --git a/core/assets/bundles/bundle_fil.properties b/core/assets/bundles/bundle_fil.properties
index eabd808298..466a2dd69e 100644
--- a/core/assets/bundles/bundle_fil.properties
+++ b/core/assets/bundles/bundle_fil.properties
@@ -2375,6 +2375,7 @@ lenum.shoot = Shoot at a position.
 lenum.shootp = Shoot at a unit/building with velocity prediction.
 lenum.config = Building configuration, e.g. sorter item.
 lenum.enabled = Whether the block is enabled.
+laccess.currentammotype = Current ammo item/liquid of a turret.
 laccess.color = Illuminator color.
 laccess.controller = Unit controller. If processor controlled, returns processor.\nIf in a formation, returns leader.\nOtherwise, returns the unit itself.
 laccess.dead = Whether a unit/building is dead or no longer valid.
diff --git a/core/assets/bundles/bundle_fr.properties b/core/assets/bundles/bundle_fr.properties
index 7af3543782..8c57d0bb1e 100644
--- a/core/assets/bundles/bundle_fr.properties
+++ b/core/assets/bundles/bundle_fr.properties
@@ -2425,6 +2425,7 @@ lenum.shoot = Tire à une position donnée.
 lenum.shootp = Tire à une unité/bâtiment avec la prédiction de mouvement.
 lenum.config = La configuration d'un bâtiment. Par exemple, l'objet sélectionné dans un trieur.
 lenum.enabled = Retourne si le bloc est activé ou pas.
+laccess.currentammotype = Current ammo item/liquid of a turret.
 
 laccess.color = La couleur d'un illuminateur.
 laccess.controller = Le contrôleur de l'Unité.\nSi l'Unité est contrôlée par un processeur, cela retournera le processeur en question.\nSi l'Unité est en formation, cela retournera le leader de la formation.\nSinon, renvoie l’unité elle-même.
diff --git a/core/assets/bundles/bundle_hu.properties b/core/assets/bundles/bundle_hu.properties
index 0151974670..5d4de8ef2c 100644
--- a/core/assets/bundles/bundle_hu.properties
+++ b/core/assets/bundles/bundle_hu.properties
@@ -2437,6 +2437,7 @@ lenum.shoot = Lövés egy adott pontra.
 lenum.shootp = Lövés egy egységre/épületre sebesség-előrejelzéssel.
 lenum.config = Épületkonfiguráció, például nyersanyag-válogató.
 lenum.enabled = Engedélyezve van-e a blokk.
+laccess.currentammotype = Current ammo item/liquid of a turret.
 
 laccess.color = Megvilágítás színe.
 laccess.controller = Egységvezérlő. Ha processzor vezérli, akkor a processzort adja vissza.\nKülönben magát az egységet adja vissza.
diff --git a/core/assets/bundles/bundle_id_ID.properties b/core/assets/bundles/bundle_id_ID.properties
index 8f1f0bde9b..9c058872ca 100644
--- a/core/assets/bundles/bundle_id_ID.properties
+++ b/core/assets/bundles/bundle_id_ID.properties
@@ -2416,6 +2416,7 @@ lenum.shoot = Menembak pada suatu posisi yang ditentukan.
 lenum.shootp = Menembak pada unit/bangunan dengan prediksi kecepatan.
 lenum.config = Pengaturan bangunan, misalnya menyortir barang.
 lenum.enabled = Menentukan aktif tidaknya suatu blok.
+laccess.currentammotype = Current ammo item/liquid of a turret.
 
 laccess.color = Warna lampu.
 laccess.controller = Pengendali unit. Jika dikendalikan prosesor, mengembalikan prosesor.\nJika unit dalam barisan, mengembalikan leader.\nSebaliknya, mengembalikan unit itu sendiri.
diff --git a/core/assets/bundles/bundle_it.properties b/core/assets/bundles/bundle_it.properties
index 6aa47caa19..5b6dc2407d 100644
--- a/core/assets/bundles/bundle_it.properties
+++ b/core/assets/bundles/bundle_it.properties
@@ -2388,6 +2388,7 @@ lenum.shoot = Shoot at a position.
 lenum.shootp = Shoot at a unit/building with velocity prediction.
 lenum.config = Building configuration, e.g. sorter item.
 lenum.enabled = Whether the block is enabled.
+laccess.currentammotype = Current ammo item/liquid of a turret.
 laccess.color = Illuminator color.
 laccess.controller = Unit controller. If processor controlled, returns processor.\nIf in a formation, returns leader.\nOtherwise, returns the unit itself.
 laccess.dead = Whether a unit/building is dead or no longer valid.
diff --git a/core/assets/bundles/bundle_ja.properties b/core/assets/bundles/bundle_ja.properties
index 18c8f086ff..ab9b095823 100644
--- a/core/assets/bundles/bundle_ja.properties
+++ b/core/assets/bundles/bundle_ja.properties
@@ -2392,6 +2392,7 @@ lenum.shoot = 指定した座標に向かって撃ちます。
 lenum.shootp = 任意のユニットや建物を撃ちます。
 lenum.config = 建物の設定を取得します。\n例:ソーターに設定されているアイテムなど
 lenum.enabled = ブロックが有効かどうかを取得します。
+laccess.currentammotype = Current ammo item/liquid of a turret.
 laccess.color = イルミネーターの色を取得します。
 laccess.controller = ユニットを制御しているものを取得します。\nプロセッサ制御の場合、制御しているプロセッサを返します。\nほかのユニットに制御されている場合、制御しているユニットを返します。\nそれ以外の場合は、ユニット自身を返します。
 laccess.dead = ユニットや建物が機能しているかどうか、またはもう有効でないかどうか。
diff --git a/core/assets/bundles/bundle_ko.properties b/core/assets/bundles/bundle_ko.properties
index 83d24dfa40..79f23ca5ab 100644
--- a/core/assets/bundles/bundle_ko.properties
+++ b/core/assets/bundles/bundle_ko.properties
@@ -2393,6 +2393,7 @@ lenum.shoot = 특정 위치에 발사
 lenum.shootp = 목표물 속도를 예측하여 발사
 lenum.config = 필터의 아이템같은 건물의 설정
 lenum.enabled = 블록의 활성 여부
+laccess.currentammotype = Current ammo item/liquid of a turret.
 
 laccess.color = 조명 색상
 laccess.controller = 기체 제어자. 프로세서가 제어하면, 프로세서를 반환합니다.\n다른 기체에 의해 지휘되면(G키), 지휘하는 기체를 반환합니다.\n그 외에는 자신을 반환합니다.
diff --git a/core/assets/bundles/bundle_lt.properties b/core/assets/bundles/bundle_lt.properties
index 1855ed10e6..d197bd3657 100644
--- a/core/assets/bundles/bundle_lt.properties
+++ b/core/assets/bundles/bundle_lt.properties
@@ -2376,6 +2376,7 @@ lenum.shoot = Shoot at a position.
 lenum.shootp = Shoot at a unit/building with velocity prediction.
 lenum.config = Building configuration, e.g. sorter item.
 lenum.enabled = Whether the block is enabled.
+laccess.currentammotype = Current ammo item/liquid of a turret.
 laccess.color = Illuminator color.
 laccess.controller = Unit controller. If processor controlled, returns processor.\nIf in a formation, returns leader.\nOtherwise, returns the unit itself.
 laccess.dead = Whether a unit/building is dead or no longer valid.
diff --git a/core/assets/bundles/bundle_nl.properties b/core/assets/bundles/bundle_nl.properties
index a9565e7a58..21df1a3d23 100644
--- a/core/assets/bundles/bundle_nl.properties
+++ b/core/assets/bundles/bundle_nl.properties
@@ -2389,6 +2389,7 @@ lenum.shoot = Shoot at a position.
 lenum.shootp = Shoot at a unit/building with velocity prediction.
 lenum.config = Building configuration, e.g. sorter item.
 lenum.enabled = Whether the block is enabled.
+laccess.currentammotype = Current ammo item/liquid of a turret.
 laccess.color = Illuminator color.
 laccess.controller = Unit controller. If processor controlled, returns processor.\nIf in a formation, returns leader.\nOtherwise, returns the unit itself.
 laccess.dead = Whether a unit/building is dead or no longer valid.
diff --git a/core/assets/bundles/bundle_nl_BE.properties b/core/assets/bundles/bundle_nl_BE.properties
index 58cfa95b77..bb32cf85be 100644
--- a/core/assets/bundles/bundle_nl_BE.properties
+++ b/core/assets/bundles/bundle_nl_BE.properties
@@ -2376,6 +2376,7 @@ lenum.shoot = Shoot at a position.
 lenum.shootp = Shoot at a unit/building with velocity prediction.
 lenum.config = Building configuration, e.g. sorter item.
 lenum.enabled = Whether the block is enabled.
+laccess.currentammotype = Current ammo item/liquid of a turret.
 laccess.color = Illuminator color.
 laccess.controller = Unit controller. If processor controlled, returns processor.\nIf in a formation, returns leader.\nOtherwise, returns the unit itself.
 laccess.dead = Whether a unit/building is dead or no longer valid.
diff --git a/core/assets/bundles/bundle_pl.properties b/core/assets/bundles/bundle_pl.properties
index a013f5d4d7..87477c01ab 100644
--- a/core/assets/bundles/bundle_pl.properties
+++ b/core/assets/bundles/bundle_pl.properties
@@ -2412,6 +2412,7 @@ lenum.shoot = Strzel w określoną pozycje.
 lenum.shootp = Strzel w jednostkę/budynek z zachowaniem trajektorii.
 lenum.config = Konfiguracja budynku, np. sortownika.
 lenum.enabled = Sprawdza czy blok jest włączony.
+laccess.currentammotype = Current ammo item/liquid of a turret.
 
 laccess.color = Kolor iluminatora.
 laccess.controller = Kontroler jednostki. Jeśli jest kontrolowana przez procesor, zwraca procesor.\nJeśli we formacji, zwraca przywódcę.\nW innym wypadku zwraca samą jednostkę.
diff --git a/core/assets/bundles/bundle_pt_BR.properties b/core/assets/bundles/bundle_pt_BR.properties
index aa7a4ee556..2aadc7d22f 100644
--- a/core/assets/bundles/bundle_pt_BR.properties
+++ b/core/assets/bundles/bundle_pt_BR.properties
@@ -2411,6 +2411,7 @@ lenum.shoot = Atire em uma posição.
 lenum.shootp = Atire em uma unidade/edifício com previsão de velocidade.
 lenum.config = Configuração do edifício, por ex. item classificador.
 lenum.enabled = Se o bloco está ativado.
+laccess.currentammotype = Current ammo item/liquid of a turret.
 
 laccess.color = Cor do iluminador.
 laccess.controller = Controlador de unidade. Se controlado pelo processador, retorna o processador.\nCaso contrário, retorna a própria unidade.
diff --git a/core/assets/bundles/bundle_pt_PT.properties b/core/assets/bundles/bundle_pt_PT.properties
index 1eccbc6aba..3dbe0a7975 100644
--- a/core/assets/bundles/bundle_pt_PT.properties
+++ b/core/assets/bundles/bundle_pt_PT.properties
@@ -2376,6 +2376,7 @@ lenum.shoot = Shoot at a position.
 lenum.shootp = Shoot at a unit/building with velocity prediction.
 lenum.config = Building configuration, e.g. sorter item.
 lenum.enabled = Whether the block is enabled.
+laccess.currentammotype = Current ammo item/liquid of a turret.
 laccess.color = Illuminator color.
 laccess.controller = Unit controller. If processor controlled, returns processor.\nIf in a formation, returns leader.\nOtherwise, returns the unit itself.
 laccess.dead = Whether a unit/building is dead or no longer valid.
diff --git a/core/assets/bundles/bundle_ro.properties b/core/assets/bundles/bundle_ro.properties
index f619f285bb..cae469702e 100644
--- a/core/assets/bundles/bundle_ro.properties
+++ b/core/assets/bundles/bundle_ro.properties
@@ -2395,6 +2395,7 @@ lenum.shoot = Lovește către o locație.
 lenum.shootp = Lovește către o unitate/clădire. Anticipează viteza țintei și a proiectilului.
 lenum.config = Configurația clădirii, de ex. materialul selectat pt Sortator.
 lenum.enabled = Specifică dacă clădirea este pornită.
+laccess.currentammotype = Current ammo item/liquid of a turret.
 
 laccess.color = Culoarea iluminatorului.
 laccess.controller = Controlorul unității. Dacă e controlată de procesor, returnează procesorul.\nDacă e într-o formație, returnează liderul.\nAltfel, returnează unitatea însăși.
diff --git a/core/assets/bundles/bundle_ru.properties b/core/assets/bundles/bundle_ru.properties
index 9760beacc7..23fd6df9b6 100644
--- a/core/assets/bundles/bundle_ru.properties
+++ b/core/assets/bundles/bundle_ru.properties
@@ -2397,6 +2397,7 @@ lenum.shoot = Стрельба в определённую позицию.
 lenum.shootp = Стрельба в единицу/постройку с расчётом скорости.
 lenum.config = Конфигурация постройки, например, предмет сортировки.
 lenum.enabled = Включён ли блок.
+laccess.currentammotype = Current ammo item/liquid of a turret.
 
 laccess.color = Цвет осветителя.
 laccess.controller = Командующий единицей. Если единица управляется процессором, возвращает процессор. Если в строю, возвращает командующего.\nВ противном случае возвращает саму единицу.
diff --git a/core/assets/bundles/bundle_sr.properties b/core/assets/bundles/bundle_sr.properties
index 6bb7bb4f38..6e6cf07481 100644
--- a/core/assets/bundles/bundle_sr.properties
+++ b/core/assets/bundles/bundle_sr.properties
@@ -2398,6 +2398,7 @@ lenum.shoot = Ispaljuj na mestu.
 lenum.shootp = Shoot at a unit/building with velocity prediction.
 lenum.config = Konfiguracija građevine, npr. sortirani materijal.
 lenum.enabled = Da li je ova građevina osposobljena.
+laccess.currentammotype = Current ammo item/liquid of a turret.
 
 laccess.color = Boja iluminatora.
 laccess.controller = Upravljač jedinice. Ako upravljano putem procesora, šalji "processor".\nAko je upravljano u formaciji, šalji "lider".U ostalim slučajevima, šalji jedinicu za sebe.
diff --git a/core/assets/bundles/bundle_sv.properties b/core/assets/bundles/bundle_sv.properties
index ae76e627e3..a9cb83d9fb 100644
--- a/core/assets/bundles/bundle_sv.properties
+++ b/core/assets/bundles/bundle_sv.properties
@@ -2376,6 +2376,7 @@ lenum.shoot = Shoot at a position.
 lenum.shootp = Shoot at a unit/building with velocity prediction.
 lenum.config = Building configuration, e.g. sorter item.
 lenum.enabled = Whether the block is enabled.
+laccess.currentammotype = Current ammo item/liquid of a turret.
 laccess.color = Illuminator color.
 laccess.controller = Unit controller. If processor controlled, returns processor.\nIf in a formation, returns leader.\nOtherwise, returns the unit itself.
 laccess.dead = Whether a unit/building is dead or no longer valid.
diff --git a/core/assets/bundles/bundle_th.properties b/core/assets/bundles/bundle_th.properties
index 9b50196aa5..1fe1ed195a 100644
--- a/core/assets/bundles/bundle_th.properties
+++ b/core/assets/bundles/bundle_th.properties
@@ -2415,6 +2415,7 @@ lenum.shoot = ยิงไปที่ตำแหน่งเป้าหมา
 lenum.shootp = ยิงเป้าหมายโดยมีการคำนวณการยิง
 lenum.config = การกำหนดค่าของสิ่งก่อสร้าง เช่น ไอเท็มของเครื่องคัดแยก
 lenum.enabled = ว่าบล็อกเปิดใช้งาน/ทำงานอยู่หรือเปล่า
+laccess.currentammotype = Current ammo item/liquid of a turret.
 
 laccess.color = สีของตัวเปล่งแสง
 laccess.controller = ผู้ควบคุมยูนิต ถ้าผู้ควบคุมคือตัวประมวลผล จะส่งกลับค่า processor\nนอกนั้น จะส่งกลับค่าตัวยูนิตเอง
diff --git a/core/assets/bundles/bundle_tk.properties b/core/assets/bundles/bundle_tk.properties
index c468c30579..e625322820 100644
--- a/core/assets/bundles/bundle_tk.properties
+++ b/core/assets/bundles/bundle_tk.properties
@@ -2376,6 +2376,7 @@ lenum.shoot = Shoot at a position.
 lenum.shootp = Shoot at a unit/building with velocity prediction.
 lenum.config = Building configuration, e.g. sorter item.
 lenum.enabled = Whether the block is enabled.
+laccess.currentammotype = Current ammo item/liquid of a turret.
 laccess.color = Illuminator color.
 laccess.controller = Unit controller. If processor controlled, returns processor.\nIf in a formation, returns leader.\nOtherwise, returns the unit itself.
 laccess.dead = Whether a unit/building is dead or no longer valid.
diff --git a/core/assets/bundles/bundle_tr.properties b/core/assets/bundles/bundle_tr.properties
index 1c1c95f1f8..db687017f7 100644
--- a/core/assets/bundles/bundle_tr.properties
+++ b/core/assets/bundles/bundle_tr.properties
@@ -2395,6 +2395,7 @@ lenum.shoot = Bir konuma ateş et.
 lenum.shootp = Belli bir birim veya binaya ateş et.
 lenum.config = Bina yapılandırması, örnek: Ayıklayıcı Türü
 lenum.enabled = Blok aktif mi?
+laccess.currentammotype = Current ammo item/liquid of a turret.
 
 laccess.color = Aydınlatıcı Rengi
 laccess.controller = Birim Kontrol edici. Eğer işlemci kontrol ediyorsa işlemci döner. \nFormasyon durumundaysa, lider döner.\nDiğer şekilde, birimi kendi döner.
diff --git a/core/assets/bundles/bundle_uk_UA.properties b/core/assets/bundles/bundle_uk_UA.properties
index 0d13699812..b50afe1626 100644
--- a/core/assets/bundles/bundle_uk_UA.properties
+++ b/core/assets/bundles/bundle_uk_UA.properties
@@ -2422,6 +2422,7 @@ lenum.shoot = Стріляти в зазначену позицію.
 lenum.shootp = Стріляти в одиницю чи будівлю із передбаченням швидкості.
 lenum.config = Конфігурація будівлі, як-от в сортувальника.
 lenum.enabled = Чи блок увімкнено.
+laccess.currentammotype = Current ammo item/liquid of a turret.
 
 laccess.color = Колір освітлювача.
 laccess.controller = Керувач одиницями. Якщо процесор керує одиницею, повертає процесор.\nЯкщо у формуванні, повертається лідер.\nІнакше повертає саму одиницю.
diff --git a/core/assets/bundles/bundle_vi.properties b/core/assets/bundles/bundle_vi.properties
index cd61f3d6cb..ca0458b04e 100644
--- a/core/assets/bundles/bundle_vi.properties
+++ b/core/assets/bundles/bundle_vi.properties
@@ -2437,6 +2437,7 @@ lenum.shoot = Bắn vào một vị trí.
 lenum.shootp = Bắn vào một đơn vị/công trình với tốc độ dự đoán.
 lenum.config = Cấu hình công trình, kiểu như vật phẩm của Khối sắp xếp.
 lenum.enabled = Khối có đang hoạt động.
+laccess.currentammotype = Current ammo item/liquid of a turret.
 
 laccess.color = Màu đèn chiếu sáng.
 laccess.controller = Thứ điều khiển đơn vị. Nếu khối xử lý đã điều khiển, trả về khối xử lý.\nNgược lại, trả về chính đơn vị đó.
diff --git a/core/assets/bundles/bundle_zh_CN.properties b/core/assets/bundles/bundle_zh_CN.properties
index f5e11ba156..60a25dd6d4 100644
--- a/core/assets/bundles/bundle_zh_CN.properties
+++ b/core/assets/bundles/bundle_zh_CN.properties
@@ -2423,6 +2423,7 @@ lenum.shoot = 向某个位置瞄准/射击
 lenum.shootp = 根据提前量向某个单位或建筑瞄准/射击
 lenum.config = 建筑设置，例如分类器所设置的筛选物品种类
 lenum.enabled = 建筑是否已启用
+laccess.currentammotype = Current ammo item/liquid of a turret.
 
 laccess.color = 照明器发光的颜色
 laccess.controller = 单位的控制方\n如果单位由处理器控制，返回对应的处理器\n如果单位在编队中，返回编队的领队\n其他情况，返回单位自身
diff --git a/core/assets/bundles/bundle_zh_TW.properties b/core/assets/bundles/bundle_zh_TW.properties
index 26f5bf7575..7ef0eea54f 100644
--- a/core/assets/bundles/bundle_zh_TW.properties
+++ b/core/assets/bundles/bundle_zh_TW.properties
@@ -2407,6 +2407,7 @@ lenum.shoot = 對該位置開火
 lenum.shootp = 對指定單位/建築開火，具自瞄功能
 lenum.config = 建築設置，例如分類器篩选的物品種類
 lenum.enabled = 確認該建築是否啟用
+laccess.currentammotype = Current ammo item/liquid of a turret.
 
 laccess.color = 照明燈顏色
 laccess.controller = 單位的控制者。受處理器控制時回傳處理器。\n在隊形中回傳領導的單位。\n否則回傳單位自己。