Bundle update / Minor tweaks

This commit is contained in:
Anuken
2019-03-05 13:50:28 -05:00
parent 335c880af2
commit 82e44397ff
22 changed files with 22 additions and 5 deletions

View File

@@ -687,6 +687,7 @@ block.spectre.name = Spectre
block.meltdown.name = Meltdown block.meltdown.name = Meltdown
block.container.name = Container block.container.name = Container
block.launch-pad.name = Launch Pad 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.blue.name = blue
team.red.name = red team.red.name = red
team.orange.name = orange team.orange.name = orange

View File

@@ -681,6 +681,7 @@ block.spectre.name = Spektr
block.meltdown.name = Meltdown block.meltdown.name = Meltdown
block.container.name = Kontejnér block.container.name = Kontejnér
block.launch-pad.name = Launch Pad 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.blue.name = modrá
team.red.name = červená team.red.name = červená
team.orange.name = oranžová team.orange.name = oranžová

View File

@@ -681,6 +681,7 @@ block.spectre.name = Spectre
block.meltdown.name = Meltdown block.meltdown.name = Meltdown
block.container.name = Container block.container.name = Container
block.launch-pad.name = Launch Pad 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.blue.name = Blau
team.red.name = Rot team.red.name = Rot
team.orange.name = Orange team.orange.name = Orange

View File

@@ -681,6 +681,7 @@ block.spectre.name = Espectro
block.meltdown.name = Meltdown block.meltdown.name = Meltdown
block.container.name = Contenedor block.container.name = Contenedor
block.launch-pad.name = Launch Pad 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.blue.name = Azul
team.red.name = Rojo team.red.name = Rojo
team.orange.name = Naranja team.orange.name = Naranja

View File

@@ -681,6 +681,7 @@ block.spectre.name = Spectre
block.meltdown.name = Meltdown block.meltdown.name = Meltdown
block.container.name = Conteneur block.container.name = Conteneur
block.launch-pad.name = Launch Pad 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.blue.name = Bleu
team.red.name = Rouge team.red.name = Rouge
team.orange.name = Orange team.orange.name = Orange

View File

@@ -681,6 +681,7 @@ block.spectre.name = Spectre
block.meltdown.name = Meltdown block.meltdown.name = Meltdown
block.container.name = Conteneur block.container.name = Conteneur
block.launch-pad.name = Launch Pad 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.blue.name = Bleu
team.red.name = Rouge team.red.name = Rouge
team.orange.name = Orange team.orange.name = Orange

View File

@@ -681,6 +681,7 @@ block.spectre.name = Spectre
block.meltdown.name = Meltdown block.meltdown.name = Meltdown
block.container.name = Container block.container.name = Container
block.launch-pad.name = Launch Pad 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.blue.name = blue
team.red.name = red team.red.name = red
team.orange.name = orange team.orange.name = orange

View File

@@ -681,6 +681,7 @@ block.spectre.name = Spectre
block.meltdown.name = Meltdown block.meltdown.name = Meltdown
block.container.name = Container block.container.name = Container
block.launch-pad.name = Launch Pad 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.blue.name = blue
team.red.name = red team.red.name = red
team.orange.name = orange team.orange.name = orange

View File

@@ -681,6 +681,7 @@ block.spectre.name = スペクター
block.meltdown.name = メルトダウン block.meltdown.name = メルトダウン
block.container.name = コンテナー block.container.name = コンテナー
block.launch-pad.name = Launch Pad 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.blue.name = ブルー
team.red.name = レッド team.red.name = レッド
team.orange.name = オレンジ team.orange.name = オレンジ

View File

@@ -681,6 +681,7 @@ block.spectre.name = 스펙터
block.meltdown.name = 멜트다운 block.meltdown.name = 멜트다운
block.container.name = 컨테이너 block.container.name = 컨테이너
block.launch-pad.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.blue.name = 블루팀
team.red.name = 레드팀 team.red.name = 레드팀
team.orange.name = 오렌지팀 team.orange.name = 오렌지팀

View File

@@ -681,6 +681,7 @@ block.spectre.name = Spectre
block.meltdown.name = Meltdown block.meltdown.name = Meltdown
block.container.name = Container block.container.name = Container
block.launch-pad.name = Launch Pad 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.blue.name = blue
team.red.name = red team.red.name = red
team.orange.name = orange team.orange.name = orange

View File

@@ -681,6 +681,7 @@ block.spectre.name = Spectre
block.meltdown.name = Meltdown block.meltdown.name = Meltdown
block.container.name = Kontener block.container.name = Kontener
block.launch-pad.name = Skocznia 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.blue.name = niebieski
team.red.name = czerwony team.red.name = czerwony
team.orange.name = pomarańczowy team.orange.name = pomarańczowy

