From f831f3ab758a35cb53c20e6d9da3ce0bef84b3bc Mon Sep 17 00:00:00 2001
From: Flashfyre <flashfireex@gmail.com>
Date: Sat, 28 Oct 2023 17:59:49 -0400
Subject: [PATCH] Remove extreme weather conditions from natural weather

---
 src/data/weather.ts | 22 +++++++++-------------
 1 file changed, 9 insertions(+), 13 deletions(-)

diff --git a/src/data/weather.ts b/src/data/weather.ts
index 9dae6b4b518..74eb05032d6 100644
--- a/src/data/weather.ts
+++ b/src/data/weather.ts
@@ -216,15 +216,13 @@ export function getRandomWeatherType(biome: Biome): WeatherType {
     case Biome.FOREST:
       weatherPool = [
         { weatherType: WeatherType.NONE, weight: 8 },
-        { weatherType: WeatherType.RAIN, weight: 5 },
-        { weatherType: WeatherType.HEAVY_RAIN, weight: 2 }
+        { weatherType: WeatherType.RAIN, weight: 5 }
       ];
       break;
     case Biome.SEA:
       weatherPool = [
         { weatherType: WeatherType.NONE, weight: 3 },
-        { weatherType: WeatherType.RAIN, weight: 7 },
-        { weatherType: WeatherType.HEAVY_RAIN, weight: 5 }
+        { weatherType: WeatherType.RAIN, weight: 12 }
       ];
       break;
     case Biome.SWAMP:
@@ -245,13 +243,12 @@ export function getRandomWeatherType(biome: Biome): WeatherType {
       weatherPool = [
         { weatherType: WeatherType.NONE, weight: 10 },
         { weatherType: WeatherType.RAIN, weight: 5 },
-        { weatherType: WeatherType.FOG, weight: 3 },
-        { weatherType: WeatherType.HEAVY_RAIN, weight: 2 }
+        { weatherType: WeatherType.FOG, weight: 3 }
       ];
       break;
     case Biome.SEABED:
       weatherPool = [
-        { weatherType: WeatherType.HEAVY_RAIN, weight: 1 }
+        { weatherType: WeatherType.RAIN, weight: 1 }
       ];
       break;
     case Biome.MOUNTAIN:
@@ -262,15 +259,14 @@ export function getRandomWeatherType(biome: Biome): WeatherType {
     case Biome.BADLANDS:
       weatherPool = [
         { weatherType: WeatherType.NONE, weight: 8 },
-        { weatherType: WeatherType.SUNNY, weight: 3 },
-        { weatherType: WeatherType.SANDSTORM, weight: 2 },
-        { weatherType: WeatherType.HARSH_SUN, weight: 5 }
+        { weatherType: WeatherType.SUNNY, weight: 5 },
+        { weatherType: WeatherType.SANDSTORM, weight: 2 }
       ];
       break;
     case Biome.DESERT:
       weatherPool = [
-        { weatherType: WeatherType.SANDSTORM, weight: 1 },
-        { weatherType: WeatherType.HARSH_SUN, weight: 1 }
+        { weatherType: WeatherType.SANDSTORM, weight: 2 },
+        { weatherType: WeatherType.SUNNY, weight: 1 }
       ];
       break;
     case Biome.ICE_CAVE:
@@ -284,7 +280,7 @@ export function getRandomWeatherType(biome: Biome): WeatherType {
       ];
     case Biome.VOLCANO:
       weatherPool = [
-        { weatherType: WeatherType.HARSH_SUN, weight: 1 }
+        { weatherType: WeatherType.SUNNY, weight: 1 }
       ];
       break;
     case Biome.GRAVEYARD: