From a6d0a17bd9bf1ddce7bca5939a223fab533f0dac Mon Sep 17 00:00:00 2001
From: WayZer <himc.wicp@gmail.com>
Date: Sat, 14 Oct 2023 21:09:59 +0800
Subject: [PATCH] PR: world-switch (#9167)

---
 .../sprites/blocks/logic/world-switch-on.png  | Bin 0 -> 164 bytes
 .../sprites/blocks/logic/world-switch.png     | Bin 0 -> 389 bytes
 core/assets/icons/icons.properties            |   1 +
 core/src/mindustry/content/Blocks.java        |   9 +++++++-
 .../world/blocks/logic/SwitchBlock.java       |  21 ++++++++++++++++++
 5 files changed, 30 insertions(+), 1 deletion(-)
 create mode 100644 core/assets-raw/sprites/blocks/logic/world-switch-on.png
 create mode 100644 core/assets-raw/sprites/blocks/logic/world-switch.png

diff --git a/core/assets-raw/sprites/blocks/logic/world-switch-on.png b/core/assets-raw/sprites/blocks/logic/world-switch-on.png
new file mode 100644
index 0000000000000000000000000000000000000000..54f03c820cb716941b2f38c66f42d18a3edf68c5
GIT binary patch
literal 164
zcmeAS@N?(olHy`uVBq!ia0y~yU{C;I4mJh`hT^KKFANL}oCO|{#S9GG!XV7ZFl&wk
z0|P^tr;B4qMC;ot2YDF;1Y82YEOrZA++;Di;|+(>&-Xdy&lsLFF!WcJZkQIb+ttu}
z_mYK%HOpHn6U5d{GmwpI)mCj<dVo{p$7`W=UNMzzn}uGvvoKVwW8}z};rq_hrpmy;
Oz~JfX=d#Wzp$PyyVKZ0&

literal 0
HcmV?d00001

diff --git a/core/assets-raw/sprites/blocks/logic/world-switch.png b/core/assets-raw/sprites/blocks/logic/world-switch.png
new file mode 100644
index 0000000000000000000000000000000000000000..b7c65601a9df43a27612344db71e1628358c6d07
GIT binary patch
literal 389
zcmeAS@N?(olHy`uVBq!ia0y~yU{C;I4mJh`hT^KKFANL}oCO|{#S9GG!XV7ZFl&wk
z0|TSEr;B4qL~HUH?TjDi8`$sctd*Q^;<#YZs_yW4ol2KiGPubeX!5^w@^s_D&V!7u
zXX1<O<Cx9u%8v-#-u{-s@2iFLfs>~hr;D6qm>(G->)?Bub7tp5hNy_X^EqN)YWn1!
z8yI9iO5yOmFiV>U1Tuf_j7YusR#{8@fQ~w=!0Pq|%qKR^5!qX@S<$W`?#QI*lw=Es
zr$4eL>9%(!7PD0CY@FBTp~v|#RIf!#E~i0-T_BlpWuL@{T?tnhRV*83tZ~aKQ?X?E
z5b59-*$~JlGjWTHaAf~gr6g{pGv5x1{^3&)3%C{0%Geb6;JLiVwud{iTqemltW)mT
zIH$3(v9a~WB<^P%v!5UTxN3K@WLLP{UArEE9c6F%0{N8K6SC(d^)f|SFomC%NS9i$
mO!<T9X-W6rZOZo;85S)|OuFTfzlVW=fx*+&&t;ucLK6TM*p=V_

literal 0
HcmV?d00001

diff --git a/core/assets/icons/icons.properties b/core/assets/icons/icons.properties
index b1a6b32aca..d72941dee9 100755
--- a/core/assets/icons/icons.properties
+++ b/core/assets/icons/icons.properties
@@ -586,3 +586,4 @@
 63096=fast|status-fast-ui
 63095=ranai|ranai
 63094=cat|cat
+63093=world-switch|block-world-switch-ui
diff --git a/core/src/mindustry/content/Blocks.java b/core/src/mindustry/content/Blocks.java
index f7b63bc6a4..6d7f4623f4 100644
--- a/core/src/mindustry/content/Blocks.java
+++ b/core/src/mindustry/content/Blocks.java
@@ -160,7 +160,7 @@ public class Blocks{
     //logic
     message, switchBlock, microProcessor, logicProcessor, hyperProcessor, largeLogicDisplay, logicDisplay, memoryCell, memoryBank,
     canvas, reinforcedMessage,
-    worldProcessor, worldCell, worldMessage,
+    worldProcessor, worldCell, worldMessage, worldSwitch,
 
     //campaign
     launchPad, interplanetaryAccelerator
@@ -5944,6 +5944,13 @@ public class Blocks{
             privileged = true;
         }};
 
+        worldSwitch = new SwitchBlock("world-switch"){{
+            requirements(Category.logic, BuildVisibility.editorOnly, with());
+
+            targetable = false;
+            privileged = true;
+        }};
+
         //endregion
     }
 }
diff --git a/core/src/mindustry/world/blocks/logic/SwitchBlock.java b/core/src/mindustry/world/blocks/logic/SwitchBlock.java
index 8ed7723abf..c3e579e456 100644
--- a/core/src/mindustry/world/blocks/logic/SwitchBlock.java
+++ b/core/src/mindustry/world/blocks/logic/SwitchBlock.java
@@ -8,6 +8,8 @@ import mindustry.gen.*;
 import mindustry.world.*;
 import mindustry.world.meta.*;
 
+import static mindustry.Vars.state;
+
 public class SwitchBlock extends Block{
     public Sound clickSound = Sounds.click;
 
@@ -25,7 +27,26 @@ public class SwitchBlock extends Block{
         config(Boolean.class, (SwitchBuild entity, Boolean b) -> entity.enabled = b);
     }
 
+    public boolean accessible(){
+        return !privileged || state.rules.editor;
+    }
+
+    @Override
+    public boolean canBreak(Tile tile){
+        return accessible();
+    }
+
     public class SwitchBuild extends Building{
+        @Override
+        public void damage(float damage){
+            if(privileged) return;
+            super.damage(damage);
+        }
+
+        @Override
+        public boolean collide(Bullet other){
+            return !privileged;
+        }
 
         @Override
         public boolean configTapped(){