initial commit

CleverRaven · Nov 24, 2024 · f49b088 · f49b088
1 parent b1266d1
commit f49b088
Show file tree

Hide file tree

Showing 36 changed files with 605 additions and 319 deletions.
diff --git a/data/json/bionics.json b/data/json/bionics.json
@@ -1034,6 +1034,25 @@
     "description": "Your feet are equipped with precision sonar equipment, allowing you to detect the movements of creatures below the ground, buried traps, and unstable terrain.",
     "occupied_bodyparts": [ [ "foot_l", 3 ], [ "foot_r", 3 ] ],
     "flags": [ "BIONIC_TOGGLED" ],
+    "enchantments": [
+      {
+        "condition": "ACTIVE",
+        "special_vision": [
+          {
+            "condition": { "or": [ { "npc_has_flag": "DIGS" }, { "and": [ "npc_is_underwater", { "npc_has_flag": "CAN_DIG" } ] } ] },
+            "distance": 20,
+            "descriptions": [
+              {
+                "id": "ground_sonar_sense",
+                "symbol": "?",
+                "color": "c_green",
+                "text": "You sense some creature moving underground here."
+              }
+            ]
+          }
+        ]
+      }
+    ],
     "act_cost": "200 J",
     "react_cost": "200 J",
     "time": "1 s"

diff --git a/data/json/effects_on_condition/general_conditions.json b/data/json/effects_on_condition/general_conditions.json
@@ -0,0 +1,15 @@
+[
+  {
+    "type": "effect_on_condition",
+    "id": "EOC_IS_ELECTRIC",
+    "condition": {
+      "or": [
+        { "npc_has_species": "ROBOT" },
+        { "npc_has_species": "CYBORG" },
+        { "npc_has_species": "ROBOT_FLYING" },
+        { "npc_has_flag": "ELECTRIC" },
+        { "npc_has_any_trait": [ "EXODII_BODY_1", "EXODII_BODY_2", "EXODII_BODY_9" ] }
+      ]
+    }
+  }
+]
diff --git a/data/json/enchantments.json b/data/json/enchantments.json
@@ -52,36 +52,37 @@
       {
         "condition": { "and": [ "u_see_npc_loc", "npc_is_warm" ] },
         "distance": 60,
+        "precise": true,
         "descriptions": [
           {
             "id": "infrared_creature_tiny",
             "text_condition": { "math": [ "n_val('size') == 1" ] },
+            "symbol": ".",
             "text": "You see a tiny figure radiating heat."
           },
           {
             "id": "infrared_creature_small",
             "text_condition": { "math": [ "n_val('size') == 2" ] },
+            "symbol": ",",
             "text": "You see a small figure radiating heat."
           },
           {
             "id": "infrared_creature_medium",
             "text_condition": { "math": [ "n_val('size') == 3" ] },
+            "symbol": "o",
             "text": "You see a medium figure radiating heat."
           },
           {
             "id": "infrared_creature_large",
             "text_condition": { "math": [ "n_val('size') == 4" ] },
+            "symbol": "O",
             "text": "You see a large figure radiating heat."
           },
           {
             "id": "infrared_creature_huge",
             "text_condition": { "math": [ "n_val('size') == 5" ] },
+            "symbol": "&",
             "text": "You see a huge figure radiating heat."
-          },
-          {
-            "id": "infrared_creature_medium",
-            "text_condition": { "math": [ "true" ] },
-            "text": "You see a figure radiating heat."
           }
         ]
       }
@@ -95,36 +96,37 @@
       {
         "condition": { "and": [ "u_see_npc_loc", "npc_is_warm" ] },
         "distance": 60,
+        "precise": true,
         "descriptions": [
           {
             "id": "infrared_creature_tiny",
             "text_condition": { "math": [ "n_val('size') == 1" ] },
+            "symbol": ".",
             "text": "You see a tiny figure radiating heat."
           },
           {
             "id": "infrared_creature_small",
             "text_condition": { "math": [ "n_val('size') == 2" ] },
+            "symbol": ",",
             "text": "You see a small figure radiating heat."
           },
           {
             "id": "infrared_creature_medium",
             "text_condition": { "math": [ "n_val('size') == 3" ] },
+            "symbol": "o",
             "text": "You see a medium figure radiating heat."
           },
           {
             "id": "infrared_creature_large",
             "text_condition": { "math": [ "n_val('size') == 4" ] },
+            "symbol": "O",
             "text": "You see a large figure radiating heat."
           },
           {
             "id": "infrared_creature_huge",
             "text_condition": { "math": [ "n_val('size') == 5" ] },
+            "symbol": "&",
             "text": "You see a huge figure radiating heat."
-          },
-          {
-            "id": "infrared_creature_medium",
-            "text_condition": { "math": [ "true" ] },
-            "text": "You see a figure radiating heat."
           }
         ]
       }
