diff --git a/js/003-data/miscData.js b/js/003-data/miscData.js
index 07485f6c710336a3c36a00c170cdd1c20ea8dc0f..4c801e2fe0dc31f52ec46ff93024149f0731f14f 100644
--- a/js/003-data/miscData.js
+++ b/js/003-data/miscData.js
@@ -2023,169 +2023,3 @@ App.Data.misc.lawlessMarkets = [
"white collar",
...App.Data.misc.schools.keys()
];
-
-App.Data.weather = {
-
- hotnice: [
- {name: "Sunny", severity: 1},
- {name: "Warm", 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 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},
- ],
-
- toxicnice: [
- {name: "Cloudy", severity: 1},
- {name: "Light Rain", severity: 1},
- {name: "Heavy Rain", severity: 1},
- {name: "Sunny", severity: 1},
- {name: "Clear and Calm", 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},
- ],
-
- tectonicnice: [
- {name: "Light Rain", severity: 1},
- {name: "Partly Cloudy", severity: 1},
- {name: "Heavy Rain", severity: 1},
- {name: "Sunny", 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: "T-Storm Warning", severity: 2},
- {name: "Light T-Storms", severity: 2},
- {name: "Flood Warning", severity: 2},
- {name: "Tornado Warning", 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},
- ],
-
- 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},
- ],
-
- tectoniclight: [
- {name: "T-Storm Warning", severity: 2},
- {name: "Light T-Storms", severity: 2},
- {name: "Light Mudslides", severity: 2},
- {name: "Earthquake 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: "Flooding", severity: 3},
- {name: "Tornadoes", 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},
- ],
-
- 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},
- ],
-
- tectonicheavy: [
- {name: "Violent Mudslides", severity: 3},
- {name: "Rumbling Earthquake", severity: 3},
- {name: "Extreme T-Storms", 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},
- ],
-
- 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},
- ],
-
- tectonicextreme: [
- {name: "Hellish Earthquake", severity: 4},
- {name: "Ion Storm", severity: 4},
- {name: "Cataclysmic Rains", severity: 4},
- ],
-
-};
diff --git a/js/003-data/weatherData.js b/js/003-data/weatherData.js
new file mode 100644
index 0000000000000000000000000000000000000000..5888623b3d522fec969bd603d2e02c57f4d214e5
--- /dev/null
+++ b/js/003-data/weatherData.js
@@ -0,0 +1,165 @@
+App.Data.Weather = {
+
+ hotNice: [
+ {name: "Sunny", severity: 1},
+ {name: "Warm", 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 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},
+ ],
+
+ toxicNice: [
+ {name: "Cloudy", severity: 1},
+ {name: "Light Rain", severity: 1},
+ {name: "Heavy Rain", severity: 1},
+ {name: "Sunny", severity: 1},
+ {name: "Clear and Calm", 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},
+ ],
+
+ tectonicNice: [
+ {name: "Light Rain", severity: 1},
+ {name: "Partly Cloudy", severity: 1},
+ {name: "Heavy Rain", severity: 1},
+ {name: "Sunny", 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: "T-Storm Warning", severity: 2},
+ {name: "Light T-Storms", severity: 2},
+ {name: "Flood Warning", severity: 2},
+ {name: "Tornado Warning", 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},
+ ],
+
+ 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},
+ ],
+
+ tectonicLight: [
+ {name: "T-Storm Warning", severity: 2},
+ {name: "Light T-Storms", severity: 2},
+ {name: "Light Mudslides", severity: 2},
+ {name: "Earthquake 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: "Flooding", severity: 3},
+ {name: "Tornadoes", 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},
+ ],
+
+ 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},
+ ],
+
+ tectonicHeavy: [
+ {name: "Violent Mudslides", severity: 3},
+ {name: "Rumbling Earthquake", severity: 3},
+ {name: "Extreme T-Storms", 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},
+ ],
+
+ 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},
+ ],
+
+ tectonicExtreme: [
+ {name: "Hellish Earthquake", severity: 4},
+ {name: "Ion Storm", severity: 4},
+ {name: "Cataclysmic Rains", severity: 4},
+ ],
+
+};
diff --git a/src/endWeek/nextWeek/weather.js b/src/endWeek/nextWeek/weather.js
index 84f5f286a172d0ef54a764388ade0517c0c81189..d8f7bec32ee76f34dbca9d3abfd75f44eae2a74c 100644
--- a/src/endWeek/nextWeek/weather.js
+++ b/src/endWeek/nextWeek/weather.js
@@ -40,612 +40,612 @@ App.EndWeek.weather = function() {
if (V.weatherType === 1) {
if (V.week < 25) {
if (_seed > 4) {
- V.weatherToday = App.Data.weather.hotnice.random();
+ V.weatherToday = App.Data.Weather.hotNice.random();
V.weatherLastWeek = 1;
} else {
- V.weatherToday = App.Data.weather.hotlight.random();
+ V.weatherToday = App.Data.Weather.hotLight.random();
V.weatherLastWeek = 2;
}
} else if (V.week < 50 && V.weatherLastWeek === 1) {
if (_seed > 4) {
- V.weatherToday = App.Data.weather.hotnice.random();
+ V.weatherToday = App.Data.Weather.hotNice.random();
V.weatherLastWeek = 1;
} else {
- V.weatherToday = App.Data.weather.hotlight.random();
+ V.weatherToday = App.Data.Weather.hotLight.random();
V.weatherLastWeek = 2;
}
} else if (V.week < 50 && V.weatherLastWeek === 2) {
if (_seed > 4) {
- V.weatherToday = App.Data.weather.hotnice.random();
+ V.weatherToday = App.Data.Weather.hotNice.random();
V.weatherLastWeek = 1;
} else if (_seed > 2) {
- V.weatherToday = App.Data.weather.hotlight.random();
+ V.weatherToday = App.Data.Weather.hotLight.random();
V.weatherLastWeek = 2;
} else {
- V.weatherToday = App.Data.weather.hotheavy.random();
+ V.weatherToday = App.Data.Weather.hotHeavy.random();
V.weatherLastWeek = 3;
}
} else if (V.week < 50 && V.weatherLastWeek === 3) {
if (_seed > 4) {
- V.weatherToday = App.Data.weather.hotlight.random();
+ V.weatherToday = App.Data.Weather.hotLight.random();
V.weatherLastWeek = 2;
} else {
- V.weatherToday = App.Data.weather.hotheavy.random();
+ V.weatherToday = App.Data.Weather.hotHeavy.random();
V.weatherLastWeek = 3;
}
} else if (V.week < 75 && V.weatherLastWeek === 1) {
if (_seed > 6) {
- V.weatherToday = App.Data.weather.hotnice.random();
+ V.weatherToday = App.Data.Weather.hotNice.random();
V.weatherLastWeek = 1;
} else {
- V.weatherToday = App.Data.weather.hotlight.random();
+ V.weatherToday = App.Data.Weather.hotLight.random();
V.weatherLastWeek = 2;
}
} else if (V.week < 75 && V.weatherLastWeek === 2) {
if (_seed > 6) {
- V.weatherToday = App.Data.weather.hotnice.random();
+ V.weatherToday = App.Data.Weather.hotNice.random();
V.weatherLastWeek = 1;
} else if (_seed > 3) {
- V.weatherToday = App.Data.weather.hotlight.random();
+ V.weatherToday = App.Data.Weather.hotLight.random();
V.weatherLastWeek = 2;
} else {
- V.weatherToday = App.Data.weather.hotheavy.random();
+ V.weatherToday = App.Data.Weather.hotHeavy.random();
V.weatherLastWeek = 3;
}
} else if (V.week < 75 && V.weatherLastWeek === 3) {
if (_seed > 5) {
- V.weatherToday = App.Data.weather.hotlight.random();
+ V.weatherToday = App.Data.Weather.hotLight.random();
V.weatherLastWeek = 2;
} else {
- V.weatherToday = App.Data.weather.hotheavy.random();
+ V.weatherToday = App.Data.Weather.hotHeavy.random();
V.weatherLastWeek = 3;
}
} else if (V.week > 75 && V.weatherLastWeek === 1) {
if (_seed > 8) {
- V.weatherToday = App.Data.weather.hotnice.random();
+ V.weatherToday = App.Data.Weather.hotNice.random();
V.weatherLastWeek = 1;
} else {
- V.weatherToday = App.Data.weather.hotlight.random();
+ V.weatherToday = App.Data.Weather.hotLight.random();
V.weatherLastWeek = 2;
}
} else if (V.week > 75 && V.weatherLastWeek === 2) {
if (_seed > 7) {
- V.weatherToday = App.Data.weather.hotnice.random();
+ V.weatherToday = App.Data.Weather.hotNice.random();
V.weatherLastWeek = 1;
} else if (_seed > 5) {
- V.weatherToday = App.Data.weather.hotlight.random();
+ V.weatherToday = App.Data.Weather.hotLight.random();
V.weatherLastWeek = 2;
} else {
- V.weatherToday = App.Data.weather.hotheavy.random();
+ V.weatherToday = App.Data.Weather.hotHeavy.random();
V.weatherLastWeek = 3;
}
} else if (V.week > 75 && V.weatherLastWeek === 3) {
if (_seed > 6) {
- V.weatherToday = App.Data.weather.hotlight.random();
+ V.weatherToday = App.Data.Weather.hotLight.random();
V.weatherLastWeek = 2;
} else if (_seed > 2) {
- V.weatherToday = App.Data.weather.hotheavy.random();
+ V.weatherToday = App.Data.Weather.hotHeavy.random();
V.weatherLastWeek = 3;
} else {
- V.weatherToday = App.Data.weather.hotextreme.random();
+ V.weatherToday = App.Data.Weather.hotExtreme.random();
V.weatherLastWeek = 4;
}
} else if (V.week > 75 && V.weatherLastWeek === 4) {
if (_seed > 4) {
- V.weatherToday = App.Data.weather.hotheavy.random();
+ V.weatherToday = App.Data.Weather.hotHeavy.random();
V.weatherLastWeek = 3;
} else {
- V.weatherToday = App.Data.weather.hotextreme.random();
+ V.weatherToday = App.Data.Weather.hotExtreme.random();
V.weatherLastWeek = 4;
}
}
} else if (V.weatherType === 2) {
if (V.week < 25) {
if (_seed > 4) {
- V.weatherToday = App.Data.weather.windynice.random();
+ V.weatherToday = App.Data.Weather.windyNice.random();
V.weatherLastWeek = 1;
} else {
- V.weatherToday = App.Data.weather.windylight.random();
+ V.weatherToday = App.Data.Weather.windyLight.random();
V.weatherLastWeek = 2;
}
} else if (V.week < 50 && V.weatherLastWeek === 1) {
if (_seed > 4) {
- V.weatherToday = App.Data.weather.windynice.random();
+ V.weatherToday = App.Data.Weather.windyNice.random();
V.weatherLastWeek = 1;
} else {
- V.weatherToday = App.Data.weather.windylight.random();
+ V.weatherToday = App.Data.Weather.windyLight.random();
V.weatherLastWeek = 2;
}
} else if (V.week < 50 && V.weatherLastWeek === 2) {
if (_seed > 4) {
- V.weatherToday = App.Data.weather.windynice.random();
+ V.weatherToday = App.Data.Weather.windyNice.random();
V.weatherLastWeek = 1;
} else if (_seed > 2) {
- V.weatherToday = App.Data.weather.windylight.random();
+ V.weatherToday = App.Data.Weather.windyLight.random();
V.weatherLastWeek = 2;
} else {
- V.weatherToday = App.Data.weather.windyheavy.random();
+ V.weatherToday = App.Data.Weather.windyHeavy.random();
V.weatherLastWeek = 3;
}
} else if (V.week < 50 && V.weatherLastWeek === 3) {
if (_seed > 4) {
- V.weatherToday = App.Data.weather.windylight.random();
+ V.weatherToday = App.Data.Weather.windyLight.random();
V.weatherLastWeek = 2;
} else {
- V.weatherToday = App.Data.weather.windyheavy.random();
+ V.weatherToday = App.Data.Weather.windyHeavy.random();
V.weatherLastWeek = 3;
}
} else if (V.week < 75 && V.weatherLastWeek === 1) {
if (_seed > 6) {
- V.weatherToday = App.Data.weather.windynice.random();
+ V.weatherToday = App.Data.Weather.windyNice.random();
V.weatherLastWeek = 1;
} else {
- V.weatherToday = App.Data.weather.windylight.random();
+ V.weatherToday = App.Data.Weather.windyLight.random();
V.weatherLastWeek = 2;
}
} else if (V.week < 75 && V.weatherLastWeek === 2) {
if (_seed > 6) {
- V.weatherToday = App.Data.weather.windynice.random();
+ V.weatherToday = App.Data.Weather.windyNice.random();
V.weatherLastWeek = 1;
} else if (_seed > 3) {
- V.weatherToday = App.Data.weather.windylight.random();
+ V.weatherToday = App.Data.Weather.windyLight.random();
V.weatherLastWeek = 2;
} else {
- V.weatherToday = App.Data.weather.windyheavy.random();
+ V.weatherToday = App.Data.Weather.windyHeavy.random();
V.weatherLastWeek = 3;
}
} else if (V.week < 75 && V.weatherLastWeek === 3) {
if (_seed > 5) {
- V.weatherToday = App.Data.weather.windylight.random();
+ V.weatherToday = App.Data.Weather.windyLight.random();
V.weatherLastWeek = 2;
} else {
- V.weatherToday = App.Data.weather.windyheavy.random();
+ V.weatherToday = App.Data.Weather.windyHeavy.random();
V.weatherLastWeek = 3;
}
} else if (V.week > 75 && V.weatherLastWeek === 1) {
if (_seed > 8) {
- V.weatherToday = App.Data.weather.windynice.random();
+ V.weatherToday = App.Data.Weather.windyNice.random();
V.weatherLastWeek = 1;
} else {
- V.weatherToday = App.Data.weather.windylight.random();
+ V.weatherToday = App.Data.Weather.windyLight.random();
V.weatherLastWeek = 2;
}
} else if (V.week > 75 && V.weatherLastWeek === 2) {
if (_seed > 7) {
- V.weatherToday = App.Data.weather.windynice.random();
+ V.weatherToday = App.Data.Weather.windyNice.random();
V.weatherLastWeek = 1;
} else if (_seed > 5) {
- V.weatherToday = App.Data.weather.windylight.random();
+ V.weatherToday = App.Data.Weather.windyLight.random();
V.weatherLastWeek = 2;
} else {
- V.weatherToday = App.Data.weather.windyheavy.random();
+ V.weatherToday = App.Data.Weather.windyHeavy.random();
V.weatherLastWeek = 3;
}
} else if (V.week > 75 && V.weatherLastWeek === 3) {
if (_seed > 6) {
- V.weatherToday = App.Data.weather.windylight.random();
+ V.weatherToday = App.Data.Weather.windyLight.random();
V.weatherLastWeek = 2;
} else if (_seed > 2) {
- V.weatherToday = App.Data.weather.windyheavy.random();
+ V.weatherToday = App.Data.Weather.windyHeavy.random();
V.weatherLastWeek = 3;
} else {
- V.weatherToday = App.Data.weather.windyextreme.random();
+ V.weatherToday = App.Data.Weather.windyExtreme.random();
V.weatherLastWeek = 4;
}
} else if (V.week > 75 && V.weatherLastWeek === 4) {
if (_seed > 4) {
- V.weatherToday = App.Data.weather.windyheavy.random();
+ V.weatherToday = App.Data.Weather.windyHeavy.random();
V.weatherLastWeek = 3;
} else {
- V.weatherToday = App.Data.weather.windyextreme.random();
+ V.weatherToday = App.Data.Weather.windyExtreme.random();
V.weatherLastWeek = 4;
}
}
} else if (V.weatherType === 3) {
if (V.week < 25) {
if (_seed > 4) {
- V.weatherToday = App.Data.weather.smokynice.random();
+ V.weatherToday = App.Data.Weather.smokyNice.random();
V.weatherLastWeek = 1;
} else {
- V.weatherToday = App.Data.weather.smokylight.random();
+ V.weatherToday = App.Data.Weather.smokyLight.random();
V.weatherLastWeek = 2;
}
} else if (V.week < 50 && V.weatherLastWeek === 1) {
if (_seed > 4) {
- V.weatherToday = App.Data.weather.smokynice.random();
+ V.weatherToday = App.Data.Weather.smokyNice.random();
V.weatherLastWeek = 1;
} else {
- V.weatherToday = App.Data.weather.smokylight.random();
+ V.weatherToday = App.Data.Weather.smokyLight.random();
V.weatherLastWeek = 2;
}
} else if (V.week < 50 && V.weatherLastWeek === 2) {
if (_seed > 4) {
- V.weatherToday = App.Data.weather.smokynice.random();
+ V.weatherToday = App.Data.Weather.smokyNice.random();
V.weatherLastWeek = 1;
} else if (_seed > 2) {
- V.weatherToday = App.Data.weather.smokylight.random();
+ V.weatherToday = App.Data.Weather.smokyLight.random();
V.weatherLastWeek = 2;
} else {
- V.weatherToday = App.Data.weather.smokyheavy.random();
+ V.weatherToday = App.Data.Weather.smokyHeavy.random();
V.weatherLastWeek = 3;
}
} else if (V.week < 50 && V.weatherLastWeek === 3) {
if (_seed > 4) {
- V.weatherToday = App.Data.weather.smokylight.random();
+ V.weatherToday = App.Data.Weather.smokyLight.random();
V.weatherLastWeek = 2;
} else {
- V.weatherToday = App.Data.weather.smokyheavy.random();
+ V.weatherToday = App.Data.Weather.smokyHeavy.random();
V.weatherLastWeek = 3;
}
} else if (V.week < 75 && V.weatherLastWeek === 1) {
if (_seed > 6) {
- V.weatherToday = App.Data.weather.smokynice.random();
+ V.weatherToday = App.Data.Weather.smokyNice.random();
V.weatherLastWeek = 1;
} else {
- V.weatherToday = App.Data.weather.smokylight.random();
+ V.weatherToday = App.Data.Weather.smokyLight.random();
V.weatherLastWeek = 2;
}
} else if (V.week < 75 && V.weatherLastWeek === 2) {
if (_seed > 6) {
- V.weatherToday = App.Data.weather.smokynice.random();
+ V.weatherToday = App.Data.Weather.smokyNice.random();
V.weatherLastWeek = 1;
} else if (_seed > 3) {
- V.weatherToday = App.Data.weather.smokylight.random();
+ V.weatherToday = App.Data.Weather.smokyLight.random();
V.weatherLastWeek = 2;
} else {
- V.weatherToday = App.Data.weather.smokyheavy.random();
+ V.weatherToday = App.Data.Weather.smokyHeavy.random();
V.weatherLastWeek = 3;
}
} else if (V.week < 75 && V.weatherLastWeek === 3) {
if (_seed > 5) {
- V.weatherToday = App.Data.weather.smokylight.random();
+ V.weatherToday = App.Data.Weather.smokyLight.random();
V.weatherLastWeek = 2;
} else {
- V.weatherToday = App.Data.weather.smokyheavy.random();
+ V.weatherToday = App.Data.Weather.smokyHeavy.random();
V.weatherLastWeek = 3;
}
} else if (V.week > 75 && V.weatherLastWeek === 1) {
if (_seed > 8) {
- V.weatherToday = App.Data.weather.smokynice.random();
+ V.weatherToday = App.Data.Weather.smokyNice.random();
V.weatherLastWeek = 1;
} else {
- V.weatherToday = App.Data.weather.smokylight.random();
+ V.weatherToday = App.Data.Weather.smokyLight.random();
V.weatherLastWeek = 2;
}
} else if (V.week > 75 && V.weatherLastWeek === 2) {
if (_seed > 7) {
- V.weatherToday = App.Data.weather.smokynice.random();
+ V.weatherToday = App.Data.Weather.smokyNice.random();
V.weatherLastWeek = 1;
} else if (_seed > 5) {
- V.weatherToday = App.Data.weather.smokylight.random();
+ V.weatherToday = App.Data.Weather.smokyLight.random();
V.weatherLastWeek = 2;
} else {
- V.weatherToday = App.Data.weather.smokyheavy.random();
+ V.weatherToday = App.Data.Weather.smokyHeavy.random();
V.weatherLastWeek = 3;
}
} else if (V.week > 75 && V.weatherLastWeek === 3) {
if (_seed > 6) {
- V.weatherToday = App.Data.weather.smokylight.random();
+ V.weatherToday = App.Data.Weather.smokyLight.random();
V.weatherLastWeek = 2;
} else if (_seed > 2) {
- V.weatherToday = App.Data.weather.smokyheavy.random();
+ V.weatherToday = App.Data.Weather.smokyHeavy.random();
V.weatherLastWeek = 3;
} else {
- V.weatherToday = App.Data.weather.smokyextreme.random();
+ V.weatherToday = App.Data.Weather.smokyExtreme.random();
V.weatherLastWeek = 4;
}
} else if (V.week > 75 && V.weatherLastWeek === 4) {
if (_seed > 4) {
- V.weatherToday = App.Data.weather.smokyheavy.random();
+ V.weatherToday = App.Data.Weather.smokyHeavy.random();
V.weatherLastWeek = 3;
} else {
- V.weatherToday = App.Data.weather.smokyextreme.random();
+ V.weatherToday = App.Data.Weather.smokyExtreme.random();
V.weatherLastWeek = 4;
}
}
} else if (V.weatherType === 4) {
if (V.week < 25) {
if (_seed > 4) {
- V.weatherToday = App.Data.weather.toxicnice.random();
+ V.weatherToday = App.Data.Weather.toxicNice.random();
V.weatherLastWeek = 1;
} else {
- V.weatherToday = App.Data.weather.toxiclight.random();
+ V.weatherToday = App.Data.Weather.toxicLight.random();
V.weatherLastWeek = 2;
}
} else if (V.week < 50 && V.weatherLastWeek === 1) {
if (_seed > 4) {
- V.weatherToday = App.Data.weather.toxicnice.random();
+ V.weatherToday = App.Data.Weather.toxicNice.random();
V.weatherLastWeek = 1;
} else {
- V.weatherToday = App.Data.weather.toxiclight.random();
+ V.weatherToday = App.Data.Weather.toxicLight.random();
V.weatherLastWeek = 2;
}
} else if (V.week < 50 && V.weatherLastWeek === 2) {
if (_seed > 4) {
- V.weatherToday = App.Data.weather.toxicnice.random();
+ V.weatherToday = App.Data.Weather.toxicNice.random();
V.weatherLastWeek = 1;
} else if (_seed > 2) {
- V.weatherToday = App.Data.weather.toxiclight.random();
+ V.weatherToday = App.Data.Weather.toxicLight.random();
V.weatherLastWeek = 2;
} else {
- V.weatherToday = App.Data.weather.toxicheavy.random();
+ V.weatherToday = App.Data.Weather.toxicHeavy.random();
V.weatherLastWeek = 3;
}
} else if (V.week < 50 && V.weatherLastWeek === 3) {
if (_seed > 4) {
- V.weatherToday = App.Data.weather.toxiclight.random();
+ V.weatherToday = App.Data.Weather.toxicLight.random();
V.weatherLastWeek = 2;
} else {
- V.weatherToday = App.Data.weather.toxicheavy.random();
+ V.weatherToday = App.Data.Weather.toxicHeavy.random();
V.weatherLastWeek = 3;
}
} else if (V.week < 75 && V.weatherLastWeek === 1) {
if (_seed > 6) {
- V.weatherToday = App.Data.weather.toxicnice.random();
+ V.weatherToday = App.Data.Weather.toxicNice.random();
V.weatherLastWeek = 1;
} else {
- V.weatherToday = App.Data.weather.toxiclight.random();
+ V.weatherToday = App.Data.Weather.toxicLight.random();
V.weatherLastWeek = 2;
}
} else if (V.week < 75 && V.weatherLastWeek === 2) {
if (_seed > 6) {
- V.weatherToday = App.Data.weather.toxicnice.random();
+ V.weatherToday = App.Data.Weather.toxicNice.random();
V.weatherLastWeek = 1;
} else if (_seed > 3) {
- V.weatherToday = App.Data.weather.toxiclight.random();
+ V.weatherToday = App.Data.Weather.toxicLight.random();
V.weatherLastWeek = 2;
} else {
- V.weatherToday = App.Data.weather.toxicheavy.random();
+ V.weatherToday = App.Data.Weather.toxicHeavy.random();
V.weatherLastWeek = 3;
}
} else if (V.week < 75 && V.weatherLastWeek === 3) {
if (_seed > 5) {
- V.weatherToday = App.Data.weather.toxiclight.random();
+ V.weatherToday = App.Data.Weather.toxicLight.random();
V.weatherLastWeek = 2;
} else {
- V.weatherToday = App.Data.weather.toxicheavy.random();
+ V.weatherToday = App.Data.Weather.toxicHeavy.random();
V.weatherLastWeek = 3;
}
} else if (V.week > 75 && V.weatherLastWeek === 1) {
if (_seed > 8) {
- V.weatherToday = App.Data.weather.toxicnice.random();
+ V.weatherToday = App.Data.Weather.toxicNice.random();
V.weatherLastWeek = 1;
} else {
- V.weatherToday = App.Data.weather.toxiclight.random();
+ V.weatherToday = App.Data.Weather.toxicLight.random();
V.weatherLastWeek = 2;
}
} else if (V.week > 75 && V.weatherLastWeek === 2) {
if (_seed > 7) {
- V.weatherToday = App.Data.weather.toxicnice.random();
+ V.weatherToday = App.Data.Weather.toxicNice.random();
V.weatherLastWeek = 1;
} else if (_seed > 5) {
- V.weatherToday = App.Data.weather.toxiclight.random();
+ V.weatherToday = App.Data.Weather.toxicLight.random();
V.weatherLastWeek = 2;
} else {
- V.weatherToday = App.Data.weather.toxicheavy.random();
+ V.weatherToday = App.Data.Weather.toxicHeavy.random();
V.weatherLastWeek = 3;
}
} else if (V.week > 75 && V.weatherLastWeek === 3) {
if (_seed > 6) {
- V.weatherToday = App.Data.weather.toxiclight.random();
+ V.weatherToday = App.Data.Weather.toxicLight.random();
V.weatherLastWeek = 2;
} else if (_seed > 2) {
- V.weatherToday = App.Data.weather.toxicheavy.random();
+ V.weatherToday = App.Data.Weather.toxicHeavy.random();
V.weatherLastWeek = 3;
} else {
- V.weatherToday = App.Data.weather.toxicextreme.random();
+ V.weatherToday = App.Data.Weather.toxicExtreme.random();
V.weatherLastWeek = 4;
}
} else if (V.week > 75 && V.weatherLastWeek === 4) {
if (_seed > 4) {
- V.weatherToday = App.Data.weather.toxicheavy.random();
+ V.weatherToday = App.Data.Weather.toxicHeavy.random();
V.weatherLastWeek = 3;
} else {
- V.weatherToday = App.Data.weather.toxicextreme.random();
+ V.weatherToday = App.Data.Weather.toxicExtreme.random();
V.weatherLastWeek = 4;
}
}
} else if (V.weatherType === 5) {
if (V.week < 25) {
if (_seed > 4) {
- V.weatherToday = App.Data.weather.coldnice.random();
+ V.weatherToday = App.Data.Weather.coldNice.random();
V.weatherLastWeek = 1;
} else {
- V.weatherToday = App.Data.weather.coldlight.random();
+ V.weatherToday = App.Data.Weather.coldLight.random();
V.weatherLastWeek = 2;
}
} else if (V.week < 50 && V.weatherLastWeek === 1) {
if (_seed > 4) {
- V.weatherToday = App.Data.weather.coldnice.random();
+ V.weatherToday = App.Data.Weather.coldNice.random();
V.weatherLastWeek = 1;
} else {
- V.weatherToday = App.Data.weather.coldlight.random();
+ V.weatherToday = App.Data.Weather.coldLight.random();
V.weatherLastWeek = 2;
}
} else if (V.week < 50 && V.weatherLastWeek === 2) {
if (_seed > 4) {
- V.weatherToday = App.Data.weather.coldnice.random();
+ V.weatherToday = App.Data.Weather.coldNice.random();
V.weatherLastWeek = 1;
} else if (_seed > 2) {
- V.weatherToday = App.Data.weather.coldlight.random();
+ V.weatherToday = App.Data.Weather.coldLight.random();
V.weatherLastWeek = 2;
} else {
- V.weatherToday = App.Data.weather.coldheavy.random();
+ V.weatherToday = App.Data.Weather.coldHeavy.random();
V.weatherLastWeek = 3;
}
} else if (V.week < 50 && V.weatherLastWeek === 3) {
if (_seed > 4) {
- V.weatherToday = App.Data.weather.coldlight.random();
+ V.weatherToday = App.Data.Weather.coldLight.random();
V.weatherLastWeek = 2;
} else {
- V.weatherToday = App.Data.weather.coldheavy.random();
+ V.weatherToday = App.Data.Weather.coldHeavy.random();
V.weatherLastWeek = 3;
}
} else if (V.week < 75 && V.weatherLastWeek === 1) {
if (_seed > 6) {
- V.weatherToday = App.Data.weather.coldnice.random();
+ V.weatherToday = App.Data.Weather.coldNice.random();
V.weatherLastWeek = 1;
} else {
- V.weatherToday = App.Data.weather.coldlight.random();
+ V.weatherToday = App.Data.Weather.coldLight.random();
V.weatherLastWeek = 2;
}
} else if (V.week < 75 && V.weatherLastWeek === 2) {
if (_seed > 6) {
- V.weatherToday = App.Data.weather.coldnice.random();
+ V.weatherToday = App.Data.Weather.coldNice.random();
V.weatherLastWeek = 1;
} else if (_seed > 3) {
- V.weatherToday = App.Data.weather.coldlight.random();
+ V.weatherToday = App.Data.Weather.coldLight.random();
V.weatherLastWeek = 2;
} else {
- V.weatherToday = App.Data.weather.coldheavy.random();
+ V.weatherToday = App.Data.Weather.coldHeavy.random();
V.weatherLastWeek = 3;
}
} else if (V.week < 75 && V.weatherLastWeek === 3) {
if (_seed > 5) {
- V.weatherToday = App.Data.weather.coldlight.random();
+ V.weatherToday = App.Data.Weather.coldLight.random();
V.weatherLastWeek = 2;
} else {
- V.weatherToday = App.Data.weather.coldheavy.random();
+ V.weatherToday = App.Data.Weather.coldHeavy.random();
V.weatherLastWeek = 3;
}
} else if (V.week > 75 && V.weatherLastWeek === 1) {
if (_seed > 8) {
- V.weatherToday = App.Data.weather.coldnice.random();
+ V.weatherToday = App.Data.Weather.coldNice.random();
V.weatherLastWeek = 1;
} else {
- V.weatherToday = App.Data.weather.coldlight.random();
+ V.weatherToday = App.Data.Weather.coldLight.random();
V.weatherLastWeek = 2;
}
} else if (V.week > 75 && V.weatherLastWeek === 2) {
if (_seed > 7) {
- V.weatherToday = App.Data.weather.coldnice.random();
+ V.weatherToday = App.Data.Weather.coldNice.random();
V.weatherLastWeek = 1;
} else if (_seed > 5) {
- V.weatherToday = App.Data.weather.coldlight.random();
+ V.weatherToday = App.Data.Weather.coldLight.random();
V.weatherLastWeek = 2;
} else {
- V.weatherToday = App.Data.weather.coldheavy.random();
+ V.weatherToday = App.Data.Weather.coldHeavy.random();
V.weatherLastWeek = 3;
}
} else if (V.week > 75 && V.weatherLastWeek === 3) {
if (_seed > 6) {
- V.weatherToday = App.Data.weather.coldlight.random();
+ V.weatherToday = App.Data.Weather.coldLight.random();
V.weatherLastWeek = 2;
} else if (_seed > 2) {
- V.weatherToday = App.Data.weather.coldheavy.random();
+ V.weatherToday = App.Data.Weather.coldHeavy.random();
V.weatherLastWeek = 3;
} else {
- V.weatherToday = App.Data.weather.coldextreme.random();
+ V.weatherToday = App.Data.Weather.coldExtreme.random();
V.weatherLastWeek = 4;
}
} else if (V.week > 75 && V.weatherLastWeek === 4) {
if (_seed > 4) {
- V.weatherToday = App.Data.weather.coldheavy.random();
+ V.weatherToday = App.Data.Weather.coldHeavy.random();
V.weatherLastWeek = 3;
} else {
- V.weatherToday = App.Data.weather.coldextreme.random();
+ V.weatherToday = App.Data.Weather.coldExtreme.random();
V.weatherLastWeek = 4;
}
}
} else if (V.weatherType === 6) {
if (V.week < 25) {
if (_seed > 4) {
- V.weatherToday = App.Data.weather.tectonicnice.random();
+ V.weatherToday = App.Data.Weather.tectonicNice.random();
V.weatherLastWeek = 1;
} else {
- V.weatherToday = App.Data.weather.tectoniclight.random();
+ V.weatherToday = App.Data.Weather.tectonicLight.random();
V.weatherLastWeek = 2;
}
} else if (V.week < 50 && V.weatherLastWeek === 1) {
if (_seed > 4) {
- V.weatherToday = App.Data.weather.tectonicnice.random();
+ V.weatherToday = App.Data.Weather.tectonicNice.random();
V.weatherLastWeek = 1;
} else {
- V.weatherToday = App.Data.weather.tectoniclight.random();
+ V.weatherToday = App.Data.Weather.tectonicLight.random();
V.weatherLastWeek = 2;
}
} else if (V.week < 50 && V.weatherLastWeek === 2) {
if (_seed > 4) {
- V.weatherToday = App.Data.weather.tectonicnice.random();
+ V.weatherToday = App.Data.Weather.tectonicNice.random();
V.weatherLastWeek = 1;
} else if (_seed > 2) {
- V.weatherToday = App.Data.weather.tectoniclight.random();
+ V.weatherToday = App.Data.Weather.tectonicLight.random();
V.weatherLastWeek = 2;
} else {
- V.weatherToday = App.Data.weather.tectonicheavy.random();
+ V.weatherToday = App.Data.Weather.tectonicHeavy.random();
V.weatherLastWeek = 3;
}
} else if (V.week < 50 && V.weatherLastWeek === 3) {
if (_seed > 4) {
- V.weatherToday = App.Data.weather.tectoniclight.random();
+ V.weatherToday = App.Data.Weather.tectonicLight.random();
V.weatherLastWeek = 2;
} else {
- V.weatherToday = App.Data.weather.tectonicheavy.random();
+ V.weatherToday = App.Data.Weather.tectonicHeavy.random();
V.weatherLastWeek = 3;
}
} else if (V.week < 75 && V.weatherLastWeek === 1) {
if (_seed > 6) {
- V.weatherToday = App.Data.weather.tectonicnice.random();
+ V.weatherToday = App.Data.Weather.tectonicNice.random();
V.weatherLastWeek = 1;
} else {
- V.weatherToday = App.Data.weather.tectoniclight.random();
+ V.weatherToday = App.Data.Weather.tectonicLight.random();
V.weatherLastWeek = 2;
}
} else if (V.week < 75 && V.weatherLastWeek === 2) {
if (_seed > 6) {
- V.weatherToday = App.Data.weather.tectonicnice.random();
+ V.weatherToday = App.Data.Weather.tectonicNice.random();
V.weatherLastWeek = 1;
} else if (_seed > 3) {
- V.weatherToday = App.Data.weather.tectoniclight.random();
+ V.weatherToday = App.Data.Weather.tectonicLight.random();
V.weatherLastWeek = 2;
} else {
- V.weatherToday = App.Data.weather.tectonicheavy.random();
+ V.weatherToday = App.Data.Weather.tectonicHeavy.random();
V.weatherLastWeek = 3;
}
} else if (V.week < 75 && V.weatherLastWeek === 3) {
if (_seed > 5) {
- V.weatherToday = App.Data.weather.tectoniclight.random();
+ V.weatherToday = App.Data.Weather.tectonicLight.random();
V.weatherLastWeek = 2;
} else {
- V.weatherToday = App.Data.weather.tectonicheavy.random();
+ V.weatherToday = App.Data.Weather.tectonicHeavy.random();
V.weatherLastWeek = 3;
}
} else if (V.week > 75 && V.weatherLastWeek === 1) {
if (_seed > 8) {
- V.weatherToday = App.Data.weather.tectonicnice.random();
+ V.weatherToday = App.Data.Weather.tectonicNice.random();
V.weatherLastWeek = 1;
} else {
- V.weatherToday = App.Data.weather.tectoniclight.random();
+ V.weatherToday = App.Data.Weather.tectonicLight.random();
V.weatherLastWeek = 2;
}
} else if (V.week > 75 && V.weatherLastWeek === 2) {
if (_seed > 7) {
- V.weatherToday = App.Data.weather.tectonicnice.random();
+ V.weatherToday = App.Data.Weather.tectonicNice.random();
V.weatherLastWeek = 1;
} else if (_seed > 5) {
- V.weatherToday = App.Data.weather.tectoniclight.random();
+ V.weatherToday = App.Data.Weather.tectonicLight.random();
V.weatherLastWeek = 2;
} else {
- V.weatherToday = App.Data.weather.tectonicheavy.random();
+ V.weatherToday = App.Data.Weather.tectonicHeavy.random();
V.weatherLastWeek = 3;
}
} else if (V.week > 75 && V.weatherLastWeek === 3) {
if (_seed > 6) {
- V.weatherToday = App.Data.weather.tectoniclight.random();
+ V.weatherToday = App.Data.Weather.tectonicLight.random();
V.weatherLastWeek = 2;
} else if (_seed > 2) {
- V.weatherToday = App.Data.weather.tectonicheavy.random();
+ V.weatherToday = App.Data.Weather.tectonicHeavy.random();
V.weatherLastWeek = 3;
} else {
- V.weatherToday = App.Data.weather.tectonicextreme.random();
+ V.weatherToday = App.Data.Weather.tectonicExtreme.random();
V.weatherLastWeek = 4;
}
} else if (V.week > 75 && V.weatherLastWeek === 4) {
if (_seed > 4) {
- V.weatherToday = App.Data.weather.tectonicheavy.random();
+ V.weatherToday = App.Data.Weather.tectonicHeavy.random();
V.weatherLastWeek = 3;
} else {
- V.weatherToday = App.Data.weather.tectonicextreme.random();
+ V.weatherToday = App.Data.Weather.tectonicExtreme.random();
V.weatherLastWeek = 4;
}
}
diff --git a/src/init/storyInit.tw b/src/init/storyInit.tw
index 4f9e2482233c86e912ffd48c4d04fa1d5dfc6f1f..2aad4145719a1fd06fff7c34499655d220ee14c2 100644
--- a/src/init/storyInit.tw
+++ b/src/init/storyInit.tw
@@ -50,7 +50,7 @@ You should have received a copy of the GNU General Public License along with thi
<<set $foodConsumption = (($lowerClass*$foodRate.lower) + ($middleClass*$foodRate.middle) + ($upperClass*$foodRate.upper) + ($topClass*$foodRate.top))>> /* total amount food consumed per week */
-<<set $weatherToday = App.Data.weather.hotnice.random()>>
+<<set $weatherToday = App.Data.Weather.hotNice.random()>>
<<set $weatherLastWeek = 1>>
<<set $weatherType = 1>>
<<set $weatherRemaining = 6>>