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

Campaign bugfixes

Browse Source
This commit is contained in:
Anuken
2020-11-26 15:31:19 -05:00
parent 84474040c0
commit 1d8ec9abd9
7 changed files with 19 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
core/src/mindustry/world/blocks/storage/CoreBlock.java
View File

@@ -229,12 +229,12 @@ public class CoreBlock extends StorageBlock{
@Override
public boolean acceptItem(Building source, Item item){
return items.get(item) < getMaximumAccepted(item) || incinerate();
return items.get(item) < getMaximumAccepted(item);
}
@Override
public int getMaximumAccepted(Item item){
return storageCapacity;
return incinerate() ? storageCapacity * 2 : storageCapacity;
}
@Override
@@ -270,10 +270,15 @@ public class CoreBlock extends StorageBlock{
@Override
public void handleStack(Item item, int amount, Teamc source){
super.handleStack(item, amount, source);
int realAmount = Math.min(amount, storageCapacity - items.get(item));
super.handleStack(item, realAmount, source);
if(team == state.rules.defaultTeam && state.isCampaign()){
state.rules.sector.info.handleCoreItem(item, amount);
if(realAmount == 0){
Fx.coreBurn.at(x, y);
}
}
}
@@ -377,7 +382,7 @@ public class CoreBlock extends StorageBlock{
state.rules.sector.info.handleCoreItem(item, 1);
}
if(items.get(item) >= getMaximumAccepted(item)){
if(items.get(item) >= storageCapacity){
//create item incineration effect at random intervals
if(!noEffect){
incinerateEffect(this, source);