Merge remote-tracking branch 'origin/master'

core/assets/bundles/bundle.properties

@@ -1153,6 +1153,7 @@ rules.coreincinerates = Core Incinerates Overflow
 rules.disableworldprocessors = Disable World Processors
 rules.schematic = Schematics Allowed
 rules.wavetimer = Wave Timer
+rules.wavesending = Wave Sending
 rules.waves = Waves
 rules.attack = Attack Mode
 rules.rtsai = RTS AI
@@ -2114,7 +2115,7 @@ lst.getblock = Get tile data at any location.
 lst.setblock = Set tile data at any location.
 lst.spawnunit = Spawn unit at a location.
 lst.applystatus = Apply or clear a status effect from a unit.
-lst.spawnwave = Simulate a wave being spawned at an arbitrary location.\nWill not increment the wave counter.
+lst.spawnwave = Spawn a wave.
 lst.explosion = Create an explosion at a location.
 lst.setrate = Set processor execution speed in instructions/tick.
 lst.fetch = Lookup units, cores, players or buildings by index.\nIndices start at 0 and end at their returned count.

core/assets/bundles/bundle_be.properties

@@ -1132,6 +1132,7 @@ rules.coreincinerates = Core Incinerates Overflow
 rules.disableworldprocessors = Disable World Processors
 rules.schematic = Schematics Allowed
 rules.wavetimer = Інтэрвал хваляў
+rules.wavesending = Wave Sending
 rules.waves = Хвалі
 rules.attack = Рэжым атакі
 rules.rtsai = RTS AI

core/assets/bundles/bundle_bg.properties

@@ -1142,6 +1142,7 @@ rules.coreincinerates = Унищожаване на Ресурси при Пре
 rules.disableworldprocessors = Disable World Processors
 rules.schematic = Позволена Употребата на Схеми
 rules.wavetimer = Таймер за Вълни
+rules.wavesending = Wave Sending
 rules.waves = Вълни
 rules.attack = Режим Атака
 rules.rtsai = RTS AI

core/assets/bundles/bundle_ca.properties

@@ -1147,6 +1147,7 @@ rules.coreincinerates = El nucli incinera els excedents
 rules.disableworldprocessors = Desactiva els processadors integrats
 rules.schematic = Permetre l’ús d’esquemes
 rules.wavetimer = Temporitzador d’onades
+rules.wavesending = Wave Sending
 rules.waves = Onades
 rules.attack = Mode d’atac
 rules.rtsai = IA avançada (RTS AI)

core/assets/bundles/bundle_cs.properties

@@ -1144,6 +1144,7 @@ rules.coreincinerates = Jádro Spaluje Nadbytečné Suroviny
 rules.disableworldprocessors = Disable World Processors
 rules.schematic = Šablony povoleny
 rules.wavetimer = Časovač vln
+rules.wavesending = Wave Sending
 rules.waves = Vlny
 rules.attack = Režim útoku
 rules.rtsai = RTS AI

core/assets/bundles/bundle_da.properties

@@ -1132,6 +1132,7 @@ rules.coreincinerates = Core Incinerates Overflow
 rules.disableworldprocessors = Disable World Processors
 rules.schematic = Skabeloner tilladt
 rules.wavetimer = Bølge-æggeur
+rules.wavesending = Wave Sending
 rules.waves = Bølger
 rules.attack = Angrebsmode
 rules.rtsai = RTS AI

core/assets/bundles/bundle_de.properties

@@ -1147,6 +1147,7 @@ rules.coreincinerates = Kern verbrennt überflüssige Materialien
 rules.disableworldprocessors = Deaktiviere Weltprozessoren
 rules.schematic = Entwürfe erlaubt
 rules.wavetimer = Wellen-Timer
+rules.wavesending = Wave Sending
 rules.waves = Wellen
 rules.attack = Angriff-Modus
 rules.rtsai = RTS AI

core/assets/bundles/bundle_es.properties

@@ -1152,6 +1152,7 @@ rules.coreincinerates = Incinerar exceso de recursos en el Núcleo
 rules.disableworldprocessors = Desactivar procesadores integrados
 rules.schematic = Permitir esquemas
 rules.wavetimer = Temporizador de oleadas
