Merge remote-tracking branch 'origin/master'

core/assets/bundles/bundle.properties

@@ -992,6 +992,7 @@ stat.abilities = Abilities
 stat.canboost = Can Boost
 stat.flying = Flying
 stat.ammouse = Ammo Use
+stat.ammocapacity = Ammo Capacity
 stat.damagemultiplier = Damage Multiplier
 stat.healthmultiplier = Health Multiplier
 stat.speedmultiplier = Speed Multiplier
@@ -1093,7 +1094,7 @@ bullet.pierce = [stat]{0}x[lightgray] pierce
 bullet.infinitepierce = [stat]pierce
 bullet.healpercent = [stat]{0}%[lightgray] repair
 bullet.healamount = [stat]{0}[lightgray] direct repair
-bullet.multiplier = [stat]{0}x[lightgray] ammo multiplier
+bullet.multiplier = [stat]{0}[lightgray] ammo/item
 bullet.reload = [stat]{0}%[lightgray] fire rate
 bullet.range = [stat]{0}[lightgray] tiles range
 
@@ -1118,6 +1119,7 @@ unit.items = items
 unit.thousands = k
 unit.millions = mil
 unit.billions = b
+unit.shots = shots
 unit.pershot = /shot
 category.purpose = Purpose
 category.general = General

core/assets/bundles/bundle_be.properties

@@ -965,6 +965,7 @@ stat.abilities = Здольнасйі
 stat.canboost = Можа Узлятаць
 stat.flying = Паветраны
 stat.ammouse = Выкарыстанне Боезапасу
+stat.ammocapacity = Ammo Capacity
 stat.damagemultiplier = Множнік Пашкоджанняў
 stat.healthmultiplier = Множнік Здароўя
 stat.speedmultiplier = Множнік Хуткасці
@@ -1090,6 +1091,7 @@ unit.items = прадметаў
 unit.thousands = Тыс.
 unit.millions = М.
 unit.billions = Б.
+unit.shots = shots
 unit.pershot = /стрэл
 category.purpose = Апісанне
 category.general = Асноўныя

core/assets/bundles/bundle_bg.properties

@@ -975,6 +975,7 @@ stat.abilities = Способности
 stat.canboost = Може да ускорява
 stat.flying = Летящ
 stat.ammouse = Употребе на Боеприпаси
+stat.ammocapacity = Ammo Capacity
 stat.damagemultiplier = Множител на Щети
 stat.healthmultiplier = Множител на Точки живот
 stat.speedmultiplier = Множител на Скорост
@@ -1101,6 +1102,7 @@ unit.items = предмети
 unit.thousands = хил
 unit.millions = млн
 unit.billions = млр
+unit.shots = shots
 unit.pershot = /изстрел
 category.purpose = Предназначение
 category.general = Обща информация

core/assets/bundles/bundle_ca.properties

@@ -979,6 +979,7 @@ stat.abilities = Habilitats
 stat.canboost = Pot sobrevolar.
 stat.flying = Està volant.
 stat.ammouse = Ús de munició
+stat.ammocapacity = Ammo Capacity
 stat.damagemultiplier = Multiplicador de dany
 stat.healthmultiplier = Multiplicador de salut
 stat.speedmultiplier = Multiplicador de velocitat
@@ -1104,6 +1105,7 @@ unit.items = elements
 unit.thousands = k
 unit.millions = M
 unit.billions = kM
+unit.shots = shots
 unit.pershot = /dispar
 category.purpose = Funció
 category.general = General

core/assets/bundles/bundle_cs.properties

@@ -977,6 +977,7 @@ stat.abilities = Schopnosti
 stat.canboost = Umí posilovat
 stat.flying = Létající
 stat.ammouse = Spotřeba Munice
+stat.ammocapacity = Ammo Capacity
 stat.damagemultiplier = Násobič Poškození
 stat.healthmultiplier = Násobič Životů
 stat.speedmultiplier = Násobič Rychlostí
@@ -1103,6 +1104,7 @@ unit.items = předměty
 unit.thousands = tis
 unit.millions = mio
 unit.billions = mld
+unit.shots = shots
 unit.pershot = /střela
 category.purpose = Účel
 category.general = Všeobecné

core/assets/bundles/bundle_da.properties

