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

Fixed #5772

Browse Source
This commit is contained in:
Anuken
2021-08-15 21:17:16 -04:00
parent 79d757856e
commit c35dde5569
2 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
core/src/mindustry/world/Block.java
View File

@@ -36,8 +36,11 @@ import java.util.*;
import static mindustry.Vars.*; import static mindustry.Vars.*;
public class Block extends UnlockableContent{ public class Block extends UnlockableContent{
/** If true, buildings have an ItemModule. */
public boolean hasItems; public boolean hasItems;
/** If true, buildings have a LiquidModule. */
public boolean hasLiquids; public boolean hasLiquids;
/** If true, buildings have a PowerModule. */
public boolean hasPower; public boolean hasPower;
public boolean outputsLiquid = false; public boolean outputsLiquid = false;
@@ -45,8 +48,6 @@ public class Block extends UnlockableContent{
public boolean outputsPower = false; public boolean outputsPower = false;
public boolean outputsPayload = false; public boolean outputsPayload = false;
public boolean acceptsPayload = false; public boolean acceptsPayload = false;
public boolean outputFacing = true;
public boolean noSideBlend = false;
public boolean acceptsItems = false; public boolean acceptsItems = false;
public int itemCapacity = 10; public int itemCapacity = 10;
@@ -56,6 +57,11 @@ public class Block extends UnlockableContent{
public final BlockBars bars = new BlockBars(); public final BlockBars bars = new BlockBars();
public final Consumers consumes = new Consumers(); public final Consumers consumes = new Consumers();
/** If true, this block outputs to its facing direction, when applicable.
* Used for blending calculations. */
public boolean outputFacing = true;
/** if true, this block does not accept input from the sides (used for armored conveyors) */
public boolean noSideBlend = false;
/** whether to display flow rate */ /** whether to display flow rate */
public boolean displayFlow = true; public boolean displayFlow = true;
/** whether this block is visible in the editor */ /** whether this block is visible in the editor */

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

@@ -122,7 +122,7 @@ public class LaunchPad extends Block{
if(!state.isCampaign()) return; if(!state.isCampaign()) return;
//increment launchCounter then launch when full and base conditions are met //increment launchCounter then launch when full and base conditions are met
if((launchCounter += edelta()) >= launchTime && items.total() >= itemCapacity){ if((launchCounter += edelta()) >= launchTime && edelta() >= 0.001f && items.total() >= itemCapacity){
launchSound.at(x, y); launchSound.at(x, y);
LaunchPayload entity = LaunchPayload.create(); LaunchPayload entity = LaunchPayload.create();
items.each((item, amount) -> entity.stacks.add(new ItemStack(item, amount))); items.each((item, amount) -> entity.stacks.add(new ItemStack(item, amount)));