From db054add64bb177fa1cf5a88f2e3144417574013 Mon Sep 17 00:00:00 2001
From: Anuken <arnukren@gmail.com>
Date: Sat, 12 Jun 2021 17:22:46 -0400
Subject: [PATCH] Merge

---
 core/src/mindustry/content/Weathers.java             | 1 +
 core/src/mindustry/type/Weather.java                 | 1 +
 core/src/mindustry/ui/dialogs/CustomRulesDialog.java | 1 +
 3 files changed, 3 insertions(+)

diff --git a/core/src/mindustry/content/Weathers.java b/core/src/mindustry/content/Weathers.java
index 262c38475b..ab03e32eda 100644
--- a/core/src/mindustry/content/Weathers.java
+++ b/core/src/mindustry/content/Weathers.java
@@ -109,6 +109,7 @@ public class Weathers implements ContentList{
             particleRegion = "particle";
             statusGround = false;
             useWindVector = true;
+            hidden = true;
             sizeMax = 4f;
             sizeMin = 1.4f;
             minAlpha = 0.5f;
diff --git a/core/src/mindustry/type/Weather.java b/core/src/mindustry/type/Weather.java
index 4c8be19a55..a21cb992af 100644
--- a/core/src/mindustry/type/Weather.java
+++ b/core/src/mindustry/type/Weather.java
@@ -30,6 +30,7 @@ public class Weather extends UnlockableContent{
     public Sound sound = Sounds.none;
     public float soundVol = 0.1f, soundVolMin = 0f;
     public float soundVolOscMag = 0f, soundVolOscScl = 20f;
+    public boolean hidden = false;
 
     //internals
     public Prov<WeatherState> type = WeatherState::create;
diff --git a/core/src/mindustry/ui/dialogs/CustomRulesDialog.java b/core/src/mindustry/ui/dialogs/CustomRulesDialog.java
index bf150bcd6a..6c763e840b 100644
--- a/core/src/mindustry/ui/dialogs/CustomRulesDialog.java
+++ b/core/src/mindustry/ui/dialogs/CustomRulesDialog.java
@@ -337,6 +337,7 @@ public class CustomRulesDialog extends BaseDialog{
                 t.background(Tex.button);
                 int i = 0;
                 for(Weather weather : content.<Weather>getBy(ContentType.weather)){
+                    if(weather.hidden) continue;
 
                     t.button(weather.localizedName, Styles.cleart, () -> {
                         rules.weather.add(new WeatherEntry(weather));