[MOM][Aftershock] Adds new 'uses_energy' search data and converts ele…

…ctron overflow powers to use it (#77062) * Add uses_energy filter for search data and convert the electron overflow powers to use that for searching. Deletes old flag that used to be used for this. * lint * Update doc with suggestion Co-authored-by: Anton Simakov <[email protected]> * Switch to optional struct * get rid of the exclamation mark * Convert new eoc content to uses_energy * fix aftershock missing a variable declaration --------- Co-authored-by: Anton Simakov <[email protected]>
CleverRaven · Oct 18, 2024 · d2943c9 · d2943c9
1 parent 0764d84
commit d2943c9
Show file tree

Hide file tree

Showing 14 changed files with 37 additions and 234 deletions.
diff --git a/data/mods/Aftershock/flags.json b/data/mods/Aftershock/flags.json
@@ -27,10 +27,5 @@
     "id": "TEEP_IMMUNE",
     "type": "monster_flag",
     "//": "Immune to telepathic damage"
-  },
-  {
-    "id": "ELECTROKINETIC_CHARGEABLE",
-    "type": "json_flag",
-    "info": "This item can be recharged by an electrokinetic"
   }
 ]
diff --git a/data/mods/Aftershock/items/electrokinetic_charging_overrides.json b/data/mods/Aftershock/items/electrokinetic_charging_overrides.json
diff --git a/data/mods/Aftershock/spells/psionics/electrokinesis_concentration_eocs.json b/data/mods/Aftershock/spells/psionics/electrokinesis_concentration_eocs.json
@@ -227,14 +227,10 @@
           }
         ]
       },
