Merge pull request #79114 from Standing-Storm/homullus-more-punishing…

…-murder [Xedra Evolved] Homullus murder fae ban comes into play earlier
CleverRaven · Jan 13, 2025 · 3f13c46 · 3f13c46
2 parents c123bfe + f0cf80b
commit 3f13c46
Showing 1 changed file with 15 additions and 2 deletions.
diff --git a/data/mods/Xedra_Evolved/mutations/paraclesians/paraclesian_fae_bans.json b/data/mods/Xedra_Evolved/mutations/paraclesians/paraclesian_fae_bans.json
@@ -220,7 +220,13 @@
     "id": "EOC_HOMULLUS_FAE_BAN_KILL_HUMAN",
     "eoc_type": "EVENT",
     "required_event": "character_kills_character",
-    "condition": { "u_has_trait": "THRESH_HOMULLUS" },
+    "condition": {
+      "or": [
+        { "u_has_trait": "THRESH_HOMULLUS" },
+        { "u_has_trait": "HOMULLUS_BACKSTAGE" },
+        { "math": [ "u_sum_traits_of_category_char_has('HOMULLUS') >= 15" ] }
+      ]
+    },
     "effect": [
       { "run_eocs": "EOC_PARACLESIAN_BROKE_FAE_BAN" },
       { "run_eocs": "EOC_PARACLESIAN_BROKE_FAE_BAN_PAIN", "time_in_future": 1 },
@@ -237,10 +243,17 @@
     "required_event": "character_kills_monster",
     "condition": {
       "and": [
-        { "u_has_trait": "THRESH_HOMULLUS" },
+        {
+          "or": [
+            { "u_has_trait": "THRESH_HOMULLUS" },
+            { "u_has_trait": "HOMULLUS_BACKSTAGE" },
+            { "math": [ "u_sum_traits_of_category_char_has('HOMULLUS') >= 15" ] }
+          ]
+        },
         {
           "or": [
             { "and": [ { "npc_has_species": "HUMAN" }, { "not": { "npc_has_species": "ZOMBIE" } } ] },
+            { "and": [ { "npc_has_flag": "HUMAN" }, { "not": { "npc_has_species": "ZOMBIE" } } ] },
             { "npc_has_species": "FERAL" }
           ]
         }