From 6f0900d8082f27b7f7b13e80eb14ca27a36ebd08 Mon Sep 17 00:00:00 2001 From: Standing-Storm <120433252+Standing-Storm@users.noreply.github.com> Date: Thu, 22 Feb 2024 21:30:53 -0600 Subject: [PATCH] [Xedra Evolved] Consolidate some Arvore traits (#71920) * Consolidate Sensing the Sun * Consolidate Solar Repast * Consolidate Solar Rejuvenation -> Solar Ascendancy line * Remove active versions from mutation prereqs * Fix * Kick tests * Thanks random overmap failures * Consolidate Hidden Thorns and Jagged Wooden Claws * Spelling --- data/mods/Xedra_Evolved/effects/effects.json | 20 + .../mutations/paraclesians/arvore_eocs.json | 23 ++ .../paraclesians/arvore_mutation_spells.json | 34 +- .../paraclesians/arvore_mutations.json | 360 ++++-------------- .../migration_eocs.json | 18 + .../obsoletion_and_migration/mutations.json | 146 +++++++ 6 files changed, 305 insertions(+), 296 deletions(-) create mode 100644 data/mods/Xedra_Evolved/obsoletion_and_migration/migration_eocs.json create mode 100644 data/mods/Xedra_Evolved/obsoletion_and_migration/mutations.json diff --git a/data/mods/Xedra_Evolved/effects/effects.json b/data/mods/Xedra_Evolved/effects/effects.json index e2059b38ab7e0..a125bb5a924ef 100644 --- a/data/mods/Xedra_Evolved/effects/effects.json +++ b/data/mods/Xedra_Evolved/effects/effects.json @@ -836,6 +836,26 @@ "removes_effects": [ "effect_pollen_arvore_weaken" ], "enchantments": [ { "emitter": "emit_arvore_poison_pollen" } ] }, + { + "type": "effect_type", + "id": "effect_arvore_sense_sun", + "//": "Hidden, but provides flags for Sensing the Sun", + "name": [ "" ], + "desc": [ "" ], + "flags": [ "WATCH", "ALARMCLOCK" ] + }, + { + "type": "effect_type", + "id": "effect_arvore_vitamin_bonus", + "//": "Hidden, but provides vitamins for being out in the sun", + "name": [ "" ], + "desc": [ "" ], + "vitamins": [ + { "vitamin": "calcium", "rate": [ [ 1, 1 ] ], "tick": [ "20 m" ] }, + { "vitamin": "vitC", "rate": [ [ 1, 1 ] ], "tick": [ "20 m" ] }, + { "vitamin": "iron", "rate": [ [ 1, 1 ] ], "tick": [ "20 m" ] } + ] + }, { "type": "effect_type", "id": "effect_pollen_arvore_weaken", diff --git a/data/mods/Xedra_Evolved/mutations/paraclesians/arvore_eocs.json b/data/mods/Xedra_Evolved/mutations/paraclesians/arvore_eocs.json index 2b81e86d72391..9d191cb82cf2d 100644 --- a/data/mods/Xedra_Evolved/mutations/paraclesians/arvore_eocs.json +++ b/data/mods/Xedra_Evolved/mutations/paraclesians/arvore_eocs.json @@ -124,6 +124,29 @@ "id": "EOC_ARVORE_POISON_POLLEN_OFF", "effect": [ { "u_lose_effect": "effect_arvore_poison_pollen" } ] }, + { + "type": "effect_on_condition", + "id": "EOC_ARVORE_JAGGED_CLAWS_ON", + "condition": { "not": { "u_has_trait": "ARVORE_WOOD_CLAWS_active" } }, + "effect": [ + { "u_add_trait": "ARVORE_WOOD_CLAWS_active" }, + { "u_message": "Your fingers itch as jagged wood rapidly covers them.", "type": "good" } + ], + "false_effect": [ + { "u_lose_trait": "ARVORE_WOOD_CLAWS_active" }, + { "u_message": "The jagged wood covering your hands recedes, leaving no trace behind.", "type": "neutral" } + ] + }, + { + "type": "effect_on_condition", + "id": "EOC_ARVORE_THORNSKIN_ON", + "condition": { "not": { "u_has_trait": "ARVORE_THORN_SKIN_ON" } }, + "effect": [ { "u_add_trait": "ARVORE_THORN_SKIN_ON" }, { "u_message": "Woody thorns push through your skin.", "type": "good" } ], + "false_effect": [ + { "u_lose_trait": "ARVORE_THORN_SKIN_ON" }, + { "u_message": "Your thorns retract, leaving smooth unbroken skin behind.", "type": "neutral" } + ] + }, { "type": "effect_on_condition", "id": "EOC_ARVORE_WALK_WILDS_TELEPORT_CHECK", diff --git a/data/mods/Xedra_Evolved/mutations/paraclesians/arvore_mutation_spells.json b/data/mods/Xedra_Evolved/mutations/paraclesians/arvore_mutation_spells.json index 8585f38aa5634..15263b73a7bd1 100644 --- a/data/mods/Xedra_Evolved/mutations/paraclesians/arvore_mutation_spells.json +++ b/data/mods/Xedra_Evolved/mutations/paraclesians/arvore_mutation_spells.json @@ -38,10 +38,42 @@ "condition": "ALWAYS", "hit_me_effect": [ { "id": "spell_arvore_thorns_mut_counter", "hit_self": false, "once_in": 3 } ] }, + { + "type": "enchantment", + "id": "ench_arvore_sense_sun", + "condition": { "math": [ "u_val('pos_z')", ">=", "0" ] }, + "ench_effects": [ { "effect": "effect_arvore_sense_sun", "intensity": 1 } ] + }, { "type": "enchantment", "id": "ench_arvore_sun_foods_on", - "condition": "ALWAYS", + "condition": { + "and": [ + "is_day", + "u_is_outside", + { + "or": [ + { "u_is_on_terrain_with_flag": "SHRUB" }, + { "u_is_on_terrain": "t_tree_young" }, + { "u_is_on_terrain": "t_bamboo_tall" }, + { "u_is_on_terrain": "t_dirt" }, + { "u_is_on_terrain": "t_dirtmound" }, + { "u_is_on_terrain": "t_clay" }, + { "u_is_on_terrain": "t_sand" }, + { "u_is_on_terrain": "t_sandmound" }, + { "u_is_on_terrain": "t_grave" }, + { "u_is_on_terrain": "t_forestfloor" }, + { "u_is_on_terrain": "t_grass" }, + { "u_is_on_terrain": "t_grass_long" }, + { "u_is_on_terrain": "t_grass_tall" }, + { "u_is_on_terrain": "t_grass_dead" }, + { "u_is_on_terrain": "t_mud" }, + { "u_is_on_terrain": "t_dirtfloor_no_roof" }, + { "u_is_on_terrain": "t_moss" } + ] + } + ] + }, "intermittent_activation": { "effects": [ { "frequency": "1 minutes", "spell_effects": [ { "id": "arvore_sun_foods_on_spell" } ] } ] }, "values": [ { "value": "HUNGER", "multiply": -0.95 } ] }, diff --git a/data/mods/Xedra_Evolved/mutations/paraclesians/arvore_mutations.json b/data/mods/Xedra_Evolved/mutations/paraclesians/arvore_mutations.json index 52b4e88e5878a..57bb482e97ca0 100644 --- a/data/mods/Xedra_Evolved/mutations/paraclesians/arvore_mutations.json +++ b/data/mods/Xedra_Evolved/mutations/paraclesians/arvore_mutations.json @@ -249,14 +249,7 @@ "points": 3, "visibility": 0, "ugliness": 0, - "prereqs": [ - "ARVORE_SUN_NUTRIENTS_AND_MANA", - "ARVORE_SUN_NUTRIENTS_AND_MANA_ON", - "ARVORE_SUN_MANA_BONUS", - "ARVORE_SUN_MANA_BONUS_ON", - "ARVORE_SUN_POWER_MANA_STATS", - "ARVORE_SUN_POWER_MANA_STATS_ON" - ], + "prereqs": [ "ARVORE_SUN_NUTRIENTS_AND_MANA", "ARVORE_SUN_MANA_BONUS", "ARVORE_SUN_POWER_MANA_STATS" ], "description": "Upon gaining this ability the Arvore gains the ability to bind their soul to the heart of the forest, rebirthing themselves when on the verge of death.", "category": [ "ARVORE" ], "threshreq": [ "THRESH_ARVORE" ], @@ -282,16 +275,7 @@ "visibility": 0, "ugliness": 0, "prereqs": [ "ARVORE_COMMUNE_WITH_NATURE" ], - "prereqs2": [ - "ARVORE_SUN_NUTRIENTS", - "ARVORE_SUN_NUTRIENTS_ON", - "ARVORE_SUN_NUTRIENTS_AND_MANA", - "ARVORE_SUN_NUTRIENTS_AND_MANA_ON", - "ARVORE_SUN_MANA_BONUS", - "ARVORE_SUN_MANA_BONUS_ON", - "ARVORE_SUN_POWER_MANA_STATS", - "ARVORE_SUN_POWER_MANA_STATS_ON" - ], + "prereqs2": [ "ARVORE_SUN_NUTRIENTS", "ARVORE_SUN_NUTRIENTS_AND_MANA", "ARVORE_SUN_MANA_BONUS", "ARVORE_SUN_POWER_MANA_STATS" ], "description": "Upon gaining this ability the Arvore gains the ability to infuse their companions with the vitality of the forest.", "category": [ "ARVORE" ], "spells_learned": [ [ "arvore_verdant_infusion", 1 ] ] @@ -425,35 +409,14 @@ "description": "Like a tree, you are fueled by the sun. When standing in the sunlight, you will absorb its energy as nutrients and heal slightly faster.", "category": [ "ARVORE" ], "changes_to": [ "ARVORE_SUN_NUTRIENTS_AND_MANA" ], - "triggers": [ [ { "condition": { "and": [ "is_day", "u_is_outside" ] }, "msg_on": { "text": "", "rating": "good" } } ] ], - "transform": { "target": "ARVORE_SUN_NUTRIENTS_ON", "msg_transform": "", "active": false, "moves": 0 }, - "//": "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_SUN_NUTRIENTS_ON", - "name": { "str": "Solar Rejuvenation (active)" }, - "points": 3, - "visibility": 0, - "ugliness": 0, - "valid": false, - "description": "You feel the warm sun radiating down on you and revitalizing you. You are absorbing the sun's energy as nutrients and will heal slightly faster.", - "category": [ "ARVORE" ], - "changes_to": [ "ARVORE_SUN_NUTRIENTS_AND_MANA" ], - "vitamin_rates": [ [ "calcium", -1200, "vitC", -1200, "iron", -1200 ] ], - "healing_awake": 0.25, - "healing_multiplier": 1.5, - "mending_modifier": 3.0, - "//": "Halfway between fast healer and very fast healer, but only outside in the sun", - "triggers": [ - [ - { - "condition": { "or": [ { "not": "is_day" }, { "not": "u_is_outside" } ] }, - "msg_on": { "text": "", "rating": "good" } - } - ] + "enchantments": [ + { + "condition": { "and": [ "is_day", "u_is_outside" ] }, + "values": [ { "value": "REGEN_HP", "multiply": 0.5 } ], + "ench_effects": [ { "effect": "effect_arvore_vitamin_bonus", "intensity": 1 } ] + } ], - "transform": { "target": "ARVORE_SUN_NUTRIENTS", "msg_transform": "", "active": false, "moves": 0 } + "//": "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", @@ -466,37 +429,14 @@ "category": [ "ARVORE" ], "prereqs": [ "ARVORE_SUN_NUTRIENTS" ], "changes_to": [ "ARVORE_SUN_MANA_BONUS" ], - "triggers": [ [ { "condition": { "and": [ "is_day", "u_is_outside" ] }, "msg_on": { "text": "", "rating": "good" } } ] ], - "transform": { "target": "ARVORE_SUN_NUTRIENTS_AND_MANA_ON", "msg_transform": "", "active": false, "moves": 0 }, - "//": "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_SUN_NUTRIENTS_AND_MANA_ON", - "name": { "str": "Solar Revitalization (active)" }, - "points": 3, - "visibility": 0, - "ugliness": 0, - "valid": false, - "description": "You feel the warm sun radiating down on you and revitalizing you. You are absorbing the sun's energy as nutrients, will heal slightly faster, and your mana is regenerating quicker.", - "category": [ "ARVORE" ], - "prereqs": [ "ARVORE_SUN_NUTRIENTS" ], - "changes_to": [ "ARVORE_SUN_MANA_BONUS" ], - "vitamin_rates": [ [ "calcium", -1200, "vitC", -1200, "iron", -1200 ] ], - "healing_awake": 0.25, - "healing_multiplier": 1.5, - "mending_modifier": 3.0, - "mana_regen_multiplier": 1.5, - "//": "Halfway between fast healer and very fast healer, but only outside in the sun", - "triggers": [ - [ - { - "condition": { "or": [ { "not": "is_day" }, { "not": "u_is_outside" } ] }, - "msg_on": { "text": "", "rating": "good" } - } - ] + "enchantments": [ + { + "condition": { "and": [ "is_day", "u_is_outside" ] }, + "values": [ { "value": "REGEN_HP", "multiply": 0.5 }, { "value": "REGEN_MANA", "multiply": 0.5 } ], + "ench_effects": [ { "effect": "effect_arvore_vitamin_bonus", "intensity": 1 } ] + } ], - "transform": { "target": "ARVORE_SUN_NUTRIENTS_AND_MANA", "msg_transform": "", "active": false, "moves": 0 } + "//": "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", @@ -505,100 +445,11 @@ "points": 3, "visibility": 0, "ugliness": 0, - "prereqs": [ - "ARVORE_SUN_NUTRIENTS_AND_MANA", - "ARVORE_SUN_NUTRIENTS_AND_MANA_ON", - "ARVORE_SUN_POWER_MANA_STATS", - "ARVORE_SUN_MANA_BONUS_ON", - "ARVORE_SUN_POWER_MANA_STATS", - "ARVORE_SUN_POWER_MANA_STATS_ON" - ], + "prereqs": [ "ARVORE_SUN_NUTRIENTS_AND_MANA", "ARVORE_SUN_MANA_BONUS", "ARVORE_SUN_POWER_MANA_STATS" ], "description": "Like a tree, you draw nourishment from the sun and the soil. When standing in the sunlight and on natural terrain, you absorb its energy as food. You still need to drink water and you will still get hungry.", "category": [ "ARVORE" ], "threshreq": [ "THRESH_ARVORE" ], - "triggers": [ - [ - { - "condition": { - "and": [ - "is_day", - "u_is_outside", - { - "or": [ - { "u_is_on_terrain_with_flag": "SHRUB" }, - { "u_is_on_terrain": "t_tree_young" }, - { "u_is_on_terrain": "t_bamboo_tall" }, - { "u_is_on_terrain": "t_dirt" }, - { "u_is_on_terrain": "t_dirtmound" }, - { "u_is_on_terrain": "t_clay" }, - { "u_is_on_terrain": "t_sand" }, - { "u_is_on_terrain": "t_sandmound" }, - { "u_is_on_terrain": "t_grave" }, - { "u_is_on_terrain": "t_forestfloor" }, - { "u_is_on_terrain": "t_grass" }, - { "u_is_on_terrain": "t_grass_long" }, - { "u_is_on_terrain": "t_grass_tall" }, - { "u_is_on_terrain": "t_grass_dead" }, - { "u_is_on_terrain": "t_mud" }, - { "u_is_on_terrain": "t_dirtfloor_no_roof" }, - { "u_is_on_terrain": "t_moss" } - ] - } - ] - }, - "msg_on": { "text": "", "rating": "good" } - } - ] - ], - "transform": { "target": "ARVORE_SUN_FOODS_ON", "msg_transform": "", "active": false, "moves": 0 } - }, - { - "type": "mutation", - "id": "ARVORE_SUN_FOODS_ON", - "name": { "str": "Solar Repast (active)" }, - "points": 3, - "visibility": 0, - "ugliness": 0, - "valid": false, - "description": "You feel the warm sun radiating down on you and revitalizing you. You are absorbing the sun's energy as food and will need to eat much less.", - "category": [ "ARVORE" ], - "threshreq": [ "THRESH_ARVORE" ], - "enchantments": [ "ench_arvore_sun_foods_on" ], - "triggers": [ - [ - { - "condition": { - "and": [ - { "or": [ { "not": "is_day" }, { "not": "u_is_outside" } ] }, - { - "and": [ - { "not": { "u_is_on_terrain_with_flag": "SHRUB" } }, - { "not": { "u_is_on_terrain": "t_tree_young" } }, - { "not": { "u_is_on_terrain": "t_bamboo_tall" } }, - { "not": { "u_is_on_terrain": "t_dirt" } }, - { "not": { "u_is_on_terrain": "t_dirtmound" } }, - { "not": { "u_is_on_terrain": "t_clay" } }, - { "not": { "u_is_on_terrain": "t_sand" } }, - { "not": { "u_is_on_terrain": "t_sandmound" } }, - { "not": { "u_is_on_terrain": "t_grave" } }, - { "not": { "u_is_on_terrain": "t_forestfloor" } }, - { "not": { "u_is_on_terrain": "t_grass" } }, - { "not": { "u_is_on_terrain": "t_grass_long" } }, - { "not": { "u_is_on_terrain": "t_grass_tall" } }, - { "not": { "u_is_on_terrain": "t_grass_dead" } }, - { "not": { "u_is_on_terrain": "t_dirtfloor_no_roof" } }, - { "not": { "u_is_on_terrain": "t_mud" } }, - { "not": { "u_is_on_terrain": "t_dirtfloor_no_roof" } }, - { "not": { "u_is_on_terrain": "t_moss" } } - ] - } - ] - }, - "msg_on": { "text": "", "rating": "good" } - } - ] - ], - "transform": { "target": "ARVORE_SUN_FOODS", "msg_transform": "", "active": false, "moves": 0 } + "enchantments": [ "ench_arvore_sun_foods_on" ] }, { "type": "mutation", @@ -632,42 +483,30 @@ "id": "ARVORE_WOOD_CLAWS", "name": { "str": "Jagged Wooden Claws" }, "points": 2, - "active": true, "description": "At will, you can transform your hands into jagged wooden claws. They are potent weapons but make anything other than combat more difficult.", "types": [ "CLAWS" ], "prereqs": [ "ARVORE_SKIN_2", "ARVORE_SKIN_3" ], "category": [ "ARVORE" ], - "transform": { - "target": "ARVORE_WOOD_CLAWS_active", - "msg_transform": "Your fingers itch as jagged wood rapidly covers them.", - "active": false, - "moves": 10 - }, - "cost": 0 + "activated_is_setup": true, + "active": true, + "activated_eocs": [ "EOC_ARVORE_JAGGED_CLAWS_ON" ], + "deactivated_eocs": [ "EOC_ARVORE_JAGGED_CLAWS_ON" ] }, { "type": "mutation", "id": "ARVORE_WOOD_CLAWS_active", - "name": { "str": "Jagged Wooden Claws (active)" }, + "name": { "str": "Jagged Wooden Claws Extended" }, "points": 2, "visibility": 3, "ugliness": 2, "description": "Your hands are transformed into jagged wooden claws. You can use them to attack, but performing mundane tasks will be harder.", "types": [ "CLAWS" ], - "prereqs": [ "ARVORE_SKIN_2", "ARVORE_SKIN_3" ], "category": [ "ARVORE" ], - "transform": { - "target": "ARVORE_WOOD_CLAWS", - "msg_transform": "The wood covering your hands receeds, leaving no trace behind.", - "active": false, - "moves": 10 - }, "cost": 0, - "copy-from": "ARVORE_WOOD_CLAWS", + "player_display": false, "valid": false, - "active": true, "integrated_armor": [ "integrated_arvore_claws" ], - "crafting_speed_multiplier": 0.75 + "crafting_speed_multiplier": 0.5 }, { "type": "mutation", @@ -701,23 +540,9 @@ "points": 1, "visibility": 0, "ugliness": 0, - "description": "By the places of the sun and the moon, you can always tell exactly what time it is.", - "category": [ "ARVORE" ], - "triggers": [ [ { "condition": { "math": [ "u_val('pos_z')", "<=", "-1" ] }, "msg_on": { "text": "", "rating": "good" } } ] ], - "transform": { "target": "ARVORE_KNOW_TIME_OFF", "msg_transform": "", "active": false, "moves": 0 }, - "flags": [ "WATCH", "ALARMCLOCK" ] - }, - { - "type": "mutation", - "id": "ARVORE_KNOW_TIME_OFF", - "name": { "str": "Sensing the Sun" }, - "points": 1, - "visibility": 0, - "ugliness": 0, - "description": "By the places of the sun and the moon, you can always tell exactly what time it is. Or you could, if you weren't underground.", + "description": "By the places of the sun and the moon, you can always tell exactly what time it is, as long as you're not underground.", "category": [ "ARVORE" ], - "triggers": [ [ { "condition": { "math": [ "u_val('pos_z')", ">=", "0" ] }, "msg_on": { "text": "", "rating": "good" } } ] ], - "transform": { "target": "ARVORE_KNOW_TIME", "msg_transform": "", "active": false, "moves": 0 } + "enchantments": [ "ench_arvore_sense_sun" ] }, { "type": "mutation", @@ -727,16 +552,7 @@ "visibility": 0, "ugliness": 0, "prereqs": [ "GREENSTRIDE" ], - "prereqs2": [ - "ARVORE_SUN_NUTRIENTS", - "ARVORE_SUN_NUTRIENTS_ON", - "ARVORE_SUN_NUTRIENTS_AND_MANA", - "ARVORE_SUN_NUTRIENTS_AND_MANA_ON", - "ARVORE_SUN_MANA_BONUS", - "ARVORE_SUN_MANA_BONUS_ON", - "ARVORE_SUN_POWER_MANA_STATS", - "ARVORE_SUN_POWER_MANA_STATS_ON" - ], + "prereqs2": [ "ARVORE_SUN_NUTRIENTS", "ARVORE_SUN_NUTRIENTS_AND_MANA", "ARVORE_SUN_MANA_BONUS", "ARVORE_SUN_POWER_MANA_STATS" ], "description": "The wilderness welcomes you as one of its own, and you have an easier time surviving there and making things from its bounty. +1.5 Survival skill.", "category": [ "ARVORE" ], "craft_skill_bonus": [ [ "survival", 6 ] ] @@ -1022,7 +838,6 @@ "valid": false, "prereqs": [ "ARVORE_EYES" ], "changes_to": [ "ARVORE_FOREST_DETECT_AND_OVERMAP" ], - "leads_to": [ "ARVORE_FOREST_MAPPING" ], "description": "In the whispers of the leaves and the movement of the grasses, the forest warns you of approaching dangers. The foliage is whispering to you of hidden dangers nearby.", "category": [ "ARVORE" ], "enchantments": [ "arvore_forest_detect_enemies" ], @@ -1057,7 +872,7 @@ "points": 4, "visibility": 0, "ugliness": 0, - "prereqs": [ "ARVORE_EYES" ], + "prereqs": [ "ARVORE_FOREST_DETECT", "ARVORE_FOREST_DETECT_ON" ], "leads_to": [ "ARVORE_FOREST_MAPPING" ], "description": "In the whispers of the leaves and the movement of the grasses, the forest warns you of approaching dangers. When outside and near thick foliage, you can detect your enemies. Also, you can see further when you're standing in a forest.", "category": [ "ARVORE" ], @@ -1093,7 +908,7 @@ "visibility": 0, "ugliness": 0, "valid": false, - "prereqs": [ "ARVORE_EYES" ], + "prereqs": [ "ARVORE_FOREST_DETECT", "ARVORE_FOREST_DETECT_ON" ], "leads_to": [ "ARVORE_FOREST_MAPPING" ], "description": "In the whispers of the leaves and the movement of the grasses, the forest warns you of approaching dangers. The foliage is whispering to you of hidden dangers nearby and revealing the lay of the land to you.", "category": [ "ARVORE" ], @@ -1158,36 +973,27 @@ "description": "Every rose has its thorn and so do you. With a moment's concentration, you can exude thorns through your skin that have a chance of damaging attackers while increasing the damage of your unarmed attacks. However, you cannot wear rigid armor over your thorns.", "category": [ "ARVORE" ], "active": true, - "transform": { - "target": "ARVORE_THORN_SKIN_ON", - "msg_transform": "Woody thorns push through your skin!", - "active": true, - "moves": 50 - } + "activated_is_setup": true, + "activated_eocs": [ "EOC_ARVORE_THORNSKIN_ON" ], + "deactivated_eocs": [ "EOC_ARVORE_THORNSKIN_ON" ] }, { "type": "mutation", "id": "ARVORE_THORN_SKIN_ON", - "name": { "str": "Unveiled Thorns (active)" }, + "name": { "str": "Unveiled Thorns Extended" }, "points": 7, "visibility": 8, "ugliness": 4, "description": "You are exuding thorns through your skin that have a chance of damaging attackers while increasing the damage of your unarmed attacks. However, you cannot wear rigid armor over your thorns.", "category": [ "ARVORE" ], - "active": true, + "player_display": false, "valid": false, "restricts_gear": [ "head", "torso", "arm_l", "arm_r", "leg_r", "leg_l" ], "remove_rigid": [ "head", "torso", "arm_l", "arm_r", "leg_r", "leg_l" ], "allow_soft_gear": true, "integrated_armor": [ "integrated_arvore_thorns" ], "enchantments": [ "ench_arvore_thorns_mut" ], - "encumbrance_covered": [ [ "hand_l", 10 ], [ "hand_r", 10 ] ], - "transform": { - "target": "ARVORE_THORN_SKIN", - "msg_transform": "Your thorns retract, leaving smooth unbroken skin behind.", - "active": false, - "moves": 50 - } + "encumbrance_covered": [ [ "hand_l", 10 ], [ "hand_r", 10 ] ] }, { "type": "mutation", @@ -1355,7 +1161,7 @@ "points": 8, "description": "You may transform into a tree, extending roots and spreading leaves out to the sun. You will heal faster, gain more benefit from sleep, and almost all monsters will ignore you, but you will only be dimly aware of the outside world and will be nearly unable to move.", "prereqs": [ "ARVORE_HEAL_LIMB_REGEN" ], - "prereqs2": [ "ARVORE_SUN_FOODS", "ARVORE_SUN_FOODS_ON" ], + "prereqs2": [ "ARVORE_SUN_FOODS" ], "category": [ "ARVORE" ], "threshreq": [ "THRESH_ARVORE" ], "active": true, @@ -1436,40 +1242,20 @@ "description": "Like a tree, you are fueled by the sun. When standing in the sunlight, you will absorb its energy as nutrients, heal slightly faster, your mana regenerates much quicker, and you gain a bonus to your maximum mana.", "category": [ "ARVORE" ], "threshreq": [ "THRESH_ARVORE" ], - "prereqs": [ "ARVORE_SUN_NUTRIENTS_AND_MANA", "ARVORE_SUN_NUTRIENTS_AND_MANA_ON" ], - "changes_to": [ "ARVORE_SUN_POWER_MANA_STATS" ], - "triggers": [ [ { "condition": { "and": [ "is_day", "u_is_outside" ] }, "msg_on": { "text": "", "rating": "good" } } ] ], - "transform": { "target": "ARVORE_SUN_MANA_BONUS_ON", "msg_transform": "", "active": false, "moves": 0 }, - "//": "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_SUN_MANA_BONUS_ON", - "name": { "str": "Solar Empowerment (active)" }, - "points": 10, - "visibility": 0, - "ugliness": 0, - "valid": false, - "description": "You feel the warm sun radiating down on you and revitalizing you. You are absorbing the sun's energy as nutrients, will heal slightly faster, your mana is regenerating quicker, and your maximum mana is increased.", - "category": [ "ARVORE" ], - "threshreq": [ "THRESH_ARVORE" ], + "prereqs": [ "ARVORE_SUN_NUTRIENTS_AND_MANA" ], "changes_to": [ "ARVORE_SUN_POWER_MANA_STATS" ], - "vitamin_rates": [ [ "calcium", -1200, "vitC", -1200, "iron", -1200 ] ], - "healing_awake": 0.25, - "healing_multiplier": 1.5, - "mending_modifier": 3.0, - "//": "Halfway between fast healer and very fast healer, but only outside in the sun", - "mana_regen_multiplier": 1.5, - "mana_multiplier": 1.5, - "triggers": [ - [ - { - "condition": { "or": [ { "not": "is_day" }, { "not": "u_is_outside" } ] }, - "msg_on": { "text": "", "rating": "good" } - } - ] + "enchantments": [ + { + "condition": { "and": [ "is_day", "u_is_outside" ] }, + "values": [ + { "value": "REGEN_HP", "multiply": 0.5 }, + { "value": "REGEN_MANA", "multiply": 0.5 }, + { "value": "MAX_MANA", "multiply": 0.5 } + ], + "ench_effects": [ { "effect": "effect_arvore_vitamin_bonus", "intensity": 1 } ] + } ], - "transform": { "target": "ARVORE_SUN_MANA_BONUS", "msg_transform": "", "active": false, "moves": 0 } + "//": "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", @@ -1481,38 +1267,22 @@ "description": "Like a tree, you are fueled by the sun. When standing in the sunlight, you will absorb its energy as nutrients, heal slightly faster, your mana regenerates much quicker, you gain a bonus to your maximum mana, and you gain a +2 bonus to all stats.", "category": [ "ARVORE" ], "threshreq": [ "THRESH_ARVORE" ], - "prereqs": [ "ARVORE_SUN_MANA_BONUS", "ARVORE_SUN_MANA_BONUS_ON" ], - "triggers": [ [ { "condition": { "and": [ "is_day", "u_is_outside" ] }, "msg_on": { "text": "", "rating": "good" } } ] ], - "transform": { "target": "ARVORE_SUN_POWER_MANA_STATS_ON", "msg_transform": "", "active": false, "moves": 0 }, - "//": "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_SUN_POWER_MANA_STATS_ON", - "name": { "str": "Solar Ascendancy (active)" }, - "points": 10, - "visibility": 0, - "ugliness": 0, - "valid": false, - "description": "You feel the warm sun radiating down on you and revitalizing you. You are absorbing the sun's energy as nutrients, will heal slightly faster, your mana is regenerating quicker, your maximum mana is increased, and you have +2 to all stats.", - "category": [ "ARVORE" ], - "threshreq": [ "THRESH_ARVORE" ], - "vitamin_rates": [ [ "calcium", -1200, "vitC", -1200, "iron", -1200 ] ], - "healing_awake": 0.25, - "healing_multiplier": 1.5, - "mending_modifier": 3.0, - "//": "Halfway between fast healer and very fast healer, but only outside in the sun", - "mana_regen_multiplier": 1.5, - "mana_multiplier": 1.5, - "passive_mods": { "str_mod": 2, "dex_mod": 2, "int_mod": 2, "per_mod": 2 }, - "triggers": [ - [ - { - "condition": { "or": [ { "not": "is_day" }, { "not": "u_is_outside" } ] }, - "msg_on": { "text": "", "rating": "good" } - } - ] + "prereqs": [ "ARVORE_SUN_MANA_BONUS" ], + "enchantments": [ + { + "condition": { "and": [ "is_day", "u_is_outside" ] }, + "values": [ + { "value": "REGEN_HP", "multiply": 0.5 }, + { "value": "REGEN_MANA", "multiply": 0.5 }, + { "value": "MAX_MANA", "multiply": 0.5 }, + { "value": "STRENGTH", "add": 2 }, + { "value": "DEXTERITY", "add": 2 }, + { "value": "INTELLIGENCE", "add": 2 }, + { "value": "PERCEPTION", "add": 2 } + ], + "ench_effects": [ { "effect": "effect_arvore_vitamin_bonus", "intensity": 1 } ] + } ], - "transform": { "target": "ARVORE_SUN_POWER_MANA_STATS", "msg_transform": "", "active": false, "moves": 0 } + "//": "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." } ] diff --git a/data/mods/Xedra_Evolved/obsoletion_and_migration/migration_eocs.json b/data/mods/Xedra_Evolved/obsoletion_and_migration/migration_eocs.json new file mode 100644 index 0000000000000..f3c1b66b114b4 --- /dev/null +++ b/data/mods/Xedra_Evolved/obsoletion_and_migration/migration_eocs.json @@ -0,0 +1,18 @@ +[ + { + "type": "effect_on_condition", + "id": "EOC_ARVORE_JAGGED_CLAWS_LOAD_UPGRADE", + "eoc_type": "EVENT", + "required_event": "game_load", + "condition": { "and": [ { "not": { "u_has_trait": "ARVORE_WOOD_CLAWS" } }, { "u_has_trait": "ARVORE_WOOD_CLAWS_active" } ] }, + "effect": [ { "u_add_trait": "ARVORE_WOOD_CLAWS" } ] + }, + { + "type": "effect_on_condition", + "id": "EOC_ARVORE_THORN_SKIN_LOAD_UPGRADE", + "eoc_type": "EVENT", + "required_event": "game_load", + "condition": { "and": [ { "not": { "u_has_trait": "ARVORE_THORN_SKIN" } }, { "u_has_trait": "ARVORE_THORN_SKIN_ON" } ] }, + "effect": [ { "u_add_trait": "ARVORE_THORN_SKIN" } ] + } +] diff --git a/data/mods/Xedra_Evolved/obsoletion_and_migration/mutations.json b/data/mods/Xedra_Evolved/obsoletion_and_migration/mutations.json new file mode 100644 index 0000000000000..122d9aeb21260 --- /dev/null +++ b/data/mods/Xedra_Evolved/obsoletion_and_migration/mutations.json @@ -0,0 +1,146 @@ +[ + { + "type": "mutation", + "id": "ARVORE_KNOW_TIME_OFF", + "name": { "str": "Sensing the Sun" }, + "points": 1, + "visibility": 0, + "ugliness": 0, + "description": "By the places of the sun and the moon, you can always tell exactly what time it is. Or you could, if you weren't underground.", + "category": [ "ARVORE" ], + "triggers": [ [ { "condition": { "math": [ "u_val('pos_z')", ">=", "0" ] }, "msg_on": { "text": "", "rating": "good" } } ] ], + "transform": { "target": "ARVORE_KNOW_TIME", "msg_transform": "", "active": false, "moves": 0 } + }, + { + "type": "mutation", + "id": "ARVORE_SUN_FOODS_ON", + "name": { "str": "Solar Repast (active)" }, + "points": 3, + "visibility": 0, + "ugliness": 0, + "valid": false, + "description": "You feel the warm sun radiating down on you and revitalizing you. You are absorbing the sun's energy as food and will need to eat much less.", + "category": [ "ARVORE" ], + "threshreq": [ "THRESH_ARVORE" ], + "enchantments": [ "ench_arvore_sun_foods_on" ], + "triggers": [ + [ + { + "condition": { + "and": [ + "is_day", + "u_is_outside", + { + "or": [ + { "u_is_on_terrain_with_flag": "SHRUB" }, + { "u_is_on_terrain": "t_tree_young" }, + { "u_is_on_terrain": "t_bamboo_tall" }, + { "u_is_on_terrain": "t_dirt" }, + { "u_is_on_terrain": "t_dirtmound" }, + { "u_is_on_terrain": "t_clay" }, + { "u_is_on_terrain": "t_sand" }, + { "u_is_on_terrain": "t_sandmound" }, + { "u_is_on_terrain": "t_grave" }, + { "u_is_on_terrain": "t_forestfloor" }, + { "u_is_on_terrain": "t_grass" }, + { "u_is_on_terrain": "t_grass_long" }, + { "u_is_on_terrain": "t_grass_tall" }, + { "u_is_on_terrain": "t_grass_dead" }, + { "u_is_on_terrain": "t_mud" }, + { "u_is_on_terrain": "t_dirtfloor_no_roof" }, + { "u_is_on_terrain": "t_moss" } + ] + } + ] + }, + "msg_on": { "text": "", "rating": "good" } + } + ] + ], + "transform": { "target": "ARVORE_SUN_FOODS", "msg_transform": "", "active": false, "moves": 0 } + }, + { + "type": "mutation", + "id": "ARVORE_SUN_NUTRIENTS_ON", + "name": { "str": "Solar Rejuvenation (active)" }, + "points": 3, + "visibility": 0, + "ugliness": 0, + "valid": false, + "description": "You feel the warm sun radiating down on you and revitalizing you. You are absorbing the sun's energy as nutrients and will heal slightly faster.", + "category": [ "ARVORE" ], + "changes_to": [ "ARVORE_SUN_NUTRIENTS_AND_MANA" ], + "vitamin_rates": [ [ "calcium", -1200, "vitC", -1200, "iron", -1200 ] ], + "healing_awake": 0.25, + "healing_multiplier": 1.5, + "mending_modifier": 3.0, + "//": "Halfway between fast healer and very fast healer, but only outside in the sun", + "triggers": [ [ { "condition": { "and": [ "is_day", "u_is_outside" ] }, "msg_on": { "text": "", "rating": "good" } } ] ], + "transform": { "target": "ARVORE_SUN_NUTRIENTS", "msg_transform": "", "active": false, "moves": 0 } + }, + { + "type": "mutation", + "id": "ARVORE_SUN_NUTRIENTS_AND_MANA_ON", + "name": { "str": "Solar Revitalization (active)" }, + "points": 3, + "visibility": 0, + "ugliness": 0, + "valid": false, + "description": "You feel the warm sun radiating down on you and revitalizing you. You are absorbing the sun's energy as nutrients, will heal slightly faster, and your mana is regenerating quicker.", + "category": [ "ARVORE" ], + "prereqs": [ "ARVORE_SUN_NUTRIENTS" ], + "changes_to": [ "ARVORE_SUN_MANA_BONUS" ], + "vitamin_rates": [ [ "calcium", -1200, "vitC", -1200, "iron", -1200 ] ], + "healing_awake": 0.25, + "healing_multiplier": 1.5, + "mending_modifier": 3.0, + "mana_regen_multiplier": 1.5, + "//": "Halfway between fast healer and very fast healer, but only outside in the sun", + "triggers": [ [ { "condition": { "and": [ "is_day", "u_is_outside" ] }, "msg_on": { "text": "", "rating": "good" } } ] ], + "transform": { "target": "ARVORE_SUN_NUTRIENTS_AND_MANA", "msg_transform": "", "active": false, "moves": 0 } + }, + { + "type": "mutation", + "id": "ARVORE_SUN_MANA_BONUS_ON", + "name": { "str": "Solar Empowerment (active)" }, + "points": 10, + "visibility": 0, + "ugliness": 0, + "valid": false, + "description": "You feel the warm sun radiating down on you and revitalizing you. You are absorbing the sun's energy as nutrients, will heal slightly faster, your mana is regenerating quicker, and your maximum mana is increased.", + "category": [ "ARVORE" ], + "threshreq": [ "THRESH_ARVORE" ], + "changes_to": [ "ARVORE_SUN_POWER_MANA_STATS" ], + "vitamin_rates": [ [ "calcium", -1200, "vitC", -1200, "iron", -1200 ] ], + "healing_awake": 0.25, + "healing_multiplier": 1.5, + "mending_modifier": 3.0, + "//": "Halfway between fast healer and very fast healer, but only outside in the sun", + "mana_regen_multiplier": 1.5, + "mana_multiplier": 1.5, + "triggers": [ [ { "condition": { "and": [ "is_day", "u_is_outside" ] }, "msg_on": { "text": "", "rating": "good" } } ] ], + "transform": { "target": "ARVORE_SUN_MANA_BONUS", "msg_transform": "", "active": false, "moves": 0 } + }, + { + "type": "mutation", + "id": "ARVORE_SUN_POWER_MANA_STATS_ON", + "name": { "str": "Solar Ascendancy (active)" }, + "points": 10, + "visibility": 0, + "ugliness": 0, + "valid": false, + "description": "You feel the warm sun radiating down on you and revitalizing you. You are absorbing the sun's energy as nutrients, will heal slightly faster, your mana is regenerating quicker, your maximum mana is increased, and you have +2 to all stats.", + "category": [ "ARVORE" ], + "threshreq": [ "THRESH_ARVORE" ], + "vitamin_rates": [ [ "calcium", -1200, "vitC", -1200, "iron", -1200 ] ], + "healing_awake": 0.25, + "healing_multiplier": 1.5, + "mending_modifier": 3.0, + "//": "Halfway between fast healer and very fast healer, but only outside in the sun", + "mana_regen_multiplier": 1.5, + "mana_multiplier": 1.5, + "passive_mods": { "str_mod": 2, "dex_mod": 2, "int_mod": 2, "per_mod": 2 }, + "triggers": [ [ { "condition": { "and": [ "is_day", "u_is_outside" ] }, "msg_on": { "text": "", "rating": "good" } } ] ], + "transform": { "target": "ARVORE_SUN_POWER_MANA_STATS", "msg_transform": "", "active": false, "moves": 0 } + } +]