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

Enforce sector core capacity

Browse Source
This commit is contained in:
Anuken
2020-06-28 20:16:36 -04:00
parent 0d6657a1e8
commit fb032eb763
2 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
core/src/mindustry/core/Logic.java
View File

@@ -16,6 +16,7 @@ import mindustry.type.Weather.*;
import mindustry.world.*; import mindustry.world.*;
import mindustry.world.blocks.*; import mindustry.world.blocks.*;
import mindustry.world.blocks.BuildBlock.*; import mindustry.world.blocks.BuildBlock.*;
import mindustry.world.blocks.storage.CoreBlock.*;
import java.util.*; import java.util.*;
@@ -88,7 +89,7 @@ public class Logic implements ApplicationListener{
Events.on(WorldLoadEvent.class, e -> { Events.on(WorldLoadEvent.class, e -> {
if(state.isCampaign() && state.rules.sector.getTurnsPassed() > 0){ if(state.isCampaign() && state.rules.sector.getTurnsPassed() > 0){
int passed = state.rules.sector.getTurnsPassed(); int passed = state.rules.sector.getTurnsPassed();
Building core = state.rules.defaultTeam.core(); CoreEntity core = state.rules.defaultTeam.core();
if(state.rules.sector.hasWaves()){ if(state.rules.sector.hasWaves()){
SectorDamage.apply(passed); SectorDamage.apply(passed);
@@ -103,6 +104,8 @@ public class Logic implements ApplicationListener{
//ensure positive items //ensure positive items
if(core.items.get(item) < 0) core.items.set(item, 0); if(core.items.get(item) < 0) core.items.set(item, 0);
//cap the items
if(core.items.get(item) > core.storageCapacity) core.items.set(item, core.storageCapacity);
}); });
} }

2
core/src/mindustry/ui/dialogs/PlanetDialog.java
View File

@@ -312,7 +312,7 @@ public class PlanetDialog extends BaseDialog implements PlanetInterfaceRenderer{
int i = 0; int i = 0;
for(Item item : content.items()){ for(Item item : content.items()){
int amount = map.get(item); int amount = Math.min(map.get(item), sector.save.meta.secinfo.storageCapacity);
if(amount > 0){ if(amount > 0){
res.image(item.icon(Cicon.small)).padRight(3); res.image(item.icon(Cicon.small)).padRight(3);
res.add(ui.formatAmount(amount)).color(Color.lightGray); res.add(ui.formatAmount(amount)).color(Color.lightGray);