+rules.wavesending = Wave Sending
 rules.waves = Oleadas
 rules.attack = Modo de ataque
 rules.rtsai = IA enemiga avanzada (RTS AI)

core/assets/bundles/bundle_et.properties

@@ -1132,6 +1132,7 @@ rules.coreincinerates = Core Incinerates Overflow
 rules.disableworldprocessors = Disable World Processors
 rules.schematic = Schematics Allowed
 rules.wavetimer = Kasuta taimerit
+rules.wavesending = Wave Sending
 rules.waves = Kasuta lahingulaineid
 rules.attack = Mänguviis "Rünnak"
 rules.rtsai = RTS AI

core/assets/bundles/bundle_eu.properties

@@ -1132,6 +1132,7 @@ rules.coreincinerates = Core Incinerates Overflow
 rules.disableworldprocessors = Disable World Processors
 rules.schematic = Schematics Allowed
 rules.wavetimer = Boladen denboragailua
+rules.wavesending = Wave Sending
 rules.waves = Boladak
 rules.attack = Eraso modua
 rules.rtsai = RTS AI

core/assets/bundles/bundle_fi.properties

@@ -1132,6 +1132,7 @@ rules.coreincinerates = Ydin höyrystää ylivuodon
 rules.disableworldprocessors = Poista maailmaprosessorit käytöstä
 rules.schematic = Salli kaaviot
 rules.wavetimer = Tasojen aikaraja
+rules.wavesending = Wave Sending
 rules.waves = Tasot
 rules.attack = Hyökkäystila
 rules.rtsai = RTS AI

core/assets/bundles/bundle_fil.properties

@@ -1132,6 +1132,7 @@ rules.coreincinerates = Core Incinerates Overflow
 rules.disableworldprocessors = Disable World Processors
 rules.schematic = Schematics Allowed
 rules.wavetimer = Wave Timer
+rules.wavesending = Wave Sending
 rules.waves = Waves
 rules.attack = Attack Mode
 rules.rtsai = RTS AI

core/assets/bundles/bundle_fr.properties

@@ -1152,6 +1152,7 @@ rules.coreincinerates = Incinération des surplus du Noyau
 rules.disableworldprocessors = Désactiver les Processeurs Globaux
 rules.schematic = Schémas autorisés
 rules.wavetimer = Compte à rebours des vagues
+rules.wavesending = Wave Sending
 rules.waves = Vagues
 rules.attack = Mode « Attaque »
 rules.rtsai = IA de RTS

core/assets/bundles/bundle_hu.properties

@@ -1141,6 +1141,7 @@ rules.coreincinerates = Túlcsorduló itemek megsemmisítse a magban
 rules.disableworldprocessors = Disable World Processors
 rules.schematic = Schematicok
 rules.wavetimer = Hullám időzítő
+rules.wavesending = Wave Sending
 rules.waves = Hullámok
 rules.attack = Támadás mód
 rules.rtsai = RTS AI

core/assets/bundles/bundle_id_ID.properties

@@ -1152,6 +1152,7 @@ rules.coreincinerates = Penghangusan Luapan Inti
 rules.disableworldprocessors = Nonaktifkan Prosesor Dunia
 rules.schematic = Bagan Diperbolehkan
 rules.wavetimer = Pengaturan Waktu Gelombang
+rules.wavesending = Wave Sending
 rules.waves = Gelombang
 rules.attack = Mode Penyerangan
 rules.rtsai = A.I. RTS

core/assets/bundles/bundle_it.properties

@@ -1139,6 +1139,7 @@ rules.coreincinerates = Core Incinerates Overflow
 rules.disableworldprocessors = Disabilita processori
 rules.schematic = Schematiche Consentite
 rules.wavetimer = Timer Ondate
+rules.wavesending = Wave Sending
 rules.waves = Ondate
 rules.attack = Modalità Attacco
 rules.rtsai = RTS AI

core/assets/bundles/bundle_ja.properties

