[Xedra Evolved] Paraclesian fae cannot wear steel or iron without pro…

…blems (except Homullus) (#74951) * Initial commit * Merge branch 'master' of https://github.com/Standing-Storm/Cataclysm-DDA into no-iron-fae * Fix merge problems * more fixes * Even more fixes * Kick tests
CleverRaven · Jul 9, 2024 · fa408f7 · fa408f7
1 parent 5c033a6
commit fa408f7
Show file tree

Hide file tree

Showing 2 changed files with 236 additions and 0 deletions.
diff --git a/data/mods/Xedra_Evolved/effects/effects.json b/data/mods/Xedra_Evolved/effects/effects.json
@@ -910,6 +910,104 @@
     ],
     "flags": [ "EFFECT_LIMB_SCORE_MOD" ]
   },
+  {
+    "type": "effect_type",
+    "id": "effect_arvore_sylph_undine_wearing_iron",
+    "name": [ "Touching Iron" ],
+    "desc": [ "You are in contact with iron, the ancient bane of the fae.  It will cause you pain and discomfort until removed." ],
+    "rating": "bad",
+    "apply_message": "As the iron touches you, your skin begins to burn.",
+    "remove_message": "The burning from the iron finally fades.",
+    "base_mods": {
+      "pain_amount": [ 10 ],
+      "pain_min": [ 1 ],
+      "pain_max": [ 3 ],
+      "pain_chance": [ 2 ],
+      "pain_max_val": [ 200 ],
+      "pain_tick": [ 90 ]
+    },
+    "limb_score_mods": [
+      { "limb_score": "balance", "modifier": 0.75 },
+      { "limb_score": "breathing", "modifier": 0.7 },
+      { "limb_score": "lift", "modifier": 0.8 },
+      { "limb_score": "grip", "modifier": 0.8 },
+      { "limb_score": "reaction", "modifier": 0.8 }
+    ],
+    "flags": [ "EFFECT_LIMB_SCORE_MOD" ]
+  },
+  {
+    "type": "effect_type",
+    "id": "effect_arvore_sylph_undine_wearing_steel",
+    "name": [ "Touching Steel" ],
+    "desc": [
+      "You are in contact with steel, the closest material to iron, the ancient bane of the fae.  It will cause you pain and discomfort until removed."
+    ],
+    "rating": "bad",
+    "apply_message": "As the steel touches you, your skin begins to burn.",
+    "remove_message": "The burning from the steel finally fades.",
+    "base_mods": {
+      "pain_amount": [ 8 ],
+      "pain_min": [ 1 ],
+      "pain_max": [ 3 ],
+      "pain_chance": [ 2 ],
+      "pain_max_val": [ 100 ],
+      "pain_tick": [ 120 ]
+    },
+    "limb_score_mods": [
+      { "limb_score": "balance", "modifier": 0.8 },
+      { "limb_score": "breathing", "modifier": 0.75 },
+      { "limb_score": "lift", "modifier": 0.9 },
+      { "limb_score": "grip", "modifier": 0.85 },
+      { "limb_score": "reaction", "modifier": 0.85 }
+    ],
+    "flags": [ "EFFECT_LIMB_SCORE_MOD" ]
+  },
+  {
+    "type": "effect_type",
+    "id": "effect_ierde_salamander_wearing_iron",
+    "name": [ "Touching Iron" ],
+    "desc": [ "You are in contact with iron, the ancient bane of the fae.  It will cause you pain and discomfort until removed." ],
+    "rating": "bad",
+    "apply_message": "As the iron touches you, your skin begins to burn.",
+    "remove_message": "The burning from the iron finally fades.",
+    "base_mods": {
+      "pain_amount": [ 5 ],
+      "pain_min": [ 1 ],
+      "pain_max": [ 3 ],
+      "pain_chance": [ 3 ],
+      "pain_max_val": [ 100 ],
+      "pain_tick": [ 120 ]
+    },
+    "limb_score_mods": [
+      { "limb_score": "balance", "modifier": 0.9 },
+      { "limb_score": "breathing", "modifier": 0.85 },
+      { "limb_score": "lift", "modifier": 0.9 },
+      { "limb_score": "grip", "modifier": 0.9 },
+      { "limb_score": "reaction", "modifier": 0.9 }
+    ],
+    "flags": [ "EFFECT_LIMB_SCORE_MOD" ]
+  },
+  {
+    "type": "effect_type",
+    "id": "effect_ierde_salamander_wearing_steel",
+    "name": [ "Touching Steel" ],
+    "desc": [
+      "You are in contact with steel, the closest material to iron, the ancient bane of the fae.  It will cause you pain and discomfort until removed."
+    ],
+    "rating": "bad",
+    "apply_message": "As the steel touches you, your skin begins to itch.",
+    "remove_message": "The itching from the steel finally fades.",
+    "base_mods": {
+      "pain_amount": [ 2 ],
+      "pain_min": [ 1 ],
+      "pain_max": [ 3 ],
+      "pain_chance": [ 6 ],
+      "pain_max_val": [ 100 ],
+      "pain_tick": [ 120 ]
+    },
+    "limb_score_mods": [ { "limb_score": "breathing", "modifier": 0.95 } ],
+    "flags": [ "EFFECT_LIMB_SCORE_MOD" ]
+  },
   {
     "type": "effect_type",
     "id": "natures_commune",

diff --git a/data/mods/Xedra_Evolved/mutations/paraclesians/paraclesian_fae_bans.json b/data/mods/Xedra_Evolved/mutations/paraclesians/paraclesian_fae_bans.json
@@ -299,5 +299,143 @@
         "type": "bad"
       }
     ]
