Merge branch 'master' into schematic

core/assets/bundles/bundle.properties

@@ -138,6 +138,8 @@ mod.scripts.disable = Your device does not support mods with scripts. You must d
 about.button = About
 name = Name:
 noname = Pick a[accent] player name[] first.
+planetmap = Planet Map
+launchcore = Launch Core
 filename = File Name:
 unlocked = New content unlocked!
 completed = [accent]Completed
@@ -172,7 +174,7 @@ host.info = The [accent]host[] button hosts a server on port [scarlet]6567[]. \n
 join.info = Here, you can enter a [accent]server IP[] to connect to, or discover [accent]local network[] or [accent]global[] servers to connect to.\nBoth LAN and WAN multiplayer is supported.\n\n[lightgray]If you want to connect to someone by IP, you would need to ask the host for their IP, which can be found by googling "my ip" from their device.
 hostserver = Host Multiplayer Game
 invitefriends = Invite Friends
-hostserver.mobile = Host\nGame
+hostserver.mobile = Host Game
 host = Host
 hosting = [accent]Opening server...
 hosts.refresh = Refresh
@@ -577,6 +579,8 @@ blocks.shootrange = Range
 blocks.size = Size
 blocks.liquidcapacity = Liquid Capacity
 blocks.powerrange = Power Range
+blocks.linkrange = Link Range
+blocks.instructions = Instructions
 blocks.powerconnections = Max Connections
 blocks.poweruse = Power Use
 blocks.powerdamage = Power/Damage
@@ -729,6 +733,7 @@ category.blocks.name = Block Select
 command.attack = Attack
 command.rally = Rally
 command.retreat = Retreat
