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

Untested rank system / 'Fixed' junction speed / Balancing

Browse Source
This commit is contained in:
Anuken
2019-02-13 18:28:36 -05:00
parent 12ca4cda91
commit a708c8b7ea
9 changed files with 75 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
core/src/io/anuke/mindustry/ui/dialogs/GameOverDialog.java
View File

@@ -2,6 +2,7 @@ package io.anuke.mindustry.ui.dialogs;
import io.anuke.arc.Core;
import io.anuke.mindustry.core.GameState.State;
import io.anuke.mindustry.game.Stats.RankResult;
import io.anuke.mindustry.game.Team;
import io.anuke.mindustry.type.Item;
import io.anuke.mindustry.type.Item.Icon;
@@ -67,6 +68,12 @@ public class GameOverDialog extends FloatingDialog{
}
}
}
if(world.isZone()){
RankResult result = state.stats.calculateRank(world.getZone(), state.rules, state.launched);
cont.add(Core.bundle.format("stat.rank", result.rank + result.modifier));
cont.row();
}
}).pad(12);
if(world.isZone()){

10
core/src/io/anuke/mindustry/ui/fragments/BlockInventoryFragment.java
View File

@@ -149,10 +149,12 @@ public class BlockInventoryFragment extends Fragment{
public boolean touchDown(InputEvent event, float x, float y, int pointer, KeyCode button){
if(!canPick.get() || !tile.entity.items.has(item)) return false;
int amount = Math.min(1, player.maxAccepted(item));
Call.requestItem(player, tile, item, amount);
lastItem = item;
holding = true;
holdTime = 0f;
if(amount > 0){
Call.requestItem(player, tile, item, amount);
lastItem = item;
holding = true;
holdTime = 0f;
}
return true;
}