@@ -966,6 +966,7 @@ stat.abilities = Evner
 stat.canboost = Can Boost
 stat.flying = Flying
 stat.ammouse = Ammo Use
+stat.ammocapacity = Ammo Capacity
 stat.damagemultiplier = Damage Multiplier
 stat.healthmultiplier = Health Multiplier
 stat.speedmultiplier = Speed Multiplier
@@ -1092,6 +1093,7 @@ unit.items = genstande
 unit.thousands = t
 unit.millions = mio
 unit.billions = mia
+unit.shots = shots
 unit.pershot = /shot
 category.purpose = Purpose
 category.general = Generel

core/assets/bundles/bundle_de.properties

@@ -988,6 +988,7 @@ stat.abilities = Fähigkeiten
 stat.canboost = Kann boosten
 stat.flying = Flug
 stat.ammouse = Muntionsverbrauch
+stat.ammocapacity = Ammo Capacity
 stat.damagemultiplier = Schaden-Multiplikator
 stat.healthmultiplier = Lebenspunkte-Multiplikator
 stat.speedmultiplier = Geschwindigkeit-Multiplikator
@@ -1114,6 +1115,7 @@ unit.items = Materialeinheiten
 unit.thousands = k
 unit.millions = Mio
 unit.billions = Mrd
+unit.shots = shots
 unit.pershot = /Schuss
 category.purpose = Beschreibung
 category.general = Allgemeines

core/assets/bundles/bundle_es.properties

@@ -985,6 +985,7 @@ stat.abilities = Habilidades
 stat.canboost = Puede volar
 stat.flying = Aéreo
 stat.ammouse = Uso de munición
+stat.ammocapacity = Ammo Capacity
 stat.damagemultiplier = Multiplicador de daño
 stat.healthmultiplier = Multiplicador de vida
 stat.speedmultiplier = Multiplicador de velocidad
@@ -1110,6 +1111,7 @@ unit.items = objetos
 unit.thousands = k
 unit.millions = M
 unit.billions = B
+unit.shots = shots
 unit.pershot = /disparo
 category.purpose = Objetivo
 category.general = General

core/assets/bundles/bundle_et.properties

@@ -966,6 +966,7 @@ stat.abilities = Abilities
 stat.canboost = Can Boost
 stat.flying = Flying
 stat.ammouse = Ammo Use
+stat.ammocapacity = Ammo Capacity
 stat.damagemultiplier = Damage Multiplier
 stat.healthmultiplier = Health Multiplier
 stat.speedmultiplier = Speed Multiplier
@@ -1092,6 +1093,7 @@ unit.items = ressursiühikut
 unit.thousands = k
 unit.millions = mil
 unit.billions = b
+unit.shots = shots
 unit.pershot = /shot
 category.purpose = Purpose
 category.general = Üldinfo

core/assets/bundles/bundle_eu.properties

@@ -968,6 +968,7 @@ stat.abilities = Abilities
 stat.canboost = Can Boost
 stat.flying = Flying
 stat.ammouse = Ammo Use
+stat.ammocapacity = Ammo Capacity
 stat.damagemultiplier = Damage Multiplier
 stat.healthmultiplier = Health Multiplier
 stat.speedmultiplier = Speed Multiplier
@@ -1094,6 +1095,7 @@ unit.items = elementu
 unit.thousands = k
 unit.millions = mil
 unit.billions = b
+unit.shots = shots
 unit.pershot = /shot
 category.purpose = Purpose
 category.general = Orokorra

core/assets/bundles/bundle_fi.properties

@@ -965,6 +965,7 @@ stat.abilities = Erikoisvoimat
 stat.canboost = Voi tehostaa
 stat.flying = Lentävä
 stat.ammouse = Ammusten käyttö
+stat.ammocapacity = Ammo Capacity
 stat.damagemultiplier = Vahinkokerroin
 stat.healthmultiplier = Elmäpistekerroin
 stat.speedmultiplier = Nopeuskerroin
@@ -1091,6 +1092,7 @@ unit.items = esinettä
 unit.thousands = t
 unit.millions = milj
 unit.billions = mrd
+unit.shots = shots
 unit.pershot = /laukaisu
 category.purpose = Tarkoitus
 category.general = Yleinen

core/assets/bundles/bundle_fil.properties

