Update OMT searches in existing json

CleverRaven · Aug 19, 2024 · 4fe32ab · 4fe32ab
1 parent 48a4647
commit 4fe32ab
Show file tree

Hide file tree

Showing 10 changed files with 8 additions and 178 deletions.
diff --git a/data/json/effects_on_condition/misc_effect_on_condition.json b/data/json/effects_on_condition/misc_effect_on_condition.json
@@ -14,23 +14,23 @@
     "id": "ambient_subway",
     "recurrence": [ "1 hours", "2 hours" ],
     "global": true,
-    "condition": { "or": [ { "u_at_om_location": "subway_ns" }, { "u_at_om_location": "subway_ew" } ] },
+    "condition": { "u_at_om_location": "subway" },
     "effect": [ { "u_message": "<AMBIENT_SUBWAY>", "snippet": true, "sound": true } ]
   },
   {
     "type": "effect_on_condition",
     "id": "ambient_lab_subway",
     "recurrence": [ "1 hours", "2 hours" ],
     "global": true,
-    "condition": { "or": [ { "u_at_om_location": "lab_subway_ns" }, { "u_at_om_location": "lab_subway_ew" } ] },
+    "condition": { "u_at_om_location": "subway" },
     "effect": [ { "u_message": "<AMBIENT_LAB_SUBWAY>", "snippet": true, "sound": true } ]
   },
   {
     "type": "effect_on_condition",
     "id": "ambient_sewer",
     "recurrence": [ "1 hours", "2 hours" ],
     "global": true,
-    "condition": { "or": [ { "u_at_om_location": "sewer_ns" }, { "u_at_om_location": "sewer_ew" } ] },
+    "condition": { "u_at_om_location": "sewer" },
     "effect": [ { "u_message": "<AMBIENT_SEWER>", "snippet": true, "sound": true } ]
   },
   {
@@ -133,7 +133,7 @@
     "id": "sewer_morale_debuff",
     "global": false,
     "recurrence": [ "20 minutes", "1 hour" ],
-    "condition": { "or": [ { "u_at_om_location": "sewer_ns" }, { "u_at_om_location": "sewer_ew" } ] },
+    "condition": { "u_at_om_location": "sewer" },
     "effect": [
       { "u_message": "<SEWER_MORALE_DEBUFF>", "snippet": true },
       {

diff --git a/data/mods/Magiclysm/Spells/druid.json b/data/mods/Magiclysm/Spells/druid.json
@@ -568,16 +568,6 @@
             { "u_is_on_terrain_with_flag": "YOUNG" }
           ]
         },
-        { "not": { "u_near_om_location": "road_curved", "range": 1 } },
-        { "not": { "u_near_om_location": "road_four_way", "range": 1 } },
-        { "not": { "u_near_om_location": "road_tee", "range": 1 } },
-        { "not": { "u_near_om_location": "road_straight", "range": 1 } },
-        { "not": { "u_near_om_location": "road_end", "range": 1 } },
-        { "not": { "u_near_om_location": "road_sw", "range": 1 } },
-        { "not": { "u_near_om_location": "road_ne", "range": 1 } },
-        { "not": { "u_near_om_location": "road_ew", "range": 1 } },
-        { "not": { "u_near_om_location": "road_ns", "range": 1 } },
-        { "not": { "u_near_om_location": "road_nesw", "range": 1 } },
         { "not": { "u_near_om_location": "road", "range": 1 } }
       ]
     },
@@ -731,16 +721,6 @@
             { "u_is_on_terrain_with_flag": "YOUNG" }
           ]
         },
-        { "not": { "u_near_om_location": "road_curved", "range": 1 } },
-        { "not": { "u_near_om_location": "road_four_way", "range": 1 } },
-        { "not": { "u_near_om_location": "road_tee", "range": 1 } },
-        { "not": { "u_near_om_location": "road_straight", "range": 1 } },
-        { "not": { "u_near_om_location": "road_end", "range": 1 } },
-        { "not": { "u_near_om_location": "road_sw", "range": 1 } },
-        { "not": { "u_near_om_location": "road_ne", "range": 1 } },
-        { "not": { "u_near_om_location": "road_ew", "range": 1 } },
-        { "not": { "u_near_om_location": "road_ns", "range": 1 } },
-        { "not": { "u_near_om_location": "road_nesw", "range": 1 } },
         { "not": { "u_near_om_location": "road", "range": 1 } }
       ]
     },
