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

Implemented #3486 with some minor changes

Browse Source
This commit is contained in:
Anuken
2020-12-11 11:48:20 -05:00
parent c54f398063
commit daaea591e4
7 changed files with 51 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -377,7 +377,8 @@ public class Block extends UnlockableContent{
public boolean canReplace(Block other){
if(other.alwaysReplace) return true;
return (other != this || rotate) && this.group != BlockGroup.none && other.group == this.group && (size == other.size || (size >= other.size && subclass != null && subclass == other.subclass));
return (other != this || rotate) && this.group != BlockGroup.none && other.group == this.group &&
(size == other.size || (size >= other.size && ((subclass != null && subclass == other.subclass) || group.anyReplace)));
}
/** @return a possible replacement for this block when placed in a line by the player. */

6
core/src/mindustry/world/blocks/defense/Wall.java
View File

@@ -69,12 +69,6 @@ public class Wall extends Block{
return new TextureRegion[]{Core.atlas.find(Core.atlas.has(name) ? name : name + "1")};
}
@Override
public boolean canReplace(Block other){
if(other.alwaysReplace) return true;
return (other != this || rotate) && this.group != BlockGroup.none && other.group == this.group && other != this && size >= other.size;
}
public class WallBuild extends Building{
public float hit;

6
core/src/mindustry/world/blocks/distribution/Router.java
View File

@@ -23,12 +23,6 @@ public class Router extends Block{
noUpdateDisabled = true;
}
@Override
public boolean canReplace(Block other){
if(other.alwaysReplace) return true;
return (other != this || rotate) && this.group != BlockGroup.none && other.group == this.group && size >= other.size;
}
public class RouterBuild extends Building implements ControlBlock{
public Item lastItem;
public Tile lastInput;

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

@@ -254,7 +254,7 @@ public class CoreBlock extends StorageBlock{
for(Building other : state.teams.cores(team)){
if(other.tile() == tile) continue;
storageCapacity += other.block.itemCapacity + other.proximity().sum(e -> owns(e) && owns(other, e) ? e.block.itemCapacity : 0);
storageCapacity += other.block.itemCapacity + other.proximity().sum(e -> owns(other, e) ? e.block.itemCapacity : 0);
}
//Team.sharded.core().items.set(Items.surgeAlloy, 12000)

13
core/src/mindustry/world/meta/BlockGroup.java
View File

@@ -1,5 +1,16 @@
package mindustry.world.meta;
public enum BlockGroup{
none, walls, projectors, turrets, transportation, power, liquids, drills, storage, units, logic
none, walls(true), projectors(true), turrets, transportation(true), power, liquids(true), drills, storage, units, logic(true);
/** if true, any block in this category replaces any other block in this category. */
public final boolean anyReplace;
BlockGroup(boolean anyReplace){
this.anyReplace = anyReplace;
}
BlockGroup(){
this(false);
}
}