@@ -1144,6 +1144,7 @@ rules.coreincinerates = 余剰アイテムの焼却
 rules.disableworldprocessors = Disable World Processors
 rules.schematic = 設計図を許可
 rules.wavetimer = ウェーブの自動進行
+rules.wavesending = Wave Sending
 rules.waves = ウェーブ
 rules.attack = アタックモード
 rules.rtsai = RTS AI

core/assets/bundles/bundle_ko.properties

@@ -1145,6 +1145,7 @@ rules.coreincinerates = 코어 방화 비허용
 rules.disableworldprocessors = 월드 프로세서 비활성화
 rules.schematic = 설계도 허용
 rules.wavetimer = 시간 제한이 있는 단계
+rules.wavesending = Wave Sending
 rules.waves = 단계
 rules.attack = 공격 모드
 rules.rtsai = RTS AI

core/assets/bundles/bundle_lt.properties

@@ -1132,6 +1132,7 @@ rules.coreincinerates = Core Incinerates Overflow
 rules.disableworldprocessors = Disable World Processors
 rules.schematic = Schematics Allowed
 rules.wavetimer = Bangų Laikmatis
+rules.wavesending = Wave Sending
 rules.waves = Bangos
 rules.attack = Puolimo Režimas
 rules.rtsai = RTS AI

core/assets/bundles/bundle_nl.properties

@@ -1132,6 +1132,7 @@ rules.coreincinerates = Core Incinerates Overflow
 rules.disableworldprocessors = Disable World Processors
 rules.schematic = Schematics Allowed
 rules.wavetimer = Ronde timer
+rules.wavesending = Wave Sending
 rules.waves = Rondes
 rules.attack = Aanval modus
 rules.rtsai = RTS AI

core/assets/bundles/bundle_nl_BE.properties

@@ -1132,6 +1132,7 @@ rules.coreincinerates = Core Incinerates Overflow
 rules.disableworldprocessors = Disable World Processors
 rules.schematic = Schematics Allowed
 rules.wavetimer = Wave Timer
+rules.wavesending = Wave Sending
 rules.waves = Waves
 rules.attack = Attack Mode
 rules.rtsai = RTS AI

core/assets/bundles/bundle_pl.properties

@@ -1143,6 +1143,7 @@ rules.coreincinerates = Rdzeń Spala Nadmiarowe Przedmioty
 rules.disableworldprocessors = Wyłącz Procesor Świata
 rules.schematic = Zezwalaj na schematy
 rules.wavetimer = Zegar Fal
+rules.wavesending = Wave Sending
 rules.waves = Fale
 rules.attack = Tryb Ataku
 rules.rtsai = RTS SI

core/assets/bundles/bundle_pt_BR.properties

@@ -1139,6 +1139,7 @@ rules.coreincinerates = Core Incinerates Overflow
 rules.disableworldprocessors = Disable World Processors
 rules.schematic = Permitir Esquemas
 rules.wavetimer = Tempo de horda
+rules.wavesending = Wave Sending
 rules.waves = Hordas
 rules.attack = Modo de ataque
 rules.rtsai = RTS AI

core/assets/bundles/bundle_pt_PT.properties

@@ -1132,6 +1132,7 @@ rules.coreincinerates = Core Incinerates Overflow
 rules.disableworldprocessors = Disable World Processors
 rules.schematic = Schematics Allowed
 rules.wavetimer = Tempo de horda
+rules.wavesending = Wave Sending
 rules.waves = Hordas
 rules.attack = Modo de ataque
 rules.rtsai = RTS AI

core/assets/bundles/bundle_ro.properties

@@ -1144,6 +1144,7 @@ rules.coreincinerates = Nucleul Incinerează Resursele în Plus
 rules.disableworldprocessors = Disable World Processors
 rules.schematic = Se Pot Folosi Scheme
 rules.wavetimer = Valuri pe Timp
+rules.wavesending = Wave Sending
 rules.waves = Valuri
 rules.attack = Modul Atac
 rules.rtsai = RTS AI

core/assets/bundles/bundle_ru.properties