@@ -1302,16 +1282,6 @@
             { "u_is_on_terrain_with_flag": "YOUNG" }
           ]
         },
-        { "not": { "u_near_om_location": "road_curved", "range": 1 } },
-        { "not": { "u_near_om_location": "road_four_way", "range": 1 } },
-        { "not": { "u_near_om_location": "road_tee", "range": 1 } },
-        { "not": { "u_near_om_location": "road_straight", "range": 1 } },
-        { "not": { "u_near_om_location": "road_end", "range": 1 } },
-        { "not": { "u_near_om_location": "road_sw", "range": 1 } },
-        { "not": { "u_near_om_location": "road_ne", "range": 1 } },
-        { "not": { "u_near_om_location": "road_ew", "range": 1 } },
-        { "not": { "u_near_om_location": "road_ns", "range": 1 } },
-        { "not": { "u_near_om_location": "road_nesw", "range": 1 } },
         { "not": { "u_near_om_location": "road", "range": 1 } }
       ]
     },
@@ -1341,21 +1311,7 @@
                 { "not": { "u_is_on_terrain_with_flag": "YOUNG" } }
               ]
             },
-            {
-              "or": [
-                { "u_near_om_location": "road_curved", "range": 1 },
-                { "u_near_om_location": "road_four_way", "range": 1 },
-                { "u_near_om_location": "road_tee", "range": 1 },
-                { "u_near_om_location": "road_straight", "range": 1 },
-                { "u_near_om_location": "road_end", "range": 1 },
-                { "u_near_om_location": "road_sw", "range": 1 },
-                { "u_near_om_location": "road_ne", "range": 1 },
-                { "u_near_om_location": "road_ew", "range": 1 },
-                { "u_near_om_location": "road_ns", "range": 1 },
-                { "u_near_om_location": "road_nesw", "range": 1 },
-                { "u_near_om_location": "road", "range": 1 }
-              ]
-            }
+            { "u_near_om_location": "road", "range": 1 }
           ]
         }
       ]

diff --git a/data/mods/Magiclysm/Spells/mana_upgrades.json b/data/mods/Magiclysm/Spells/mana_upgrades.json
@@ -228,11 +228,7 @@
                 { "u_at_om_location": "river_c_not_ne" },
                 { "u_at_om_location": "river_c_not_nw" },
                 { "u_at_om_location": "river_c_not_se" },
-                { "u_at_om_location": "river_c_not_sw" },
-                { "u_at_om_location": "river_ne" },
-                { "u_at_om_location": "river_se" },
-                { "u_at_om_location": "river_sw" },
-                { "u_at_om_location": "river_nw" }
+                { "u_at_om_location": "river_c_not_sw" }
               ]
             },
             { "u_is_on_terrain_with_flag": "CURRENT" },
@@ -306,16 +302,6 @@
         { "not": { "u_at_om_location": "FACTION_CAMP_ANY" } },
         { "not": { "u_near_om_location": "cabin", "range": 4 } },
         { "not": { "u_near_om_location": "magic_cabin", "range": 4 } },
-        { "not": { "u_near_om_location": "road_curved", "range": 4 } },
-        { "not": { "u_near_om_location": "road_four_way", "range": 4 } },
-        { "not": { "u_near_om_location": "road_tee", "range": 4 } },
-        { "not": { "u_near_om_location": "road_straight", "range": 4 } },
-        { "not": { "u_near_om_location": "road_end", "range": 4 } },
-        { "not": { "u_near_om_location": "road_sw", "range": 4 } },
-        { "not": { "u_near_om_location": "road_ne", "range": 4 } },
-        { "not": { "u_near_om_location": "road_ew", "range": 4 } },
-        { "not": { "u_near_om_location": "road_ns", "range": 4 } },
-        { "not": { "u_near_om_location": "road_nesw", "range": 4 } },
         { "not": { "u_near_om_location": "road", "range": 4 } },
         { "not": { "u_near_om_location": "dirt_road", "range": 4 } },
         { "not": { "u_near_om_location": "dumpsite", "range": 4 } }
