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

Core incineration tweaks

Browse Source
This commit is contained in:
Anuken
2021-01-03 16:52:54 -05:00
parent 0cfdacdd28
commit af636f74fc
2 changed files with 5 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -233,7 +233,7 @@ public class CoreBlock extends StorageBlock{
@Override
public int getMaximumAccepted(Item item){
return incinerate() ? storageCapacity * 2 : storageCapacity;
return state.rules.coreIncinerates ? storageCapacity * 2 : storageCapacity;
}
@Override
@@ -318,10 +318,6 @@ public class CoreBlock extends StorageBlock{
return tile instanceof StorageBuild b && (b.linkedCore == core || b.linkedCore == null);
}
public boolean incinerate(){
return state.isCampaign() || state.rules.coreIncinerates;
}
@Override
public float handleDamage(float amount){
if(player != null && team == player.team()){
@@ -386,7 +382,7 @@ public class CoreBlock extends StorageBlock{
}else{
super.handleItem(source, item);
}
}else if(incinerate()){
}else if(state.rules.coreIncinerates){
if(items.get(item) >= storageCapacity){
//create item incineration effect at random intervals
if(!noEffect){