diff --git a/data/mods/Xedra_Evolved/mutations/paraclesians/arvore_mutations.json b/data/mods/Xedra_Evolved/mutations/paraclesians/arvore_mutations.json index 5403e2cbef279..2367772e2c477 100644 --- a/data/mods/Xedra_Evolved/mutations/paraclesians/arvore_mutations.json +++ b/data/mods/Xedra_Evolved/mutations/paraclesians/arvore_mutations.json @@ -407,7 +407,11 @@ "enchantments": [ { "condition": { "and": [ "is_day", "u_is_outside" ] }, - "values": [ { "value": "REGEN_HP", "multiply": 0.5 }, { "value": "MENDING_MODIFIER", "multiply": 1 } ], + "values": [ + { "value": "REGEN_HP", "multiply": 0.5 }, + { "value": "REGEN_HP_AWAKE", "multiply": 0.2 }, + { "value": "MENDING_MODIFIER", "multiply": 1 } + ], "ench_effects": [ { "effect": "effect_arvore_vitamin_bonus", "intensity": 1 } ] } ], @@ -429,6 +433,7 @@ "condition": { "and": [ "is_day", "u_is_outside" ] }, "values": [ { "value": "REGEN_HP", "multiply": 0.5 }, + { "value": "REGEN_HP_AWAKE", "multiply": 0.2 }, { "value": "REGEN_MANA", "multiply": 0.5 }, { "value": "MENDING_MODIFIER", "multiply": 1 } ], @@ -437,6 +442,35 @@ ], "//": "No messages so you aren't constantly spammed while you're walking in and out of buildings. Being a fae spirit, the arvore doesn't need uncovered arms or head or anything--simply being in the sun is enough." }, + { + "type": "mutation", + "id": "ARVORE_MOOD_CHANGES_WITH_SEASONS", + "name": { "str": "The Eternal Cycle" }, + "points": 3, + "visibility": 0, + "ugliness": 0, + "description": "Your energy changes with the seasons: in spring and summer, you're more awake and need less sleep, and the reverse is true in autumn and winter.", + "prereqs": [ "ARVORE_SUN_NUTRIENTS", "ARVORE_SUN_NUTRIENTS_AND_MANA", "ARVORE_SUN_MANA_BONUS", "ARVORE_SUN_POWER_MANA_STATS" ], + "category": [ "ARVORE" ], + "enchantments": [ + { + "condition": { "is_season": "spring" }, + "values": [ { "value": "SLEEPINESS", "multiply": -0.1 }, { "value": "SLEEPINESS_REGEN", "multiply": 0.1 } ] + }, + { + "condition": { "is_season": "summer" }, + "values": [ { "value": "SLEEPINESS", "multiply": -0.25 }, { "value": "SLEEPINESS_REGEN", "multiply": 0.25 } ] + }, + { + "condition": { "is_season": "autumn" }, + "values": [ { "value": "SLEEPINESS", "multiply": 0.1 }, { "value": "SLEEPINESS_REGEN", "multiply": -0.1 } ] + }, + { + "condition": { "is_season": "winter" }, + "values": [ { "value": "SLEEPINESS", "multiply": 0.25 }, { "value": "SLEEPINESS_REGEN", "multiply": -0.25 } ] + } + ] + }, { "type": "mutation", "id": "ARVORE_SUN_FOODS", @@ -974,6 +1008,7 @@ "condition": { "and": [ "is_day", "u_is_outside" ] }, "values": [ { "value": "REGEN_HP", "multiply": 0.5 }, + { "value": "REGEN_HP_AWAKE", "multiply": 0.2 }, { "value": "REGEN_MANA", "multiply": 0.5 }, { "value": "MAX_MANA", "multiply": 0.5 }, { "value": "MENDING_MODIFIER", "multiply": 1 } @@ -999,6 +1034,7 @@ "condition": { "and": [ "is_day", "u_is_outside" ] }, "values": [ { "value": "REGEN_HP", "multiply": 0.5 }, + { "value": "REGEN_HP_AWAKE", "multiply": 0.2 }, { "value": "REGEN_MANA", "multiply": 0.5 }, { "value": "MAX_MANA", "multiply": 0.5 }, { "value": "MENDING_MODIFIER", "multiply": 1 }, diff --git a/data/mods/Xedra_Evolved/mutations/paraclesians/homullus_eocs.json b/data/mods/Xedra_Evolved/mutations/paraclesians/homullus_eocs.json index 4e5d54ba03c84..2b0bad0b27708 100644 --- a/data/mods/Xedra_Evolved/mutations/paraclesians/homullus_eocs.json +++ b/data/mods/Xedra_Evolved/mutations/paraclesians/homullus_eocs.json @@ -167,6 +167,32 @@ }, "effect": [ { "u_add_trait": "HOMULLUS_MINIMIZED_MUTATIONS" } ] }, + { + "type": "effect_on_condition", + "id": "EOC_HOMULLUS_CUT_OFF_FURTHER_HOMULLUS_MUTATIONS", + "eoc_type": "EVENT", + "required_event": "character_consumes_item", + "condition": { + "and": [ + { + "or": [ + { "compare_string": [ "iv_mutagen", { "context_val": "itype" } ] }, + { "compare_string": [ "mutagen", { "context_val": "itype" } ] } + ] + }, + { "u_has_trait": "HOMULLUS_EXPANDED_MUTATIONS" } + ] + }, + "effect": [ { "u_add_trait": "HOMULLUS_NO_DOLL_MUTATIONS" } ] + }, + { + "type": "effect_on_condition", + "id": "EOC_HOMULLUS_CUT_OFF_FURTHER_HOMULLUS_MUTATIONS_2", + "recurrence": "10 m", + "condition": { "u_has_trait": "HOMULLUS_NO_DOLL_MUTATIONS" }, + "deactivate_condition": { "not": { "u_has_trait": "HOMULLUS_NO_DOLL_MUTATIONS" } }, + "effect": [ { "math": [ "u_vitamin('mutagen_dollkin')", "=", "0" ] } ] + }, { "type": "effect_on_condition", "id": "EOC_HOMULLUS_DOLL_FORM_ON", diff --git a/data/mods/Xedra_Evolved/mutations/paraclesians/homullus_mutations.json b/data/mods/Xedra_Evolved/mutations/paraclesians/homullus_mutations.json index 073da9168726e..8b2e3c843d24e 100644 --- a/data/mods/Xedra_Evolved/mutations/paraclesians/homullus_mutations.json +++ b/data/mods/Xedra_Evolved/mutations/paraclesians/homullus_mutations.json @@ -607,7 +607,7 @@ "visibility": 0, "ugliness": 0, "purifiable": false, - "description": "As a spirit of humanity, you lack the natural biology required for mutagens to function. However, your powers have grown far enough to allow you to use even the most abstract of human tools, allowing you to consume mutagens to change your body. Unlike humans, however, there are thresholds you will never be able to reach.", + "description": "As a spirit of humanity, you lack the natural biology required for mutagens to function. However, your powers have grown far enough to allow you to use even the most abstract of human tools, allowing you to consume mutagens to change your body. Unlike humans, however, there are thresholds you will never be able to reach, and should you choose this route, further development of your native spirit powers will be closed off to you.", "threshreq": [ "THRESH_HOMULLUS" ], "prereqs": [ "HOMULLUS_MINIMIZED_MUTATIONS" ], "category": [ "HOMULLUS" ] @@ -628,6 +628,48 @@ "changes_to": [ "HOMULLUS_EXPANDED_MUTATIONS" ], "category": [ "HOMULLUS" ] }, + { + "type": "mutation", + "id": "HOMULLUS_NO_DOLL_MUTATIONS", + "name": "Homullus No Doll Mutations", + "//": "For Homullus who choose to consume mutagen, prevent them from mutating any more homullus traits.", + "valid": false, + "player_display": false, + "purifiable": false, + "points": 0, + "visibility": 0, + "ugliness": 0, + "description": "You have chosen the path of human mutation and further Homullus mutation is closed off to you. You should not see this in-game.", + "vitamin_rates": [ [ "mutagen_dollkin", 1 ] ], + "allowed_category": [ + "ALPHA", + "BATRACHIAN", + "BEAST", + "BIRD", + "CATTLE", + "CEPHALOPOD", + "CHIMERA", + "CHIROPTERAN", + "CRUSTACEAN", + "ELFA", + "FELINE", + "FISH", + "GASTROPOD", + "INSECT", + "LIZARD", + "LUPINE", + "MEDICAL", + "MOUSE", + "PLANT", + "RABBIT", + "RAPTOR", + "RAT", + "SLIME", + "SPIDER", + "TROGLOBITE", + "URSINE" + ] + }, { "type": "mutation", "id": "HOMULLUS_THE_HUNTER2", diff --git a/data/mods/Xedra_Evolved/mutations/paraclesians/paraclesian_fae_bans.json b/data/mods/Xedra_Evolved/mutations/paraclesians/paraclesian_fae_bans.json index 47c0df1fcaa4b..33f300e6de247 100644 --- a/data/mods/Xedra_Evolved/mutations/paraclesians/paraclesian_fae_bans.json +++ b/data/mods/Xedra_Evolved/mutations/paraclesians/paraclesian_fae_bans.json @@ -28,7 +28,7 @@ "id": "EOC_ARVORE_FAE_BAN_CUT_TREE", "eoc_type": "EVENT", "required_event": "cuts_tree", - "condition": { "u_has_trait": "THRESH_ARVORE" }, + "condition": { "or": [ { "u_has_trait": "THRESH_ARVORE" }, { "u_has_trait": "ARVORE_NURTURING_THE_GREEN" } ] }, "effect": [ { "run_eocs": "EOC_PARACLESIAN_BROKE_FAE_BAN" }, { "queue_eocs": "EOC_PARACLESIAN_BROKE_FAE_BAN_PAIN", "time_in_future": 1 }, @@ -73,7 +73,7 @@ "required_event": "character_wakes_up", "condition": { "and": [ - { "u_has_trait": "THRESH_ARVORE" }, + { "or": [ { "u_has_trait": "THRESH_ARVORE" }, { "u_has_trait": "ARVORE_MOSS" } ] }, { "or": [ { "test_eoc": "EOC_CONDITION_HOMULLUS_NEAR_FACTION" }, @@ -92,6 +92,25 @@ } ] }, + { + "type": "effect_on_condition", + "id": "EOC_ARVORE_GAIN_ANTI_JUNK", + "eoc_type": "EVENT", + "required_event": "gains_mutation", + "//": "Automatically gain the Junkfood Intolerance trait when gaining the Solar Rejuvenation or Verdant Blood traits", + "condition": { + "and": [ + { + "or": [ + { "compare_string": [ "ARVORE_SUN_NUTRIENTS", { "context_val": "trait" } ] }, + { "compare_string": [ "ARVORE_BLOOD", { "context_val": "trait" } ] } + ] + }, + { "u_has_trait": "ARVORE" } + ] + }, + "effect": [ { "u_add_trait": "ANTIJUNK" } ] + }, { "type": "effect_on_condition", "id": "EOC_IERDE_FAE_BAN_DIDNT_SLEEP_UNDERGROUND", @@ -158,6 +177,44 @@ } ] }, + { + "type": "effect_on_condition", + "id": "EOC_IERDE_FAE_BAN_GAIN_ANTIJUNK", + "eoc_type": "EVENT", + "required_event": "gains_mutation", + "//": "Automatically gain the Junkfood Intolerance traits when gaining the The Soil Knows Those Who Treat Upon It or the In the Earthmother's Embrace traits", + "condition": { + "and": [ + { + "or": [ + { "compare_string": [ "IERDE_DETECT_NEARBY_MONSTERS_EARTH", { "context_val": "trait" } ] }, + { "compare_string": [ "IERDE_SINK_INTO_EARTH", { "context_val": "trait" } ] } + ] + }, + { "u_has_trait": "IERDE" } + ] + }, + "effect": [ { "u_add_trait": "ANTIJUNK" } ] + }, + { + "type": "effect_on_condition", + "id": "EOC_IERDE_FAE_BAN_GAIN_HEAVY_SLEEPER", + "eoc_type": "EVENT", + "required_event": "gains_mutation", + "//": "Automatically gain the Very Heavy Sleeper traits when gaining the Unceasing Strength of the Earth or the Blood of the Earth trait", + "condition": { + "and": [ + { + "or": [ + { "compare_string": [ "IERDE_CARDIO2", { "context_val": "trait" } ] }, + { "compare_string": [ "IERDE_SLOW_BLEEDING", { "context_val": "trait" } ] } + ] + }, + { "u_has_trait": "IERDE" } + ] + }, + "effect": [ { "u_add_trait": "HEAVYSLEEPER2" } ] + }, { "type": "effect_on_condition", "id": "EOC_HOMULLUS_FAE_BAN_KILL_HUMAN", @@ -254,8 +311,7 @@ "required_event": "character_gains_effect", "condition": { "and": [ - { "u_has_trait": "THRESH_SALAMANDER" }, - { "u_has_trait": "SALAMANDER_SKIN_2" }, + { "or": [ { "u_has_trait": "THRESH_SALAMANDER" }, { "u_has_trait": "SALAMANDER_SKIN_2" } ] }, { "compare_string": [ "wet", { "context_val": "effect" } ] } ] }, @@ -268,6 +324,25 @@ } ] }, + { + "type": "effect_on_condition", + "id": "EOC_SALAMANDER_FAE_BAN_GAIN_PYROMANIA", + "eoc_type": "EVENT", + "required_event": "gains_mutation", + "//": "Automatically gain the Pyromania trait when gaining the Stove's Caress and One in the Sea or the Reading the Heartfires traits", + "condition": { + "and": [ + { + "or": [ + { "compare_string": [ "SALAMANDER_COOKING_HEAT", { "context_val": "trait" } ] }, + { "compare_string": [ "SALAMANDER_HEAT_EYES2", { "context_val": "trait" } ] } + ] + }, + { "u_has_trait": "SALAMANDER" } + ] + }, + "effect": [ { "u_add_trait": "PYROMANIA" } ] + }, { "type": "effect_on_condition", "id": "EOC_SYLPH_FAE_BAN_DIDNT_SLEEP_OUTSIDE", @@ -275,7 +350,7 @@ "required_event": "character_wakes_up", "condition": { "and": [ - { "u_has_trait": "THRESH_SYLPH" }, + { "or": [ { "u_has_trait": "THRESH_SYLPH" }, { "u_has_trait": "SYLPH_DEX_BONUS_2" } ] }, { "or": [ { "not": "u_is_outside" }, { "u_is_on_terrain_with_flag": "INDOORS" } ] } ] }, @@ -335,6 +410,44 @@ } ] }, + { + "type": "effect_on_condition", + "id": "EOC_SYLPH_FAE_BAN_GAIN_ANTIJUNK", + "eoc_type": "EVENT", + "required_event": "gains_mutation", + "//": "Automatically gain the Junkfood Intolerance traits when gaining the Call the Children of the Winds or the Breathe Without Air traits", + "condition": { + "and": [ + { + "or": [ + { "compare_string": [ "air_sprite", { "context_val": "trait" } ] }, + { "compare_string": [ "BREATHE_WO_AIR", { "context_val": "trait" } ] } + ] + }, + { "u_has_trait": "SYLPH" } + ] + }, + "effect": [ { "u_add_trait": "ANTIJUNK" } ] + }, + { + "type": "effect_on_condition", + "id": "EOC_SYLPH_FAE_BAN_GAIN_MOOD_SWINGS", + "eoc_type": "EVENT", + "required_event": "gains_mutation", + "//": "Automatically gain the Mood Swings trait when gaining the Ice-Clear Thoughts or the Born of a Gale traits", + "condition": { + "and": [ + { + "or": [ + { "compare_string": [ "SYLPH_INT_BONUS_1", { "context_val": "trait" } ] }, + { "compare_string": [ "SLYPH_RESIST_COLD2", { "context_val": "trait" } ] } + ] + }, + { "u_has_trait": "SYLPH" } + ] + }, + "effect": [ { "u_add_trait": "MOODSWINGS" } ] + }, { "type": "effect_on_condition", "id": "EOC_UNDINE_FAE_BAN_SLEEP_ON_LAND", @@ -349,6 +462,44 @@ } ] }, + { + "type": "effect_on_condition", + "id": "EOC_UNDINE_FAE_BAN_GAIN_ANTIJUNK", + "eoc_type": "EVENT", + "required_event": "gains_mutation", + "//": "Automatically gain the Junkfood Intolerance traits when gaining the Cleansing the Poison Well or the Summon Rain traits", + "condition": { + "and": [ + { + "or": [ + { "compare_string": [ "FOUL_WATER", { "context_val": "trait" } ] }, + { "compare_string": [ "SUMMON_RAIN", { "context_val": "trait" } ] } + ] + }, + { "u_has_trait": "UNDINE" } + ] + }, + "effect": [ { "u_add_trait": "ANTIJUNK" } ] + }, + { + "type": "effect_on_condition", + "id": "EOC_UNDINE_FAE_BAN_GAIN_LIGHTWEIGHT", + "eoc_type": "EVENT", + "required_event": "gains_mutation", + "//": "Automatically gain the Lightweight trait when gaining the One Foot in the River and One in the Sea or the Embrace of the Waters traits", + "condition": { + "and": [ + { + "or": [ + { "compare_string": [ "SALTWATER_TO_FRESHWATER", { "context_val": "trait" } ] }, + { "compare_string": [ "UNDINE_SLEEP_WATER", { "context_val": "trait" } ] } + ] + }, + { "u_has_trait": "UNDINE" } + ] + }, + "effect": [ { "u_add_trait": "LIGHTWEIGHT" } ] + }, { "type": "effect_on_condition", "id": "EOC_ARVORE_SYLPH_UNDINE_FAE_BAN_WEARING_IRON_OR_STEEL", diff --git a/data/mods/Xedra_Evolved/mutations/paraclesians/paraclesian_mutations.json b/data/mods/Xedra_Evolved/mutations/paraclesians/paraclesian_mutations.json index 2238c0713afe8..dbc0b991a29a4 100644 --- a/data/mods/Xedra_Evolved/mutations/paraclesians/paraclesian_mutations.json +++ b/data/mods/Xedra_Evolved/mutations/paraclesians/paraclesian_mutations.json @@ -40,6 +40,7 @@ "description": "A spirit of earth and stone.", "anger_relations": [ [ "IERDE", -20 ], [ "SYLPH", 20 ] ], "allowed_category": [ "IERDE" ], + "vitamin_rates": [ [ "mutagen_human", 1 ] ], "no_cbm_on_bp": [ "torso", "head", "eyes", "mouth", "arm_l", "arm_r", "hand_l", "hand_r", "leg_l", "leg_r", "foot_l", "foot_r" ] }, { @@ -83,6 +84,7 @@ "description": "A spirit of leaf and bark.", "anger_relations": [ [ "ARVORE", -20 ], [ "HOMULLUS", 20 ] ], "allowed_category": [ "ARVORE" ], + "vitamin_rates": [ [ "mutagen_human", 1 ] ], "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": [ "TREE_COMMUNION_PLUS", "ARVORE_POLLEN_IMMUNE" ] }, @@ -127,6 +129,7 @@ "description": "A spirit of fire.", "anger_relations": [ [ "SALAMANDER", -20 ], [ "UNDINE", 20 ] ], "allowed_category": [ "SALAMANDER" ], + "vitamin_rates": [ [ "mutagen_human", 1 ] ], "no_cbm_on_bp": [ "torso", "head", "eyes", "mouth", "arm_l", "arm_r", "hand_l", "hand_r", "leg_l", "leg_r", "foot_l", "foot_r" ] }, { @@ -180,6 +183,7 @@ "description": "You are born of the deep waters.", "anger_relations": [ [ "UNDINE", -20 ], [ "SALAMANDER", 20 ] ], "allowed_category": [ "UNDINE" ], + "vitamin_rates": [ [ "mutagen_human", 1 ] ], "no_cbm_on_bp": [ "torso", "head", "eyes", "mouth", "arm_l", "arm_r", "hand_l", "hand_r", "leg_l", "leg_r", "foot_l", "foot_r" ] }, { @@ -220,6 +224,7 @@ "NOHEAL" ], "can_heal_with": [ "doll_repair_paste" ], + "vitamin_rates": [ [ "mutagen_human", 1 ] ], "description": "A spirit of the image of humans given life.", "anger_relations": [ [ "HOMULLUS", -20 ], [ "ARVORE", 20 ] ] }, @@ -264,6 +269,7 @@ "description": "A spirit of air and wind.", "anger_relations": [ [ "SYLPH", -20 ], [ "IERDE", 20 ] ], "allowed_category": [ "SYLPH" ], + "vitamin_rates": [ [ "mutagen_human", 1 ] ], "no_cbm_on_bp": [ "torso", "head", "eyes", "mouth", "arm_l", "arm_r", "hand_l", "hand_r", "leg_l", "leg_r", "foot_l", "foot_r" ] }, { @@ -506,5 +512,14 @@ "purifiable": false, "valid": false, "description": "This person won't speak with them again if this goes poorly." + }, + { + "type": "effect_on_condition", + "id": "EOC_PARACLESIANS_CANNOT_USE_PURIFIER", + "//": "Paraclesians are elemental spirits, not humans, and purifier is human mutagen", + "recurrence": "10 m", + "condition": { "u_has_any_trait": [ "ARVORE", "HOMULLUS", "IERDE", "SALAMANDER", "SYLPH", "UNDINE" ] }, + "deactivate_condition": { "not": { "u_has_any_trait": [ "ARVORE", "HOMULLUS", "IERDE", "SALAMANDER", "SYLPH", "UNDINE" ] } }, + "effect": [ { "math": [ "u_vitamin('mutagen_human')", "=", "0" ] } ] } ] diff --git a/data/mods/Xedra_Evolved/mutations/paraclesians/salamander_mutations.json b/data/mods/Xedra_Evolved/mutations/paraclesians/salamander_mutations.json index dad15f5cd45f7..6002927113571 100644 --- a/data/mods/Xedra_Evolved/mutations/paraclesians/salamander_mutations.json +++ b/data/mods/Xedra_Evolved/mutations/paraclesians/salamander_mutations.json @@ -18,11 +18,12 @@ "points": 2, "visibility": 4, "ugliness": 3, - "description": "Your skin has magickal flames flaring out of it on occasion. You can operate in warmer climates than normal humans but begin to take damage from getting wet.", + "description": "Your skin has magickal flames flaring out of it on occasion. You can operate in warmer climates than normal humans but begin to take damage from getting wet, and you always smell of smoke and ashes.", "types": [ "SKIN" ], "category": [ "SALAMANDER" ], "prereqs": [ "SALAMANDER_SKIN_1" ], "changes_to": [ "SALAMANDER_SKIN_3" ], + "scent_intensity": 800, "enchantments": [ { "values": [ { "value": "WEAKNESS_TO_WATER", "multiply": 0.016 }, { "value": "SWEAT_MULTIPLIER", "multiply": -1 } ] } ],