View File

@@ -681,6 +681,7 @@ block.spectre.name = Espectra
block.meltdown.name = Derreter block.meltdown.name = Derreter
block.container.name = Container block.container.name = Container
block.launch-pad.name = Launch Pad 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.blue.name = Azul
team.red.name = Vermelho team.red.name = Vermelho
team.orange.name = Laranja team.orange.name = Laranja

View File

@@ -681,6 +681,7 @@ block.spectre.name = Призрак
block.meltdown.name = Катастрофа block.meltdown.name = Катастрофа
block.container.name = Склад block.container.name = Склад
block.launch-pad.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.blue.name = Синяя
team.red.name = Красная team.red.name = Красная
team.orange.name = Оранжевая team.orange.name = Оранжевая

View File

@@ -681,6 +681,7 @@ block.spectre.name = Spectre
block.meltdown.name = Meltdown block.meltdown.name = Meltdown
block.container.name = Container block.container.name = Container
block.launch-pad.name = Launch Pad 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.blue.name = blue
team.red.name = red team.red.name = red
team.orange.name = orange team.orange.name = orange

View File

@@ -681,6 +681,7 @@ block.spectre.name = Spectre
block.meltdown.name = Meltdown block.meltdown.name = Meltdown
block.container.name = Container block.container.name = Container
block.launch-pad.name = Launch Pad 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.blue.name = blue
team.red.name = red team.red.name = red
team.orange.name = orange team.orange.name = orange

View File

@@ -681,6 +681,7 @@ block.spectre.name = Мара
block.meltdown.name = Розтоплення block.meltdown.name = Розтоплення
block.container.name = Склад block.container.name = Склад
block.launch-pad.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.blue.name = Синя
team.red.name = Червона team.red.name = Червона
team.orange.name = Помаренчева team.orange.name = Помаренчева

View File

@@ -681,6 +681,7 @@ block.spectre.name = 幽灵
block.meltdown.name = 熔毁 block.meltdown.name = 熔毁
block.container.name = 容器 block.container.name = 容器
block.launch-pad.name = Launch Pad 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.blue.name =
team.red.name = team.red.name =
team.orange.name = team.orange.name =

View File

@@ -681,6 +681,7 @@ block.spectre.name = 幽靈炮
block.meltdown.name = 熔毀炮 block.meltdown.name = 熔毀炮
block.container.name = 容器 block.container.name = 容器
block.launch-pad.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.blue.name =
team.red.name = team.red.name =
team.orange.name = team.orange.name =

View File

@@ -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)); requirements(Category.effect, () -> world.isZone(), ItemStack.with(Items.copper, 500, Items.titanium, 200, Items.silicon, 200, Items.lead, 200));
size = 3; size = 3;
itemCapacity = 100; itemCapacity = 100;
launchTime = 60f * 6; launchTime = 60f * 8;
hasPower = true; hasPower = true;
consumes.power(1f); consumes.power(1f);
}}; }};

View File

@@ -66,8 +66,7 @@ public class Renderer implements ApplicationListener{
Effects.setEffectProvider((effect, color, x, y, rotation, data) -> { Effects.setEffectProvider((effect, color, x, y, rotation, data) -> {
if(effect == Fx.none) return; if(effect == Fx.none) return;
if(Core.settings.getBool("effects")){ if(Core.settings.getBool("effects")){
Rectangle view = rect.setSize(camera.width, camera.height) Rectangle view = camera.bounds(rect);
.setCenter(camera.position.x, camera.position.y);
Rectangle pos = rect2.setSize(effect.size).setCenter(x, y); Rectangle pos = rect2.setSize(effect.size).setCenter(x, y);
if(view.overlaps(pos)){ if(view.overlaps(pos)){
@@ -289,7 +288,7 @@ public class Renderer implements ApplicationListener{
public void clampScale(){ public void clampScale(){
float s = io.anuke.arc.scene.ui.layout.Unit.dp.scl(1f); 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(){ public void takeMapScreenshot(){

View File

@@ -161,7 +161,6 @@ public class UnitFactory extends Block{
if(!tile.isEnemyCheat()){ if(!tile.isEnemyCheat()){
//player-made spawners have default behavior //player-made spawners have default behavior
if(hasRequirements(entity.items, entity.buildTime / produceTime) && entity.cons.valid()){ if(hasRequirements(entity.items, entity.buildTime / produceTime) && entity.cons.valid()){
entity.time += entity.delta() * entity.speedScl; entity.time += entity.delta() * entity.speedScl;
entity.buildTime += entity.delta() * entity.power.satisfaction; entity.buildTime += entity.delta() * entity.power.satisfaction;