@@ -148,11 +150,24 @@
       {
         "condition": { "and": [ "u_see_npc_loc", "npc_is_warm" ] },
         "distance": 10,
+        "descriptions": [ { "id": "infrared_creature_medium", "symbol": "o", "text": "You sense a creature with your thermal nostrils." } ]
+      }
+    ]
+  },
+  {
+    "type": "enchantment",
+    "id": "ELECTRIC_VISION",
+    "condition": "ALWAYS",
+    "special_vision": [
+      {
+        "condition": { "test_eoc": "EOC_IS_ELECTRIC" },
+        "distance": 1000,
         "descriptions": [
           {
-            "id": "infrared_creature_medium",
-            "text_condition": { "math": [ "true" ] },
-            "text": "You sense a creature with your thermal nostrils."
+            "id": "electric_creature_sense",
+            "symbol": "?",
+            "color": "c_cyan",
+            "text": "You sense something emitting electricity here."
           }
         ]
       }
@@ -252,7 +267,15 @@
     "description": "Your armor lets you detect otherworldly presence with ease.",
     "has": "WORN",
     "condition": "ALWAYS",
-    "values": [ { "value": "SIGHT_RANGE_NETHER", "add": 10 } ]
+    "special_vision": [
+      {
+        "condition": {
+          "or": [ { "npc_has_species": "HORROR" }, { "npc_has_species": "NETHER" }, { "npc_has_species": "nether_player_hate" } ]
+        },
+        "distance": 10,
+        "descriptions": [ { "id": "nether_creature_sense", "symbol": "?", "color": "c_pink", "text": "You sense an otherworldy danger here." } ]
+      }
+    ]
   },
   {
     "id": "ench_dampened_steps",

diff --git a/data/json/mutations/mutations.json b/data/json/mutations/mutations.json
@@ -9118,10 +9118,7 @@
     "vitamin_cost": 160,
     "description": "A network of jelly-filled electroreceptors, like that of a shark, have grown throughout your face and nose.  They are very sensitive to magnetic fields, allowing you to see robots and creatures charged with electricity through walls, but being shocked will seriously mess you up.",
     "category": [ "FISH" ],
-    "enchantments": [
-      { "condition": "ALWAYS", "values": [ { "value": "SIGHT_RANGE_ELECTRIC", "add": 1000 } ] },
-      { "condition": "ALWAYS", "values": [ { "value": "EXTRA_ELEC_PAIN", "add": 1 } ] }
-    ],
+    "enchantments": [ "ELECTRIC_VISION", { "condition": "ALWAYS", "values": [ { "value": "EXTRA_ELEC_PAIN", "add": 1 } ] } ],
     "mixed_effect": true
   },
   {

diff --git a/data/mods/Aftershock/effects_esper.json b/data/mods/Aftershock/effects_esper.json
@@ -88,14 +88,23 @@
     "max_duration": "7 days",
     "enchantments": [
       {
-        "values": [
+        "condition": "ALWAYS",
+        "special_vision": [
           {
-            "value": "SIGHT_RANGE_ELECTRIC",
-            "add": {
+            "condition": { "test_eoc": "EOC_IS_ELECTRIC" },
+            "distance": {
               "math": [
                 "( ( u_spell_level('electrokinesis_see_electric') * 1.5) + 6 ) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling"
               ]
-            }
+            },
+            "descriptions": [
+              {
+                "id": "electric_creature_sense",
+                "symbol": "?",
+                "color": "c_cyan",
+                "text": "You sense something emitting electricity here."
+              }
+            ]
           }
         ]
       }
@@ -149,10 +158,30 @@
     "max_intensity": 50,
     "enchantments": [
       {
-        "values": [
+        "condition": "ALWAYS",
+        "special_vision": [
           {
-            "value": "SIGHT_RANGE_MINDS",
-            "add": { "math": [ "( ( u_spell_level('afs_telepathic_mind_sense') * 2) * (scaling_factor(u_val('intelligence') ) ) )" ] }
+            "condition": {
+              "and": [
+                {
+                  "or": [
+                    { "and": [ { "not": { "npc_has_species": "PSI_NULL" } }, { "npc_has_flag": "HAS_MIND" } ] },
+                    {
+                      "and": [
+                        { "not": { "npc_has_species": "PSI_NULL" } },
+                        { "not": { "npc_has_species": "ZOMBIE" } },
+                        { "npc_has_flag": "HUMAN" }
+                      ]
+                    },
+                    "npc_is_npc"
+                  ]
+                },
+                { "not": { "npc_has_effect": "eff_monster_immune_to_telepathy" } },
+                { "not": { "npc_has_flag": "TEEP_IMMUNE" } }
+              ]
+            },
+            "distance": { "math": [ "( ( u_spell_level('afs_telepathic_mind_sense') * 2) * (scaling_factor(u_val('intelligence') ) ) )" ] },
+            "descriptions": [ { "id": "sense_minds", "symbol": "@", "color": "c_white", "text": "You sense something sapient here." } ]
           }
         ]
       }

diff --git a/data/mods/Aftershock/items/item_enchants.json b/data/mods/Aftershock/items/item_enchants.json
@@ -15,7 +15,13 @@
     "name": { "str": "Active Motion Detector" },
     "description": "Actively detects nearby movement.",
     "condition": { "math": [ "u_flag_motion_sensor_afs_motion_sensor_ping >= 1" ] },
-    "values": [ { "value": "MOTION_VISION_RANGE", "add": 24 } ]
+    "special_vision": [
+      {
+        "distance": 24,
+        "precise": true,
+        "descriptions": [ { "id": "moving_creature", "symbol": "?", "color": "c_white", "text": "You sense something moving here." } ]
+      }
+    ]
   },
   {
     "type": "enchantment",

diff --git a/data/mods/BombasticPerks/perkdata/sight_beyond_sight.json b/data/mods/BombasticPerks/perkdata/sight_beyond_sight.json
@@ -8,7 +8,15 @@
     "description": "Your Sight Beyond Sight is active.  You should never see this.",
     "enchantments": [
       {
-        "values": [ { "value": "SIGHT_RANGE_NETHER", "add": { "math": [ "( u_val('perception') + u_val('intelligence'))" ] } } ]
+        "special_vision": [
+          {
+            "condition": {
+              "or": [ { "npc_has_species": "HORROR" }, { "npc_has_species": "NETHER" }, { "npc_has_species": "nether_player_hate" } ]
+            },
+            "distance": { "math": [ "u_val('perception') + u_val('intelligence')" ] },
+            "descriptions": [ { "id": "nether_creature_sense", "symbol": "?", "color": "c_pink", "text": "You sense an otherworldy danger here." } ]
+          }
+        ]
       }
     ],
     "flags": [ "BLIND" ]

diff --git a/data/mods/BombasticPerks/perks.json b/data/mods/BombasticPerks/perks.json
@@ -413,7 +413,26 @@
     "purifiable": false,
     "valid": false,
     "description": "Ever since the apocalypse you get a funny feeling during storms and have trouble trusting small appliances.  You usually have a pretty good idea where they are though.",
-    "enchantments": [ { "condition": "ALWAYS", "values": [ { "value": "SIGHT_RANGE_ELECTRIC", "add": 4.0 } ] } ]
+    "enchantments": [
+      {
+        "condition": "ALWAYS",
+        "special_vision": [
+          {
+            "condition": { "test_eoc": "EOC_IS_ELECTRIC" },
+            "distance": 4,
+            "precise": true,
+            "descriptions": [
+              {
+                "id": "electric_creature_sense",
+                "symbol": "?",
+                "color": "c_cyan",
+                "text": "You sense something emitting electricity here."
+              }
+            ]
+          }
+        ]
+      }
+    ]
   },
   {
     "type": "mutation",

diff --git a/data/mods/Magiclysm/effects/effects.json b/data/mods/Magiclysm/effects/effects.json
@@ -709,13 +709,13 @@
     "rating": "good",
     "show_intensity": false,
     "enchantments": [
+      "ELECTRIC_VISION",
       {
         "values": [
           { "value": "BONUS_BLOCK", "add": 1 },
           { "value": "BONUS_DODGE", "add": 1 },
           { "value": "DEXTERITY", "add": 2 },
-          { "value": "PERCEPTION", "add": 4 },
-          { "value": "SIGHT_RANGE_ELECTRIC", "add": 1000 }
+          { "value": "PERCEPTION", "add": 4 }
         ]
       }
     ]
@@ -933,7 +933,13 @@
     "max_duration": "50 minutes",
     "enchantments": [
       {
-        "values": [ { "value": "MOTION_VISION_RANGE", "add": { "math": [ "( u_spell_level('earthshaper_danger_sense') * 3)" ] } } ]
+        "condition": "ALWAYS",
+        "special_vision": [
+          {
+            "distance": { "math": [ "( u_spell_level('earthshaper_danger_sense') * 3)" ] },
+            "descriptions": [ { "id": "moving_creature", "symbol": "?", "color": "c_white", "text": "You sense something moving here." } ]
+          }
+        ]
       }
     ]
   },
@@ -947,7 +953,15 @@
     "rating": "good",
     "enchantments": [
       {
-        "values": [ { "value": "SIGHT_RANGE_NETHER", "add": { "math": [ "(( u_spell_level('animist_sense_outsiders') * 2.5) + 3)" ] } } ]
+        "special_vision": [
+          {
+            "condition": {
+              "or": [ { "npc_has_species": "HORROR" }, { "npc_has_species": "NETHER" }, { "npc_has_species": "nether_player_hate" } ]
+            },
+            "distance": { "math": [ "( u_spell_level('animist_sense_outsiders') * 2.5) + 3" ] },
+            "descriptions": [ { "id": "nether_creature_sense", "symbol": "?", "color": "c_pink", "text": "You sense an otherworldy danger here." } ]
+          }
+        ]
       }
     ]
   },

diff --git a/data/mods/Magiclysm/traits/attunements.json b/data/mods/Magiclysm/traits/attunements.json
@@ -780,7 +780,7 @@
     "purifiable": false,
     "valid": false,
     "description": "This attunement grants you a magical control over the forces of magnetism.\n\nPower: Your Magnetism Mage abilities grant you a good defense against firearms, perfect electric immunity, and the ability to see electric creatures from any distance.",
-    "enchantments": [ { "values": [ { "value": "ARMOR_BULLET", "add": -50 }, { "value": "SIGHT_RANGE_ELECTRIC", "add": 1000 } ] } ],
+    "enchantments": [ "ELECTRIC_VISION", { "values": [ { "value": "ARMOR_BULLET", "add": -50 } ] } ],
     "prereqs": [ "STORMSHAPER", "EARTHSHAPER" ],
     "spells_learned": [ [ "railgun", 5 ], [ "magnetismmage_electrolaser", 5 ], [ "robot_disabler_explosion", 5 ] ],
     "cancels": [

diff --git a/data/mods/Magiclysm/traits/infrastructure.json b/data/mods/Magiclysm/traits/infrastructure.json
@@ -128,15 +128,21 @@
     "points": 0,
     "description": "You can feel the living energy of creatures around you, which allows you to predict their movements or words.",
     "enchantments": [
+      {
+        "condition": "ALWAYS",
+        "//": "can see every creature, not only one that has mind, for some reason",
+        "special_vision": [
+          {
+            "distance": { "math": [ "10 + (( u_spell_count('school': 'ANIMIST') + u_spell_count('school': 'DRUID')) / 2)" ] },
+            "descriptions": [ { "id": "moving_creature", "symbol": "?", "color": "c_white", "text": "You sense something here." } ]
+          }
+        ]
+      },
       {
         "values": [
           { "value": "SOCIAL_INTIMIDATE", "add": 20 },
           { "value": "SOCIAL_LIE", "add": 20 },
-          { "value": "SOCIAL_PERSUADE", "add": 20 },
-          {
-            "value": "MOTION_VISION_RANGE",
-            "add": { "math": [ "10 + (( u_spell_count('school': 'ANIMIST') + u_spell_count('school': 'DRUID')) / 2)" ] }
-          }
+          { "value": "SOCIAL_PERSUADE", "add": 20 }
         ]
       },
       {