@@ -1142,6 +1142,7 @@ rules.coreincinerates = Ядро сжигает избыток ресурсов
 rules.disableworldprocessors = Отключить мировые процессоры
 rules.schematic = Схемы разрешены
 rules.wavetimer = Интервал волн
+rules.wavesending = Wave Sending
 rules.waves = Волны
 rules.attack = Режим атаки
 rules.rtsai = ИИ в реальном времени

core/assets/bundles/bundle_sr.properties

@@ -1144,6 +1144,7 @@ rules.coreincinerates = Core Incinerates Overflow
 rules.disableworldprocessors = Onesposobi Svetovne Procesore
 rules.schematic = Šeme Su Dozvoljene
 rules.wavetimer = Wave Timer
+rules.wavesending = Wave Sending
 rules.waves = Talasi
 rules.attack = Mod Napada
 rules.rtsai = RTS AI

core/assets/bundles/bundle_sv.properties

@@ -1132,6 +1132,7 @@ rules.coreincinerates = Core Incinerates Overflow
 rules.disableworldprocessors = Disable World Processors
 rules.schematic = Schematics Allowed
 rules.wavetimer = Vågtimer
+rules.wavesending = Wave Sending
 rules.waves = Vågor
 rules.attack = Attack Mode
 rules.rtsai = RTS AI

core/assets/bundles/bundle_th.properties

@@ -1144,6 +1144,7 @@ rules.coreincinerates = แกนกลางเผาทรัพยากร
 rules.disableworldprocessors = ปิดการทำงานของตัวประมวลผลโลก
 rules.schematic = อนุญาตแผนผัง
 rules.wavetimer = นับถอยหลังการปล่อยคลื่น
+rules.wavesending = Wave Sending
 rules.waves = คลื่น
 rules.attack = โหมดการโจมตี
 rules.rtsai = RTS AI

core/assets/bundles/bundle_tk.properties

@@ -1132,6 +1132,7 @@ rules.coreincinerates = Core Incinerates Overflow
 rules.disableworldprocessors = Disable World Processors
 rules.schematic = Schematics Allowed
 rules.wavetimer = Wave Timer
+rules.wavesending = Wave Sending
 rules.waves = Waves
 rules.attack = Attack Mode
 rules.rtsai = RTS AI

core/assets/bundles/bundle_tr.properties

@@ -1144,6 +1144,7 @@ rules.coreincinerates = Merkez Taşanları Eritir
 rules.disableworldprocessors = Evrensel İşlemcileri Devredışı Bırak
 rules.schematic = Şema Kullanılabilir
 rules.wavetimer = Dalga Zamanlayıcısı
+rules.wavesending = Wave Sending
 rules.waves = Dalgalar
 rules.attack = Saldırı Modu
 rules.rtsai = RTS AI

core/assets/bundles/bundle_uk_UA.properties

@@ -1147,6 +1147,7 @@ rules.coreincinerates = Ядро спалює надлишкові предме
 rules.disableworldprocessors = Вимкнути світові процесори
 rules.schematic = Використання схем дозволено
 rules.wavetimer = Таймер для хвиль
+rules.wavesending = Wave Sending
 rules.waves = Хвилі
 rules.attack = Режим атаки
 rules.rtsai = ШІ зі стратегій реального часу

core/assets/bundles/bundle_vi.properties

@@ -1144,6 +1144,7 @@ rules.coreincinerates = Hủy vật phẩm khi căn cứ đầy
 rules.disableworldprocessors = Disable World Processors
 rules.schematic = Cho phép dùng bản thiết kế
 rules.wavetimer = Đếm ngược đợt
+rules.wavesending = Wave Sending
 rules.waves = Đợt
 rules.attack = Chế độ tấn công
 rules.rtsai = RTS AI

core/assets/bundles/bundle_zh_CN.properties

@@ -1145,6 +1145,7 @@ rules.coreincinerates = 核心焚烧
 rules.disableworldprocessors = 禁用世界处理器
 rules.schematic = 允许使用蓝图
 rules.wavetimer = 波次计时器
+rules.wavesending = Wave Sending
 rules.waves = 波次
 rules.attack = 进攻模式
 rules.rtsai = RTS AI

