From 92ce6703f853d4c9fe1f40e210ae43543af33bd4 Mon Sep 17 00:00:00 2001
From: turnop <17540-turnop@users.noreply.gitgud.io>
Date: Fri, 9 Oct 2020 22:38:14 -0700
Subject: [PATCH] new weather system

---
 js/003-data/miscData.js | 129 +++++++++++++++++++++++++++++++++++-----
 1 file changed, 113 insertions(+), 16 deletions(-)

diff --git a/js/003-data/miscData.js b/js/003-data/miscData.js
index b6f86d984e2..896f941febf 100644
--- a/js/003-data/miscData.js
+++ b/js/003-data/miscData.js
@@ -1986,45 +1986,142 @@ App.Data.misc.lawlessMarkets = [
 App.Data.misc.schools = ["GRI", "HA", "NUL", "SCP", "TCR", "TFS", "TGA", "TSS", "LDE", "TUO"];
 
 App.Data.weather = {
-	nice: [
+
+	hotnice: [
 		{name: "Sunny", severity: 1},
+		{name: "Hot", severity: 1},
+		{name: "Partly Cloudy", severity: 1},
+		{name: "Light Rain", severity: 1},
+		{name: "Clear and Calm", severity: 1},
+	],
+
+	windynice: [
+		{name: "Light Wind", severity: 1},
 		{name: "Cloudy", severity: 1},
 		{name: "Partly Cloudy", severity: 1},
 		{name: "Overcast", severity: 1},
-		{name: "Light Wind", severity: 1},
-		{name: "Clear and Calm", severity: 1},
 		{name: "Light Rain", severity: 1},
 		{name: "Heavy Rain", severity: 1},
+		{name: "Clear and Calm", severity: 1},
+	],
+
+	smokynice: [
 		{name: "Smoke warning", severity: 1},
+		{name: "Overcast", severity: 1},
+		{name: "Clear and Calm", severity: 1},
 	],
-	light: [
+
+	toxicnice: [
+		{name: "Cloudy", severity: 1},
+		{name: "Light Rain", severity: 1},
+		{name: "Heavy Rain", severity: 1},
+		{name: "Clear and Calm", severity: 1},
+		{name: "Sunny", severity: 1},
+	],
+
+	coldnice: [
+		{name: "Overcast", severity: 1},
+		{name: "Chilly", severity: 1},
+		{name: "Heavy Rain", severity: 1},
+		{name: "Gentle Snow", severity: 1},
+		{name: "Clear and Calm", severity: 1},
+	],
+
+	hotlight: [
+		{name: "Light Sandstorms", severity: 2},
+		{name: "High Heat", severity: 2},
+		{name: "Minor Wildfires", severity: 2},
+		{name: "Volcano Warning", severity: 2},
+	],
+
+	windylight: [
 		{name: "High Winds", severity: 2},
-		{name: "Acid Rain", severity: 2},
 		{name: "T-Storm Warning", severity: 2},
+		{name: "Light T-Storms", severity: 2},
 		{name: "Flood Warning", severity: 2},
 		{name: "Tornado Warning", severity: 2},
-		{name: "Light Sandstorm", severity: 2},
-		{name: "High Heat", severity: 2},
+	],
+
+	smokylight: [
 		{name: "Smoky", severity: 2},
+		{name: "Ash Storm Warning", severity: 2},
+		{name: "T-Storm Warning", severity: 2},
+		{name: "Light T-Storms", severity: 2},
 	],
-	heavy: [
+
+	toxiclight: [
+		{name: "Acid Rain", severity: 2},
+		{name: "Radiation Warning", severity: 2},
+		{name: "T-Storm Warning", severity: 2},
+		{name: "Light T-Storms", severity: 2},
+	],
+
+	coldlight: [
+		{name: "Subzero Temps", severity: 2},
+		{name: "Light Snowstorms", severity: 2},
+		{name: "Blizzard Warning", severity: 2},
+	],
+
+	hotheavy: [
+		{name: "Severe Sandstorm", severity: 3},
+		{name: "Extreme Heat", severity: 3},
+		{name: "Serious Wildfires", severity: 3},
+		{name: "Volcanic Rumbling", severity: 3},
+	],
+
+	windyheavy: [
 		{name: "Extreme Winds", severity: 3},
-		{name: "Heavy Acid Rain", severity: 3},
-		{name: "Extreme T-storm", severity: 3},
 		{name: "Flooding", severity: 3},
 		{name: "Tornadoes", severity: 3},
-		{name: "Sandstorm", severity: 3},
-		{name: "Extreme Heat", severity: 3},
+		{name: "Extreme T-storms", severity: 3},
+	],
+
+	smokyheavy: [
 		{name: "Dense Smoke", severity: 3},
+		{name: "Ash Storms", severity: 3},
+		{name: "Extreme T-storms", severity: 3},
 	],
-	extreme: [
+
+	toxicheavy: [
+		{name: "Heavy Acid Rain", severity: 3},
+		{name: "Extreme T-storms", severity: 3},
+		{name: "Radiological Drift", severity: 3},
+	],
+
+	coldheavy: [
+		{name: "Severe Snowstorm", severity: 3},
+		{name: "Blizzard", severity: 3},
+		{name: "Freezing Temps", severity: 3},
+	],
+
+	hotextreme: [
 		{name: "Solar Flare", severity: 4},
+		{name: "Devastating Sandstorm", severity: 4},
+		{name: "Volcanic Eruption", severity: 4},
+	],
+
+	windyextreme: [
 		{name: "Ion Storm", severity: 4},
 		{name: "Cataclysmic Rains", severity: 4},
 		{name: "Cat 6 Hurricane", severity: 4},
-		{name: "Abrasive Sandstorm", severity: 4},
-		{name: "Radiological Warning", severity: 4},
-	]
+	],
+
+	smokyextreme: [
+		{name: "Cataclysmic Rains", severity: 4},
+		{name: "Suffocating Ash Storms", severity: 4},
+	],
+
+	toxicextreme: [
+		{name: "Radiological Storm", severity: 4},
+		{name: "Cataclysmic Acid Rain", severity: 4},
+	],
+
+	coldextreme: [
+		{name: "Polar Vortex", severity: 4},
+		{name: "Apocalyptic Blizzard", severity: 4},
+		{name: "Arctic Temps", severity: 4},
+	],
+
 };
 App.Data.misc.bioreactorFluids = {
 	XX: {
-- 
GitLab