From 41b96c38371e34e44882b04472e8f51490a8c2a5 Mon Sep 17 00:00:00 2001
From: lowercasedonkey <lowercasedonkey@gmail.com>
Date: Mon, 2 Mar 2020 15:53:50 -0500
Subject: [PATCH] move weather out of save dafuq
---
js/003-data/miscData.js | 44 +++++++++++++++++++++++++++++++++++
src/init/storyInit.tw | 10 ++------
src/uncategorized/nextWeek.tw | 24 +++++++++----------
3 files changed, 58 insertions(+), 20 deletions(-)
diff --git a/js/003-data/miscData.js b/js/003-data/miscData.js
index e1be87724bf..9879d73f915 100644
--- a/js/003-data/miscData.js
+++ b/js/003-data/miscData.js
@@ -2687,3 +2687,47 @@ App.Data.misc.nationalityPoolSelector = {
"Japan": App.Data.misc.asiaNationalities,
"Brazil": App.Data.misc.southamericaNationalities
};
+
+
+
+App.Data.weather = {};
+
+App.Data.weather.nice = [
+ {name: "Sunny", 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: "Smoke warning", severity: 1},
+];
+App.Data.weather.light = [
+ {name: "High Winds", severity: 2},
+ {name: "Acid Rain", severity: 2},
+ {name: "T-Storm Warning", severity: 2},
+ {name: "Flood Warning", severity: 2},
+ {name: "Tornado Warning", severity: 2},
+ {name: "Light Sandstorm", severity: 2},
+ {name: "High Heat", severity: 2},
+ {name: "Smoky", severity: 2},
+];
+App.Data.weather.heavy = [
+ {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: "Dense Smoke", severity: 3},
+];
+App.Data.weather.extreme = [
+ {name: "Solar Flare", severity: 4},
+ {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},
+];
diff --git a/src/init/storyInit.tw b/src/init/storyInit.tw
index 02168009aef..6909e0b8dd2 100644
--- a/src/init/storyInit.tw
+++ b/src/init/storyInit.tw
@@ -1231,14 +1231,8 @@ You should have received a copy of the GNU General Public License along with thi
{name: "Dense Smoke", severity: 3},
]>>
-<<set $extremeWeather = [
- {name: "Solar Flare", severity: 4},
- {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},
-]>>
+<<set $weatherToday = App.Data.weather.nice.random()>>
+<<set $merchantFSWares = ["AssetExpansionistResearch", "GenderRadicalistResearch", "HedonisticDecadenceResearch", "SlaveProfessionalismResearch", "SlimnessEnthusiastResearch", "TransformationFetishistResearch", "YouthPreferentialistResearch"]>>
<<set $weatherToday = $niceWeather.random()>>
diff --git a/src/uncategorized/nextWeek.tw b/src/uncategorized/nextWeek.tw
index dbf164ad604..42a173d420f 100644
--- a/src/uncategorized/nextWeek.tw
+++ b/src/uncategorized/nextWeek.tw
@@ -292,35 +292,35 @@
<<set _seed = random(1,10)>>
<<if $week < 25>>
<<if _seed > 4>>
- <<set $weatherToday = $niceWeather.random()>>
+ <<set $weatherToday = App.Data.weather.nice.random()>>
<<else>>
- <<set $weatherToday = $lightWeather.random()>>
+ <<set $weatherToday = App.Data.weather.light.random()>>
<</if>>
<<elseif $week < 50>>
<<if _seed > 4>>
- <<set $weatherToday = $niceWeather.random()>>
+ <<set $weatherToday = App.Data.weather.nice.random()>>
<<elseif _seed > 2>>
- <<set $weatherToday = $lightWeather.random()>>
+ <<set $weatherToday = App.Data.weather.light.random()>>
<<else>>
- <<set $weatherToday = $heavyWeather.random()>>
+ <<set $weatherToday = App.Data.weather.heavy.random()>>
<</if>>
<<elseif $week < 75>>
<<if _seed > 6>>
- <<set $weatherToday = $niceWeather.random()>>
+ <<set $weatherToday = App.Data.weather.nice.random()>>
<<elseif _seed > 3>>
- <<set $weatherToday = $lightWeather.random()>>
+ <<set $weatherToday = App.Data.weather.light.random()>>
<<else>>
- <<set $weatherToday = $heavyWeather.random()>>
+ <<set $weatherToday = App.Data.weather.heavy.random()>>
<</if>>
<<else>>
<<if _seed > 8>>
- <<set $weatherToday = $niceWeather.random()>>
+ <<set $weatherToday = App.Data.weather.nice.random()>>
<<elseif _seed > 6>>
- <<set $weatherToday = $lightWeather.random()>>
+ <<set $weatherToday = App.Data.weather.light.random()>>
<<elseif _seed > 2>>
- <<set $weatherToday = $heavyWeather.random()>>
+ <<set $weatherToday = App.Data.weather.heavy.random()>>
<<else>>
- <<set $weatherToday = $extremeWeather.random()>>
+ <<set $weatherToday = App.Data.weather.extreme.random()>>
<</if>>
<</if>>
--
GitLab