@@ -965,6 +965,7 @@ stat.abilities = Abilities
 stat.canboost = Can Boost
 stat.flying = Flying
 stat.ammouse = Ammo Use
+stat.ammocapacity = Ammo Capacity
 stat.damagemultiplier = Damage Multiplier
 stat.healthmultiplier = Health Multiplier
 stat.speedmultiplier = Speed Multiplier
@@ -1091,6 +1092,7 @@ unit.items = items
 unit.thousands = k
 unit.millions = mil
 unit.billions = bil
+unit.shots = shots
 unit.pershot = /shot
 category.purpose = Purpose
 category.general = General

core/assets/bundles/bundle_fr.properties

@@ -991,6 +991,7 @@ stat.abilities = Habilités
 stat.canboost = Boost
 stat.flying = Unité volante
 stat.ammouse = Utilisation de munitions
+stat.ammocapacity = Ammo Capacity
 stat.damagemultiplier = Multiplicateur de dégâts
 stat.healthmultiplier = Multiplicateur de santé
 stat.speedmultiplier = Multiplicateur de vitesse
@@ -1116,6 +1117,7 @@ unit.items = objets
 unit.thousands = k
 unit.millions = M
 unit.billions = Md
+unit.shots = shots
 unit.pershot = /tirs
 category.purpose = Description
 category.general = Caractéristiques

core/assets/bundles/bundle_hu.properties

@@ -992,6 +992,7 @@ stat.abilities = Képességek
 stat.canboost = Erősíthető
 stat.flying = Repül
 stat.ammouse = Lőszerhasználat
+stat.ammocapacity = Ammo Capacity
 stat.damagemultiplier = Sebzésszorzó
 stat.healthmultiplier = Életerőszorzó
 stat.speedmultiplier = Sebességszorzó
@@ -1118,6 +1119,7 @@ unit.items = nyersanyag
 unit.thousands = k
 unit.millions = mil
 unit.billions = Mrd
+unit.shots = shots
 unit.pershot = /lövés
 category.purpose = Rendeltetés
 category.general = Általános

core/assets/bundles/bundle_id_ID.properties

@@ -985,6 +985,7 @@ stat.abilities = Kemampuan
 stat.canboost = Dapat Dipercepat
 stat.flying = Terbang
 stat.ammouse = Penggunaan Amunisi
+stat.ammocapacity = Ammo Capacity
 stat.damagemultiplier = Penggandaan Kekuatan (dmg)
 stat.healthmultiplier = Penggandaan Darah
 stat.speedmultiplier = Penggandaan Kecepatan
@@ -1110,6 +1111,7 @@ unit.items = bahan
 unit.thousands = rb
 unit.millions = jt
 unit.billions = m
+unit.shots = shots
 unit.pershot = /tembakan
 category.purpose = Kegunaan
 category.general = Umum

core/assets/bundles/bundle_it.properties

@@ -971,6 +971,7 @@ stat.abilities = Abilità
 stat.canboost = Capace di Potenziamento
 stat.flying = Volo
 stat.ammouse = Consumo di munizioni
+stat.ammocapacity = Ammo Capacity
 stat.damagemultiplier = Moltiplicatore danni
 stat.healthmultiplier = Moltiplicatore salute
 stat.speedmultiplier = Moltiplicatore velocità
@@ -1097,6 +1098,7 @@ unit.items = oggetti
 unit.thousands = k
 unit.millions = mln
 unit.billions = mld
+unit.shots = shots
 unit.pershot = /colpo
 category.purpose = Scopo
 category.general = Generali

core/assets/bundles/bundle_ja.properties

@@ -977,6 +977,7 @@ stat.abilities = 能力
 stat.canboost = ブースト可能
 stat.flying = 飛行
 stat.ammouse = 使用弾薬
+stat.ammocapacity = Ammo Capacity
 stat.damagemultiplier = ダメージ倍率
 stat.healthmultiplier = 体力倍率
 stat.speedmultiplier = スピード倍率
@@ -1103,6 +1104,7 @@ unit.items = アイテム
 unit.thousands = k
 unit.millions = mil
 unit.billions = b
+unit.shots = shots
 unit.pershot = /発
 category.purpose = 説明
 category.general = 一般

core/assets/bundles/bundle_ko.properties