@@ -384,16 +370,6 @@
         { "not": { "u_at_om_location": "FACTION_CAMP_ANY" } },
         { "not": { "u_near_om_location": "cabin", "range": 15 } },
         { "not": { "u_near_om_location": "magic_cabin", "range": 15 } },
-        { "not": { "u_near_om_location": "road_curved", "range": 15 } },
-        { "not": { "u_near_om_location": "road_four_way", "range": 15 } },
-        { "not": { "u_near_om_location": "road_tee", "range": 15 } },
-        { "not": { "u_near_om_location": "road_straight", "range": 15 } },
-        { "not": { "u_near_om_location": "road_end", "range": 15 } },
-        { "not": { "u_near_om_location": "road_sw", "range": 15 } },
-        { "not": { "u_near_om_location": "road_ne", "range": 15 } },
-        { "not": { "u_near_om_location": "road_ew", "range": 15 } },
-        { "not": { "u_near_om_location": "road_ns", "range": 15 } },
-        { "not": { "u_near_om_location": "road_nesw", "range": 15 } },
         { "not": { "u_near_om_location": "road", "range": 15 } },
         { "not": { "u_near_om_location": "dirt_road", "range": 15 } },
         { "not": { "u_near_om_location": "dumpsite", "range": 15 } }

diff --git a/data/mods/Magiclysm/items/enchanted_boots.json b/data/mods/Magiclysm/items/enchanted_boots.json
@@ -276,16 +276,6 @@
                   { "u_is_on_terrain_with_flag": "YOUNG" }
                 ]
               },
-              { "not": { "u_near_om_location": "road_curved", "range": 1 } },
-              { "not": { "u_near_om_location": "road_four_way", "range": 1 } },
-              { "not": { "u_near_om_location": "road_tee", "range": 1 } },
-              { "not": { "u_near_om_location": "road_straight", "range": 1 } },
-              { "not": { "u_near_om_location": "road_end", "range": 1 } },
-              { "not": { "u_near_om_location": "road_sw", "range": 1 } },
-              { "not": { "u_near_om_location": "road_ne", "range": 1 } },
-              { "not": { "u_near_om_location": "road_ew", "range": 1 } },
-              { "not": { "u_near_om_location": "road_ns", "range": 1 } },
-              { "not": { "u_near_om_location": "road_nesw", "range": 1 } },
               { "not": { "u_near_om_location": "road", "range": 1 } }
             ]
           },

diff --git a/data/mods/Xedra_Evolved/mutations/paraclesians/arvore_eocs.json b/data/mods/Xedra_Evolved/mutations/paraclesians/arvore_eocs.json
@@ -11,19 +11,7 @@
           {
             "id": "EOC_CONDITION_CHECK_ARVORE_IN_THE_WILD_ON_OMT_ENTER_2",
             "condition": {
-              "and": [
-                { "not": { "u_near_om_location": "road_curved", "range": 2 } },
-                { "not": { "u_near_om_location": "road_four_way", "range": 2 } },
-                { "not": { "u_near_om_location": "road_tee", "range": 2 } },
-                { "not": { "u_near_om_location": "road_straight", "range": 2 } },
-                { "not": { "u_near_om_location": "road_end", "range": 2 } },
-                { "not": { "u_near_om_location": "road_sw", "range": 2 } },
-                { "not": { "u_near_om_location": "road_ne", "range": 2 } },
-                { "not": { "u_near_om_location": "road_ew", "range": 2 } },
-                { "not": { "u_near_om_location": "road_ns", "range": 2 } },
-                { "not": { "u_near_om_location": "road_nesw", "range": 2 } },
                 { "not": { "u_near_om_location": "road", "range": 2 } }
-              ]
             },
             "effect": [ { "math": [ "u_arvore_is_in_wilderness", "=", "1" ] } ],
             "false_effect": [ { "math": [ "u_arvore_is_in_wilderness", "=", "0" ] } ]

diff --git a/data/mods/Xedra_Evolved/mutations/paraclesians/arvore_mutation_spells.json b/data/mods/Xedra_Evolved/mutations/paraclesians/arvore_mutation_spells.json
@@ -117,16 +117,6 @@
             { "u_is_on_terrain_with_flag": "YOUNG" }
           ]
         },
