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

Various tweaks

Browse Source
This commit is contained in:
Anuken
2020-09-22 20:42:36 -04:00
parent 4a02315ee5
commit ba6ab8483e
12 changed files with 75 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
core/src/mindustry/world/blocks/campaign/LaunchPad.java
View File

@@ -180,18 +180,26 @@ public class LaunchPad extends Block{
Sector destsec = !net.client() ? state.secinfo.origin : state.rules.sector.planet.sectors.find(Sector::hasBase);
//actually launch the items upon removal
if(team() == state.rules.defaultTeam && destsec != null){
ItemSeq dest = destsec.getExtraItems();
if(team() == state.rules.defaultTeam){
if(destsec != null && (destsec != state.rules.sector || net.client())){
ItemSeq dest = destsec.getExtraItems();
for(ItemStack stack : stacks){
dest.add(stack);
for(ItemStack stack : stacks){
dest.add(stack);
//update export
state.secinfo.handleItemExport(stack);
Events.fire(new LaunchItemEvent(stack));
//update export
state.secinfo.handleItemExport(stack);
Events.fire(new LaunchItemEvent(stack));
}
destsec.setExtraItems(dest);
}else if(team().core() != null){
//dump launched stuff into the core
for(ItemStack stack : stacks){
int min = Math.min(team().core().block.itemCapacity - team().core().items.get(stack.item), stack.amount);
team().core().items.add(stack.item, min);
}
}
destsec.setExtraItems(dest);
}
}
}

13
core/src/mindustry/world/modules/ItemModule.java
View File

@@ -135,6 +135,15 @@ public class ItemModule extends BlockModule{
return true;
}
public boolean has(ItemSeq items){
for(Item item : content.items()){
if(!has(item, items.get(item))){
return false;
}
}
return true;
}
public boolean has(Iterable<ItemStack> stacks){
for(ItemStack stack : stacks){
if(!has(stack.item, stack.amount)) return false;
@@ -261,6 +270,10 @@ public class ItemModule extends BlockModule{
for(ItemStack stack : stacks) remove(stack.item, stack.amount);
}
public void remove(ItemSeq stacks){
stacks.each(this::remove);
}
public void remove(Iterable<ItemStack> stacks){
for(ItemStack stack : stacks) remove(stack.item, stack.amount);
}