@@ -977,6 +977,7 @@ stat.abilities = 능력
 stat.canboost = 이륙 가능
 stat.flying = 비행
 stat.ammouse = 탄약 사용
+stat.ammocapacity = Ammo Capacity
 stat.damagemultiplier = 피해량 배수
 stat.healthmultiplier = 체력 배수
 stat.speedmultiplier = 이동속도 배수
@@ -1102,6 +1103,7 @@ unit.items = 자원
 unit.thousands = k
 unit.millions = m
 unit.billions = b
+unit.shots = shots
 unit.pershot = /발
 category.purpose = 목적
 category.general = 일반

core/assets/bundles/bundle_lt.properties

@@ -966,6 +966,7 @@ stat.abilities = Abilities
 stat.canboost = Can Boost
 stat.flying = Flying
 stat.ammouse = Ammo Use
+stat.ammocapacity = Ammo Capacity
 stat.damagemultiplier = Damage Multiplier
 stat.healthmultiplier = Health Multiplier
 stat.speedmultiplier = Speed Multiplier
@@ -1092,6 +1093,7 @@ unit.items = daiktai
 unit.thousands = k
 unit.millions = mil
 unit.billions = b
+unit.shots = shots
 unit.pershot = /shot
 category.purpose = Purpose
 category.general = Bendra

core/assets/bundles/bundle_nl.properties

@@ -978,6 +978,7 @@ stat.abilities = Capaciteiten
 stat.canboost = Kan Boosten
 stat.flying = Vliegende
 stat.ammouse = Ammunitie gebruik
+stat.ammocapacity = Ammo Capacity
 stat.damagemultiplier = Schade Vermenigvuldiger
 stat.healthmultiplier = Levenspunten Vermenigvuldiger
 stat.speedmultiplier = Snelheids Vermenigvuldiger
@@ -1104,6 +1105,7 @@ unit.items = materialen
 unit.thousands = k
 unit.millions = mln
 unit.billions = mjd
+unit.shots = shots
 unit.pershot = /schot
 category.purpose = Doel
 category.general = Algemeen

core/assets/bundles/bundle_nl_BE.properties

@@ -966,6 +966,7 @@ stat.abilities = Abilities
 stat.canboost = Can Boost
 stat.flying = Flying
 stat.ammouse = Ammo Use
+stat.ammocapacity = Ammo Capacity
 stat.damagemultiplier = Damage Multiplier
 stat.healthmultiplier = Health Multiplier
 stat.speedmultiplier = Speed Multiplier
@@ -1092,6 +1093,7 @@ unit.items = items
 unit.thousands = k
 unit.millions = mil
 unit.billions = b
+unit.shots = shots
 unit.pershot = /shot
 category.purpose = Purpose
 category.general = General

core/assets/bundles/bundle_pl.properties

@@ -975,6 +975,7 @@ stat.abilities = Umiejętności
 stat.canboost = Może przyspieszyć
 stat.flying = Może latać
 stat.ammouse = Zużycie Amunicji
+stat.ammocapacity = Ammo Capacity
 stat.damagemultiplier = Mnożnik Obrażeń
 stat.healthmultiplier = Mnożnik Zdrowia
 stat.speedmultiplier = Mnożnik Prędkości
@@ -1101,6 +1102,7 @@ unit.items = przedmioty
 unit.thousands = tys.
 unit.millions = mln.
 unit.billions = mld.
+unit.shots = shots
 unit.pershot = /strzał
 category.purpose = Opis
 category.general = Główne

core/assets/bundles/bundle_pt_BR.properties

@@ -986,6 +986,7 @@ stat.abilities = Habilidades
 stat.canboost = Pode impulsionar
 stat.flying = Voador
 stat.ammouse = Consumo de Munição
+stat.ammocapacity = Ammo Capacity
 stat.damagemultiplier = Multiplicador de Dano
 stat.healthmultiplier = Multiplicador de Vida
 stat.speedmultiplier = Multiplicador de Velocidade
@@ -1111,6 +1112,7 @@ unit.items = itens
 unit.thousands = k
 unit.millions = m
 unit.billions = b
+unit.shots = shots
 unit.pershot = /disparo
 category.purpose = Propósito
 category.general = Geral

