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

Fixed map rule loadouts not applying on Erekir

Browse Source
This commit is contained in:
Anuken
2022-10-03 16:05:17 -04:00
parent 975384d3b1
commit eb1192cdbe
2 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/src/mindustry/core/Logic.java
+2 -1
View File
@@ -215,11 +215,12 @@ public class Logic implements ApplicationListener{
Events.fire(new PlayEvent()); Events.fire(new PlayEvent());
//add starting items //add starting items
if(!state.isCampaign()){ if(!state.isCampaign() || !state.rules.sector.planet.allowLaunchLoadout || (state.rules.sector.preset != null && state.rules.sector.preset.addStartingItems)){
for(TeamData team : state.teams.getActive()){ for(TeamData team : state.teams.getActive()){
if(team.hasCore()){ if(team.hasCore()){
CoreBuild entity = team.core(); CoreBuild entity = team.core();
entity.items.clear(); entity.items.clear();
for(ItemStack stack : state.rules.loadout){ for(ItemStack stack : state.rules.loadout){
//make sure to cap storage //make sure to cap storage
entity.items.add(stack.item, Math.min(stack.amount, entity.storageCapacity - entity.items.get(stack.item))); entity.items.add(stack.item, Math.min(stack.amount, entity.storageCapacity - entity.items.get(stack.item)));
core/src/mindustry/maps/generators/FileMapGenerator.java
+2 -1
View File
@@ -82,7 +82,8 @@ public class FileMapGenerator implements WorldGenerator{
} }
anyCores = true; anyCores = true;
if(preset.addStartingItems){ if(preset.addStartingItems || !preset.planet.allowLaunchLoadout){
tile.build.items.clear();
tile.build.items.add(state.rules.loadout); tile.build.items.add(state.rules.loadout);
} }
} }