core/assets/bundles/bundle_zh_TW.properties

@@ -1152,6 +1152,7 @@ rules.coreincinerates = 核心銷毀物品
 rules.disableworldprocessors = 停用世界處理器
 rules.schematic = 允許使用藍圖
 rules.wavetimer = 波次時間
+rules.wavesending = Wave Sending
 rules.waves = 波次
 rules.attack = 攻擊模式
 rules.rtsai = RTS AI

core/src/mindustry/entities/comp/BoundedComp.java

@@ -5,6 +5,7 @@ import arc.util.*;
 import mindustry.annotations.Annotations.*;
 import mindustry.game.*;
 import mindustry.gen.*;
+import mindustry.type.*;
 
 import static mindustry.Vars.*;
 
@@ -12,11 +13,14 @@ import static mindustry.Vars.*;
 abstract class BoundedComp implements Velc, Posc, Healthc, Flyingc{
     static final float warpDst = 30f;
 
+    @Import UnitType type;
     @Import float x, y;
     @Import Team team;
 
     @Override
     public void update(){
+        if(!type.bounded) return;
+        
         float bot = 0f, left = 0f, top = world.unitHeight(), right = world.unitWidth();
 
         //TODO hidden map rules only apply to player teams? should they?

core/src/mindustry/game/MapObjectives.java

@@ -380,7 +380,7 @@ public class MapObjectives implements Iterable<MapObjective>, Eachable<MapObject
 
         @Override
         public String text(){
-            return Core.bundle.format("objective.build", count, block.emoji(), block.localizedName);
+            return Core.bundle.format("objective.build", count - state.stats.placedBlockCount.get(block, 0), block.emoji(), block.localizedName);
         }
     }
 
@@ -403,7 +403,7 @@ public class MapObjectives implements Iterable<MapObjective>, Eachable<MapObject
 
         @Override
         public String text(){
-            return Core.bundle.format("objective.buildunit", count, unit.emoji(), unit.localizedName);
+            return Core.bundle.format("objective.buildunit", count - state.rules.defaultTeam.data().countType(unit), unit.emoji(), unit.localizedName);
         }
     }
 
@@ -424,7 +424,7 @@ public class MapObjectives implements Iterable<MapObjective>, Eachable<MapObject
 
         @Override
         public String text(){
-            return Core.bundle.format("objective.destroyunits", count);
+            return Core.bundle.format("objective.destroyunits", count - state.stats.enemyUnitsDestroyed);
         }
     }
 

core/src/mindustry/game/Rules.java

