From 2db61f93acfef6ccb8a072b493742d893690603a Mon Sep 17 00:00:00 2001 From: Anuken Date: Mon, 11 Mar 2019 09:28:50 -0400 Subject: [PATCH] Balance --- core/src/io/anuke/mindustry/world/blocks/storage/LaunchPad.java | 2 +- core/src/io/anuke/mindustry/world/blocks/storage/Unloader.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/core/src/io/anuke/mindustry/world/blocks/storage/LaunchPad.java b/core/src/io/anuke/mindustry/world/blocks/storage/LaunchPad.java index 94875bac5b..206c63f1ac 100644 --- a/core/src/io/anuke/mindustry/world/blocks/storage/LaunchPad.java +++ b/core/src/io/anuke/mindustry/world/blocks/storage/LaunchPad.java @@ -34,7 +34,7 @@ public class LaunchPad extends StorageBlock{ if(entity.cons.valid() && world.isZone()){ for(Item item : Vars.content.items()){ - if(entity.items.get(item) >= itemCapacity && entity.timer.get(timerLaunch, launchTime)){ + if(entity.items.get(item) >= itemCapacity && entity.timer.get(timerLaunch, launchTime / entity.timeScale)){ //TODO play animation of some sort Effects.effect(Fx.dooropenlarge, tile); data.addItem(item, entity.items.get(item)); diff --git a/core/src/io/anuke/mindustry/world/blocks/storage/Unloader.java b/core/src/io/anuke/mindustry/world/blocks/storage/Unloader.java index 3707752cf9..083751bd10 100644 --- a/core/src/io/anuke/mindustry/world/blocks/storage/Unloader.java +++ b/core/src/io/anuke/mindustry/world/blocks/storage/Unloader.java @@ -57,7 +57,7 @@ public class Unloader extends Block implements SelectionTrait{ public void update(Tile tile){ SortedUnloaderEntity entity = tile.entity(); - if(tile.entity.timer.get(timerUnload, speed) && tile.entity.items.total() == 0){ + if(tile.entity.timer.get(timerUnload, speed / entity.timeScale) && tile.entity.items.total() == 0){ for(Tile other : tile.entity.proximity()){ if(other.interactable(tile.getTeam()) && other.block() instanceof StorageBlock && entity.items.total() == 0 && ((entity.sortItem == null && other.entity.items.total() > 0) || ((StorageBlock) other.block()).hasItem(other, entity.sortItem))){