+  },
+  {
+    "type": "effect_on_condition",
+    "id": "EOC_ARVORE_SYLPH_UNDINE_FAE_BAN_WEARING_IRON_OR_STEEL",
+    "eoc_type": "EVENT",
+    "required_event": "character_wears_item",
+    "condition": { "u_has_any_trait": [ "ARVORE", "SYLPH", "UNDINE" ] },
+    "effect": [
+      {
+        "run_eocs": [ "EOC_ARVORE_SYLPH_UNDINE_FAE_BAN_WEARING_IRON_FOLLOWUP", "EOC_ARVORE_SYLPH_UNDINE_FAE_BAN_WEARING_STEEL_FOLLOWUP" ]
+      }
+    ]
+  },
+  {
+    "type": "effect_on_condition",
+    "id": "EOC_ARVORE_SYLPH_UNDINE_FAE_BAN_WEARING_IRON_FOLLOWUP",
+    "effect": {
+      "u_run_inv_eocs": "all",
+      "search_data": [ { "material": "iron", "worn_only": true } ],
+      "true_eocs": [
+        {
+          "id": "EOC_ARVORE_SYLPH_UNDINE_FAE_BAN_WEARING_IRON_RESULT_TRUE",
+          "effect": [
+            { "u_add_effect": "effect_arvore_sylph_undine_wearing_iron", "duration": "PERMANENT" },
+            { "queue_eocs": "EOC_ARVORE_SYLPH_UNDINE_FAE_BAN_WEARING_IRON_FOLLOWUP", "time_in_future": 60 }
+          ]
+        }
+      ],
+      "false_eocs": [
+        {
+          "id": "EOC_ARVORE_SYLPH_UNDINE_FAE_BAN_WEARING_IRON_RESULT_FALSE",
+          "effect": [ { "u_lose_effect": "effect_arvore_sylph_undine_wearing_iron" } ]
+        }
+      ]
+    }
+  },
+  {
+    "type": "effect_on_condition",
+    "id": "EOC_ARVORE_SYLPH_UNDINE_FAE_BAN_WEARING_STEEL_FOLLOWUP",
+    "effect": {
+      "u_run_inv_eocs": "all",
+      "search_data": [
+        { "material": "steel", "worn_only": true },
+        { "material": "lc_steel", "worn_only": true },
+        { "material": "mc_steel", "worn_only": true },
+        { "material": "hc_steel", "worn_only": true },
+        { "material": "ch_steel", "worn_only": true },
+        { "material": "lc_steel_chain", "worn_only": true },
+        { "material": "mc_steel_chain", "worn_only": true },
+        { "material": "hc_steel_chain", "worn_only": true },
+        { "material": "ch_steel_chain", "worn_only": true }
+      ],
+      "true_eocs": [
+        {
+          "id": "EOC_ARVORE_SYLPH_UNDINE_FAE_BAN_WEARING_STEEL_RESULT_TRUE",
+          "effect": [
+            { "u_add_effect": "effect_arvore_sylph_undine_wearing_steel", "duration": "PERMANENT" },
+            { "queue_eocs": "EOC_ARVORE_SYLPH_UNDINE_FAE_BAN_WEARING_STEEL_FOLLOWUP", "time_in_future": 60 }
+          ],
+          "false_effect": [ { "u_lose_effect": "effect_arvore_sylph_undine_wearing_steel" } ]
+        }
+      ],
+      "false_eocs": [
+        {
+          "id": "EOC_ARVORE_SYLPH_UNDINE_FAE_BAN_WEARING_STEEL_RESULT_FALSE",
+          "effect": [ { "u_lose_effect": "effect_arvore_sylph_undine_wearing_steel" } ]
+        }
+      ]
+    }
+  },
+  {
+    "type": "effect_on_condition",
+    "id": "EOC_IERDE_SALAMANDER_FAE_BAN_WEARING_IRON_OR_STEEL",
+    "eoc_type": "EVENT",
+    "required_event": "character_wears_item",
+    "condition": { "u_has_any_trait": [ "IERDE", "SALAMANDER" ] },
+    "effect": [
+      {
+        "run_eocs": [ "EOC_IERDE_SALAMANDER_FAE_BAN_WEARING_IRON_FOLLOWUP", "EOC_IERDE_SALAMANDER_FAE_BAN_WEARING_STEEL_FOLLOWUP" ]
+      }
+    ]
+  },
+  {
+    "type": "effect_on_condition",
+    "id": "EOC_IERDE_SALAMANDER_FAE_BAN_WEARING_IRON_FOLLOWUP",
+    "effect": {
+      "u_run_inv_eocs": "all",
+      "search_data": [ { "material": "iron", "worn_only": true } ],
+      "true_eocs": [
+        {
+          "id": "EOC_IERDE_SALAMANDER_FAE_BAN_WEARING_IRON_RESULT_TRUE",
+          "effect": [
+            { "u_add_effect": "effect_ierde_salamander_wearing_iron", "duration": "PERMANENT" },
+            { "queue_eocs": "EOC_IERDE_SALAMANDER_FAE_BAN_WEARING_IRON_FOLLOWUP", "time_in_future": 60 }
+          ]
+        }
+      ],
+      "false_eocs": [
+        {
+          "id": "EOC_IERDE_SALAMANDER_FAE_BAN_WEARING_IRON_RESULT_FALSE",
+          "effect": [ { "u_lose_effect": "effect_ierde_salamander_wearing_iron" } ]
+        }
+      ]
+    }
+  },
+  {
+    "type": "effect_on_condition",
+    "id": "EOC_IERDE_SALAMANDER_FAE_BAN_WEARING_STEEL_FOLLOWUP",
+    "effect": {
+      "u_run_inv_eocs": "all",
+      "search_data": [
+        { "material": "steel", "worn_only": true },
+        { "material": "lc_steel", "worn_only": true },
+        { "material": "mc_steel", "worn_only": true },
+        { "material": "hc_steel", "worn_only": true },
+        { "material": "ch_steel", "worn_only": true },
+        { "material": "lc_steel_chain", "worn_only": true },
+        { "material": "mc_steel_chain", "worn_only": true },
+        { "material": "hc_steel_chain", "worn_only": true },
+        { "material": "ch_steel_chain", "worn_only": true }
+      ],
+      "true_eocs": [
+        {
+          "id": "EOC_IERDE_SALAMANDER_FAE_BAN_WEARING_STEEL_RESULT_TRUE",
+          "effect": [
+            { "u_add_effect": "effect_ierde_salamander_wearing_steel", "duration": "PERMANENT" },
+            { "queue_eocs": "EOC_IERDE_SALAMANDER_FAE_BAN_WEARING_STEEL_FOLLOWUP", "time_in_future": 60 }
+          ],
+          "false_effect": [ { "u_lose_effect": "effect_ierde_salamander_wearing_steel" } ]
+        }
+      ],
+      "false_eocs": [
+        {
+          "id": "EOC_IERDE_SALAMANDER_FAE_BAN_WEARING_STEEL_RESULT_FALSE",
+          "effect": [ { "u_lose_effect": "effect_ierde_salamander_wearing_steel" } ]
+        }
+      ]
+    }
   }
 ]