[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
CleverRaven · Feb 23, 2024 · 6f0900d · 6f0900d
1 parent cefcb0a
commit 6f0900d
Show file tree

Hide file tree

Showing 6 changed files with 305 additions and 296 deletions.
diff --git 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
@@ -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
@@ -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 } ]
   },