diff --git a/data/mods/Xedra_Evolved/eocs/give_a_class_eoc.json b/data/mods/Xedra_Evolved/eocs/give_a_class_eoc.json index 9be451cf7ec20..4c5976ef798e7 100644 --- a/data/mods/Xedra_Evolved/eocs/give_a_class_eoc.json +++ b/data/mods/Xedra_Evolved/eocs/give_a_class_eoc.json @@ -12,7 +12,23 @@ ] }, { "math": [ "magic_potential", ">", "0" ] }, - { "not": { "u_has_trait": "DREAMLESS" } } + { + "not": { + "u_has_any_trait": [ + "DREAMLESS", + "CHANGELING_MAGIC", + "NATIVE_SHAPESHIFTER", + "LILIN_TRAITS", + "ARVORE", + "IERDE", + "HOMULLUS", + "SALAMANDER", + "SYLPH", + "UNDINE", + "VAMPIRE" + ] + } + } ] } }, diff --git a/data/mods/Xedra_Evolved/mutations/mutations.json b/data/mods/Xedra_Evolved/mutations/mutations.json index 4d9172cb5768d..ae46e1731c23f 100644 --- a/data/mods/Xedra_Evolved/mutations/mutations.json +++ b/data/mods/Xedra_Evolved/mutations/mutations.json @@ -164,7 +164,8 @@ "purifiable": false, "valid": false, "vitamin_rates": [ [ "human_blood_vitamin", 180 ] ], - "flags": [ "CANNIBAL", "HEMOVORE" ] + "flags": [ "CANNIBAL", "HEMOVORE" ], + "cancels": [ "DREAMER", "DREAMSMITH", "EATER", "INVENTOR" ] }, { "type": "mutation", diff --git a/data/mods/Xedra_Evolved/mutations/paraclesians/paraclesian_mutations.json b/data/mods/Xedra_Evolved/mutations/paraclesians/paraclesian_mutations.json index 6acec95446b1e..0506087d8cb42 100644 --- a/data/mods/Xedra_Evolved/mutations/paraclesians/paraclesian_mutations.json +++ b/data/mods/Xedra_Evolved/mutations/paraclesians/paraclesian_mutations.json @@ -34,7 +34,11 @@ "SLOWHEALER", "SLOWHEALER2", "SLOWHEALER3", - "NOHEAL" + "NOHEAL", + "DREAMER", + "DREAMSMITH", + "EATER", + "INVENTOR" ], "can_heal_with": [ "cthonic_poultice" ], "description": "A spirit of earth and stone.", @@ -78,7 +82,11 @@ "SLOWHEALER", "SLOWHEALER2", "SLOWHEALER3", - "NOHEAL" + "NOHEAL", + "DREAMER", + "DREAMSMITH", + "EATER", + "INVENTOR" ], "can_heal_with": [ "verdant_poultice" ], "description": "A spirit of leaf and bark.", @@ -123,7 +131,11 @@ "SLOWHEALER", "SLOWHEALER2", "SLOWHEALER3", - "NOHEAL" + "NOHEAL", + "DREAMER", + "DREAMSMITH", + "EATER", + "INVENTOR" ], "can_heal_with": [ "charred_sacrifice" ], "description": "A spirit of fire.", @@ -177,7 +189,11 @@ "SLOWHEALER", "SLOWHEALER2", "SLOWHEALER3", - "NOHEAL" + "NOHEAL", + "DREAMER", + "DREAMSMITH", + "EATER", + "INVENTOR" ], "can_heal_with": [ "cerulean_poultice" ], "description": "You are born of the deep waters.", @@ -221,7 +237,11 @@ "SLOWHEALER", "SLOWHEALER2", "SLOWHEALER3", - "NOHEAL" + "NOHEAL", + "DREAMER", + "DREAMSMITH", + "EATER", + "INVENTOR" ], "can_heal_with": [ "doll_repair_paste" ], "vitamin_rates": [ [ "mutagen_human", 1 ] ], @@ -263,7 +283,11 @@ "SLOWHEALER", "SLOWHEALER2", "SLOWHEALER3", - "NOHEAL" + "NOHEAL", + "DREAMER", + "DREAMSMITH", + "EATER", + "INVENTOR" ], "can_heal_with": [ "ethereal_draught" ], "description": "A spirit of air and wind.", diff --git a/data/mods/Xedra_Evolved/mutations/playable_changeling.json b/data/mods/Xedra_Evolved/mutations/playable_changeling.json index 500f11b870b79..55b837e41ad23 100644 --- a/data/mods/Xedra_Evolved/mutations/playable_changeling.json +++ b/data/mods/Xedra_Evolved/mutations/playable_changeling.json @@ -48,7 +48,8 @@ "description": "This provides the school trait for Changeling magic. It should not be visible.", "valid": false, "purifiable": false, - "player_display": false + "player_display": false, + "cancels": [ "DREAMER", "DREAMSMITH", "EATER", "INVENTOR" ] }, { "type": "mutation", diff --git a/data/mods/Xedra_Evolved/mutations/shapeshifters.json b/data/mods/Xedra_Evolved/mutations/shapeshifters.json index ebc684bfd666f..c70e9b227ec66 100644 --- a/data/mods/Xedra_Evolved/mutations/shapeshifters.json +++ b/data/mods/Xedra_Evolved/mutations/shapeshifters.json @@ -40,7 +40,8 @@ ], "no_cbm_on_bp": [ "torso", "head", "eyes", "mouth", "arm_l", "arm_r", "hand_l", "hand_r", "leg_l", "leg_r", "foot_l", "foot_r" ], "flags": [ "MEND_ALL" ], - "enchantments": [ { "values": [ { "value": "REGEN_HP", "multiply": 0.25 }, { "value": "REGEN_HP_AWAKE", "multiply": 0.1 } ] } ] + "enchantments": [ { "values": [ { "value": "REGEN_HP", "multiply": 0.25 }, { "value": "REGEN_HP_AWAKE", "multiply": 0.1 } ] } ], + "cancels": [ "DREAMER", "DREAMSMITH", "EATER", "INVENTOR" ] }, { "type": "mutation", diff --git a/data/mods/Xedra_Evolved/mutations/xe_lilin.json b/data/mods/Xedra_Evolved/mutations/xe_lilin.json index 5eec16d449c29..8aa3608577c4e 100644 --- a/data/mods/Xedra_Evolved/mutations/xe_lilin.json +++ b/data/mods/Xedra_Evolved/mutations/xe_lilin.json @@ -52,7 +52,8 @@ "ench_effects": [ { "effect": "effect_lilin_vampire_immune", "intensity": 1 } ] } ], - "activated_eocs": [ "EOC_LILIN_SPEND_RUACH_FOR_POWERS" ] + "activated_eocs": [ "EOC_LILIN_SPEND_RUACH_FOR_POWERS" ], + "cancels": [ "DREAMER", "DREAMSMITH", "EATER", "INVENTOR" ] }, { "type": "mutation",