core/assets/bundles/bundle_pt_PT.properties

@@ -966,6 +966,7 @@ stat.abilities = Abilities
 stat.canboost = Can Boost
 stat.flying = Flying
 stat.ammouse = Ammo Use
+stat.ammocapacity = Ammo Capacity
 stat.damagemultiplier = Damage Multiplier
 stat.healthmultiplier = Health Multiplier
 stat.speedmultiplier = Speed Multiplier
@@ -1092,6 +1093,7 @@ unit.items = itens
 unit.thousands = k
 unit.millions = mil
 unit.billions = b
+unit.shots = shots
 unit.pershot = /shot
 category.purpose = Purpose
 category.general = Geral

core/assets/bundles/bundle_ro.properties

@@ -977,6 +977,7 @@ stat.abilities = Abilități
 stat.canboost = Are Propulsor
 stat.flying = Zboară
 stat.ammouse = Consum muniție
+stat.ammocapacity = Ammo Capacity
 stat.damagemultiplier = Multiplicator Forță
 stat.healthmultiplier = Multiplicator Viață
 stat.speedmultiplier = Multiplicator Viteză
@@ -1103,6 +1104,7 @@ unit.items = materiale
 unit.thousands = mii
 unit.millions = mil
 unit.billions = mld
+unit.shots = shots
 unit.pershot = /lovitură
 category.purpose = Utilizare
 category.general = General

core/assets/bundles/bundle_ru.properties

@@ -978,6 +978,7 @@ stat.abilities = Способности
 stat.canboost = Может взлететь
 stat.flying = Летающий
 stat.ammouse = Использование боеприпасов
+stat.ammocapacity = Ammo Capacity
 stat.damagemultiplier = Множитель урона
 stat.healthmultiplier = Множитель прочности
 stat.speedmultiplier = Множитель скорости
@@ -1103,6 +1104,7 @@ unit.items = предметов
 unit.thousands = к
 unit.millions = М
 unit.billions = кM
+unit.shots = shots
 unit.pershot = /выстрел
 category.purpose = Назначение
 category.general = Основные

core/assets/bundles/bundle_sr.properties

@@ -979,6 +979,7 @@ stat.abilities = Spospbnosti
 stat.canboost = Može lebdeti
 stat.flying = Leteća jedinica
 stat.ammouse = Upotreba municije
+stat.ammocapacity = Ammo Capacity
 stat.damagemultiplier = Umnožavač štete
 stat.healthmultiplier = Umnožavač izdržljivosti
 stat.speedmultiplier = Umnožavač brzine
@@ -1105,6 +1106,7 @@ unit.items = materijali
 unit.thousands = hiljade
 unit.millions = milioni
 unit.billions = milijarde
+unit.shots = shots
 unit.pershot = /pucnju
 category.purpose = Namena
 category.general = Opšte

core/assets/bundles/bundle_sv.properties

@@ -966,6 +966,7 @@ stat.abilities = Abilities
 stat.canboost = Can Boost
 stat.flying = Flying
 stat.ammouse = Ammo Use
+stat.ammocapacity = Ammo Capacity
 stat.damagemultiplier = Damage Multiplier
 stat.healthmultiplier = Health Multiplier
 stat.speedmultiplier = Speed Multiplier
@@ -1092,6 +1093,7 @@ unit.items = föremål
 unit.thousands = k
 unit.millions = mil
 unit.billions = b
+unit.shots = shots
 unit.pershot = /shot
 category.purpose = Purpose
 category.general = Allmänt

core/assets/bundles/bundle_th.properties

@@ -979,6 +979,7 @@ stat.abilities = ทักษะ
 stat.canboost = บูสต์ได้
 stat.flying = บินได้
 stat.ammouse = การใช้กระสุน
+stat.ammocapacity = Ammo Capacity
 stat.damagemultiplier = พหุคูณดาเมจ
 stat.healthmultiplier = พหุคูณพลังชีวิต
 stat.speedmultiplier = พหุคูณความเร็ว
@@ -1104,6 +1105,7 @@ unit.items = ไอเท็ม
 unit.thousands = k
 unit.millions = mil
 unit.billions = b
+unit.shots = shots
 unit.pershot = /การยิง
 category.purpose = วัตถุประสงค์
 category.general = ทั่วไป

