Merge pull request #78544 from Standing-Storm/fix-suppression-belt

[MoM] Fix Suppression Belt
CleverRaven · Dec 14, 2024 · f1025b3 · f1025b3
2 parents 9962573 + d177a12
commit f1025b3
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 12 deletions.
diff --git a/data/mods/MindOverMatter/effects/effects_items.json b/data/mods/MindOverMatter/effects/effects_items.json
@@ -56,6 +56,14 @@
     "desc": [ "" ],
     "flags": [ "TELEKIN_SHIELD" ]
   },
+  {
+    "id": "effect_suppression_belt_fire_protection",
+    "type": "effect_type",
+    "//": "Blank to hide effect",
+    "name": [ "" ],
+    "desc": [ "" ],
+    "flags": [ "HEAT_IMMUNE" ]
+  },
   {
     "type": "effect_type",
     "id": "effect_black_nether_water_disease",

diff --git a/data/mods/MindOverMatter/items/armor/belt.json b/data/mods/MindOverMatter/items/armor/belt.json
@@ -126,7 +126,18 @@
         "volume_encumber_modifier": 0.35
       }
     ],
-    "relic_data": { "charge_info": { "recharge_type": "periodic", "time": "30 s", "regenerate_ammo": true } },
+    "relic_data": {
+      "passive_effects": [
+        {
+          "has": "WORN",
+          "condition": "ACTIVE",
+          "incoming_damage_mod": [ { "type": "heat", "multiply": -1 } ],
+          "values": [ { "value": "CLIMATE_CONTROL_CHILL", "add": 1000 } ],
+          "ench_effects": [ { "effect": "effect_suppression_belt_fire_protection", "intensity": 1 } ]
+        }
+      ],
+      "charge_info": { "recharge_type": "periodic", "time": "30 s", "regenerate_ammo": true }
+    },
     "//": "Recharge time is 30 seconds due to bug #48019, making it actually 15 seconds. Reduce to 15 seconds if that ever gets fixed."
   },
   {
@@ -145,17 +156,7 @@
         "type": "transform"
       }
     ],
-    "extend": { "flags": [ "NO_TAKEOFF" ] },
-    "relic_data": {
-      "passive_effects": [
-        {
-          "has": "WORN",
-          "condition": "ALWAYS",
-          "incoming_damage_mod": [ { "type": "heat", "multiply": -1 } ],
-          "values": [ { "value": "CLIMATE_CONTROL_CHILL", "add": 1000 } ]
-        }
-      ]
-    }
+    "extend": { "flags": [ "NO_TAKEOFF" ] }
   },
   {
     "id": "psionic_fire_shield_belt_broken",