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

Allow hidden blocks to be revealed by plugins (#4017)

Browse Source 
* Add revealedBlocks rule

(1/2)

* Use revealedBlocks rule

(2/2)
This commit is contained in:
Patrick 'Quezler' Mounier
2020-12-17 18:37:47 +01:00
committed by GitHub
parent 9f5183b36f
commit 056afa572e
2 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/src/mindustry/game/Rules.java
View File

@@ -80,6 +80,8 @@ public class Rules{
public Seq<WeatherEntry> weather = new Seq<>(1); public Seq<WeatherEntry> weather = new Seq<>(1);
/** Blocks that cannot be placed. */ /** Blocks that cannot be placed. */
public ObjectSet<Block> bannedBlocks = new ObjectSet<>(); public ObjectSet<Block> bannedBlocks = new ObjectSet<>();
/** Reveals blocks normally hidden by build visibility */
public ObjectSet<Block> revealedBlocks = new ObjectSet<>();
/** Unlocked content names. Only used in multiplayer when the campaign is enabled. */ /** Unlocked content names. Only used in multiplayer when the campaign is enabled. */
public ObjectSet<String> researched = new ObjectSet<>(); public ObjectSet<String> researched = new ObjectSet<>();
/** Whether ambient lighting is enabled. */ /** Whether ambient lighting is enabled. */

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

@@ -522,7 +522,7 @@ public class Block extends UnlockableContent{
} }
public boolean isVisible(){ public boolean isVisible(){
return buildVisibility.visible() && !isHidden(); return (buildVisibility.visible() || state.rules.revealedBlocks.contains(this)) && !isHidden();
} }
public boolean isPlaceable(){ public boolean isPlaceable(){
@@ -718,7 +718,7 @@ public class Block extends UnlockableContent{
@Override @Override
public boolean isHidden(){ public boolean isHidden(){
return !buildVisibility.visible(); return !buildVisibility.visible() && !state.rules.revealedBlocks.contains(this);
} }
@Override @Override