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

@@ -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);
}};

View File

@@ -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(){

View File

@@ -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;