Merge pull request #78302 from Standing-Storm/tree-form-fixes

[Xedra Evolved] Arvore One with the Forest + the Forest's Warning updates
CleverRaven · Dec 4, 2024 · f9fa8ea · f9fa8ea
2 parents 419748e + 560fdda
commit f9fa8ea
Show file tree

Hide file tree

Showing 5 changed files with 101 additions and 36 deletions.
diff --git a/data/mods/Xedra_Evolved/effects/effects.json b/data/mods/Xedra_Evolved/effects/effects.json
@@ -1164,19 +1164,6 @@
       "healing_rate": [ 2 ]
     }
   },
-  {
-    "type": "effect_type",
-    "id": "effect_arvore_tree_immobility",
-    "name": [ "Rooted" ],
-    "desc": [ "Your roots sink into the ground and you are nearly immobile." ],
-    "apply_message": "",
-    "remove_message": "",
-    "rating": "mixed",
-    "max_intensity": 100000,
-    "show_intensity": false,
-    "limb_score_mods": [ { "limb_score": "lift", "modifier": 0.51 }, { "limb_score": "grip", "modifier": 0.25 } ],
-    "flags": [ "EFFECT_LIMB_SCORE_MOD", "EFFECT_IMPEDING" ]
-  },
   {
     "type": "effect_type",
     "id": "effect_arvore_seedbearer_available",

diff --git a/data/mods/Xedra_Evolved/mutations/paraclesians/arvore_eocs.json b/data/mods/Xedra_Evolved/mutations/paraclesians/arvore_eocs.json
@@ -812,12 +812,7 @@
     "type": "effect_on_condition",
     "id": "EOC_ARVORE_TREE_FORM_ON",
     "condition": { "and": [ "u_is_outside", { "test_eoc": "EOC_CONDITION_CHECK_ARVORE_ON_NATURAL_TERRAIN" } ] },
-    "effect": [
-      { "u_add_trait": "CHLOROMORPH" },
-      { "u_add_trait": "LEAVES3" },
-      { "u_add_trait": "ARVORE_TREE_FORM_TRAITS" },
-      { "u_add_effect": "effect_arvore_tree_immobility", "duration": 86400, "intensity": 100 }
-    ],
+    "effect": [ { "u_add_trait": "CHLOROMORPH" }, { "u_add_trait": "LEAVES3" }, { "u_add_trait": "ARVORE_TREE_FORM_TRAITS" } ],
     "false_effect": [ { "u_message": "You must be outside on diggable ground to become one with the forest.", "type": "bad" } ]
   },
   {

diff --git a/data/mods/Xedra_Evolved/mutations/paraclesians/arvore_mutation_spells.json b/data/mods/Xedra_Evolved/mutations/paraclesians/arvore_mutation_spells.json
@@ -14,6 +14,7 @@
         "u_is_outside",
         {
           "or": [
+            { "u_has_trait": "ARVORE_TREE_FORM_TRAITS" },
             { "u_is_on_terrain_with_flag": "SHRUB" },
             { "u_is_on_terrain_with_flag": "YOUNG" },
             { "u_is_on_terrain": "t_bamboo_tall" },
@@ -27,20 +28,97 @@
     "special_vision": [
       {
         "distance": { "math": [ "u_val('perception') + u_val('intelligence')" ] },
+        "condition": {
+          "and": [
+            { "not": { "npc_has_species": "ZOMBIE" } },
+            {
+              "or": [
+                "npc_is_npc",
+                { "npc_has_species": "FERAL" },
+                { "npc_has_species": "HUMAN" },
+                { "npc_has_species": "RENFIELD" },
+                { "npc_has_flag": "HUMAN" }
+              ]
+            }
+          ]
+        },
+        "descriptions": [
+          {
+            "id": "moving_creature",
+            "symbol": "?",
+            "color": "c_white",
+            "text": "The forest nervously whispers to you about the presence of humans."
+          }
+        ]
+      },
+      {
+        "distance": { "math": [ "u_val('perception') + u_val('intelligence')" ] },
+        "condition": {
+          "and": [
+            { "not": { "npc_has_species": "ZOMBIE" } },
+            {
+              "or": [
+                { "npc_has_species": "MAMMAL" },
+                { "npc_has_species": "BIRD" },
+                { "npc_has_species": "REPTILE" },
+                { "npc_has_species": "MAMMAL" },
+                { "npc_has_species": "PLANT" },
+                { "npc_has_species": "AMPHIBIAN" },
+                { "npc_has_species": "FISH" },
+                { "npc_has_species": "INSECT" },
+                { "npc_has_species": "CENTIPEDE" },
+                { "npc_has_species": "SPIDER" },
+                { "npc_has_species": "INSECT_FLYING" },
+                { "npc_has_species": "MOLLUSK" },
+                { "npc_has_species": "ARVORE" }
+              ]
+            }
+          ]
+        },
+        "descriptions": [
+          {
+            "id": "infrared_creature_medium",
+            "symbol": "?",
+            "color": "c_green",
+            "text": "The forest gently whispers to you about the creatures of nature."
+          }
+        ]
+      },
+      {
+        "distance": { "math": [ "u_val('perception') + u_val('intelligence')" ] },
+        "condition": {
+          "or": [
+            { "npc_has_species": "ZOMBIE" },
+            { "npc_has_species": "FUNGUS" },
+            { "npc_has_species": "MIGO" },
+            { "npc_has_species": "NETHER" },
+            { "npc_has_species": "NETHER_BURROWING" },
+            { "npc_has_species": "VAMPIRE" },
+            { "npc_has_species": "NIGHTMARE" },
+            { "npc_has_species": "HORROR" },
+            { "npc_has_species": "ABERRATION" }
+          ]
+        },
         "descriptions": [
-          { "id": "moving_creature", "symbol": "?", "color": "c_white", "text": "Forest whispers in your ears about menacings." }
+          {
+            "id": "alien_being_sense",
+            "symbol": "?",
+            "color": "c_red",
+            "text": "The forest whispers warnings of unnatural creatures nearby."
+          }
         ]
       }
     ]
   },
   {
     "type": "enchantment",
-    "id": "arvore_forest_detect_enemies_and_overmap",
+    "id": "arvore_forest_see_overmap",
     "condition": {
       "and": [
         "u_is_outside",
         {
           "or": [
+            { "u_has_trait": "ARVORE_TREE_FORM_TRAITS" },
             { "u_is_on_terrain_with_flag": "SHRUB" },
             { "u_is_on_terrain_with_flag": "YOUNG" },
             { "u_is_on_terrain": "t_bamboo_tall" },
@@ -51,14 +129,6 @@
         }
       ]
     },
-    "special_vision": [
-      {
-        "distance": { "math": [ "u_val('perception') + u_val('intelligence')" ] },
-        "descriptions": [
-          { "id": "moving_creature", "symbol": "?", "color": "c_white", "text": "Forest whispers in your ears about menacings." }
-        ]
-      }
-    ],
     "values": [
       {
         "value": "OVERMAP_SIGHT",

diff --git a/data/mods/Xedra_Evolved/mutations/paraclesians/arvore_mutations.json b/data/mods/Xedra_Evolved/mutations/paraclesians/arvore_mutations.json
@@ -834,7 +834,7 @@
     "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.  When outside and near thick foliage, you can detect your enemies.",
+    "description": "In the whispers of the leaves and the movement of the grasses, the forest warns you of nearby creatures.  While the forest can distinguish between a bird and a zombie, some fine distinctions are still lost to it.",
     "category": [ "ARVORE" ],
     "enchantments": [ "arvore_forest_detect_enemies" ]
   },
@@ -847,9 +847,9 @@
     "ugliness": 0,
     "prereqs": [ "ARVORE_FOREST_DETECT" ],
     "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.",
+    "description": "In the whispers of the leaves and the movement of the grasses, the forest warns you of nearby creatures.  While the forest can distinguish between a bird and a zombie, some fine distinctions are still lost to it.  Also, you can see further when you're standing in a forest.",
     "category": [ "ARVORE" ],
-    "enchantments": [ "arvore_forest_detect_enemies_and_overmap" ]
+    "enchantments": [ "arvore_forest_detect_enemies", "arvore_forest_see_overmap" ]
   },
   {
     "type": "mutation",
@@ -977,7 +977,6 @@
     "activated_is_setup": true,
     "activation_msg": "Your legs fuse together and your arms stretch toward the sky as you put down roots and transform into a towering tree.",
     "activated_eocs": [ "EOC_ARVORE_TREE_FORM_ON" ],
-    "processed_eocs": [ "EOC_ARVORE_TREE_FORM_IMMOBILE" ],
     "deactivated_eocs": [ "EOC_ARVORE_TREE_FORM_OFF" ]
   },
   {
@@ -991,7 +990,7 @@
     "threshreq": [ "THRESH_ARVORE" ],
     "//": "Healing values copied from the Regeneration mutation",
     "override_look": { "id": "t_tree", "tile_category": "terrain" },
-    "flags": [ "DEAF", "BLIND", "SEESLEEP", "NO_SCENT", "NO_SPELLCASTING" ],
+    "flags": [ "DEAF", "BLIND", "SEESLEEP", "NO_SCENT", "NO_SPELLCASTING", "IMMUNE_HEARING_DAMAGE", "CANNOT_MOVE" ],
     "wet_protection": [
       { "part": "head", "ignored": 40 },
       { "part": "leg_l", "ignored": 40 },
@@ -1036,15 +1035,16 @@
     ],
     "//2": "NETHER_EMANATION missing from the above list is deliberate--they hone in on mental activity and the transformed Arvore still thinks.",
     "enchantments": [
-      "ench_arvore_tree_form",
       {
         "values": [
           { "value": "ATTACK_SPEED", "multiply": 900 },
           { "value": "METABOLISM", "multiply": -0.5 },
           { "value": "SLEEPINESS_REGEN", "multiply": 0.5 },
           { "value": "MENDING_MODIFIER", "multiply": 15 },
           { "value": "REGEN_HP", "multiply": 1.5 },
-          { "value": "REGEN_HP_AWAKE", "multiply": 0.8 }
+          { "value": "REGEN_HP_AWAKE", "multiply": 0.8 },
+          { "value": "SLEEPY", "add": 150 },
+          { "value": "CLIMATE_CONTROL_HEAT", "add": 150 }
         ]
       }
     ]

diff --git a/data/mods/Xedra_Evolved/obsoletion_and_migration/effects.json b/data/mods/Xedra_Evolved/obsoletion_and_migration/effects.json
@@ -23,5 +23,18 @@
     "//": "typo id and non-typo id were both mentioned, so the typo id is being obsoleted",
     "name": [ "" ],
     "desc": [ "" ]
+  },
+  {
+    "type": "effect_type",
+    "id": "effect_arvore_tree_immobility",
+    "name": [ "Rooted" ],
+    "desc": [ "Your roots sink into the ground and you are nearly immobile." ],
+    "apply_message": "",
+    "remove_message": "",
+    "rating": "mixed",
+    "max_intensity": 100000,
+    "show_intensity": false,
+    "limb_score_mods": [ { "limb_score": "lift", "modifier": 0.51 }, { "limb_score": "grip", "modifier": 0.25 } ],
+    "flags": [ "EFFECT_LIMB_SCORE_MOD", "EFFECT_IMPEDING" ]
   }
 ]