fix portal storm distance (CleverRaven#71498)

* fix portal storm distance * Update weather_type.json * actually fix the weather
AnotherSeawhite · Feb 4, 2024 · 67626c7 · 67626c7
1 parent 93fb548
commit 67626c7
Showing 1 changed file with 12 additions and 4 deletions.
diff --git a/data/json/weather_type.json b/data/json/weather_type.json
@@ -342,7 +342,9 @@
     "condition": {
       "and": [
         { "math": [ "cause_early_portal_storm", "==", "1" ] },
-        { "math": [ "distance('_weather_location', 'portal_storm_center')", "<=", "portal_storm_distant_distance" ] }
+        {
+          "math": [ "distance(_weather_location, portal_storm_center)", "<=", "value_or(portal_storm_distant_distance, 200)" ]
+        }
       ]
     }
   },
@@ -370,7 +372,9 @@
     "condition": {
       "and": [
         { "math": [ "cause_portal_storm", "==", "1" ] },
-        { "math": [ "distance('_weather_location', 'portal_storm_center')", "<=", "portal_storm_distant_distance" ] }
+        {
+          "math": [ "distance(_weather_location, portal_storm_center)", "<=", "value_or(portal_storm_distant_distance, 200)" ]
+        }
       ]
     }
   },
@@ -398,7 +402,9 @@
     "condition": {
       "and": [
         { "math": [ "cause_portal_storm", "==", "1" ] },
-        { "math": [ "distance('_weather_location', 'portal_storm_center')", "<=", "portal_storm_close_distance" ] }
+        {
+          "math": [ "distance(_weather_location, portal_storm_center)", "<=", "value_or(portal_storm_close_distance, 100)" ]
+        }
       ]
     }
   },
@@ -426,7 +432,9 @@
     "condition": {
       "and": [
         { "math": [ "cause_portal_storm", "==", "1" ] },
-        { "math": [ "distance('_weather_location', 'portal_storm_center')", "<=", "portal_storm_distance" ] }
+        {
+          "math": [ "distance(_weather_location, portal_storm_center)", "<=", "value_or(portal_storm_distance, 50)" ]
+        }
       ]
     }
   }