-        { "not": { "u_near_om_location": "road_curved", "range": 1 } },
-        { "not": { "u_near_om_location": "road_four_way", "range": 1 } },
-        { "not": { "u_near_om_location": "road_tee", "range": 1 } },
-        { "not": { "u_near_om_location": "road_straight", "range": 1 } },
-        { "not": { "u_near_om_location": "road_end", "range": 1 } },
-        { "not": { "u_near_om_location": "road_sw", "range": 1 } },
-        { "not": { "u_near_om_location": "road_ne", "range": 1 } },
-        { "not": { "u_near_om_location": "road_ew", "range": 1 } },
-        { "not": { "u_near_om_location": "road_ns", "range": 1 } },
-        { "not": { "u_near_om_location": "road_nesw", "range": 1 } },
         { "not": { "u_near_om_location": "road", "range": 1 } }
       ]
     },

diff --git a/data/mods/Xedra_Evolved/mutations/paraclesians/homullus_eocs.json b/data/mods/Xedra_Evolved/mutations/paraclesians/homullus_eocs.json
@@ -310,27 +310,7 @@
   {
     "type": "effect_on_condition",
     "id": "EOC_HOMULLUS_ALL_ROADS_TRANSLOCATE_CHECK",
-    "condition": {
-      "and": [
-        "u_is_outside",
-        {
-          "or": [
-            { "u_at_om_location": "road_curved" },
-            { "u_at_om_location": "road_tee" },
-            { "u_at_om_location": "road_four_way" },
-            { "u_at_om_location": "road_end" },
-            { "u_at_om_location": "road_sw" },
-            { "u_at_om_location": "road_ne" },
-            { "u_at_om_location": "road_ew" },
-            { "u_at_om_location": "road_ns" },
-            { "u_at_om_location": "road_nesw" },
-            { "u_at_om_location": "road" },
-            { "u_at_om_location": "road_straight" }
-          ]
-        },
-        { "u_is_on_terrain_with_flag": "ROAD" }
-      ]
-    },
+    "condition": { "and": [ "u_is_outside", { "u_at_om_location": "road" }, { "u_is_on_terrain_with_flag": "ROAD" } ] },
     "effect": [ { "u_cast_spell": { "id": "paraclesian_translocate" } } ],
     "false_effect": [ { "u_message": "You must be standing on a road to cast this spell.", "type": "mixed" } ]
   },

diff --git a/data/mods/Xedra_Evolved/mutations/paraclesians/homullus_mutations.json b/data/mods/Xedra_Evolved/mutations/paraclesians/homullus_mutations.json
@@ -420,16 +420,6 @@
       {
         "condition": {
           "or": [
-            { "u_near_om_location": "road_curved", "range": 3 },
-            { "u_near_om_location": "road_four_way", "range": 3 },
-            { "u_near_om_location": "road_tee", "range": 3 },
-            { "u_near_om_location": "road_straight", "range": 3 },
-            { "u_near_om_location": "road_end", "range": 3 },
-            { "u_near_om_location": "road_sw", "range": 3 },
-            { "u_near_om_location": "road_ne", "range": 3 },
-            { "u_near_om_location": "road_ew", "range": 3 },
-            { "u_near_om_location": "road_ns", "range": 3 },
-            { "u_near_om_location": "road_nesw", "range": 3 },
             { "u_near_om_location": "road", "range": 3 },
             { "u_near_om_location": "dirt_road", "range": 3 },
             { "u_near_om_location": "subway", "range": 3 },

diff --git a/data/mods/Xedra_Evolved/mutations/paraclesians/paraclesian_magic_terrain_adjustments.json b/data/mods/Xedra_Evolved/mutations/paraclesians/paraclesian_magic_terrain_adjustments.json
@@ -105,21 +105,7 @@
                     { "u_is_on_terrain": "t_dirtfloor_thatchroof" }
                   ]
                 },
-                {
-                  "or": [
-                    { "u_near_om_location": "road_curved", "range": 1 },
-                    { "u_near_om_location": "road_four_way", "range": 1 },
-                    { "u_near_om_location": "road_tee", "range": 1 },
-                    { "u_near_om_location": "road_straight", "range": 1 },
-                    { "u_near_om_location": "road_end", "range": 1 },
-                    { "u_near_om_location": "road_sw", "range": 1 },
-                    { "u_near_om_location": "road_ne", "range": 1 },
-                    { "u_near_om_location": "road_ew", "range": 1 },
-                    { "u_near_om_location": "road_ns", "range": 1 },
-                    { "u_near_om_location": "road_nesw", "range": 1 },
-                    { "u_near_om_location": "road", "range": 1 }
-                  ]
-                }
+                { "u_near_om_location": "road", "range": 1 }
               ]
             }
           ]
