diff --git a/core/assets/bundles/bundle.properties b/core/assets/bundles/bundle.properties index 4996509f20..8032ddd07a 100644 --- a/core/assets/bundles/bundle.properties +++ b/core/assets/bundles/bundle.properties @@ -687,6 +687,7 @@ block.spectre.name = Spectre block.meltdown.name = Meltdown block.container.name = Container block.launch-pad.name = Launch Pad +block.launch-pad.description = Launches batches of items without any need for a core launch. Unfinished. team.blue.name = blue team.red.name = red team.orange.name = orange diff --git a/core/assets/bundles/bundle_cs.properties b/core/assets/bundles/bundle_cs.properties index ed0252afd5..9c665955be 100644 --- a/core/assets/bundles/bundle_cs.properties +++ b/core/assets/bundles/bundle_cs.properties @@ -681,6 +681,7 @@ block.spectre.name = Spektr block.meltdown.name = Meltdown block.container.name = Kontejnér block.launch-pad.name = Launch Pad +block.launch-pad.description = Launches batches of items without any need for a core launch. Unfinished. team.blue.name = modrá team.red.name = červená team.orange.name = oranžová diff --git a/core/assets/bundles/bundle_de.properties b/core/assets/bundles/bundle_de.properties index b765dd1561..2c9e710f68 100644 --- a/core/assets/bundles/bundle_de.properties +++ b/core/assets/bundles/bundle_de.properties @@ -681,6 +681,7 @@ block.spectre.name = Spectre block.meltdown.name = Meltdown block.container.name = Container block.launch-pad.name = Launch Pad +block.launch-pad.description = Launches batches of items without any need for a core launch. Unfinished. team.blue.name = Blau team.red.name = Rot team.orange.name = Orange diff --git a/core/assets/bundles/bundle_es.properties b/core/assets/bundles/bundle_es.properties index fbc5cdd237..84a6d51bc5 100644 --- a/core/assets/bundles/bundle_es.properties +++ b/core/assets/bundles/bundle_es.properties @@ -681,6 +681,7 @@ block.spectre.name = Espectro block.meltdown.name = Meltdown block.container.name = Contenedor block.launch-pad.name = Launch Pad +block.launch-pad.description = Launches batches of items without any need for a core launch. Unfinished. team.blue.name = Azul team.red.name = Rojo team.orange.name = Naranja diff --git a/core/assets/bundles/bundle_fr.properties b/core/assets/bundles/bundle_fr.properties index 9cec84464a..c836a7610b 100644 --- a/core/assets/bundles/bundle_fr.properties +++ b/core/assets/bundles/bundle_fr.properties @@ -681,6 +681,7 @@ block.spectre.name = Spectre block.meltdown.name = Meltdown block.container.name = Conteneur block.launch-pad.name = Launch Pad +block.launch-pad.description = Launches batches of items without any need for a core launch. Unfinished. team.blue.name = Bleu team.red.name = Rouge team.orange.name = Orange diff --git a/core/assets/bundles/bundle_fr_BE.properties b/core/assets/bundles/bundle_fr_BE.properties index d33c0c4df7..ee3b8fe759 100644 --- a/core/assets/bundles/bundle_fr_BE.properties +++ b/core/assets/bundles/bundle_fr_BE.properties @@ -681,6 +681,7 @@ block.spectre.name = Spectre block.meltdown.name = Meltdown block.container.name = Conteneur block.launch-pad.name = Launch Pad +block.launch-pad.description = Launches batches of items without any need for a core launch. Unfinished. team.blue.name = Bleu team.red.name = Rouge team.orange.name = Orange diff --git a/core/assets/bundles/bundle_in_ID.properties b/core/assets/bundles/bundle_in_ID.properties index 01f7359b97..d591dce885 100644 --- a/core/assets/bundles/bundle_in_ID.properties +++ b/core/assets/bundles/bundle_in_ID.properties @@ -681,6 +681,7 @@ block.spectre.name = Spectre block.meltdown.name = Meltdown block.container.name = Container block.launch-pad.name = Launch Pad +block.launch-pad.description = Launches batches of items without any need for a core launch. Unfinished. team.blue.name = blue team.red.name = red team.orange.name = orange diff --git a/core/assets/bundles/bundle_it.properties b/core/assets/bundles/bundle_it.properties index cd6026aed3..54539615aa 100644 --- a/core/assets/bundles/bundle_it.properties +++ b/core/assets/bundles/bundle_it.properties @@ -681,6 +681,7 @@ block.spectre.name = Spectre block.meltdown.name = Meltdown block.container.name = Container block.launch-pad.name = Launch Pad +block.launch-pad.description = Launches batches of items without any need for a core launch. Unfinished. team.blue.name = blue team.red.name = red team.orange.name = orange diff --git a/core/assets/bundles/bundle_ja.properties b/core/assets/bundles/bundle_ja.properties index 684b3b7722..01781da711 100644 --- a/core/assets/bundles/bundle_ja.properties +++ b/core/assets/bundles/bundle_ja.properties @@ -681,6 +681,7 @@ block.spectre.name = スペクター block.meltdown.name = メルトダウン block.container.name = コンテナー block.launch-pad.name = Launch Pad +block.launch-pad.description = Launches batches of items without any need for a core launch. Unfinished. team.blue.name = ブルー team.red.name = レッド team.orange.name = オレンジ diff --git a/core/assets/bundles/bundle_ko.properties b/core/assets/bundles/bundle_ko.properties index a96c4ef143..169cd42444 100644 --- a/core/assets/bundles/bundle_ko.properties +++ b/core/assets/bundles/bundle_ko.properties @@ -681,6 +681,7 @@ block.spectre.name = 스펙터 block.meltdown.name = 멜트다운 block.container.name = 컨테이너 block.launch-pad.name = 발사대 +block.launch-pad.description = Launches batches of items without any need for a core launch. Unfinished. team.blue.name = 블루팀 team.red.name = 레드팀 team.orange.name = 오렌지팀 diff --git a/core/assets/bundles/bundle_nl.properties b/core/assets/bundles/bundle_nl.properties index 0daab7daf2..627ed142be 100644 --- a/core/assets/bundles/bundle_nl.properties +++ b/core/assets/bundles/bundle_nl.properties @@ -681,6 +681,7 @@ block.spectre.name = Spectre block.meltdown.name = Meltdown block.container.name = Container block.launch-pad.name = Launch Pad +block.launch-pad.description = Launches batches of items without any need for a core launch. Unfinished. team.blue.name = blue team.red.name = red team.orange.name = orange diff --git a/core/assets/bundles/bundle_pl.properties b/core/assets/bundles/bundle_pl.properties index 0de029a1a5..bab1016b6a 100644 --- a/core/assets/bundles/bundle_pl.properties +++ b/core/assets/bundles/bundle_pl.properties @@ -681,6 +681,7 @@ block.spectre.name = Spectre block.meltdown.name = Meltdown block.container.name = Kontener block.launch-pad.name = Skocznia +block.launch-pad.description = Launches batches of items without any need for a core launch. Unfinished. team.blue.name = niebieski team.red.name = czerwony team.orange.name = pomarańczowy diff --git a/core/assets/bundles/bundle_pt_BR.properties b/core/assets/bundles/bundle_pt_BR.properties index e343b6b962..02e46340da 100644 --- a/core/assets/bundles/bundle_pt_BR.properties +++ b/core/assets/bundles/bundle_pt_BR.properties @@ -681,6 +681,7 @@ block.spectre.name = Espectra block.meltdown.name = Derreter block.container.name = Container block.launch-pad.name = Launch Pad +block.launch-pad.description = Launches batches of items without any need for a core launch. Unfinished. team.blue.name = Azul team.red.name = Vermelho team.orange.name = Laranja diff --git a/core/assets/bundles/bundle_ru.properties b/core/assets/bundles/bundle_ru.properties index 5949726cca..c81158f62d 100644 --- a/core/assets/bundles/bundle_ru.properties +++ b/core/assets/bundles/bundle_ru.properties @@ -681,6 +681,7 @@ block.spectre.name = Призрак block.meltdown.name = Катастрофа block.container.name = Склад block.launch-pad.name = Стартовая площадка +block.launch-pad.description = Launches batches of items without any need for a core launch. Unfinished. team.blue.name = Синяя team.red.name = Красная team.orange.name = Оранжевая diff --git a/core/assets/bundles/bundle_tk.properties b/core/assets/bundles/bundle_tk.properties index 306c42070c..5561216c7b 100644 --- a/core/assets/bundles/bundle_tk.properties +++ b/core/assets/bundles/bundle_tk.properties @@ -681,6 +681,7 @@ block.spectre.name = Spectre block.meltdown.name = Meltdown block.container.name = Container block.launch-pad.name = Launch Pad +block.launch-pad.description = Launches batches of items without any need for a core launch. Unfinished. team.blue.name = blue team.red.name = red team.orange.name = orange diff --git a/core/assets/bundles/bundle_tr.properties b/core/assets/bundles/bundle_tr.properties index 260b169a09..7f109d2189 100644 --- a/core/assets/bundles/bundle_tr.properties +++ b/core/assets/bundles/bundle_tr.properties @@ -681,6 +681,7 @@ block.spectre.name = Spectre block.meltdown.name = Meltdown block.container.name = Container block.launch-pad.name = Launch Pad +block.launch-pad.description = Launches batches of items without any need for a core launch. Unfinished. team.blue.name = blue team.red.name = red team.orange.name = orange diff --git a/core/assets/bundles/bundle_uk_UA.properties b/core/assets/bundles/bundle_uk_UA.properties index ae0404a843..0400870ee6 100644 --- a/core/assets/bundles/bundle_uk_UA.properties +++ b/core/assets/bundles/bundle_uk_UA.properties @@ -681,6 +681,7 @@ block.spectre.name = Мара block.meltdown.name = Розтоплення block.container.name = Склад block.launch-pad.name = Стартовий майданчик +block.launch-pad.description = Launches batches of items without any need for a core launch. Unfinished. team.blue.name = Синя team.red.name = Червона team.orange.name = Помаренчева diff --git a/core/assets/bundles/bundle_zh_CN.properties b/core/assets/bundles/bundle_zh_CN.properties index 06395bf941..8cbb346913 100644 --- a/core/assets/bundles/bundle_zh_CN.properties +++ b/core/assets/bundles/bundle_zh_CN.properties @@ -681,6 +681,7 @@ block.spectre.name = 幽灵 block.meltdown.name = 熔毁 block.container.name = 容器 block.launch-pad.name = Launch Pad +block.launch-pad.description = Launches batches of items without any need for a core launch. Unfinished. team.blue.name = 蓝 team.red.name = 红 team.orange.name = 橙 diff --git a/core/assets/bundles/bundle_zh_TW.properties b/core/assets/bundles/bundle_zh_TW.properties index 6627f22664..8f96dc5461 100644 --- a/core/assets/bundles/bundle_zh_TW.properties +++ b/core/assets/bundles/bundle_zh_TW.properties @@ -681,6 +681,7 @@ block.spectre.name = 幽靈炮 block.meltdown.name = 熔毀炮 block.container.name = 容器 block.launch-pad.name = 發射台 +block.launch-pad.description = Launches batches of items without any need for a core launch. Unfinished. team.blue.name = 藍 team.red.name = 紅 team.orange.name = 橙 diff --git a/core/src/io/anuke/mindustry/content/Blocks.java b/core/src/io/anuke/mindustry/content/Blocks.java index 76d9c8742b..7b23fc2898 100644 --- a/core/src/io/anuke/mindustry/content/Blocks.java +++ b/core/src/io/anuke/mindustry/content/Blocks.java @@ -1018,7 +1018,7 @@ public class Blocks implements ContentList{ requirements(Category.effect, () -> world.isZone(), ItemStack.with(Items.copper, 500, Items.titanium, 200, Items.silicon, 200, Items.lead, 200)); size = 3; itemCapacity = 100; - launchTime = 60f * 6; + launchTime = 60f * 8; hasPower = true; consumes.power(1f); }}; diff --git a/core/src/io/anuke/mindustry/core/Renderer.java b/core/src/io/anuke/mindustry/core/Renderer.java index 7ece3e6fed..8b3ce9bc72 100644 --- a/core/src/io/anuke/mindustry/core/Renderer.java +++ b/core/src/io/anuke/mindustry/core/Renderer.java @@ -66,8 +66,7 @@ public class Renderer implements ApplicationListener{ Effects.setEffectProvider((effect, color, x, y, rotation, data) -> { if(effect == Fx.none) return; if(Core.settings.getBool("effects")){ - Rectangle view = rect.setSize(camera.width, camera.height) - .setCenter(camera.position.x, camera.position.y); + Rectangle view = camera.bounds(rect); Rectangle pos = rect2.setSize(effect.size).setCenter(x, y); if(view.overlaps(pos)){ @@ -289,7 +288,7 @@ public class Renderer implements ApplicationListener{ public void clampScale(){ float s = io.anuke.arc.scene.ui.layout.Unit.dp.scl(1f); - targetscale = Mathf.clamp(targetscale, s * 2.5f, Math.round(s * 5)); + targetscale = Mathf.clamp(targetscale, s * 2.5f, Math.round(s * 4)); } public void takeMapScreenshot(){ diff --git a/core/src/io/anuke/mindustry/world/blocks/units/UnitFactory.java b/core/src/io/anuke/mindustry/world/blocks/units/UnitFactory.java index 6e5316b31c..d831e44595 100644 --- a/core/src/io/anuke/mindustry/world/blocks/units/UnitFactory.java +++ b/core/src/io/anuke/mindustry/world/blocks/units/UnitFactory.java @@ -161,7 +161,6 @@ public class UnitFactory extends Block{ if(!tile.isEnemyCheat()){ //player-made spawners have default behavior - if(hasRequirements(entity.items, entity.buildTime / produceTime) && entity.cons.valid()){ entity.time += entity.delta() * entity.speedScl; entity.buildTime += entity.delta() * entity.power.satisfaction;