@@ -25,6 +25,8 @@ public class Rules{
     public TeamRules teams = new TeamRules();
     /** Whether the waves come automatically on a timer. If not, waves come when the play button is pressed. */
     public boolean waveTimer = true;
+    /** Whether the waves can be manually summoned with the play button. */
+    public boolean waveSending = true;
     /** Whether waves are spawnable at all. */
     public boolean waves;
     /** Whether the game objective is PvP. Note that this enables automatic hosting. */

core/src/mindustry/logic/LExecutor.java

@@ -1409,6 +1409,7 @@ public class LExecutor{
                 case wave -> state.wave = exec.numi(value);
                 case currentWaveTime -> state.wavetime = exec.numf(value) * 60f;
                 case waves -> state.rules.waves = exec.bool(value);
+                case waveSending -> state.rules.waveSending = exec.bool(value);
                 case attackMode -> state.rules.attackMode = exec.bool(value);
                 case waveSpacing -> state.rules.waveSpacing = exec.numf(value) * 60f;
                 case enemyCoreBuildRadius -> state.rules.enemyCoreBuildRadius = exec.numf(value) * 8f;
@@ -1641,12 +1642,14 @@ public class LExecutor{
     }
 
     public static class SpawnWaveI implements LInstruction{
+        public int natural;
         public int x, y;
 
         public SpawnWaveI(){
         }
 
-        public SpawnWaveI(int x, int y){
+        public SpawnWaveI(int natural, int x, int y){
+            this.natural = natural;
             this.x = x;
             this.y = y;
         }
@@ -1655,9 +1658,14 @@ public class LExecutor{
         public void run(LExecutor exec){
             if(net.client()) return;
 
+            if(exec.bool(natural)){
+                logic.skipWave();
+                return;
+            }
+
             float
-            spawnX = World.unconv(exec.numf(x)),
+                spawnX = World.unconv(exec.numf(x)),
-            spawnY = World.unconv(exec.numf(y));
+                spawnY = World.unconv(exec.numf(y));
             int packed = Point2.pack(exec.numi(x), exec.numi(y));
 
             for(SpawnGroup group : state.rules.spawns){

core/src/mindustry/logic/LStatements.java

@@ -1309,16 +1309,18 @@ public class LStatements{
 
     @RegisterStatement("spawnwave")
     public static class SpawnWaveStatement extends LStatement{
-        public String x = "10", y = "10";
+        public String x = "10", y = "10", natural = "false";
 
         @Override
         public void build(Table table){
+            table.add("natural ");
+            fields(table, natural, str -> natural = str);
 
-            table.add("x ");
+            table.add("x ").visible(() -> natural.equals("false"));
-            fields(table, x, str -> x = str);
+            fields(table, x, str -> x = str).visible(() -> natural.equals("false"));
 
-            table.add(" y ");
+            table.add(" y ").visible(() -> natural.equals("false"));
-            fields(table, y, str -> y = str);
+            fields(table, y, str -> y = str).visible(() -> natural.equals("false"));
         }
 
         @Override
@@ -1328,7 +1330,7 @@ public class LStatements{
 
         @Override
         public LInstruction build(LAssembler builder){
-            return new SpawnWaveI(builder.var(x), builder.var(y));
+            return new SpawnWaveI(builder.var(natural), builder.var(x), builder.var(y));
         }
 
         @Override

core/src/mindustry/logic/LogicRule.java

@@ -6,6 +6,7 @@ public enum LogicRule{
     waves,
     wave,
     waveSpacing,
+    waveSending,
     attackMode,
     enemyCoreBuildRadius,
     dropZoneRadius,

core/src/mindustry/type/UnitType.java

@@ -208,6 +208,8 @@ public class UnitType extends UnlockableContent{
     hidden = false,
     /** if true, this unit is for internal use only and does not have a sprite generated. */
     internal = false,
+    /** If false, this unit is not pushed away from map edges. */
+    bounded = true,
     /** if true, this unit is detected as naval - do NOT assign this manually! Initialized in init() */
     naval = false,
 

core/src/mindustry/type/unit/MissileUnitType.java

@@ -25,6 +25,7 @@ public class MissileUnitType extends UnitType{
         envEnabled = Env.any;
         envDisabled = Env.none;
         physics = false;
+        bounded = false;
         trailLength = 7;
         hidden = true;
         speed = 4f;

core/src/mindustry/ui/dialogs/CustomRulesDialog.java

@@ -139,6 +139,7 @@ public class CustomRulesDialog extends BaseDialog{
         title("@rules.title.waves");
         check("@rules.waves", b -> rules.waves = b, () -> rules.waves);
         check("@rules.wavetimer", b -> rules.waveTimer = b, () -> rules.waveTimer);
+        check("@rules.wavesending", b -> rules.waveSending = b, () -> rules.waveSending);
         check("@rules.waitForWaveToEnd", b -> rules.waitEnemies = b, () -> rules.waitEnemies);
         number("@rules.wavespacing", false, f -> rules.waveSpacing = f * 60f, () -> rules.waveSpacing / 60f, () -> rules.waveTimer, 1, Float.MAX_VALUE);
         //this is experimental, because it's not clear that 0 makes it default.

core/src/mindustry/ui/fragments/HudFragment.java

@@ -908,7 +908,7 @@ public class HudFragment{
     }
 
     private boolean canSkipWave(){
-        return state.rules.waves && ((net.server() || player.admin) || !net.active()) && state.enemies == 0 && !spawner.isSpawning();
+        return state.rules.waves && state.rules.waveSending && ((net.server() || player.admin) || !net.active()) && state.enemies == 0 && !spawner.isSpawning();
     }
 
 }