From eb1192cdbe0cc513329860ba1946e54e5918b860 Mon Sep 17 00:00:00 2001 From: Anuken Date: Mon, 3 Oct 2022 16:05:17 -0400 Subject: [PATCH] Fixed map rule loadouts not applying on Erekir --- core/src/mindustry/core/Logic.java | 3 ++- core/src/mindustry/maps/generators/FileMapGenerator.java | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/core/src/mindustry/core/Logic.java b/core/src/mindustry/core/Logic.java index ceffb75710..17bcfb6b71 100644 --- a/core/src/mindustry/core/Logic.java +++ b/core/src/mindustry/core/Logic.java @@ -215,11 +215,12 @@ public class Logic implements ApplicationListener{ Events.fire(new PlayEvent()); //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()){ if(team.hasCore()){ CoreBuild entity = team.core(); entity.items.clear(); + for(ItemStack stack : state.rules.loadout){ //make sure to cap storage entity.items.add(stack.item, Math.min(stack.amount, entity.storageCapacity - entity.items.get(stack.item))); diff --git a/core/src/mindustry/maps/generators/FileMapGenerator.java b/core/src/mindustry/maps/generators/FileMapGenerator.java index 621fae9696..5a53cb643e 100644 --- a/core/src/mindustry/maps/generators/FileMapGenerator.java +++ b/core/src/mindustry/maps/generators/FileMapGenerator.java @@ -82,7 +82,8 @@ public class FileMapGenerator implements WorldGenerator{ } anyCores = true; - if(preset.addStartingItems){ + if(preset.addStartingItems || !preset.planet.allowLaunchLoadout){ + tile.build.items.clear(); tile.build.items.add(state.rules.loadout); } }