From 67626c79eab14730cb5ab1675500de4bf702b0f6 Mon Sep 17 00:00:00 2001
From: Anton Simakov <67688115+GuardianDll@users.noreply.github.com>
Date: Sun, 4 Feb 2024 23:03:19 +0100
Subject: [PATCH] fix portal storm distance (#71498)

* fix portal storm distance

* Update weather_type.json

* actually fix the weather
---
 data/json/weather_type.json | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

diff --git a/data/json/weather_type.json b/data/json/weather_type.json
index 7039d33d12139..9186511a176c5 100644
--- 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)" ]
+        }
       ]
     }
   }