+command.idle = Idle
 placement.blockselectkeys = \n[lightgray]Key: [{0},
 keybind.respawn.name = Respawn
 keybind.control.name = Control Unit
@@ -741,6 +746,7 @@ keybind.toggle_block_status.name = Toggle Block Statuses
 keybind.move_x.name = Move X
 keybind.move_y.name = Move Y
 keybind.mouse_move.name = Follow Mouse
+keybind.pan.name = Pan View
 keybind.boost.name = Boost
 keybind.schematic_select.name = Select Region
 keybind.schematic_menu.name = Schematic Menu
@@ -1076,6 +1082,7 @@ block.container.name = Container
 block.launch-pad.name = Launch Pad
 block.launch-pad-large.name = Large Launch Pad
 block.segment.name = Segment
+block.command-center.name = Command Center
 block.ground-factory.name = Ground Factory
 block.air-factory.name = Air Factory
 block.naval-factory.name = Naval Factory
@@ -1083,7 +1090,7 @@ block.additive-reconstructor.name = Additive Reconstructor
 block.multiplicative-reconstructor.name = Multiplicative Reconstructor
 block.exponential-reconstructor.name = Exponential Reconstructor
 block.tetrative-reconstructor.name = Tetrative Reconstructor
-block.mass-conveyor.name = Mass Conveyor
+block.payload-conveyor.name = Payload Conveyor
 block.payload-router.name = Payload Router
 block.disassembler.name = Disassembler
 block.silicon-crucible.name = Silicon Crucible
@@ -1092,6 +1099,7 @@ block.overdrive-dome.name = Overdrive Dome
 block.switch.name = Switch
 block.micro-processor.name = Micro Processor
 block.logic-processor.name = Logic Processor
+block.hyper-processor.name = Hyper Processor
 block.logic-display.name = Logic Display
 block.memory-cell.name = Memory Cell
 

core/assets/bundles/bundle_be.properties

@@ -1062,7 +1062,7 @@ block.additive-reconstructor.name = Additive Reconstructor
 block.multiplicative-reconstructor.name = Multiplicative Reconstructor
 block.exponential-reconstructor.name = Exponential Reconstructor
 block.tetrative-reconstructor.name = Tetrative Reconstructor
-block.mass-conveyor.name = Mass Conveyor
+block.payload-conveyor.name = Mass Conveyor
 block.payload-router.name = Payload Router
 block.disassembler.name = Disassembler
 block.silicon-crucible.name = Silicon Crucible

core/assets/bundles/bundle_cs.properties

@@ -1062,7 +1062,7 @@ block.additive-reconstructor.name = Přídavný přestavbovač
 block.multiplicative-reconstructor.name = Násobný přestavbovač
 block.exponential-reconstructor.name = Exponenciální přestavbovač
 block.tetrative-reconstructor.name = Umocňující přestavbovač
-block.mass-conveyor.name = Hromadný dopravník
+block.payload-conveyor.name = Hromadný dopravník
 block.payload-router.name = Směřovač nákladu
 block.disassembler.name = Rozebírač
 block.silicon-crucible.name = Křemíková nádoba

core/assets/bundles/bundle_da.properties

@@ -1062,7 +1062,7 @@ block.additive-reconstructor.name = Additive Reconstructor
 block.multiplicative-reconstructor.name = Multiplicative Reconstructor
 block.exponential-reconstructor.name = Exponential Reconstructor
 block.tetrative-reconstructor.name = Tetrative Reconstructor
-block.mass-conveyor.name = Mass Conveyor
+block.payload-conveyor.name = Mass Conveyor
 block.payload-router.name = Payload Router
 block.disassembler.name = Disassembler
 block.silicon-crucible.name = Silicon Crucible

core/assets/bundles/bundle_de.properties

@@ -1062,7 +1062,7 @@ block.additive-reconstructor.name = Additive Reconstructor
 block.multiplicative-reconstructor.name = Multiplicative Reconstructor
 block.exponential-reconstructor.name = Exponential Reconstructor
 block.tetrative-reconstructor.name = Tetrative Reconstructor
-block.mass-conveyor.name = Mass Conveyor
+block.payload-conveyor.name = Mass Conveyor
 block.payload-router.name = Payload Router
 block.disassembler.name = Disassembler
 block.silicon-crucible.name = Silicon Crucible

core/assets/bundles/bundle_es.properties

@@ -1062,7 +1062,7 @@ block.additive-reconstructor.name = Additive Reconstructor
 block.multiplicative-reconstructor.name = Multiplicative Reconstructor
 block.exponential-reconstructor.name = Exponential Reconstructor
 block.tetrative-reconstructor.name = Tetrative Reconstructor
-block.mass-conveyor.name = Mass Conveyor
+block.payload-conveyor.name = Mass Conveyor
 block.payload-router.name = Payload Router
 block.disassembler.name = Disassembler
 block.silicon-crucible.name = Silicon Crucible

core/assets/bundles/bundle_et.properties

@@ -1062,7 +1062,7 @@ block.additive-reconstructor.name = Additive Reconstructor
 block.multiplicative-reconstructor.name = Multiplicative Reconstructor
 block.exponential-reconstructor.name = Exponential Reconstructor
 block.tetrative-reconstructor.name = Tetrative Reconstructor
-block.mass-conveyor.name = Mass Conveyor
+block.payload-conveyor.name = Mass Conveyor
 block.payload-router.name = Payload Router
 block.disassembler.name = Disassembler
 block.silicon-crucible.name = Silicon Crucible

core/assets/bundles/bundle_eu.properties

@@ -1062,7 +1062,7 @@ block.additive-reconstructor.name = Additive Reconstructor
 block.multiplicative-reconstructor.name = Multiplicative Reconstructor
 block.exponential-reconstructor.name = Exponential Reconstructor
 block.tetrative-reconstructor.name = Tetrative Reconstructor
-block.mass-conveyor.name = Mass Conveyor
+block.payload-conveyor.name = Mass Conveyor
 block.payload-router.name = Payload Router
 block.disassembler.name = Disassembler
 block.silicon-crucible.name = Silicon Crucible

core/assets/bundles/bundle_fi.properties

@@ -1062,7 +1062,7 @@ block.additive-reconstructor.name = Additive Reconstructor
 block.multiplicative-reconstructor.name = Multiplicative Reconstructor
 block.exponential-reconstructor.name = Exponential Reconstructor
 block.tetrative-reconstructor.name = Tetrative Reconstructor
-block.mass-conveyor.name = Mass Conveyor
+block.payload-conveyor.name = Mass Conveyor
 block.payload-router.name = Payload Router
 block.disassembler.name = Disassembler
 block.silicon-crucible.name = Silicon Crucible

core/assets/bundles/bundle_fil.properties

@@ -1076,7 +1076,7 @@ block.additive-reconstructor.name = Additive Reconstructor
 block.multiplicative-reconstructor.name = Multiplicative Reconstructor
 block.exponential-reconstructor.name = Exponential Reconstructor
 block.tetrative-reconstructor.name = Tetrative Reconstructor
-block.mass-conveyor.name = Mass Conveyor
+block.payload-conveyor.name = Mass Conveyor
 block.payload-router.name = Payload Router
 block.disassembler.name = Disassembler
 block.silicon-crucible.name = Silicon Crucible

core/assets/bundles/bundle_fr.properties

@@ -1062,7 +1062,7 @@ block.additive-reconstructor.name = Reconstructeur Additif
 block.multiplicative-reconstructor.name = Reconstructeur Multiplicatif
 block.exponential-reconstructor.name = Reconstructeur Exponentiel
 block.tetrative-reconstructor.name = Reconstructeur Tétratif
-block.mass-conveyor.name = Convoyeur de Masse
+block.payload-conveyor.name = Convoyeur de Masse
 block.payload-router.name = Routeur de Charge Utile
 block.disassembler.name = Disassembler
 block.silicon-crucible.name = Creuset de Silicium

core/assets/bundles/bundle_fr_BE.properties

@@ -1062,7 +1062,7 @@ block.additive-reconstructor.name = Additive Reconstructor
 block.multiplicative-reconstructor.name = Multiplicative Reconstructor
 block.exponential-reconstructor.name = Exponential Reconstructor
 block.tetrative-reconstructor.name = Tetrative Reconstructor
-block.mass-conveyor.name = Mass Conveyor
+block.payload-conveyor.name = Mass Conveyor
 block.payload-router.name = Payload Router
 block.disassembler.name = Disassembler
 block.silicon-crucible.name = Silicon Crucible

core/assets/bundles/bundle_hu.properties

@@ -1062,7 +1062,7 @@ block.additive-reconstructor.name = Additive Reconstructor
 block.multiplicative-reconstructor.name = Multiplicative Reconstructor
 block.exponential-reconstructor.name = Exponential Reconstructor
 block.tetrative-reconstructor.name = Tetrative Reconstructor
-block.mass-conveyor.name = Mass Conveyor
+block.payload-conveyor.name = Mass Conveyor
 block.payload-router.name = Payload Router
 block.disassembler.name = Disassembler
 block.silicon-crucible.name = Silicon Crucible

core/assets/bundles/bundle_in_ID.properties

@@ -1062,7 +1062,7 @@ block.additive-reconstructor.name = Additive Reconstructor
 block.multiplicative-reconstructor.name = Multiplicative Reconstructor
 block.exponential-reconstructor.name = Exponential Reconstructor
 block.tetrative-reconstructor.name = Tetrative Reconstructor
-block.mass-conveyor.name = Mass Conveyor
+block.payload-conveyor.name = Mass Conveyor
 block.payload-router.name = Payload Router
 block.disassembler.name = Disassembler
 block.silicon-crucible.name = Silicon Crucible

core/assets/bundles/bundle_it.properties

@@ -1062,7 +1062,7 @@ block.additive-reconstructor.name = Additive Reconstructor
 block.multiplicative-reconstructor.name = Multiplicative Reconstructor
 block.exponential-reconstructor.name = Exponential Reconstructor
 block.tetrative-reconstructor.name = Tetrative Reconstructor
-block.mass-conveyor.name = Mass Conveyor
+block.payload-conveyor.name = Mass Conveyor
 block.payload-router.name = Payload Router
 block.disassembler.name = Disassembler
 block.silicon-crucible.name = Silicon Crucible

core/assets/bundles/bundle_ja.properties

@@ -1062,7 +1062,7 @@ block.additive-reconstructor.name = Additive Reconstructor
 block.multiplicative-reconstructor.name = Multiplicative Reconstructor
 block.exponential-reconstructor.name = Exponential Reconstructor
 block.tetrative-reconstructor.name = Tetrative Reconstructor
-block.mass-conveyor.name = Mass Conveyor
+block.payload-conveyor.name = Mass Conveyor
 block.payload-router.name = Payload Router
 block.disassembler.name = Disassembler
 block.silicon-crucible.name = Silicon Crucible

core/assets/bundles/bundle_ko.properties

@@ -1062,7 +1062,7 @@ block.additive-reconstructor.name = 첨가물 재구성기
 block.multiplicative-reconstructor.name = 다중 재구성기
 block.exponential-reconstructor.name = 지수 재구성기
 block.tetrative-reconstructor.name = 정서 재구성기
-block.mass-conveyor.name = 매스 컨베이어
+block.payload-conveyor.name = 매스 컨베이어
 block.payload-router.name = 화물 분배기
 block.disassembler.name = 분해기
 block.silicon-crucible.name = 실리콘 도가니

core/assets/bundles/bundle_lt.properties

@@ -1062,7 +1062,7 @@ block.additive-reconstructor.name = Additive Reconstructor
 block.multiplicative-reconstructor.name = Multiplicative Reconstructor
 block.exponential-reconstructor.name = Exponential Reconstructor
 block.tetrative-reconstructor.name = Tetrative Reconstructor
-block.mass-conveyor.name = Mass Conveyor
+block.payload-conveyor.name = Mass Conveyor
 block.payload-router.name = Payload Router
 block.disassembler.name = Disassembler
 block.silicon-crucible.name = Silicon Crucible

core/assets/bundles/bundle_nl.properties

@@ -1062,7 +1062,7 @@ block.additive-reconstructor.name = Additive Reconstructor
 block.multiplicative-reconstructor.name = Multiplicative Reconstructor
 block.exponential-reconstructor.name = Exponential Reconstructor
 block.tetrative-reconstructor.name = Tetrative Reconstructor
-block.mass-conveyor.name = Mass Conveyor
+block.payload-conveyor.name = Mass Conveyor
 block.payload-router.name = Payload Router
 block.disassembler.name = Disassembler
 block.silicon-crucible.name = Silicon Crucible

core/assets/bundles/bundle_nl_BE.properties

@@ -1062,7 +1062,7 @@ block.additive-reconstructor.name = Additive Reconstructor
 block.multiplicative-reconstructor.name = Multiplicative Reconstructor
 block.exponential-reconstructor.name = Exponential Reconstructor
 block.tetrative-reconstructor.name = Tetrative Reconstructor
-block.mass-conveyor.name = Mass Conveyor
+block.payload-conveyor.name = Mass Conveyor
 block.payload-router.name = Payload Router
 block.disassembler.name = Disassembler
 block.silicon-crucible.name = Silicon Crucible

core/assets/bundles/bundle_pl.properties

@@ -1063,7 +1063,7 @@ block.additive-reconstructor.name = Rekonstruktor Addytywny
 block.multiplicative-reconstructor.name = Rekonstruktor Multiplikatywny
 block.exponential-reconstructor.name = Rekonstruktor Wykładniczy
 block.tetrative-reconstructor.name = Tetrative Reconstructor
-block.mass-conveyor.name = Przenośnik Masowy
+block.payload-conveyor.name = Przenośnik Masowy
 block.payload-router.name = Rozdzielacz Ładunku
 block.disassembler.name = Dezasembler
 block.silicon-crucible.name = Silicon Crucible

core/assets/bundles/bundle_pt_BR.properties

@@ -1062,7 +1062,7 @@ block.additive-reconstructor.name = Additive Reconstructor
 block.multiplicative-reconstructor.name = Multiplicative Reconstructor
 block.exponential-reconstructor.name = Exponential Reconstructor
 block.tetrative-reconstructor.name = Tetrative Reconstructor
-block.mass-conveyor.name = Mass Conveyor
+block.payload-conveyor.name = Mass Conveyor
 block.payload-router.name = Payload Router
 block.disassembler.name = Disassembler
 block.silicon-crucible.name = Silicon Crucible

core/assets/bundles/bundle_pt_PT.properties

@@ -1062,7 +1062,7 @@ block.additive-reconstructor.name = Additive Reconstructor
 block.multiplicative-reconstructor.name = Multiplicative Reconstructor
 block.exponential-reconstructor.name = Exponential Reconstructor
 block.tetrative-reconstructor.name = Tetrative Reconstructor
-block.mass-conveyor.name = Mass Conveyor
+block.payload-conveyor.name = Mass Conveyor
 block.payload-router.name = Payload Router
 block.disassembler.name = Disassembler
 block.silicon-crucible.name = Silicon Crucible

core/assets/bundles/bundle_ru.properties

@@ -1079,7 +1079,7 @@ block.additive-reconstructor.name = Добавляющий реконструк
 block.multiplicative-reconstructor.name = Умножающий реконструктор
 block.exponential-reconstructor.name = Экспоненциальный реконструктор
 block.tetrative-reconstructor.name = Тетративный реконструктор
-block.mass-conveyor.name = Грузовой конвейер
+block.payload-conveyor.name = Грузовой конвейер
 block.payload-router.name = Разгрузочный маршрутизатор
 block.disassembler.name = Разборщик
 block.silicon-crucible.name = Кремниевый тигель

core/assets/bundles/bundle_sv.properties

@@ -1062,7 +1062,7 @@ block.additive-reconstructor.name = Additive Reconstructor
 block.multiplicative-reconstructor.name = Multiplicative Reconstructor
 block.exponential-reconstructor.name = Exponential Reconstructor
 block.tetrative-reconstructor.name = Tetrative Reconstructor
-block.mass-conveyor.name = Mass Conveyor
+block.payload-conveyor.name = Mass Conveyor
 block.payload-router.name = Payload Router
 block.disassembler.name = Disassembler
 block.silicon-crucible.name = Silicon Crucible

core/assets/bundles/bundle_th.properties

@@ -1062,7 +1062,7 @@ block.additive-reconstructor.name = Additive Reconstructor
 block.multiplicative-reconstructor.name = Multiplicative Reconstructor
 block.exponential-reconstructor.name = Exponential Reconstructor
 block.tetrative-reconstructor.name = Tetrative Reconstructor
-block.mass-conveyor.name = Mass Conveyor
+block.payload-conveyor.name = Mass Conveyor
 block.payload-router.name = Payload Router
 block.disassembler.name = Disassembler
 block.silicon-crucible.name = Silicon Crucible

core/assets/bundles/bundle_tk.properties

@@ -1062,7 +1062,7 @@ block.additive-reconstructor.name = Additive Reconstructor
 block.multiplicative-reconstructor.name = Multiplicative Reconstructor
 block.exponential-reconstructor.name = Exponential Reconstructor
 block.tetrative-reconstructor.name = Tetrative Reconstructor
-block.mass-conveyor.name = Mass Conveyor
+block.payload-conveyor.name = Mass Conveyor
 block.payload-router.name = Payload Router
 block.disassembler.name = Disassembler
 block.silicon-crucible.name = Silicon Crucible

core/assets/bundles/bundle_tr.properties

@@ -1062,7 +1062,7 @@ block.additive-reconstructor.name = Additive Reconstructor
 block.multiplicative-reconstructor.name = Multiplicative Reconstructor
 block.exponential-reconstructor.name = Exponential Reconstructor
 block.tetrative-reconstructor.name = Tetrative Reconstructor
-block.mass-conveyor.name = Mass Conveyor
+block.payload-conveyor.name = Mass Conveyor
 block.payload-router.name = Payload Router
 block.disassembler.name = Disassembler
 block.silicon-crucible.name = Silicon Crucible

core/assets/bundles/bundle_uk_UA.properties

@@ -1062,7 +1062,7 @@ block.additive-reconstructor.name = Додавальний реконструк
 block.multiplicative-reconstructor.name = Примножувальний реконструктор
 block.exponential-reconstructor.name = Експоненційний реконструктор
 block.tetrative-reconstructor.name = Тетративний  реконструктор
-block.mass-conveyor.name = Вантажний конвеєр
+block.payload-conveyor.name = Вантажний конвеєр
 block.payload-router.name = Розвантажувальний маршрутизатор
 block.disassembler.name = Розбирач
 block.silicon-crucible.name = Кремнієвий тигель

core/assets/bundles/bundle_zh_CN.properties

@@ -1062,7 +1062,7 @@ block.additive-reconstructor.name = Additive Reconstructor
 block.multiplicative-reconstructor.name = Multiplicative Reconstructor
 block.exponential-reconstructor.name = Exponential Reconstructor
 block.tetrative-reconstructor.name = Tetrative Reconstructor
-block.mass-conveyor.name = Mass Conveyor
+block.payload-conveyor.name = Mass Conveyor
 block.payload-router.name = Payload Router
 block.disassembler.name = Disassembler
 block.silicon-crucible.name = Silicon Crucible

core/assets/bundles/bundle_zh_TW.properties

@@ -1062,7 +1062,7 @@ block.additive-reconstructor.name = Additive Reconstructor
 block.multiplicative-reconstructor.name = Multiplicative Reconstructor
 block.exponential-reconstructor.name = Exponential Reconstructor
 block.tetrative-reconstructor.name = Tetrative Reconstructor
-block.mass-conveyor.name = Mass Conveyor
+block.payload-conveyor.name = Mass Conveyor
 block.payload-router.name = Payload Router
 block.disassembler.name = Disassembler
 block.silicon-crucible.name = Silicon Crucible

core/assets/icons/icons.properties

@@ -285,3 +285,5 @@
 63459=logic-display|block-logic-display-medium
 63458=switch|block-switch-medium
 63457=memory-cell|block-memory-cell-medium
+63456=payload-conveyor|block-payload-conveyor-medium
+63455=hyper-processor|block-hyper-processor-medium

core/assets/scripts/base.js

@@ -5,8 +5,9 @@ const log = function(context, obj){
 }
 
 const readString = path => Vars.mods.getScripts().readString(path)
-
 const readBytes = path => Vars.mods.getScripts().readBytes(path)
+const loadMusic = path => Vars.mods.getScripts().loadMusic(path)
+const loadSound = path => Vars.mods.getScripts().loadSound(path)
 
 var scriptName = "base.js"
 var modName = "none"

core/assets/scripts/global.js

@@ -7,8 +7,9 @@ const log = function(context, obj){
 }
 
 const readString = path => Vars.mods.getScripts().readString(path)
-
 const readBytes = path => Vars.mods.getScripts().readBytes(path)
+const loadMusic = path => Vars.mods.getScripts().loadMusic(path)
+const loadSound = path => Vars.mods.getScripts().loadSound(path)
 
 var scriptName = "base.js"
 var modName = "none"
@@ -40,6 +41,7 @@ importPackage(Packages.arc)
 importPackage(Packages.arc.func)
 importPackage(Packages.arc.graphics)
 importPackage(Packages.arc.graphics.g2d)
+importPackage(Packages.arc.graphics.gl)
 importPackage(Packages.arc.math)
 importPackage(Packages.arc.math.geom)
 importPackage(Packages.arc.scene)
@@ -128,8 +130,6 @@ const ConfigEvent = Packages.mindustry.game.EventType.ConfigEvent
 const DepositEvent = Packages.mindustry.game.EventType.DepositEvent
 const WithdrawEvent = Packages.mindustry.game.EventType.WithdrawEvent
 const SectorCaptureEvent = Packages.mindustry.game.EventType.SectorCaptureEvent
-const ZoneConfigureCompleteEvent = Packages.mindustry.game.EventType.ZoneConfigureCompleteEvent
-const ZoneRequireCompleteEvent = Packages.mindustry.game.EventType.ZoneRequireCompleteEvent
 const PlayerChatEvent = Packages.mindustry.game.EventType.PlayerChatEvent
 const ClientPreConnectEvent = Packages.mindustry.game.EventType.ClientPreConnectEvent
 const CommandIssueEvent = Packages.mindustry.game.EventType.CommandIssueEvent