From e6dd6cb44d8db96b5d405b3ae367a6175f6cf08c Mon Sep 17 00:00:00 2001 From: SITUVNgcd <44901211+SITUVNgcd@users.noreply.github.com> Date: Fri, 16 Feb 2024 21:52:31 +0700 Subject: [PATCH 1/2] Make privileged SwitchBlock(World Switch) can't pickup (#9557) --- core/src/mindustry/world/blocks/logic/SwitchBlock.java | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/core/src/mindustry/world/blocks/logic/SwitchBlock.java b/core/src/mindustry/world/blocks/logic/SwitchBlock.java index c3e579e456..6c166fd331 100644 --- a/core/src/mindustry/world/blocks/logic/SwitchBlock.java +++ b/core/src/mindustry/world/blocks/logic/SwitchBlock.java @@ -42,6 +42,11 @@ public class SwitchBlock extends Block{ if(privileged) return; super.damage(damage); } + + @Override + public boolean canPickup(){ + return !privileged; + } @Override public boolean collide(Bullet other){ From d79a306970598ae8d7fa29102d1ce2aa0653e5ed Mon Sep 17 00:00:00 2001 From: SITUVNgcd <44901211+SITUVNgcd@users.noreply.github.com> Date: Fri, 16 Feb 2024 21:52:41 +0700 Subject: [PATCH 2/2] Gammar & context fix (#9559) - `lglobal.@clientMobile = True is ...` => `lglobal.@clientMobile = True if ...` - `lenum.colori = Indexed position, ...` => `lenum.colori = Indexed color, ...` --- core/assets/bundles/bundle.properties | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/core/assets/bundles/bundle.properties b/core/assets/bundles/bundle.properties index f9cbaa5622..09f8119504 100644 --- a/core/assets/bundles/bundle.properties +++ b/core/assets/bundles/bundle.properties @@ -2372,7 +2372,7 @@ lglobal.@clientLocale = Locale of the client running the code. For example: en_U lglobal.@clientUnit = Unit of client running the code lglobal.@clientName = Player name of client running the code lglobal.@clientTeam = Team ID of client running the code -lglobal.@clientMobile = True is the client running the code is on mobile, false otherwise +lglobal.@clientMobile = True if the client running the code is on mobile, false otherwise logic.nounitbuild = [red]Unit building logic is not allowed here. @@ -2532,4 +2532,4 @@ lenum.texturesize = Size of texture in tiles. Zero value scales marker width to lenum.autoscale = Whether to scale marker corresponding to player's zoom level. lenum.posi = Indexed position, used for line and quad markers with index zero being the first position. lenum.uvi = Texture's position ranging from zero to one, used for quad markers. -lenum.colori = Indexed position, used for line and quad markers with index zero being the first color. +lenum.colori = Indexed color, used for line and quad markers with index zero being the first color.