core/assets/bundles/bundle_tk.properties

@@ -966,6 +966,7 @@ stat.abilities = Abilities
 stat.canboost = Can Boost
 stat.flying = Flying
 stat.ammouse = Ammo Use
+stat.ammocapacity = Ammo Capacity
 stat.damagemultiplier = Damage Multiplier
 stat.healthmultiplier = Health Multiplier
 stat.speedmultiplier = Speed Multiplier
@@ -1092,6 +1093,7 @@ unit.items = esya
 unit.thousands = k
 unit.millions = mil
 unit.billions = b
+unit.shots = shots
 unit.pershot = /shot
 category.purpose = Purpose
 category.general = General

core/assets/bundles/bundle_tr.properties

@@ -976,6 +976,7 @@ stat.abilities = Kabiliyetler
 stat.canboost = İstekli Uçabilir
 stat.flying = Uçuyor
 stat.ammouse = Mermi Kullanıyor
+stat.ammocapacity = Ammo Capacity
 stat.damagemultiplier = Hasar Çarpanı
 stat.healthmultiplier = Can Çarpanı
 stat.speedmultiplier = Hız Çarpanı
@@ -1101,6 +1102,7 @@ unit.items = eşya
 unit.thousands = k
 unit.millions = m
 unit.billions = b
+unit.shots = shots
 unit.pershot = /vuruş
 category.purpose = Açıklama
 category.general = Genel

core/assets/bundles/bundle_uk_UA.properties

@@ -987,6 +987,7 @@ stat.abilities = Здібності
 stat.canboost = Можна прискорити
 stat.flying = Літає
 stat.ammouse = Патронів використовує
+stat.ammocapacity = Ammo Capacity
 stat.damagemultiplier = Множник шкоди
 stat.healthmultiplier = Множник здоров’я
 stat.speedmultiplier = Множник швидкості
@@ -1112,6 +1113,7 @@ unit.items = предм.
 unit.thousands = тис
 unit.millions = млн
 unit.billions = млрд
+unit.shots = shots
 unit.pershot = за постріл
 category.purpose = Призначення
 category.general = Загальне

core/assets/bundles/bundle_vi.properties

@@ -992,6 +992,7 @@ stat.abilities = Khả năng
 stat.canboost = Có thê tăng cường
 stat.flying = Bay
 stat.ammouse = Sử dụng đạn
+stat.ammocapacity = Ammo Capacity
 stat.damagemultiplier = Hệ số sát thương
 stat.healthmultiplier = Hệ số độ bền
 stat.speedmultiplier = Hệ số tốc độ
@@ -1118,6 +1119,7 @@ unit.items = vật phẩm
 unit.thousands = ng
 unit.millions = tr
 unit.billions = tỷ
+unit.shots = shots
 unit.pershot = /phát bắn
 category.purpose = Mục đích
 category.general = Chung

core/assets/bundles/bundle_zh_CN.properties

@@ -988,6 +988,7 @@ stat.abilities = 能力
 stat.canboost = 可助推
 stat.flying = 空中单位
 stat.ammouse = 弹药
+stat.ammocapacity = Ammo Capacity
 stat.damagemultiplier = 伤害倍率
 stat.healthmultiplier = 生命值倍率
 stat.speedmultiplier = 移动速度倍率
@@ -1114,6 +1115,7 @@ unit.items = 物品
 unit.thousands = K
 unit.millions = M
 unit.billions = B
+unit.shots = shots
 unit.pershot = /发
 category.purpose = 用途
 category.general = 基础

core/assets/bundles/bundle_zh_TW.properties

@@ -984,6 +984,7 @@ stat.abilities = 能力
 stat.canboost = 推進器
 stat.flying = 飛行單位
 stat.ammouse = 彈藥使用
+stat.ammocapacity = Ammo Capacity
 stat.damagemultiplier = 傷害加成
 stat.healthmultiplier = 血量加成
 stat.speedmultiplier = 速度加成
@@ -1109,6 +1110,7 @@ unit.items = 物品
 unit.thousands = K
 unit.millions = M
 unit.billions = B
+unit.shots = shots
 unit.pershot = /發
 category.purpose = 用途
 category.general = 一般

core/assets/contributors

@@ -165,3 +165,4 @@ OpalSoPL
 BalaM314
 Redstonneur1256
 ApsZoldat