+      { "math": [ "u_afs_electrokin_personal_battery_count", "=", "0" ] },
       {
         "u_run_inv_eocs": "all",
-        "search_data": [
-          { "flags": [ "RECHARGE" ] },
-          { "flags": [ "ELECTRONIC" ] },
-          { "flags": [ "ELECTROKINETIC_CHARGEABLE" ] },
-          { "flags": [ "USE_UPS" ] }
-        ],
+        "search_data": [ { "uses_energy": true } ],
         "true_eocs": [
           {
             "id": "EOC_AFS_ELECTROKIN_PERSONAL_BATTERY_INV_SCANNER_COUNTER",
@@ -254,12 +250,7 @@
     "effect": [
       {
         "u_run_inv_eocs": "all",
-        "search_data": [
-          { "flags": [ "RECHARGE" ] },
-          { "flags": [ "ELECTRONIC" ] },
-          { "flags": [ "ELECTROKINETIC_CHARGEABLE" ] },
-          { "flags": [ "USE_UPS" ] }
-        ],
+        "search_data": [ { "uses_energy": true } ],
         "true_eocs": [
           {
             "id": "EOC_AFS_ELECTROKIN_PERSONAL_BATTERY_INV_SCANNER_VALUE_ADDED",

diff --git a/data/mods/MindOverMatter/items/electrokinetic_charging_overrrides.json b/data/mods/MindOverMatter/items/electrokinetic_charging_overrrides.json
diff --git a/data/mods/MindOverMatter/json_flags.json b/data/mods/MindOverMatter/json_flags.json
@@ -24,11 +24,6 @@
     "type": "json_flag",
     "info": "You are protected against telepathic attack.  Sometimes."
   },
-  {
-    "id": "ELECTROKINETIC_CHARGEABLE",
-    "type": "json_flag",
-    "info": "This item can be recharged by an electrokinetic"
-  },
   {
     "id": "MATRIX_CRYSTAL_BIOKINESIS",
     "type": "json_flag",

diff --git a/data/mods/MindOverMatter/monsters/monster_eoc_spells.json b/data/mods/MindOverMatter/monsters/monster_eoc_spells.json
@@ -289,12 +289,7 @@
                     "condition": { "not": { "u_has_effect": "effect_electrokin_personal_battery" } },
                     "effect": {
                       "u_run_inv_eocs": "random",
-                      "search_data": [
-                        { "flags": [ "RECHARGE" ] },
-                        { "flags": [ "ELECTRONIC" ] },
-                        { "flags": [ "ELECTROKINETIC_CHARGEABLE" ] },
-                        { "flags": [ "USE_UPS" ] }
-                      ],
+                      "search_data": [ { "uses_energy": true } ],
                       "true_eocs": [
                         {
                           "id": "EOC_ELECTRONKINETIC_MONSTER_POWER_DRAINING_INV_RESULT",

diff --git a/data/mods/MindOverMatter/powers/electrokinesis_concentration_eocs.json b/data/mods/MindOverMatter/powers/electrokinesis_concentration_eocs.json
@@ -329,12 +329,7 @@
       { "math": [ "u_electrokin_personal_battery_count", "=", "0" ] },
       {
         "u_run_inv_eocs": "all",
-        "search_data": [
-          { "flags": [ "RECHARGE" ] },
-          { "flags": [ "ELECTRONIC" ] },
-          { "flags": [ "ELECTROKINETIC_CHARGEABLE" ] },
-          { "flags": [ "USE_UPS" ] }
-        ],
+        "search_data": [ { "uses_energy": true } ],
         "true_eocs": [
           {
             "id": "EOC_ELECTROKIN_PERSONAL_BATTERY_INV_SCANNER_COUNTER",
@@ -354,12 +349,7 @@
     "effect": [
       {
         "u_run_inv_eocs": "all",
-        "search_data": [
-          { "flags": [ "RECHARGE" ] },
-          { "flags": [ "ELECTRONIC" ] },
-          { "flags": [ "ELECTROKINETIC_CHARGEABLE" ] },
-          { "flags": [ "USE_UPS" ] }
-        ],
+        "search_data": [ { "uses_energy": true } ],
         "true_eocs": [
           {
             "id": "EOC_ELECTROKIN_PERSONAL_BATTERY_INV_SCANNER_VALUE_ADDED",

diff --git a/data/mods/Xedra_Evolved/flags.json b/data/mods/Xedra_Evolved/flags.json
@@ -24,11 +24,6 @@
     "type": "json_flag",
     "info": "This gear will transform you into animal form, and may have some side effects."
   },
-  {
-    "id": "ELECTROKINETIC_CHARGEABLE",
-    "type": "json_flag",
-    "info": "This item can be recharged by an electrokinetic"
-  },
   {
     "id": "HEDGE_ENCHANTED",
     "type": "json_flag",

diff --git a/data/mods/Xedra_Evolved/items/inventor/armor.json b/data/mods/Xedra_Evolved/items/inventor/armor.json
@@ -52,17 +52,7 @@
       }
     ],
     "techniques": [ "WBLOCK_1" ],
-    "flags": [
-      "MORPHIC",
-      "WATERPROOF",
-      "STURDY",
-      "PADDED",
-      "TRADER_AVOID",
-      "PSYSHIELD_PARTIAL",
-      "MUNDANE",
-      "INVENTOR_CRAFTED",
-      "ELECTROKINETIC_CHARGEABLE"
-    ]
+    "flags": [ "MORPHIC", "WATERPROOF", "STURDY", "PADDED", "TRADER_AVOID", "PSYSHIELD_PARTIAL", "MUNDANE", "INVENTOR_CRAFTED" ]
   },
   {
     "id": "helmet_inventor_on",
@@ -175,7 +165,7 @@
     "symbol": "[",
     "looks_like": "legguard_hard",
     "color": "light_red",
-    "flags": [ "MORPHIC", "STURDY", "OUTER", "BELTED", "MUNDANE", "INVENTOR_CRAFTED", "ELECTROKINETIC_CHARGEABLE" ],
+    "flags": [ "MORPHIC", "STURDY", "OUTER", "BELTED", "MUNDANE", "INVENTOR_CRAFTED" ],
     "ammo": "battery",
     "use_action": {
       "target": "inventor_leg_weight_on",
@@ -237,7 +227,7 @@
     "symbol": "[",
     "looks_like": "legguard_hard",
     "color": "light_red",
-    "flags": [ "MORPHIC", "STURDY", "OUTER", "SOFT", "MUNDANE", "INVENTOR_CRAFTED", "ELECTROKINETIC_CHARGEABLE" ],
+    "flags": [ "MORPHIC", "STURDY", "OUTER", "SOFT", "MUNDANE", "INVENTOR_CRAFTED" ],
     "ammo": "battery",
     "charges_per_use": 150,
     "use_action": { "type": "cast_spell", "spell_id": "jump_boots_leap", "no_fail": true, "level": 0 },
@@ -349,17 +339,7 @@
       }
     ],
     "techniques": [ "WBLOCK_1" ],
-    "flags": [
-      "MORPHIC",
-      "WATERPROOF",
-      "STURDY",
-      "SOFT",
-      "TRADER_AVOID",
-      "BELTED",
-      "MUNDANE",
-      "INVENTOR_CRAFTED",
-      "ELECTROKINETIC_CHARGEABLE"
-    ]
+    "flags": [ "MORPHIC", "WATERPROOF", "STURDY", "SOFT", "TRADER_AVOID", "BELTED", "MUNDANE", "INVENTOR_CRAFTED" ]
   },
   {
     "id": "aura_force_on",
@@ -411,8 +391,7 @@
       "CALORIES_INTAKE",
       "ELECTRONIC",
       "MUNDANE",
-      "INVENTOR_CRAFTED",
-      "ELECTROKINETIC_CHARGEABLE"
+      "INVENTOR_CRAFTED"
     ],
     "pocket_data": [
       {
@@ -560,7 +539,7 @@
     "weight": "300 g",
     "longest_side": "25 cm",
     "ammo": [ "battery" ],
-    "flags": [ "MORPHIC", "ONLY_ONE", "TRADER_AVOID", "MUNDANE", "INVENTOR_CRAFTED", "ELECTROKINETIC_CHARGEABLE" ],
+    "flags": [ "MORPHIC", "ONLY_ONE", "TRADER_AVOID", "MUNDANE", "INVENTOR_CRAFTED" ],
     "use_action": [
       {
         "target": "inventor_electric_fist_act",
@@ -623,7 +602,7 @@
     "color": "dark_gray",
     "material_thickness": 0.4,
     "environmental_protection": 4,
-    "flags": [ "MORPHIC", "MUNDANE", "INVENTOR_CRAFTED", "ELECTROKINETIC_CHARGEABLE" ],
+    "flags": [ "MORPHIC", "MUNDANE", "INVENTOR_CRAFTED" ],
     "relic_data": {
       "passive_effects": [ { "has": "WORN", "condition": "ACTIVE", "values": [ { "value": "REGEN_STAMINA", "multiply": 0.6 } ] } ]
     },