Astronand/Mindustry
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Balance

Browse Source
This commit is contained in:
Anuken
2019-03-11 09:28:50 -04:00
parent 87e7e04c5e
commit 2db61f93ac
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/src/io/anuke/mindustry/world/blocks/storage/LaunchPad.java
View File

@@ -34,7 +34,7 @@ public class LaunchPad extends StorageBlock{
if(entity.cons.valid() && world.isZone()){ if(entity.cons.valid() && world.isZone()){
for(Item item : Vars.content.items()){ 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 //TODO play animation of some sort
Effects.effect(Fx.dooropenlarge, tile); Effects.effect(Fx.dooropenlarge, tile);
data.addItem(item, entity.items.get(item)); data.addItem(item, entity.items.get(item));

2
core/src/io/anuke/mindustry/world/blocks/storage/Unloader.java
View File

@@ -57,7 +57,7 @@ public class Unloader extends Block implements SelectionTrait{
public void update(Tile tile){ public void update(Tile tile){
SortedUnloaderEntity entity = tile.entity(); 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()){ for(Tile other : tile.entity.proximity()){
if(other.interactable(tile.getTeam()) && other.block() instanceof StorageBlock && entity.items.total() == 0 && 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))){ ((entity.sortItem == null && other.entity.items.total() > 0) || ((StorageBlock) other.block()).hasItem(other, entity.sortItem))){