+hexagon-recursion

core/src/mindustry/core/Renderer.java

@@ -2,6 +2,7 @@ package mindustry.core;
 
 import arc.*;
 import arc.assets.loaders.TextureLoader.*;
+import arc.audio.*;
 import arc.files.*;
 import arc.graphics.*;
 import arc.graphics.Texture.*;
@@ -554,6 +555,11 @@ public class Renderer implements ApplicationListener{
         landTime = landCore.landDuration();
         launchCoreType = coreType;
 
+        Music music = landCore.launchMusic();
+        music.stop();
+        music.play();
+        music.setVolume(settings.getInt("musicvol") / 100f);
+
         landCore.beginLaunch(coreType);
     }
 

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

@@ -73,6 +73,7 @@ abstract class StatusComp implements Posc, Flyingc{
     }
 
     void clearStatuses(){
+        statuses.each(e -> e.effect.onRemoved(self()));
         statuses.clear();
     }
 
@@ -80,6 +81,7 @@ abstract class StatusComp implements Posc, Flyingc{
     void unapply(StatusEffect effect){
         statuses.remove(e -> {
             if(e.effect == effect){
+                e.effect.onRemoved(self());
                 Pools.free(e);
                 return true;
             }
@@ -189,6 +191,10 @@ abstract class StatusComp implements Posc, Flyingc{
             entry.time = Math.max(entry.time - Time.delta, 0);
 
             if(entry.effect == null || (entry.time <= 0 && !entry.effect.permanent)){
+                if(entry.effect != null){
+                    entry.effect.onRemoved(self());
+                }
+
                 Pools.free(entry);
                 index --;
                 statuses.remove(index);

core/src/mindustry/type/StatusEffect.java

@@ -142,6 +142,11 @@ public class StatusEffect extends UnlockableContent{
         }
     }
 
+    /** Called when status effect is removed. */
+    public void onRemoved(Unit unit){
+
+    }
+
     protected void trans(StatusEffect effect, TransitionHandler handler){
         transitions.put(effect, handler);
     }

core/src/mindustry/world/blocks/defense/turrets/ItemTurret.java

@@ -49,6 +49,7 @@ public class ItemTurret extends Turret{
 
         stats.remove(Stat.itemCapacity);
         stats.add(Stat.ammo, StatValues.ammo(ammoTypes));
+        stats.add(Stat.ammoCapacity, maxAmmo / ammoPerShot, StatUnit.shots);
     }
 
     @Override

core/src/mindustry/world/blocks/storage/CoreBlock.java

@@ -51,6 +51,7 @@ public class CoreBlock extends StorageBlock{
     public UnitType unitType = UnitTypes.alpha;
     public float landDuration = 160f;
     public Music landMusic = Musics.land;
+    public Music launchMusic = Musics.coreLaunch;
     public Effect launchEffect = Fx.launch;
 
     public Interp landZoomInterp = Interp.pow3;
@@ -333,6 +334,10 @@ public class CoreBlock extends StorageBlock{
             return landMusic;
         }
 
+        public Music launchMusic(){
+            return launchMusic;
+        }
+
         @Override
         public void draw(){
             //draw thrusters when just landed

core/src/mindustry/world/meta/Stat.java

@@ -86,6 +86,7 @@ public class Stat implements Comparable<Stat>{
     targetsGround = new Stat("targetsGround", StatCat.function),
     damage = new Stat("damage", StatCat.function),
     ammo = new Stat("ammo", StatCat.function),
+    ammoCapacity = new Stat("ammoCapacity", StatCat.function),
     ammoUse = new Stat("ammoUse", StatCat.function),
     shieldHealth = new Stat("shieldHealth", StatCat.function),
     cooldownTime = new Stat("cooldownTime", StatCat.function),

core/src/mindustry/world/meta/StatUnit.java

@@ -24,6 +24,7 @@ public class StatUnit{
     degrees = new StatUnit("degrees"),
     seconds = new StatUnit("seconds"),
     minutes = new StatUnit("minutes"),
+    shots = new StatUnit("shots"),
     perSecond = new StatUnit("perSecond", false),
     perMinute = new StatUnit("perMinute", false),
     perShot = new StatUnit("perShot", false),