@@ -161,16 +147,6 @@
         {
           "and": [
             { "not": { "test_eoc": "EOC_HOMULLUS_IN_CIVILIZATION_CHECKER_CONDITION" } },
-            { "not": { "u_near_om_location": "road_curved", "range": 1 } },
-            { "not": { "u_near_om_location": "road_four_way", "range": 1 } },
-            { "not": { "u_near_om_location": "road_tee", "range": 1 } },
-            { "not": { "u_near_om_location": "road_straight", "range": 1 } },
-            { "not": { "u_near_om_location": "road_end", "range": 1 } },
-            { "not": { "u_near_om_location": "road_sw", "range": 1 } },
-            { "not": { "u_near_om_location": "road_ne", "range": 1 } },
-            { "not": { "u_near_om_location": "road_ew", "range": 1 } },
-            { "not": { "u_near_om_location": "road_ns", "range": 1 } },
-            { "not": { "u_near_om_location": "road_nesw", "range": 1 } },
             { "not": { "u_near_om_location": "road", "range": 1 } }
           ]
         },
@@ -339,10 +315,6 @@
             { "u_near_om_location": "river_c_not_nw", "range": 1 },
             { "u_near_om_location": "river_c_not_se", "range": 1 },
             { "u_near_om_location": "river_c_not_sw", "range": 1 },
-            { "u_near_om_location": "river_ne", "range": 1 },
-            { "u_near_om_location": "river_se", "range": 1 },
-            { "u_near_om_location": "river_sw", "range": 1 },
-            { "u_near_om_location": "river_nw", "range": 1 },
             { "u_near_om_location": "lake_shore", "range": 1 },
             { "u_near_om_location": "lake_surface", "range": 1 }
           ]
@@ -396,10 +368,6 @@
             { "u_at_om_location": "river_c_not_nw" },
             { "u_at_om_location": "river_c_not_se" },
             { "u_at_om_location": "river_c_not_sw" },
-            { "u_at_om_location": "river_ne" },
-            { "u_at_om_location": "river_se" },
-            { "u_at_om_location": "river_sw" },
-            { "u_at_om_location": "river_nw" },
             { "u_at_om_location": "lake_shore" },
             { "u_at_om_location": "lake_surface" }
           ]

diff --git a/data/mods/Xedra_Evolved/mutations/paraclesians/undine_eocs.json b/data/mods/Xedra_Evolved/mutations/paraclesians/undine_eocs.json
@@ -20,10 +20,6 @@
                 { "u_near_om_location": "river_c_not_nw", "range": 1 },
                 { "u_near_om_location": "river_c_not_se", "range": 1 },
                 { "u_near_om_location": "river_c_not_sw", "range": 1 },
-                { "u_near_om_location": "river_ne", "range": 1 },
-                { "u_near_om_location": "river_se", "range": 1 },
-                { "u_near_om_location": "river_sw", "range": 1 },
-                { "u_near_om_location": "river_nw", "range": 1 },
                 { "u_near_om_location": "lake_shore", "range": 1 },
                 { "u_near_om_location": "lake_surface", "range": 1 },
                 { "u_near_om_location": "ocean", "range": 1 },
@@ -214,10 +210,6 @@
             { "u_at_om_location": "river_c_not_nw" },
             { "u_at_om_location": "river_c_not_se" },
             { "u_at_om_location": "river_c_not_sw" },
-            { "u_at_om_location": "river_ne" },
-            { "u_at_om_location": "river_se" },
-            { "u_at_om_location": "river_sw" },
-            { "u_at_om_location": "river_nw" },
             { "u_at_om_location": "lake_shore" },
             { "u_at_om_location": "lake_surface" },
             { "u_at_om_location": "ocean" },